Feature/add bundlev2

index.js

@@ -60,6 +60,11 @@ module.exports = {
     return schema.bundle();
   },
 
+  bundleV2: function(input) {
+    var schema = new SchemaPack(input, _.has(input, 'options') ? input.options : {});
+    return schema.bundleV2();
+  },
+
   // new API
   SchemaPack
 };

lib/schemaUtils.js

@@ -9,6 +9,7 @@ const { formatDataPath, checkIsCorrectType, isKnownType } = require('./common/sc
   { getConcreteSchemaUtils, isSwagger, validateSupportedVersion } = require('./common/versionUtils.js'),
   async = require('async'),
   sdk = require('postman-collection'),
+  $RefParser = require('@apidevtools/json-schema-ref-parser'),
   schemaFaker = require('../assets/json-schema-faker.js'),
   deref = require('./deref.js'),
   _ = require('lodash'),
@@ -5362,5 +5363,71 @@ module.exports = {
   },
   MULTI_FILE_API_TYPE_ALLOWED_VALUE,
 
-  verifyDeprecatedProperties: verifyDeprecatedProperties
+  verifyDeprecatedProperties: verifyDeprecatedProperties,
+
+  /**
+   *
+   * @description Dereferences all ref paths and returns a single JSON schema string
+   *
+   * @param {{
+   *  rootFiles: { path: string, content: string }[],
+   *  data: { fileName: string, content: string }[]
+   * }} input - Multi file data
+   * @param {object} options - a standard list of options that's globally passed around. Check options.js for more.
+   *
+   * @returns {Promise<object>} Resolved schema string
+   */
+  dereference: async (input, options = {}) => {
+    // Pre-process array data into map to optimize search later
+    const fileMap = new Map(),
+      parser = new $RefParser(),
+      version = input.specificationVersion ? input.specificationVersion : '3.0';
+
+    input.data.forEach((file) => {
+      fileMap.set(file.fileName, file.content);
+    });
+
+    // eslint-disable-next-line one-var
+    const promises = input.rootFiles.map(async (rootFile) => {
+      const bundledContent = await parser.dereference(rootFile.path, {
+          resolve: {
+            external: true,
+            file: {
+              canRead: (file) => {
+                // TODO: tweak the condition further to identify Postman-only URLs here
+                // for getting relative file data
+                const fileName = file.url.split('/').pop();
+                return fileMap.has(fileName);
+              },
+              read: async (file) => {
+                const fileName = file.url.split('/').pop();
+                return fileMap.get(fileName);
+              }
+            }
+          }
+        }),
+        result = { bundledContent };
+
+      if (options.includeReferenceMap) {
+        result.referenceMap = parser.$refs.values();
+      }
+
+      return result;
+    });
+
+    // eslint-disable-next-line one-var
+    const data = await Promise.all(promises);
+
+    return {
+      result: true,
+      output: {
+        type: 'bundledContent',
+        specification: {
+          type: 'OpenAPI',
+          version
+        },
+        data
+      }
+    };
+  }
 };

lib/schemapack.js

@@ -809,7 +809,7 @@ class SchemaPack {
           }
         });
         input.rootFiles = inputContent;
-        return schemaUtils.processRelatedFiles(input, true, this.computedOptions);
+        return schemaUtils.dereference(input, this.computedOptions);
       }
     }
     let adaptedRootFiles = input.rootFiles.map((rootFile) => {
@@ -823,7 +823,7 @@ class SchemaPack {
       throw new Error('Root file content not found in data array');
     }
     input.rootFiles = adaptedRootFiles;
-    return schemaUtils.processRelatedFiles(input, true, this.computedOptions);
+    return schemaUtils.dereference(input, this.computedOptions);
   }
 }
 

package.json

@@ -131,7 +131,8 @@
     "postman-collection": "4.1.5",
     "swagger2openapi": "7.0.8",
     "traverse": "0.6.6",
-    "yaml": "1.10.2"
+    "yaml": "1.10.2",
+    "@apidevtools/json-schema-ref-parser": "9.1.2"
   },
   "author": "Postman Labs <help@getpostman.com>",
   "license": "Apache-2.0",