Fix up OpenAPI identifier issues

Author: keithwhor

lib/well-knowns.js

@@ -174,9 +174,14 @@ const generateOpenAPISpec = (definitions, plugin, server, origin, identifier) =>
       } else if (!route.endsWith('/')) {
         route = route + '/';
       }
+      let opIdentifier = identifier.replace(/\[(.*)\]/gi, '');
+      let operationId = `${opIdentifier}${parts.length ? ('.' + parts.join('.')) : ''}`;
+      operationId = operationId.replace(/[^A-Z0-9_]+/gi, '_');
+      operationId = operationId.replace(/^_+/gi, '');
+      operationId = operationId.replace(/_+$/gi, '');
       let pathData = {
         description: def.description,
-        operationId: `${identifier}${parts.length ? ('.' + parts.join('.')) : ''}`,
+        operationId: operationId
       };
       // If we have at least one required parameter...
       if (def.params.filter(param => !param.hasOwnProperty('defaultValue').length > 0)) {
@@ -335,7 +340,10 @@ const wellKnowns = {
       const AIPlugin = {};
       AIPlugin.schema_version = 'v1';
       AIPlugin.name_for_human = plugin.name.slice(0, 20);
-      AIPlugin.name_for_model = plugin.forModel.name.slice(0, 50).replace(/[^A-Z0-9_]+/gi, '_');
+      AIPlugin.name_for_model = plugin.forModel.name.slice(0, 50);
+      AIPlugin.name_for_model = AIPlugin.name_for_model.replace(/[^A-Z0-9_]+/gi, '_');
+      AIPlugin.name_for_model = AIPlugin.name_for_model.replace(/^_+/gi, '');
+      AIPlugin.name_for_model = AIPlugin.name_for_model.replace(/_+$/gi, '');
       AIPlugin.description_for_human = plugin.description.slice(0, 100);
       AIPlugin.description_for_model = plugin.forModel.description.slice(0, 8000);
       AIPlugin.auth = {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "functionscript",
-  "version": "2.10.3",
+  "version": "2.10.4",
   "description": "An API gateway and framework for turning functions into web services",
   "author": "Keith Horwood <keithwhor@gmail.com>",
   "main": "index.js",

tests/gateway/tests.js

@@ -5594,7 +5594,7 @@ module.exports = (expect) => {
       expect(result).to.exist;
       expect(result.schema_version).to.equal('v1');
       expect(result.name_for_human).to.equal('(No name provided)');
-      expect(result.name_for_model).to.equal('(No name provided)');
+      expect(result.name_for_model).to.equal('No_name_provided');
       expect(result.description_for_human).to.equal('(No description provided)');
       expect(result.description_for_model).to.equal('(No description provided)');
       expect(result.api).to.exist;
@@ -5627,7 +5627,7 @@ module.exports = (expect) => {
       expect(result.paths['/my_function/']).to.exist;
       expect(result.paths['/my_function/'].post).to.exist;
       expect(result.paths['/my_function/'].post.description).to.equal('My function');
-      expect(result.paths['/my_function/'].post.operationId).to.equal('service.localhost.my_function');
+      expect(result.paths['/my_function/'].post.operationId).to.equal('service_localhost_my_function');
       expect(result.paths['/my_function/'].post.requestBody).to.exist;
       expect(result.paths['/my_function/'].post.requestBody.content).to.exist;
       expect(result.paths['/my_function/'].post.requestBody.content['application/json']).to.exist;