swagger-client 3.37.2 → 3.37.4

package/lib/resolver/apidom/reference/dereference/strategies/openapi-3-2-swagger-client/visitors/properties.js

@@ -18,12 +18,11 @@ class ModelPropertyMacroVisitor {
           const macroValue = this.modelPropertyMacro((0, _apidomCore.toValue)(property));
           property.set('default', macroValue);
         } catch (error) {
-          var _this$options$derefer;
           const macroError = new Error(error, {
             cause: error
           });
           macroError.fullPath = [...(0, _toPath.default)([...ancestors, parent, schemaElement]), 'properties'];
-          (_this$options$derefer = this.options.dereference.dereferenceOpts) == null || (_this$options$derefer = _this$options$derefer.errors) == null || _this$options$derefer.push == null || _this$options$derefer.push(macroError);
+          this.options.dereference.dereferenceOpts?.errors?.push?.(macroError);
         }
       });
     }

package/lib/resolver/apidom/reference/parse/parsers/json/index.js

@@ -1,7 +1,9 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 class JSONParser extends _empty.Parser {
@@ -13,8 +15,9 @@ class JSONParser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

package/lib/resolver/apidom/reference/parse/parsers/openapi-json-3-1/index.js

@@ -1,7 +1,9 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-1");
@@ -17,8 +19,9 @@ class OpenAPIJSON3_1Parser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

package/lib/resolver/apidom/reference/parse/parsers/openapi-json-3-2/index.js

@@ -1,7 +1,9 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _apidomNsOpenapi = require("@swagger-api/apidom-ns-openapi-3-2");
@@ -17,8 +19,9 @@ class OpenAPIJSON3_2Parser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

package/lib/resolver/apidom/reference/parse/parsers/openapi-yaml-3-1/index.js

@@ -1,8 +1,10 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _jsYaml = _interopRequireWildcard(require("js-yaml"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
@@ -19,8 +21,9 @@ class OpenAPIYAML31Parser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

package/lib/resolver/apidom/reference/parse/parsers/openapi-yaml-3-2/index.js

@@ -1,8 +1,10 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _jsYaml = _interopRequireWildcard(require("js-yaml"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
@@ -19,8 +21,9 @@ class OpenAPIYAML32Parser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

package/lib/resolver/apidom/reference/parse/parsers/yaml-1-2/index.js

@@ -1,8 +1,10 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _jsYaml = _interopRequireWildcard(require("js-yaml"));
 var _apidomCore = require("@swagger-api/apidom-core");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
@@ -15,8 +17,9 @@ class YAMLParser extends _empty.Parser {
     });
   }
   async canParse(file) {
-    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : this.fileExtensions.includes(file.extension);
-    const hasSupportedMediaType = this.mediaTypes.includes(file.mediaType);
+    var _context, _context2;
+    const hasSupportedFileExtension = this.fileExtensions.length === 0 ? true : (0, _includes.default)(_context = this.fileExtensions).call(_context, file.extension);
+    const hasSupportedMediaType = (0, _includes.default)(_context2 = this.mediaTypes).call(_context2, file.mediaType);
     if (!hasSupportedFileExtension) return false;
     if (hasSupportedMediaType) return true;
     if (!hasSupportedMediaType) {

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

@@ -4,7 +4,6 @@ var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequ
 exports.__esModule = true;
 exports.default = void 0;
 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"));
 class HTTPResolverSwaggerClient extends _empty.HTTPResolver {

package/lib/resolver/specmap/helpers.js

@@ -5,6 +5,7 @@ exports.__esModule = true;
 exports.absolutifyPointer = absolutifyPointer;
 exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
 exports.isFreelyNamed = isFreelyNamed;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _legacy = _interopRequireDefault(require("neotraverse/legacy"));
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _constants = require("../../constants.js");
@@ -46,7 +47,7 @@ function generateAbsoluteRefPatches(obj, basePath, {
 } = {}) {
   const patches = [];
   (0, _legacy.default)(obj).forEach(function callback() {
-    if (targetKeys.includes(this.key) && typeof this.node === 'string') {
+    if ((0, _includes.default)(targetKeys).call(targetKeys, this.key) && typeof this.node === 'string') {
       const nodePath = this.path; // this node's path, relative to `obj`
       const fullPath = basePath.concat(this.path);
       const absolutifiedRefValue = absolutifyPointer(this.node, getBaseUrlForNodePath(nodePath));
@@ -57,8 +58,8 @@ function generateAbsoluteRefPatches(obj, basePath, {
 }
 function absolutifyPointer(pointer, baseUrl) {
   const [urlPart, fragmentPart] = pointer.split('#');
-  const safeBaseUrl = baseUrl != null ? baseUrl : '';
-  const safeUrlPart = urlPart != null ? urlPart : '';
+  const safeBaseUrl = baseUrl ?? '';
+  const safeUrlPart = urlPart ?? '';
   let newRefUrlPart;
   if (!_empty.url.isHttpUrl(safeBaseUrl)) {
     const absoluteBaseUrl = _empty.url.resolve(_constants.DEFAULT_BASE_URL, safeBaseUrl);

package/lib/resolver/specmap/lib/refs.js

@@ -6,7 +6,6 @@ exports.default = void 0;
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 var _apidomError = require("@swagger-api/apidom-error");
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
-require("../../../helpers/fetch-polyfill.node.js");
 var _index = _interopRequireDefault(require("./index.js"));
 var _helpers = require("../helpers.js");
 var _constants = require("../../../constants.js");

package/lib/resolver/strategies/generic/normalize.js

@@ -3,6 +3,7 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = normalize;
+var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _ramdaAdjunct = require("ramda-adjunct");
 var _opId = _interopRequireDefault(require("../../../helpers/op-id.js"));
 function normalize(parsedSpec) {
@@ -19,16 +20,18 @@ function normalize(parsedSpec) {
 
   // eslint-disable-next-line no-restricted-syntax, guard-for-in
   for (const pathName in paths) {
+    var _context;
     const path = paths[pathName];
-    if (path == null || !['object', 'function'].includes(typeof path)) {
+    if (path == null || !(0, _includes.default)(_context = ['object', 'function']).call(_context, typeof path)) {
       continue; // eslint-disable-line no-continue
     }
     const pathParameters = path.parameters;
 
     // eslint-disable-next-line no-restricted-syntax, guard-for-in
     for (const method in path) {
+      var _context2;
       const operation = path[method];
-      if (operation == null || !['object', 'function'].includes(typeof operation)) {
+      if (operation == null || !(0, _includes.default)(_context2 = ['object', 'function']).call(_context2, typeof operation)) {
         continue; // eslint-disable-line no-continue
       }
       const oid = (0, _opId.default)(operation, pathName, method);

package/lib/resolver/utils/options.js

@@ -5,7 +5,6 @@ exports.__esModule = true;
 exports.retrievalURI = exports.httpClient = void 0;
 var _index = _interopRequireDefault(require("../../http/index.js"));
 const retrievalURI = options => {
-  var _ref, _globalThis$document;
   /**
    * Swagger-UI uses baseDoc instead of url, this helper function exists
    * to allow both.
@@ -18,8 +17,8 @@ const retrievalURI = options => {
     baseDoc,
     url
   } = options;
-  const retrievalURL = (_ref = baseDoc != null ? baseDoc : url) != null ? _ref : '';
-  return typeof ((_globalThis$document = globalThis.document) == null ? void 0 : _globalThis$document.baseURI) === 'string' ? String(new URL(retrievalURL, globalThis.document.baseURI)) : retrievalURL;
+  const retrievalURL = baseDoc ?? url ?? '';
+  return typeof globalThis.document?.baseURI === 'string' ? String(new URL(retrievalURL, globalThis.document.baseURI)) : retrievalURL;
 };
 exports.retrievalURI = retrievalURI;
 const httpClient = options => {

package/lib/subtree-resolver/index.js

@@ -62,7 +62,7 @@ const resolveSubtree = async (obj, path, options = {}) => {
     skipNormalization: !(0, _openapiPredicates.isOpenAPI31)(obj)
   });
   if (!returnEntireTree && Array.isArray(path) && path.length) {
-    result.spec = path.reduce((acc, pathSegment) => acc == null ? void 0 : acc[pathSegment], result.spec) || null;
+    result.spec = path.reduce((acc, pathSegment) => acc?.[pathSegment], result.spec) || null;
   }
   return result;
 };

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "swagger-client",
-  "version": "3.37.2",
+  "version": "3.37.4",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
     "./src/helpers/btoa.node.js": "./src/helpers/btoa.browser.js",
     "./lib/helpers/btoa.node.js": "./lib/helpers/btoa.browser.js",
     "./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",
     "./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"
@@ -71,22 +68,24 @@
     "json-refs"
   ],
   "license": "Apache-2.0",
+  "engines": {
+    "node": ">=22"
+  },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.22.15",
     "@scarf/scarf": "=1.4.0",
-    "@swagger-api/apidom-core": "^1.10.2",
-    "@swagger-api/apidom-error": "^1.10.2",
-    "@swagger-api/apidom-json-pointer": "^1.10.2",
-    "@swagger-api/apidom-ns-openapi-3-1": "^1.10.2",
-    "@swagger-api/apidom-ns-openapi-3-2": "^1.10.2",
-    "@swagger-api/apidom-reference": "^1.10.2",
+    "@swagger-api/apidom-core": "^1.11.0",
+    "@swagger-api/apidom-error": "^1.11.0",
+    "@swagger-api/apidom-json-pointer": "^1.11.0",
+    "@swagger-api/apidom-ns-openapi-3-1": "^1.11.0",
+    "@swagger-api/apidom-ns-openapi-3-2": "^1.11.0",
+    "@swagger-api/apidom-reference": "^1.11.0",
     "@swaggerexpert/cookie": "^2.0.2",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
     "js-yaml": "^4.1.0",
     "neotraverse": "=0.6.18",
     "node-abort-controller": "^3.1.1",
-    "node-fetch-commonjs": "^3.3.2",
     "openapi-path-templating": "^2.2.1",
     "openapi-server-url-templating": "^1.3.0",
     "ramda": "^0.30.1",
@@ -108,12 +107,12 @@
     "eslint-config-prettier": "=10.1.8",
     "eslint-plugin-import": "=2.32.0",
     "eslint-plugin-prettier": "=5.5.4",
-    "expect": "^29.0.3",
+    "expect": "^30.3.0",
     "glob": "=13.0.6",
     "husky": "^9.0.11",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
-    "jest": "^29.7.0",
+    "jest": "^30.3.0",
     "jest-environment-jsdom": "^30.3.0",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
@@ -124,10 +123,10 @@
     "rimraf": "=6.1.2",
     "source-map-explorer": "^2.5.3",
     "terser-webpack-plugin": "^5.0.3",
-    "undici": "^5.28.4",
-    "webpack": "=5.105.3",
+    "undici": "^6.25.0",
+    "webpack": "=5.106.2",
     "webpack-bundle-size-analyzer": "=3.1.0",
-    "webpack-cli": "=6.0.1",
+    "webpack-cli": "=7.0.2",
     "webpack-stats-plugin": "=1.1.3"
   },
   "overrides": {

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

@@ -1,22 +0,0 @@
-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 = fetchNF;
-}
-if (typeof globalThis.Headers === 'undefined') {
-  globalThis.Headers = HeadersNF;
-}
-if (typeof globalThis.Request === 'undefined') {
-  globalThis.Request = RequestNF;
-}
-if (typeof globalThis.Response === 'undefined') {
-  globalThis.Response = ResponseNF;
-}
-if (typeof globalThis.FormData === 'undefined') {
-  globalThis.FormData = FormDataNF;
-}
-if (typeof globalThis.File === 'undefined') {
-  globalThis.File = FileNF;
-}
-if (typeof globalThis.Blob === 'undefined') {
-  globalThis.Blob = BlobNF;
-}

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

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

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

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

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

@@ -1,12 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
-exports.__esModule = true;
-var _nodeFetchCommonjs = _interopRequireWildcard(require("node-fetch-commonjs"));
-exports.fetch = _nodeFetchCommonjs.default;
-exports.Response = _nodeFetchCommonjs.Response;
-exports.Headers = _nodeFetchCommonjs.Headers;
-exports.Request = _nodeFetchCommonjs.Request;
-exports.FormData = _nodeFetchCommonjs.FormData;
-exports.File = _nodeFetchCommonjs.File;
-exports.Blob = _nodeFetchCommonjs.Blob;