Merge branch 'develop' into fix/issue#401

Author: aman-v-singh

CHANGELOG.md

@@ -1,5 +1,13 @@
 # OpenAPI-Postman Changelog
 
+#### v4.9.0 (February 06, 2023)
+* Fixed issue [#660](https://github.com/postmanlabs/openapi-to-postman/issues/660) where for certain XML request bodies, conversion was failing with TypeError.
+* Fixed issue where for some definitions having non-string URLs were failing conversion with TypeErrors.
+* Fixed issue where a test in-consistently kept failing due to uncertainity of jsf library.
+
+#### v4.8.0 (January 24, 2023)
+* Added specifictionVersion field to validate result.
+
 #### v4.7.0 (January 16, 2023)
 * Fixed an issue where same schema was being validated against examples multiple times during a conversion - using local cache here.
 * Added a way to return analytics along with the result for better observability into the kind of schemas we get for conversion.

OPTIONS.md

@@ -1,15 +1,15 @@
 id|type|available options|default|description|usage
 |---|---|---|---|---|---|
 requestNameSource|enum|URL, Fallback|Fallback|Determines how the requests inside the generated collection will be named. If “Fallback” is selected, the request will be named after one of the following schema values: `summary`, `operationId`, `description`, `url`.|CONVERSION, VALIDATION
-indentCharacter|enum|Space, Tab|Space|Option for setting indentation character|CONVERSION
+indentCharacter|enum|Space, Tab|Space|Option for setting indentation character.|CONVERSION
 collapseFolders|boolean|-|true|Importing will collapse all folders that have only one child element and lack persistent folder-level data.|CONVERSION
 optimizeConversion|boolean|-|true|Optimizes conversion for large specification, disabling this option might affect the performance of conversion.|CONVERSION
 requestParametersResolution|enum|Example, Schema|Schema|Select whether to generate the request parameters based on the [schema](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#schemaObject) or the [example](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#exampleObject) in the schema.|CONVERSION
 exampleParametersResolution|enum|Example, Schema|Example|Select whether to generate the response parameters based on the [schema](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#schemaObject) or the [example](https://github.com/OAI/OpenAPI-Specification/blob/master/versions/3.0.2.md#exampleObject) in the schema.|CONVERSION
 folderStrategy|enum|Paths, Tags|Paths|Select whether to create folders according to the spec’s paths or tags.|CONVERSION
 schemaFaker|boolean|-|true|Whether or not schemas should be faked.|CONVERSION
 stackLimit|integer|-|10|Number of nesting limit till which schema resolution will happen. Increasing this limit may result in more time to convert collection depending on complexity of specification. (To make sure this option works correctly "optimizeConversion" option needs to be disabled)|CONVERSION
-includeAuthInfoInExample|boolean|-|true|Select whether to include authentication parameters in the example request|CONVERSION
+includeAuthInfoInExample|boolean|-|true|Select whether to include authentication parameters in the example request.|CONVERSION
 shortValidationErrors|boolean|-|false|Whether detailed error messages are required for request <> schema validation operations.|VALIDATION
 validationPropertiesToIgnore|array|-|[]|Specific properties (parts of a request/response pair) to ignore during validation. Must be sent as an array of strings. Valid inputs in the array: PATHVARIABLE, QUERYPARAM, HEADER, BODY, RESPONSE_HEADER, RESPONSE_BODY|VALIDATION
 showMissingInSchemaErrors|boolean|-|false|MISSING_IN_SCHEMA indicates that an extra parameter was included in the request. For most use cases, this need not be considered an error.|VALIDATION
@@ -19,7 +19,7 @@ validateMetadata|boolean|-|false|Whether to show mismatches for incorrect name a
 ignoreUnresolvedVariables|boolean|-|false|Whether to ignore mismatches resulting from unresolved variables in the Postman request|VALIDATION
 strictRequestMatching|boolean|-|false|Whether requests should be strictly matched with schema operations. Setting to true will not include any matches where the URL path segments don't match exactly.|VALIDATION
 allowUrlPathVarMatching|boolean|-|false|Whether to allow matching path variables that are available as part of URL itself in the collection request|VALIDATION
-disableOptionalParameters|boolean|-|false|Whether to set optional parameters as disabled|CONVERSION
+enableOptionalParameters|boolean|-|true|Optional parameters aren't selected in the collection. Once enabled they will be selected in the collection and request as well.|CONVERSION
 keepImplicitHeaders|boolean|-|false|Whether to keep implicit headers from the OpenAPI specification, which are removed by default.|CONVERSION
 includeWebhooks|boolean|-|false|Select whether to include Webhooks in the generated collection|CONVERSION
 includeReferenceMap|boolean|-|false|Whether or not to include reference map or not as part of output|BUNDLE

lib/31XUtils/schemaUtils31X.js

@@ -125,7 +125,7 @@ module.exports = {
       schema.items = this.fixExamplesByVersion(schema.items);
     }
     else if (hasProperties) {
-      const schemaProperties = Object.keys(schema.properties);
+      const schemaProperties = _.keys(schema.properties);
       schemaProperties.forEach((property) => {
         schema.properties[property] = this.fixExamplesByVersion(schema.properties[property]);
       });
@@ -141,7 +141,7 @@ module.exports = {
    * @returns {boolean} Returns true if content is a binary type
    */
   isBinaryContentType (bodyType, contentObj) {
-    return Object.keys(contentObj[bodyType]).length === 0 && fileUploadTypes.includes(bodyType);
+    return _.keys(contentObj[bodyType]).length === 0 && fileUploadTypes.includes(bodyType);
   },
 
   getOuterPropsIfIsSupported(schema) {
@@ -152,7 +152,7 @@ module.exports = {
 
   addOuterPropsToRefSchemaIfIsSupported(refSchema, outerProps) {
     const resolvedSchema = _.cloneDeep(refSchema),
-      outerKeys = Object.keys(outerProps);
+      outerKeys = _.keys(outerProps);
 
     if (_.isObject(resolvedSchema) && _.isObject(outerProps)) {
       outerKeys.forEach((key) => {

lib/deref.js

@@ -91,7 +91,7 @@ module.exports = {
   /**
    * Creates a schema that's a union of all input schemas (only type: object is supported)
    *
-   * @param {array} schemaArr REQUIRED - array of schemas, all of which must be valid in the returned object
+   * @param {*} schema REQUIRED - OpenAPI defined schema object to be resolved
    * @param {string} parameterSourceOption REQUIRED tells that the schema object is of request or response
    * @param {*} components REQUIRED components in openapi spec.
    * @param {object} options - REQUIRED a list of options to indicate the type of resolution needed.
@@ -103,7 +103,7 @@ module.exports = {
    * @param {*} options.stackLimit Depth to which the schema should be resolved.
    * @returns {*} schema - schema that adheres to all individual schemas in schemaArr
    */
-  resolveAllOf: function (schemaArr, parameterSourceOption, components, {
+  resolveAllOf: function (schema, parameterSourceOption, components, {
     resolveFor = RESOLVE_REF_DEFAULTS.resolveFor,
     resolveTo = RESOLVE_REF_DEFAULTS.resolveTo,
     stack = RESOLVE_REF_DEFAULTS.stack,
@@ -112,23 +112,25 @@ module.exports = {
     analytics = {}
   }) {
 
-    if (!(schemaArr instanceof Array)) {
+    if (_.isEmpty(schema)) {
       return null;
     }
 
-    if (schemaArr.length === 1) {
-      // for just one entry in allOf, don't need to enforce type: object restriction
-      return this.resolveRefs(schemaArr[0], parameterSourceOption, components,
-        { stack, seenRef: _.cloneDeep(seenRef), resolveFor, resolveTo, stackLimit, analytics });
+    let resolvedNonAllOfSchema = {};
+
+    // Resolve schema excluding allOf keyword which will be further used to resolve entire schema along with allOf
+    if (_.keys(schema).length > 1) {
+      resolvedNonAllOfSchema = this.resolveRefs(_.omit(schema, 'allOf'), parameterSourceOption, components,
+        { stack, seenRef: _.cloneDeep(seenRef), resolveFor, resolveTo, stackLimit, isAllOf: true, analytics });
     }
 
     try {
-      return mergeAllOf({
-        allOf: schemaArr.map((schema) => {
+      return mergeAllOf(_.assign(resolvedNonAllOfSchema, {
+        allOf: _.map(schema.allOf, (schema) => {
           return this.resolveRefs(schema, parameterSourceOption, components,
             { stack, seenRef: _.cloneDeep(seenRef), resolveFor, resolveTo, stackLimit, isAllOf: true, analytics });
         })
-      }, {
+      }), {
         resolvers: {
           // for keywords in OpenAPI schema that are not standard defined JSON schema keywords, use default resolver
           defaultResolver: (compacted) => { return compacted[0]; }
@@ -246,7 +248,7 @@ module.exports = {
       }) };
     }
     if (schema.allOf) {
-      return this.resolveAllOf(schema.allOf, parameterSourceOption, components,
+      return this.resolveAllOf(schema, parameterSourceOption, components,
         {
           resolveFor,
           resolveTo,
@@ -295,6 +297,9 @@ module.exports = {
         resolvedSchema = concreteUtils.addOuterPropsToRefSchemaIfIsSupported(resolvedSchema, outerProperties);
       }
       if (resolvedSchema) {
+        if (schema.example) {
+          resolvedSchema.example = schema.example;
+        }
         let refResolvedSchema = this.resolveRefs(resolvedSchema, parameterSourceOption,
           components, {
             resolveFor,

lib/options.js

@@ -75,7 +75,7 @@ module.exports = {
         type: 'enum',
         default: 'Space',
         availableOptions: ['Space', 'Tab'],
-        description: 'Option for setting indentation character',
+        description: 'Option for setting indentation character.',
         external: true,
         usage: ['CONVERSION'],
         supportedIn: [VERSION20, VERSION30, VERSION31]
@@ -168,7 +168,7 @@ module.exports = {
         id: 'includeAuthInfoInExample',
         type: 'boolean',
         default: true,
-        description: 'Select whether to include authentication parameters in the example request',
+        description: 'Select whether to include authentication parameters in the example request.',
         external: true,
         usage: ['CONVERSION'],
         supportedIn: [VERSION20, VERSION30, VERSION31]
@@ -270,11 +270,12 @@ module.exports = {
         usage: ['VALIDATION']
       },
       {
-        name: 'Disable optional parameters',
-        id: 'disableOptionalParameters',
+        name: 'Enable optional parameters',
+        id: 'enableOptionalParameters',
         type: 'boolean',
-        default: false,
-        description: 'Whether to set optional parameters as disabled',
+        default: true,
+        description: 'Optional parameters aren\'t selected in the collection. ' +
+          'Once enabled they will be selected in the collection and request as well.',
         external: true,
         usage: ['CONVERSION'],
         supportedIn: [VERSION20, VERSION30, VERSION31]

lib/schemaUtils.js

@@ -196,6 +196,13 @@ function safeSchemaFaker (oldSchema, resolveTo, resolveFor, parameterSourceOptio
     });
   }
 
+  if (schemaFormat === 'xml') {
+    key += ' schemaFormatXML';
+  }
+  else {
+    key += ' schemaFormatDEFAULT';
+  }
+
   key = hash(key);
   if (schemaFakerCache[key]) {
     return schemaFakerCache[key];
@@ -360,6 +367,11 @@ module.exports = {
   * @returns {string} string after replacing /{pet}/ with /:pet/
   */
   fixPathVariablesInUrl: function (url) {
+    // URL should always be string so update value if non-string value is found
+    if (typeof url !== 'string') {
+      return '';
+    }
+
     // All complicated logic removed
     // This simply replaces all instances of {text} with {{text}}
     // text cannot have any of these 3 chars: /{}
@@ -371,7 +383,7 @@ module.exports = {
       }
       return '{' + p1 + '}';
     };
-    return url.replace(/(\{[^\/\{\}]+\})/g, replacer);
+    return _.isString(url) ? url.replace(/(\{[^\/\{\}]+\})/g, replacer) : '';
   },
 
   /**
@@ -1749,7 +1761,7 @@ module.exports = {
     let { style, explode, startValue, propSeparator, keyValueSeparator, isExplodable } =
       this.getParamSerialisationInfo(param, parameterSource, components);
 
-    if (options && options.disableOptionalParameters) {
+    if (options && !options.enableOptionalParameters) {
       disabled = !param.required;
     }
 
@@ -2797,7 +2809,7 @@ module.exports = {
   // also, any endpoint-level params are merged into the returned pathItemObject
   findMatchingRequestFromSchema: function (method, url, schema, options) {
     // first step - get array of requests from schema
-    let parsedUrl = require('url').parse(url),
+    let parsedUrl = require('url').parse(_.isString(url) ? url : ''),
       retVal = [],
       pathToMatch,
       matchedPath,

lib/schemapack.js

@@ -142,7 +142,8 @@ class SchemaPack {
     this.openapi = specParseResult.openapi;
     this.validated = true;
     this.validationResult = {
-      result: true
+      result: true,
+      specificationVersion: concreteUtils.version
     };
     return this.validationResult;
   }

lib/xmlSchemaFaker.js

@@ -47,7 +47,7 @@ function convertSchemaToXML(name, schema, attribute, indentChar, indent) {
         attributes.push(`${key}="${propVal}"`);
       }
       else {
-        childNodes += propVal;
+        childNodes += _.isString(propVal) ? propVal : '';
       }
     });
     if (attributes.length > 0) {
@@ -66,7 +66,7 @@ function convertSchemaToXML(name, schema, attribute, indentChar, indent) {
       contents;
 
     schemaItemsWithXmlProps.xml = schema.xml;
-    contents = convertSchemaToXML(arrayElemName, schemaItemsWithXmlProps, false, indentChar, indent + extraIndent) + 
+    contents = convertSchemaToXML(arrayElemName, schemaItemsWithXmlProps, false, indentChar, indent + extraIndent) +
       convertSchemaToXML(arrayElemName, schemaItemsWithXmlProps, false, indentChar, indent + extraIndent);
     if (isWrapped) {
       return `\n${cIndent}<${tagPrefix}${name}>${contents}\n${cIndent}</${tagPrefix}${name}>`;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "openapi-to-postmanv2",
-  "version": "4.7.1",
+  "version": "4.9.0",
   "description": "Convert a given OpenAPI specification to Postman Collection v2.0",
   "homepage": "https://github.com/postmanlabs/openapi-to-postman",
   "bugs": "https://github.com/postmanlabs/openapi-to-postman/issues",