feat: use public ibm-openapi-support instead of internal swaggerize f…

…unction (#317)

lib/helpers.js

@@ -564,9 +564,12 @@ exports.loadAsync = function (path, memfs) {
     .then(data => isYaml ? JSON.stringify(YAML.load(data)) : data)
 }
 
-exports.reformatPathToSwift = function (thepath) {
-  // take a swagger path and convert the parameters to swift format.
-  // i.e. convert "/path/to/{param1}/{param2}" to "/path/to/:param1/:param2"
-  var newPath = thepath.replace(/{/g, ':')
-  return newPath.replace(/}/g, '')
+// take a swagger path and convert the parameters to Swift Kitura format.
+// i.e. convert "/path/to/{param1}/{param2}" to "/path/to/:param1/:param2"
+exports.reformatPathToSwiftKitura = (path) => path.replace(/{/g, ':').replace(/}/g, '')
+
+exports.resourceNameFromPath = function (thepath) {
+  // grab the first valid element of a path (or partial path) and return it capitalized.
+  var resource = thepath.match(/^\/*([^/]+)/)[1]
+  return resource.charAt(0).toUpperCase() + resource.slice(1)
 }

package.json

@@ -32,9 +32,7 @@
     "js-yaml": "^3.9.1",
     "request": "^2.81.0",
     "rimraf": "^2.5.2",
-    "swagger-parser": "^3.4.2",
-    "swagger-schema-official": "^2.0.0-d79c205",
-    "swaggerize-routes": "^1.0.0",
+    "ibm-openapi-support": "^0.0.4",
     "unzip2": "^0.2.5",
     "yeoman-generator": "^1.1.1"
   },

refresh/index.js

@@ -28,7 +28,7 @@ var fs = require('fs')
 
 var actions = require('../lib/actions')
 var helpers = require('../lib/helpers')
-var swaggerize = require('./fromswagger/swaggerize')
+var swaggerize = require('ibm-openapi-support')
 var sdkHelper = require('../lib/sdkGenHelper')
 var performSDKGenerationAsync = sdkHelper.performSDKGenerationAsync
 var getClientSDKAsync = sdkHelper.getClientSDKAsync
@@ -799,8 +799,13 @@ module.exports = Generator.extend({
   },
 
   parseOpenApiDocument: function () {
+    let formatters = {
+      'pathFormatter': helpers.reformatPathToSwiftKitura,
+      'resourceFormatter': helpers.resourceNameFromPath
+    }
+
     if (this.openApiDocumentBytes) {
-      return swaggerize.parse(this.openApiDocumentBytes, helpers.reformatPathToSwift)
+      return swaggerize.parse(this.openApiDocumentBytes, formatters)
         .then(response => {
           this.loadedApi = response.loaded
           this.parsedSwagger = response.parsed
@@ -1058,6 +1063,7 @@ module.exports = Generator.extend({
     createFromSwagger: function () {
       if (this.parsedSwagger) {
         Object.keys(this.parsedSwagger.resources).forEach(resource => {
+          debug(resource)
           this.fs.copyHbs(
             this.templatePath('fromswagger', 'Routes.swift.hbs'),
             this.destinationPath('Sources', this.applicationModule, 'Routes', `${resource}Routes.swift`),

test/unit/helpers.js

@@ -634,7 +634,7 @@ describe('Unit tests for helpers', function () {
 
   describe('swagger path formatter', function () {
     it('convert swagger path parameters to swift format', function () {
-      assert(helpers.reformatPathToSwift('/helper/ff/test/{p1}/{p2}') === '/helper/ff/test/:p1/:p2')
+      assert(helpers.reformatPathToSwiftKitura('/helper/ff/test/{p1}/{p2}') === '/helper/ff/test/:p1/:p2')
     })
   })
 })