swagger-client 3.25.1 → 3.25.3

package/es/helpers/fetch-polyfill.node.js

@@ -1,23 +1,22 @@
-import { fetch as fetchU, Headers as HeaderU, Request as RequestU, Response as ResponseU, FormData as FormDataU, File as FileU, Blob as BlobU } from './fetch-ponyfill-undici.node.js';
 import { fetch as fetchNF, Headers as HeadersNF, Request as RequestNF, Response as ResponseNF, FormData as FormDataNF, File as FileNF, Blob as BlobNF } from './fetch-ponyfill-node-fetch.node.js';
 if (typeof globalThis.fetch === 'undefined') {
-  globalThis.fetch = fetchU || fetchNF;
+  globalThis.fetch = fetchNF;
 }
 if (typeof globalThis.Headers === 'undefined') {
-  globalThis.Headers = HeaderU || HeadersNF;
+  globalThis.Headers = HeadersNF;
 }
 if (typeof globalThis.Request === 'undefined') {
-  globalThis.Request = RequestU || RequestNF;
+  globalThis.Request = RequestNF;
 }
 if (typeof globalThis.Response === 'undefined') {
-  globalThis.Response = ResponseU || ResponseNF;
+  globalThis.Response = ResponseNF;
 }
 if (typeof globalThis.FormData === 'undefined') {
-  globalThis.FormData = FormDataU || FormDataNF;
+  globalThis.FormData = FormDataNF;
 }
 if (typeof globalThis.File === 'undefined') {
-  globalThis.File = FileU || FileNF;
+  globalThis.File = FileNF;
 }
 if (typeof globalThis.Blob === 'undefined') {
-  globalThis.Blob = BlobU || BlobNF;
+  globalThis.Blob = BlobNF;
 }

package/es/specmap/index.js

@@ -4,7 +4,8 @@ import allOf from './lib/all-of.js';
 import parameters from './lib/parameters.js';
 import properties from './lib/properties.js';
 import ContextTree from './lib/context-tree.js';
-const HARD_LIMIT = 100;
+const PLUGIN_DISPATCH_LIMIT = 100;
+const TRAVERSE_LIMIT = 1000;
 const noop = () => {};
 class SpecMap {
   static getPluginName(plugin) {
@@ -33,7 +34,8 @@ class SpecMap {
       libMethods: Object.assign(Object.create(this), lib, {
         getInstance: () => this
       }),
-      allowMetaPatches: false
+      allowMetaPatches: false,
+      currentTraverseCount: 0
     }, opts);
 
     // Lib methods bound
@@ -62,6 +64,7 @@ class SpecMap {
     const {
       pathDiscriminator
     } = this;
+    const that = this;
     let ctx = null;
     let fn;
     if (plugin[this.pluginProp]) {
@@ -93,9 +96,14 @@ class SpecMap {
 
         // eslint-disable-next-line no-restricted-syntax
         for (const patch of patches.filter(lib.isAdditiveMutation)) {
-          yield* traverse(patch.value, patch.path, patch);
+          if (that.currentTraverseCount < TRAVERSE_LIMIT) {
+            yield* traverse(patch.value, patch.path, patch);
+          } else {
+            return;
+          }
         }
         function* traverse(obj, path, patch) {
+          that.currentTraverseCount += 1;
           if (!lib.isObject(obj)) {
             if (pluginObj.key === path[path.length - 1]) {
               yield pluginObj.plugin(obj, pluginObj.key, path, specmap);
@@ -119,7 +127,11 @@ class SpecMap {
                   if (specmap.allowMetaPatches && objRef) {
                     refCache[objRef] = true;
                   }
-                  yield* traverse(val, updatedPath, patch);
+                  if (that.currentTraverseCount < TRAVERSE_LIMIT) {
+                    yield* traverse(val, updatedPath, patch);
+                  } else {
+                    return;
+                  }
                 }
               }
               if (!isRootProperties && key === pluginObj.key) {
@@ -277,6 +289,7 @@ class SpecMap {
   dispatch() {
     const that = this;
     const plugin = this.nextPlugin();
+    that.currentTraverseCount = 0;
     if (!plugin) {
       const nextPromise = this.nextPromisedPatch();
       if (nextPromise) {
@@ -295,12 +308,12 @@ class SpecMap {
     }
 
     // Makes sure plugin isn't running an endless loop
-    that.pluginCount = that.pluginCount || {};
-    that.pluginCount[plugin] = (that.pluginCount[plugin] || 0) + 1;
-    if (that.pluginCount[plugin] > HARD_LIMIT) {
+    that.pluginCount = that.pluginCount || new WeakMap();
+    that.pluginCount.set(plugin, (that.pluginCount.get(plugin) || 0) + 1);
+    if (that.pluginCount[plugin] > PLUGIN_DISPATCH_LIMIT) {
       return Promise.resolve({
         spec: that.state,
-        errors: that.errors.concat(new Error(`We've reached a hard limit of ${HARD_LIMIT} plugin runs`))
+        errors: that.errors.concat(new Error(`We've reached a hard limit of ${PLUGIN_DISPATCH_LIMIT} plugin runs`))
       });
     }
 

package/lib/helpers/fetch-polyfill.node.js

@@ -1,25 +1,24 @@
 "use strict";
 
-var _fetchPonyfillUndiciNode = require("./fetch-ponyfill-undici.node.js");
 var _fetchPonyfillNodeFetchNode = require("./fetch-ponyfill-node-fetch.node.js");
 if (typeof globalThis.fetch === 'undefined') {
-  globalThis.fetch = _fetchPonyfillUndiciNode.fetch || _fetchPonyfillNodeFetchNode.fetch;
+  globalThis.fetch = _fetchPonyfillNodeFetchNode.fetch;
 }
 if (typeof globalThis.Headers === 'undefined') {
-  globalThis.Headers = _fetchPonyfillUndiciNode.Headers || _fetchPonyfillNodeFetchNode.Headers;
+  globalThis.Headers = _fetchPonyfillNodeFetchNode.Headers;
 }
 if (typeof globalThis.Request === 'undefined') {
-  globalThis.Request = _fetchPonyfillUndiciNode.Request || _fetchPonyfillNodeFetchNode.Request;
+  globalThis.Request = _fetchPonyfillNodeFetchNode.Request;
 }
 if (typeof globalThis.Response === 'undefined') {
-  globalThis.Response = _fetchPonyfillUndiciNode.Response || _fetchPonyfillNodeFetchNode.Response;
+  globalThis.Response = _fetchPonyfillNodeFetchNode.Response;
 }
 if (typeof globalThis.FormData === 'undefined') {
-  globalThis.FormData = _fetchPonyfillUndiciNode.FormData || _fetchPonyfillNodeFetchNode.FormData;
+  globalThis.FormData = _fetchPonyfillNodeFetchNode.FormData;
 }
 if (typeof globalThis.File === 'undefined') {
-  globalThis.File = _fetchPonyfillUndiciNode.File || _fetchPonyfillNodeFetchNode.File;
+  globalThis.File = _fetchPonyfillNodeFetchNode.File;
 }
 if (typeof globalThis.Blob === 'undefined') {
-  globalThis.Blob = _fetchPonyfillUndiciNode.Blob || _fetchPonyfillNodeFetchNode.Blob;
+  globalThis.Blob = _fetchPonyfillNodeFetchNode.Blob;
 }

package/lib/specmap/index.js

@@ -11,7 +11,8 @@ var _allOf = _interopRequireDefault(require("./lib/all-of.js"));
 var _parameters = _interopRequireDefault(require("./lib/parameters.js"));
 var _properties = _interopRequireDefault(require("./lib/properties.js"));
 var _contextTree = _interopRequireDefault(require("./lib/context-tree.js"));
-const HARD_LIMIT = 100;
+const PLUGIN_DISPATCH_LIMIT = 100;
+const TRAVERSE_LIMIT = 1000;
 const noop = () => {};
 class SpecMap {
   static getPluginName(plugin) {
@@ -40,7 +41,8 @@ class SpecMap {
       libMethods: Object.assign(Object.create(this), _index.default, {
         getInstance: () => this
       }),
-      allowMetaPatches: false
+      allowMetaPatches: false,
+      currentTraverseCount: 0
     }, opts);
 
     // Lib methods bound
@@ -69,6 +71,7 @@ class SpecMap {
     const {
       pathDiscriminator
     } = this;
+    const that = this;
     let ctx = null;
     let fn;
     if (plugin[this.pluginProp]) {
@@ -100,9 +103,14 @@ class SpecMap {
 
         // eslint-disable-next-line no-restricted-syntax
         for (const patch of patches.filter(_index.default.isAdditiveMutation)) {
-          yield* traverse(patch.value, patch.path, patch);
+          if (that.currentTraverseCount < TRAVERSE_LIMIT) {
+            yield* traverse(patch.value, patch.path, patch);
+          } else {
+            return;
+          }
         }
         function* traverse(obj, path, patch) {
+          that.currentTraverseCount += 1;
           if (!_index.default.isObject(obj)) {
             if (pluginObj.key === path[path.length - 1]) {
               yield pluginObj.plugin(obj, pluginObj.key, path, specmap);
@@ -126,7 +134,11 @@ class SpecMap {
                   if (specmap.allowMetaPatches && objRef) {
                     refCache[objRef] = true;
                   }
-                  yield* traverse(val, updatedPath, patch);
+                  if (that.currentTraverseCount < TRAVERSE_LIMIT) {
+                    yield* traverse(val, updatedPath, patch);
+                  } else {
+                    return;
+                  }
                 }
               }
               if (!isRootProperties && key === pluginObj.key) {
@@ -284,6 +296,7 @@ class SpecMap {
   dispatch() {
     const that = this;
     const plugin = this.nextPlugin();
+    that.currentTraverseCount = 0;
     if (!plugin) {
       const nextPromise = this.nextPromisedPatch();
       if (nextPromise) {
@@ -302,12 +315,12 @@ class SpecMap {
     }
 
     // Makes sure plugin isn't running an endless loop
-    that.pluginCount = that.pluginCount || {};
-    that.pluginCount[plugin] = (that.pluginCount[plugin] || 0) + 1;
-    if (that.pluginCount[plugin] > HARD_LIMIT) {
+    that.pluginCount = that.pluginCount || new WeakMap();
+    that.pluginCount.set(plugin, (that.pluginCount.get(plugin) || 0) + 1);
+    if (that.pluginCount[plugin] > PLUGIN_DISPATCH_LIMIT) {
       return Promise.resolve({
         spec: that.state,
-        errors: that.errors.concat(new Error(`We've reached a hard limit of ${HARD_LIMIT} plugin runs`))
+        errors: that.errors.concat(new Error(`We've reached a hard limit of ${PLUGIN_DISPATCH_LIMIT} plugin runs`))
       });
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.25.1",
+  "version": "3.25.3",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -102,7 +102,8 @@
     "rimraf": "=5.0.5",
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.90.1",
+    "undici": "^5.28.3",
+    "webpack": "=5.90.3",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=5.1.4",
     "webpack-stats-plugin": "=1.1.3"
@@ -119,11 +120,10 @@
     "fast-json-patch": "^3.0.0-1",
     "is-plain-object": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "node-fetch-commonjs": "^3.3.1",
     "node-abort-controller": "^3.1.1",
+    "node-fetch-commonjs": "^3.3.2",
     "qs": "^6.10.2",
-    "traverse": "~0.6.6",
-    "undici": "^5.24.0"
+    "traverse": "~0.6.6"
   },
   "overrides": {
     "@swagger-api/apidom-reference": {

package/es/helpers/fetch-ponyfill-undici.node.js

@@ -1,4 +0,0 @@
-import { Blob } from 'buffer';
-import { fetch, Response, Headers, Request, FormData, File } from 'undici';
-const BlobU = typeof fetch === 'undefined' ? undefined : Blob;
-export { fetch, Response, Headers, Request, FormData, File, BlobU as Blob };

package/lib/helpers/fetch-ponyfill-undici.node.js

@@ -1,13 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.Blob = void 0;
-var _buffer = require("buffer");
-var _undici = require("undici");
-exports.fetch = _undici.fetch;
-exports.Response = _undici.Response;
-exports.Headers = _undici.Headers;
-exports.Request = _undici.Request;
-exports.FormData = _undici.FormData;
-exports.File = _undici.File;
-const BlobU = exports.Blob = typeof _undici.fetch === 'undefined' ? undefined : _buffer.Blob;