swagger-client 3.21.0 → 3.22.1

package/es/helpers/abortcontroller-polyfill.browser.js

@@ -0,0 +1,7 @@
+import { AbortController, AbortSignal } from './abortcontroller-ponyfill.browser.js';
+if (typeof globalThis.AbortController === 'undefined') {
+  globalThis.AbortController = AbortController;
+}
+if (typeof globalThis.AbortSignal === 'undefined') {
+  globalThis.AbortSignal = AbortSignal;
+}

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

@@ -0,0 +1,7 @@
+import { AbortController, AbortSignal } from './abortcontroller-ponyfill.node.js';
+if (typeof globalThis.AbortController === 'undefined') {
+  globalThis.AbortController = AbortController;
+}
+if (typeof globalThis.AbortSignal === 'undefined') {
+  globalThis.AbortSignal = AbortSignal;
+}

package/es/helpers/abortcontroller-ponyfill.browser.js

@@ -0,0 +1,6 @@
+// we're targeting browsers that already support fetch API
+const {
+  AbortController,
+  AbortSignal
+} = globalThis;
+export { AbortController, AbortSignal };

package/es/helpers/abortcontroller-ponyfill.node.js

@@ -0,0 +1 @@
+export { AbortController, AbortSignal } from 'node-abort-controller';

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

@@ -1,4 +1,4 @@
-import { fetch, Headers, Request, Response } from './fetch-ponyfill.browser.js';
+import { fetch, Headers, Request, Response, FormData, File, Blob } from './fetch-ponyfill.browser.js';
 if (typeof globalThis.fetch === 'undefined') {
   globalThis.fetch = fetch;
 }
@@ -10,4 +10,13 @@ if (typeof globalThis.Request === 'undefined') {
 }
 if (typeof globalThis.Response === 'undefined') {
   globalThis.Response = Response;
+}
+if (typeof globalThis.FormData === 'undefined') {
+  globalThis.FormData = FormData;
+}
+if (typeof globalThis.File === 'undefined') {
+  globalThis.File = File;
+}
+if (typeof globalThis.Blob === 'undefined') {
+  globalThis.Blob = Blob;
 }

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

@@ -1,5 +1,5 @@
-import { fetch as fetchU, Headers as HeaderU, Request as RequestU, Response as ResponseU } from './fetch-ponyfill-undici.node.js';
-import { fetch as fetchNF, Headers as HeadersNF, Request as RequestNF, Response as ResponseNF } from './fetch-ponyfill-node-fetch.node.js';
+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;
 }
@@ -11,4 +11,13 @@ if (typeof globalThis.Request === 'undefined') {
 }
 if (typeof globalThis.Response === 'undefined') {
   globalThis.Response = ResponseU || ResponseNF;
+}
+if (typeof globalThis.FormData === 'undefined') {
+  globalThis.FormData = FormDataU || FormDataNF;
+}
+if (typeof globalThis.File === 'undefined') {
+  globalThis.File = FileU || FileNF;
+}
+if (typeof globalThis.Blob === 'undefined') {
+  globalThis.Blob = BlobU || BlobNF;
 }

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

@@ -1,3 +1,3 @@
 // we cannot use `node-fetch@3` as it's pure ESM package not compatible with CommonJS
-import fetch, { Response, Headers, Request } from 'node-fetch-commonjs';
-export { fetch, Response, Headers, Request };
+import fetch, { Response, Headers, Request, FormData, File, Blob } from 'node-fetch-commonjs';
+export { fetch, Response, Headers, Request, FormData, File, Blob };

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

@@ -1,2 +1,4 @@
-import { fetch, Response, Headers, Request } from 'undici';
-export { fetch, Response, Headers, Request };
+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/es/helpers/fetch-ponyfill.browser.js

@@ -3,6 +3,9 @@ const {
   fetch,
   Response,
   Headers,
-  Request
+  Request,
+  FormData,
+  File,
+  Blob
 } = globalThis;
-export { fetch, Response, Headers, Request };
+export { fetch, Response, Headers, Request, FormData, File, Blob };

package/es/http/index.js

@@ -1,6 +1,5 @@
 import qs from 'qs';
 import jsYaml from 'js-yaml';
-import { FormData, File, Blob } from 'formdata-node';
 import '../helpers/fetch-polyfill.node.js';
 import { encodeDisallowedCharacters } from '../execute/oas3/style-serializer.js';
 

package/es/resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js

@@ -1,6 +1,6 @@
-import AbortController from 'abort-controller';
 import { ResolverError, HttpResolver } from '@swagger-api/apidom-reference/configuration/empty';
 import '../../../../../../helpers/fetch-polyfill.node.js';
+import '../../../../../../helpers/abortcontroller-polyfill.node.js';
 import Http from '../../../../../../http/index.js';
 const HttpResolverSwaggerClient = HttpResolver.compose({
   props: {

package/lib/helpers/abortcontroller-polyfill.browser.js

@@ -0,0 +1,9 @@
+"use strict";
+
+var _abortcontrollerPonyfillBrowser = require("./abortcontroller-ponyfill.browser.js");
+if (typeof globalThis.AbortController === 'undefined') {
+  globalThis.AbortController = _abortcontrollerPonyfillBrowser.AbortController;
+}
+if (typeof globalThis.AbortSignal === 'undefined') {
+  globalThis.AbortSignal = _abortcontrollerPonyfillBrowser.AbortSignal;
+}

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

@@ -0,0 +1,9 @@
+"use strict";
+
+var _abortcontrollerPonyfillNode = require("./abortcontroller-ponyfill.node.js");
+if (typeof globalThis.AbortController === 'undefined') {
+  globalThis.AbortController = _abortcontrollerPonyfillNode.AbortController;
+}
+if (typeof globalThis.AbortSignal === 'undefined') {
+  globalThis.AbortSignal = _abortcontrollerPonyfillNode.AbortSignal;
+}

package/lib/helpers/abortcontroller-ponyfill.browser.js

@@ -0,0 +1,11 @@
+"use strict";
+
+exports.__esModule = true;
+exports.AbortSignal = exports.AbortController = void 0;
+// we're targeting browsers that already support fetch API
+const {
+  AbortController,
+  AbortSignal
+} = globalThis;
+exports.AbortSignal = AbortSignal;
+exports.AbortController = AbortController;

package/lib/helpers/abortcontroller-ponyfill.node.js

@@ -0,0 +1,7 @@
+"use strict";
+
+exports.__esModule = true;
+exports.AbortSignal = exports.AbortController = void 0;
+var _nodeAbortController = require("node-abort-controller");
+exports.AbortController = _nodeAbortController.AbortController;
+exports.AbortSignal = _nodeAbortController.AbortSignal;

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

@@ -12,4 +12,13 @@ if (typeof globalThis.Request === 'undefined') {
 }
 if (typeof globalThis.Response === 'undefined') {
   globalThis.Response = _fetchPonyfillBrowser.Response;
+}
+if (typeof globalThis.FormData === 'undefined') {
+  globalThis.FormData = _fetchPonyfillBrowser.FormData;
+}
+if (typeof globalThis.File === 'undefined') {
+  globalThis.File = _fetchPonyfillBrowser.File;
+}
+if (typeof globalThis.Blob === 'undefined') {
+  globalThis.Blob = _fetchPonyfillBrowser.Blob;
 }

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

@@ -13,4 +13,13 @@ if (typeof globalThis.Request === 'undefined') {
 }
 if (typeof globalThis.Response === 'undefined') {
   globalThis.Response = _fetchPonyfillUndiciNode.Response || _fetchPonyfillNodeFetchNode.Response;
+}
+if (typeof globalThis.FormData === 'undefined') {
+  globalThis.FormData = _fetchPonyfillUndiciNode.FormData || _fetchPonyfillNodeFetchNode.FormData;
+}
+if (typeof globalThis.File === 'undefined') {
+  globalThis.File = _fetchPonyfillUndiciNode.File || _fetchPonyfillNodeFetchNode.File;
+}
+if (typeof globalThis.Blob === 'undefined') {
+  globalThis.Blob = _fetchPonyfillUndiciNode.Blob || _fetchPonyfillNodeFetchNode.Blob;
 }

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

@@ -6,4 +6,7 @@ var _nodeFetchCommonjs = _interopRequireWildcard(require("node-fetch-commonjs"))
 exports.fetch = _nodeFetchCommonjs.default;
 exports.Response = _nodeFetchCommonjs.Response;
 exports.Headers = _nodeFetchCommonjs.Headers;
-exports.Request = _nodeFetchCommonjs.Request;
+exports.Request = _nodeFetchCommonjs.Request;
+exports.FormData = _nodeFetchCommonjs.FormData;
+exports.File = _nodeFetchCommonjs.File;
+exports.Blob = _nodeFetchCommonjs.Blob;

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

@@ -1,8 +1,14 @@
 "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.Request = _undici.Request;
+exports.FormData = _undici.FormData;
+exports.File = _undici.File;
+const BlobU = typeof _undici.fetch === 'undefined' ? undefined : _buffer.Blob;
+exports.Blob = BlobU;

package/lib/helpers/fetch-ponyfill.browser.js

@@ -1,14 +1,20 @@
 "use strict";
 
 exports.__esModule = true;
-exports.fetch = exports.Response = exports.Request = exports.Headers = void 0;
+exports.fetch = exports.Response = exports.Request = exports.Headers = exports.FormData = exports.File = exports.Blob = void 0;
 // we're targeting browsers that already support fetch API
 const {
   fetch,
   Response,
   Headers,
-  Request
+  Request,
+  FormData,
+  File,
+  Blob
 } = globalThis;
+exports.Blob = Blob;
+exports.File = File;
+exports.FormData = FormData;
 exports.Request = Request;
 exports.Headers = Headers;
 exports.Response = Response;

package/lib/http/index.js

@@ -13,7 +13,6 @@ exports.serializeRes = serializeRes;
 exports.shouldDownloadAsText = void 0;
 var _qs = _interopRequireDefault(require("qs"));
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
-var _formdataNode = require("formdata-node");
 require("../helpers/fetch-polyfill.node.js");
 var _styleSerializer = require("../execute/oas3/style-serializer.js");
 // For testing
@@ -176,10 +175,10 @@ function isFile(obj, navigatorObj) {
     }
     return false;
   }
-  if (typeof _formdataNode.File !== 'undefined' && obj instanceof _formdataNode.File) {
+  if (typeof File !== 'undefined' && obj instanceof File) {
     return true;
   }
-  if (typeof _formdataNode.Blob !== 'undefined' && obj instanceof _formdataNode.Blob) {
+  if (typeof Blob !== 'undefined' && obj instanceof Blob) {
     return true;
   }
   if (ArrayBuffer.isView(obj)) {
@@ -210,7 +209,7 @@ const SEPARATORS = {
  * This sub-class is exclusively used only when Encoding Object
  * is defined within the Media Type Object (OpenAPI 3.x.y).
  */
-class FileWithData extends _formdataNode.File {
+class FileWithData extends File {
   constructor(data, name, options) {
     if (name === void 0) {
       name = '';
@@ -386,21 +385,21 @@ function buildFormData(reqForm) {
         // eslint-disable-next-line no-restricted-syntax
         for (const v of value) {
           if (ArrayBuffer.isView(v)) {
-            const blob = new _formdataNode.Blob([v]);
+            const blob = new Blob([v]);
             formData.append(key, blob);
           } else {
             formData.append(key, v);
           }
         }
       } else if (ArrayBuffer.isView(value)) {
-        const blob = new _formdataNode.Blob([value]);
+        const blob = new Blob([value]);
         formData.append(key, blob);
       } else {
         formData.append(key, value);
       }
     }
     return formData;
-  }, new _formdataNode.FormData());
+  }, new FormData());
 }
 
 // Encodes an object using appropriate serializer.

package/lib/resolver/apidom/reference/resolve/resolvers/http-swagger-client/index.js

@@ -3,9 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-var _abortController = _interopRequireDefault(require("abort-controller"));
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 require("../../../../../../helpers/fetch-polyfill.node.js");
+require("../../../../../../helpers/abortcontroller-polyfill.node.js");
 var _index = _interopRequireDefault(require("../../../../../../http/index.js"));
 const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
   props: {
@@ -25,7 +25,7 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
     },
     async read(file) {
       const client = this.getHttpClient();
-      const controller = new _abortController.default();
+      const controller = new AbortController();
       const {
         signal
       } = controller;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.21.0",
+  "version": "3.22.1",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
@@ -8,7 +8,10 @@
     "./es/helpers/btoa.node.js": "./es/helpers/btoa.browser.js",
     "./src/helpers/fetch-polyfill.node.js": "./src/helpers/fetch-polyfill.browser.js",
     "./es/helpers/fetch-polyfill.node.js": "./es/helpers/fetch-polyfill.browser.js",
-    "./lib/helpers/fetch-polyfill.node.js": "./lib/helpers/fetch-polyfill.browser.js"
+    "./lib/helpers/fetch-polyfill.node.js": "./lib/helpers/fetch-polyfill.browser.js",
+    "./src/helpers/abortcontroller-polyfill.node.js": "./src/helpers/abortcontroller-polyfill.browser.js",
+    "./es/helpers/abortcontroller-polyfill.node.js": "./es/helpers/abortcontroller-polyfill.browser.js",
+    "./lib/helpers/abortcontroller-polyfill.node.js": "./lib/helpers/abortcontroller-polyfill.browser.js"
   },
   "main": "lib/commonjs.js",
   "module": "es/index.js",
@@ -110,14 +113,13 @@
     "@swagger-api/apidom-json-pointer": ">=0.76.2 <1.0.0",
     "@swagger-api/apidom-ns-openapi-3-1": ">=0.76.2 <1.0.0",
     "@swagger-api/apidom-reference": ">=0.76.2 <1.0.0",
-    "abort-controller": "^3.0.0",
     "cookie": "~0.5.0",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
-    "formdata-node": "^4.0.0",
     "is-plain-object": "^5.0.0",
     "js-yaml": "^4.1.0",
     "node-fetch-commonjs": "^3.3.1",
+    "node-abort-controller": "^3.1.1",
     "qs": "^6.10.2",
     "traverse": "~0.6.6",
     "undici": "^5.24.0"