diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index a28eab9..73cbbcd 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "apikana", - "version": "0.9.33", + "version": "0.9.34", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 9bd931e..e9d4067 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apikana", - "version": "0.9.33", + "version": "0.9.34", "description": "Integrated tools for REST API design - アピ", "main": "index.js", "bin": { diff --git a/src/generate-schema.js b/src/generate-schema.js index 8511b85..aa883b7 100644 --- a/src/generate-schema.js +++ b/src/generate-schema.js @@ -24,6 +24,7 @@ module.exports = { log.info('Found definition', colors.magenta(name)); var schema = schemas[name]; var v3 = handleAllOf(schema); + unquoteEnumValues(schema); removeDefinitions(schema); replaceLocalRef(schema); replaceLocalRef(v3); @@ -154,6 +155,16 @@ module.exports = { } } + function unquoteEnumValues(schema) { + if (schema.enum) { + schema.enum = schema.enum.map(v => v + .replace(/^"/, "") + .replace(/^'/, "") + .replace(/"$/, "") + .replace(/'$/, "")); + } + } + function removeDefinitions(schema) { for (var type in schema.definitions) { var info = schemaInfos[type];