ibm-openapi-support
Advanced tools
Comparing version 0.0.6 to 0.0.8
23
index.js
@@ -17,6 +17,7 @@ /* | ||
'use strict' | ||
let debug = require('debug')('arf:swaggerize:index') | ||
let debug = require('debug')('ibm-openapi-support:index') | ||
let utils = require('./utils') | ||
let swaggerParser = require('swagger-parser') | ||
let builderUtils = require('swaggerize-routes/lib/utils') | ||
let YAML = require('js-yaml') | ||
@@ -146,3 +147,12 @@ function ensureValidAsync (loadedSwagger) { | ||
debug('in parse') | ||
let loaded = JSON.parse(swaggerStr) | ||
let swaggerType= undefined | ||
let loaded= undefined | ||
if ( swaggerStr.charAt(0) == "{" ) { | ||
loaded = JSON.parse(swaggerStr) | ||
swaggerType= "json" | ||
} | ||
else { | ||
loaded= YAML.safeLoad(swaggerStr) | ||
swaggerType= "yaml" | ||
} | ||
return ensureValidAsync(loaded) | ||
@@ -152,5 +162,10 @@ .then(function () { | ||
// restore the original swagger as the call to ensureValidAsync modifies the original loaded object. | ||
loaded = JSON.parse(swaggerStr) | ||
return { loaded: loaded, parsed: parseSwagger(loaded, formatters) } | ||
if ( swaggerType == "json" ) { | ||
loaded = JSON.parse(swaggerStr); | ||
} | ||
else { | ||
loaded= YAML.safeLoad(swaggerStr) | ||
} | ||
return { loaded: loaded, parsed: parseSwagger(loaded, formatters), type: swaggerType } | ||
}) | ||
} |
{ | ||
"name": "ibm-openapi-support", | ||
"version": "0.0.6", | ||
"version": "0.0.8", | ||
"description": "utility for loading and parsing swagger", | ||
@@ -24,3 +24,3 @@ "author": { | ||
"debug": "^2.2.0", | ||
"js-yaml": "^3.4.2", | ||
"js-yaml": "^3.9.0", | ||
"bluebird": "^3.5.0", | ||
@@ -27,0 +27,0 @@ "request": "^2.81.0", |
@@ -110,2 +110,23 @@ /* | ||
describe('parse a Swagger document (yaml), empty formatters dict', function () { | ||
let formatters = {} | ||
let loadedApi | ||
let parsedSwagger | ||
before(function () { | ||
// Mock the options, set up an output folder and run the generator | ||
return utils.loadAsync(path.join(__dirname, '../resources/petstore.yaml'), fs) | ||
.then(loaded => swaggerize.parse(loaded, formatters)) | ||
.then(response => { | ||
loadedApi = response.loaded | ||
parsedSwagger = response.parsed | ||
}) | ||
}) | ||
it('returned parsed swagger dict and loadedApi document', function () { | ||
assert(loadedApi !== undefined) | ||
assert(parsedSwagger !== undefined) | ||
}) | ||
}) | ||
describe('parse a Swagger document, undefined formatters dict', function () { | ||
@@ -112,0 +133,0 @@ let formatters |
@@ -18,3 +18,3 @@ /* | ||
let debug = require('debug')('arf:swaggerize:utils') | ||
let debug = require('debug')('ibm-openapi-support:utils') | ||
let format = require('util').format | ||
@@ -21,0 +21,0 @@ let fs = require('fs') |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
New author
Supply chain riskA new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.
Found 1 instance in 1 package
54047
581
0
Updatedjs-yaml@^3.9.0