swagger-client 3.20.2 → 3.21.0

package/es/execute/index.js

@@ -1,7 +1,6 @@
-import getIn from 'lodash/get';
-import url from 'url';
 import cookie from 'cookie';
 import { isPlainObject } from 'is-plain-object';
+import { url } from '@swagger-api/apidom-reference/configuration/empty';
 import stockHttp, { mergeInQueryOrForm } from '../http/index.js';
 import createError from '../specmap/lib/create-error.js';
 import SWAGGER2_PARAMETER_BUILDERS from './swagger2/parameter-builders.js';
@@ -11,6 +10,33 @@ import swagger2BuildRequest from './swagger2/build-request.js';
 import { getOperationRaw, idFromPathMethodLegacy } from '../helpers/index.js';
 import { isOpenAPI3 } from '../helpers/openapi-predicates.js';
 const arrayOrEmpty = ar => Array.isArray(ar) ? ar : [];
+
+/**
+ * `parseURIReference` function simulates the behavior of `node:url` parse function.
+ * New WHATWG URL API is not capable of parsing relative references natively,
+ * but can be adapter by utilizing the `base` parameter.
+ */
+const parseURIReference = uriReference => {
+  try {
+    return new URL(uriReference);
+  } catch {
+    const parsedURL = new URL(uriReference, 'https://swagger.io');
+    const pathname = String(uriReference).startsWith('/') ? parsedURL.pathname : parsedURL.pathname.substring(1);
+    return {
+      hash: parsedURL.hash,
+      host: '',
+      hostname: '',
+      href: '',
+      origin: '',
+      password: '',
+      pathname,
+      port: '',
+      protocol: '',
+      search: parsedURL.search,
+      searchParams: parsedURL.searchParams
+    };
+  }
+};
 const OperationNotFoundError = createError('OperationNotFoundError', function cb(message, extra, oriError) {
   this.originalError = oriError;
   Object.assign(this, extra || {});
@@ -257,6 +283,7 @@ export function baseUrl(obj) {
   return specIsOAS3 ? oas3BaseUrl(obj) : swagger2BaseUrl(obj);
 }
 function oas3BaseUrl(_ref2) {
+  var _spec$paths, _spec$paths2;
   let {
     spec,
     pathName,
@@ -265,7 +292,7 @@ function oas3BaseUrl(_ref2) {
     contextUrl,
     serverVariables = {}
   } = _ref2;
-  const servers = getIn(spec, ['paths', pathName, (method || '').toLowerCase(), 'servers']) || getIn(spec, ['paths', pathName, 'servers']) || getIn(spec, ['servers']);
+  const servers = (spec === null || spec === void 0 || (_spec$paths = spec.paths) === null || _spec$paths === void 0 || (_spec$paths = _spec$paths[pathName]) === null || _spec$paths === void 0 || (_spec$paths = _spec$paths[(method || '').toLowerCase()]) === null || _spec$paths === void 0 ? void 0 : _spec$paths.servers) || (spec === null || spec === void 0 || (_spec$paths2 = spec.paths) === null || _spec$paths2 === void 0 || (_spec$paths2 = _spec$paths2[pathName]) === null || _spec$paths2 === void 0 ? void 0 : _spec$paths2.servers) || (spec === null || spec === void 0 ? void 0 : spec.servers);
   let selectedServerUrl = '';
   let selectedServerObj = null;
   if (server && servers && servers.length) {
@@ -299,11 +326,11 @@ function buildOas3UrlWithContext() {
   let ourUrl = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   let contextUrl = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   // relative server url should be resolved against contextUrl
-  const parsedUrl = ourUrl && contextUrl ? url.parse(url.resolve(contextUrl, ourUrl)) : url.parse(ourUrl);
-  const parsedContextUrl = url.parse(contextUrl);
-  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol) || '';
+  const parsedUrl = ourUrl && contextUrl ? parseURIReference(url.resolve(contextUrl, ourUrl)) : parseURIReference(ourUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
+  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol);
   const computedHost = parsedUrl.host || parsedContextUrl.host;
-  const computedPath = parsedUrl.pathname || '';
+  const computedPath = parsedUrl.pathname;
   let res;
   if (computedScheme && computedHost) {
     res = `${computedScheme}://${computedHost + computedPath}`;
@@ -333,7 +360,7 @@ function swagger2BaseUrl(_ref3) {
     scheme,
     contextUrl = ''
   } = _ref3;
-  const parsedContextUrl = url.parse(contextUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
   const firstSchemeInSpec = Array.isArray(spec.schemes) ? spec.schemes[0] : null;
   const computedScheme = scheme || firstSchemeInSpec || stripNonAlpha(parsedContextUrl.protocol) || 'http';
   const computedHost = spec.host || parsedContextUrl.host || '';

package/es/execute/oas3/build-request.js

@@ -1,7 +1,6 @@
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
 import { isPlainObject } from 'is-plain-object';
-import get from 'lodash/get';
 import btoa from '../../helpers/btoa.node.js';
 export default function buildRequest(options, req) {
   const {
@@ -88,6 +87,7 @@ export default function buildRequest(options, req) {
 // Add security values, to operations - that declare their need on them
 // Adapted from the Swagger2 implementation
 export function applySecurities(_ref3) {
+  var _spec$components;
   let {
     request,
     securities = {},
@@ -102,7 +102,7 @@ export function applySecurities(_ref3) {
   } = securities;
   const security = operation.security || spec.security || [];
   const isAuthorized = authorized && !!Object.keys(authorized).length;
-  const securityDef = get(spec, ['components', 'securitySchemes']) || {};
+  const securityDef = (spec === null || spec === void 0 || (_spec$components = spec.components) === null || _spec$components === void 0 ? void 0 : _spec$components.securitySchemes) || {};
   result.headers = result.headers || {};
   result.query = result.query || {};
   if (!Object.keys(securities).length || !isAuthorized || !security || Array.isArray(operation.security) && !operation.security.length) {

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

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

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

@@ -0,0 +1,14 @@
+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';
+if (typeof globalThis.fetch === 'undefined') {
+  globalThis.fetch = fetchU || fetchNF;
+}
+if (typeof globalThis.Headers === 'undefined') {
+  globalThis.Headers = HeaderU || HeadersNF;
+}
+if (typeof globalThis.Request === 'undefined') {
+  globalThis.Request = RequestU || RequestNF;
+}
+if (typeof globalThis.Response === 'undefined') {
+  globalThis.Response = ResponseU || ResponseNF;
+}

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

@@ -0,0 +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 };

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

@@ -0,0 +1,2 @@
+import { fetch, Response, Headers, Request } from 'undici';
+export { fetch, Response, Headers, Request };

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

@@ -0,0 +1,8 @@
+// we're targeting browsers that already support fetch API
+const {
+  fetch,
+  Response,
+  Headers,
+  Request
+} = globalThis;
+export { fetch, Response, Headers, Request };

package/es/http/index.js

@@ -1,9 +1,8 @@
-import 'cross-fetch/polyfill';
 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';
-import foldFormDataToRequest from './fold-formdata-to-request.node.js';
 
 // For testing
 export const self = {
@@ -12,7 +11,7 @@ export const self = {
 };
 
 // Handles fetch-like syntax and the case where there is only one object passed-in
-// (which will have the URL as a property). Also serilizes the response.
+// (which will have the URL as a property). Also serializes the response.
 export default async function http(url) {
   let request = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   if (typeof url === 'object') {
@@ -27,7 +26,7 @@ export default async function http(url) {
   self.mergeInQueryOrForm(request);
 
   // Newlines in header values cause weird error messages from `window.fetch`,
-  // so let's massage them out.
+  // so let's message them out.
   // Context: https://stackoverflow.com/a/50709178
   if (request.headers) {
     Object.keys(request.headers).forEach(headerName => {
@@ -45,11 +44,12 @@ export default async function http(url) {
     request = (await request.requestInterceptor(request)) || request;
   }
 
-  // for content-type=multipart\/form-data remove content-type from request before fetch
-  // so that correct one with `boundary` is set when request body is different than boundary encoded string
+  /**
+   *  For content-type=multipart/form-data remove content-type from request before fetch,
+   *  so that correct one with `boundary` is set when request body is different from boundary encoded string.
+   */
   const contentType = request.headers['content-type'] || request.headers['Content-Type'];
-  // TODO(vladimir.gorej@gmail.com): assertion of FormData instance can be removed when migrated to node-fetch@2.x
-  if (/multipart\/form-data/i.test(contentType) && request.body instanceof FormData) {
+  if (/multipart\/form-data/i.test(contentType)) {
     delete request.headers['content-type'];
     delete request.headers['Content-Type'];
   }
@@ -429,7 +429,8 @@ export function mergeInQueryOrForm() {
     const contentType = req.headers['content-type'] || req.headers['Content-Type'];
     if (hasFile || /multipart\/form-data/i.test(contentType)) {
       const formdata = buildFormData(req.form);
-      foldFormDataToRequest(formdata, req);
+      req.formdata = formdata;
+      req.body = formdata;
     } else {
       req.body = encodeFormOrQuery(form);
     }

package/es/index.js

@@ -1,5 +1,4 @@
 /* eslint-disable camelcase */
-import Url from 'url';
 import Http, { makeHttp, serializeRes, serializeHeaders } from './http/index.js';
 import { makeResolve } from './resolver/index.js';
 import { makeResolveSubtree } from './subtree-resolver/index.js';
@@ -126,7 +125,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
   const specUrl = this.url;
   // TODO: OAS3: support servers here
   if (specUrl && specUrl.startsWith('http')) {
-    const parsed = Url.parse(specUrl);
+    const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;
     }

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

@@ -1,5 +1,6 @@
-import 'cross-fetch/polyfill';
+import AbortController from 'abort-controller';
 import { ResolverError, HttpResolver } from '@swagger-api/apidom-reference/configuration/empty';
+import '../../../../../../helpers/fetch-polyfill.node.js';
 import Http from '../../../../../../http/index.js';
 const HttpResolverSwaggerClient = HttpResolver.compose({
   props: {
@@ -27,7 +28,7 @@ const HttpResolverSwaggerClient = HttpResolver.compose({
         controller.abort();
       }, this.timeout);
       const credentials = this.getHttpClient().withCredentials || this.withCredentials ? 'include' : 'same-origin';
-      const redirects = this.redirects === 0 ? 'error' : 'follow';
+      const redirect = this.redirects === 0 ? 'error' : 'follow';
       const follow = this.redirects > 0 ? this.redirects : undefined;
       try {
         const response = await client({
@@ -36,7 +37,7 @@ const HttpResolverSwaggerClient = HttpResolver.compose({
           userFetch: async (resource, options) => {
             let res = await fetch(resource, options);
             try {
-              // node-fetch supports mutations
+              // undici supports mutations
               res.headers.delete('Content-Type');
             } catch {
               // Fetch API has guards which prevent mutations
@@ -49,7 +50,7 @@ const HttpResolverSwaggerClient = HttpResolver.compose({
             return res;
           },
           credentials,
-          redirects,
+          redirect,
           follow,
           ...this.swaggerHTTPClientConfig
         });

package/es/specmap/helpers.js

@@ -1,5 +1,5 @@
 import traverse from 'traverse';
-import URL from 'url';
+import { url } from '@swagger-api/apidom-reference/configuration/empty';
 
 // This will match if the direct parent's key exactly matches an item.
 const freelyNamedKeyParents = ['properties'];
@@ -51,6 +51,6 @@ export function generateAbsoluteRefPatches(obj, basePath) {
 }
 export function absolutifyPointer(pointer, baseUrl) {
   const [urlPart, fragmentPart] = pointer.split('#');
-  const newRefUrlPart = URL.resolve(urlPart || '', baseUrl || '');
+  const newRefUrlPart = url.resolve(baseUrl || '', urlPart || '');
   return fragmentPart ? `${newRefUrlPart}#${fragmentPart}` : newRefUrlPart;
 }

package/es/specmap/lib/refs.js

@@ -1,6 +1,6 @@
-import 'cross-fetch/polyfill';
 import jsYaml from 'js-yaml';
-import url from 'url';
+import { url } from '@swagger-api/apidom-reference/configuration/empty';
+import '../../helpers/fetch-polyfill.node.js';
 import lib from './index.js';
 import createError from './create-error.js';
 import { isFreelyNamed, absolutifyPointer } from '../helpers.js';

package/es/subtree-resolver/index.js

@@ -20,7 +20,6 @@
 // future versions.
 //
 // TODO: move the remarks above into project documentation
-import get from 'lodash/get';
 import resolve from '../resolver/index.js';
 import genericResolverStrategy from '../resolver/strategies/generic/index.js';
 import openApi2ResolverStrategy from '../resolver/strategies/openapi-2/index.js';
@@ -57,7 +56,7 @@ const resolveSubtree = async function (obj, path) {
     skipNormalization: true
   });
   if (!returnEntireTree && Array.isArray(path) && path.length) {
-    result.spec = get(result.spec, path) || null;
+    result.spec = path.reduce((acc, pathSegment) => acc === null || acc === void 0 ? void 0 : acc[pathSegment], result.spec) || null;
   }
   return result;
 };

package/lib/execute/index.js

@@ -7,10 +7,9 @@ exports.baseUrl = baseUrl;
 exports.buildRequest = buildRequest;
 exports.execute = execute;
 exports.self = void 0;
-var _get = _interopRequireDefault(require("lodash/get"));
-var _url = _interopRequireDefault(require("url"));
 var _cookie = _interopRequireDefault(require("cookie"));
 var _isPlainObject = require("is-plain-object");
+var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 var _index = _interopRequireWildcard(require("../http/index.js"));
 var _createError = _interopRequireDefault(require("../specmap/lib/create-error.js"));
 var _parameterBuilders = _interopRequireDefault(require("./swagger2/parameter-builders.js"));
@@ -20,6 +19,33 @@ var _buildRequest2 = _interopRequireDefault(require("./swagger2/build-request.js
 var _index2 = require("../helpers/index.js");
 var _openapiPredicates = require("../helpers/openapi-predicates.js");
 const arrayOrEmpty = ar => Array.isArray(ar) ? ar : [];
+
+/**
+ * `parseURIReference` function simulates the behavior of `node:url` parse function.
+ * New WHATWG URL API is not capable of parsing relative references natively,
+ * but can be adapter by utilizing the `base` parameter.
+ */
+const parseURIReference = uriReference => {
+  try {
+    return new URL(uriReference);
+  } catch {
+    const parsedURL = new URL(uriReference, 'https://swagger.io');
+    const pathname = String(uriReference).startsWith('/') ? parsedURL.pathname : parsedURL.pathname.substring(1);
+    return {
+      hash: parsedURL.hash,
+      host: '',
+      hostname: '',
+      href: '',
+      origin: '',
+      password: '',
+      pathname,
+      port: '',
+      protocol: '',
+      search: parsedURL.search,
+      searchParams: parsedURL.searchParams
+    };
+  }
+};
 const OperationNotFoundError = (0, _createError.default)('OperationNotFoundError', function cb(message, extra, oriError) {
   this.originalError = oriError;
   Object.assign(this, extra || {});
@@ -267,6 +293,7 @@ function baseUrl(obj) {
   return specIsOAS3 ? oas3BaseUrl(obj) : swagger2BaseUrl(obj);
 }
 function oas3BaseUrl(_ref2) {
+  var _spec$paths, _spec$paths2;
   let {
     spec,
     pathName,
@@ -275,7 +302,7 @@ function oas3BaseUrl(_ref2) {
     contextUrl,
     serverVariables = {}
   } = _ref2;
-  const servers = (0, _get.default)(spec, ['paths', pathName, (method || '').toLowerCase(), 'servers']) || (0, _get.default)(spec, ['paths', pathName, 'servers']) || (0, _get.default)(spec, ['servers']);
+  const servers = (spec == null || (_spec$paths = spec.paths) == null || (_spec$paths = _spec$paths[pathName]) == null || (_spec$paths = _spec$paths[(method || '').toLowerCase()]) == null ? void 0 : _spec$paths.servers) || (spec == null || (_spec$paths2 = spec.paths) == null || (_spec$paths2 = _spec$paths2[pathName]) == null ? void 0 : _spec$paths2.servers) || (spec == null ? void 0 : spec.servers);
   let selectedServerUrl = '';
   let selectedServerObj = null;
   if (server && servers && servers.length) {
@@ -313,11 +340,11 @@ function buildOas3UrlWithContext(ourUrl, contextUrl) {
     contextUrl = '';
   }
   // relative server url should be resolved against contextUrl
-  const parsedUrl = ourUrl && contextUrl ? _url.default.parse(_url.default.resolve(contextUrl, ourUrl)) : _url.default.parse(ourUrl);
-  const parsedContextUrl = _url.default.parse(contextUrl);
-  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol) || '';
+  const parsedUrl = ourUrl && contextUrl ? parseURIReference(_empty.url.resolve(contextUrl, ourUrl)) : parseURIReference(ourUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
+  const computedScheme = stripNonAlpha(parsedUrl.protocol) || stripNonAlpha(parsedContextUrl.protocol);
   const computedHost = parsedUrl.host || parsedContextUrl.host;
-  const computedPath = parsedUrl.pathname || '';
+  const computedPath = parsedUrl.pathname;
   let res;
   if (computedScheme && computedHost) {
     res = `${computedScheme}://${computedHost + computedPath}`;
@@ -347,7 +374,7 @@ function swagger2BaseUrl(_ref3) {
     scheme,
     contextUrl = ''
   } = _ref3;
-  const parsedContextUrl = _url.default.parse(contextUrl);
+  const parsedContextUrl = parseURIReference(contextUrl);
   const firstSchemeInSpec = Array.isArray(spec.schemes) ? spec.schemes[0] : null;
   const computedScheme = scheme || firstSchemeInSpec || stripNonAlpha(parsedContextUrl.protocol) || 'http';
   const computedHost = spec.host || parsedContextUrl.host || '';

package/lib/execute/oas3/build-request.js

@@ -5,7 +5,6 @@ exports.__esModule = true;
 exports.applySecurities = applySecurities;
 exports.default = buildRequest;
 var _isPlainObject = require("is-plain-object");
-var _get = _interopRequireDefault(require("lodash/get"));
 var _btoaNode = _interopRequireDefault(require("../../helpers/btoa.node.js"));
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
@@ -95,6 +94,7 @@ function buildRequest(options, req) {
 // Add security values, to operations - that declare their need on them
 // Adapted from the Swagger2 implementation
 function applySecurities(_ref3) {
+  var _spec$components;
   let {
     request,
     securities = {},
@@ -109,7 +109,7 @@ function applySecurities(_ref3) {
   } = securities;
   const security = operation.security || spec.security || [];
   const isAuthorized = authorized && !!Object.keys(authorized).length;
-  const securityDef = (0, _get.default)(spec, ['components', 'securitySchemes']) || {};
+  const securityDef = (spec == null || (_spec$components = spec.components) == null ? void 0 : _spec$components.securitySchemes) || {};
   result.headers = result.headers || {};
   result.query = result.query || {};
   if (!Object.keys(securities).length || !isAuthorized || !security || Array.isArray(operation.security) && !operation.security.length) {

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

@@ -0,0 +1,15 @@
+"use strict";
+
+var _fetchPonyfillBrowser = require("./fetch-ponyfill.browser.js");
+if (typeof globalThis.fetch === 'undefined') {
+  globalThis.fetch = _fetchPonyfillBrowser.fetch;
+}
+if (typeof globalThis.Headers === 'undefined') {
+  globalThis.Headers = _fetchPonyfillBrowser.Headers;
+}
+if (typeof globalThis.Request === 'undefined') {
+  globalThis.Request = _fetchPonyfillBrowser.Request;
+}
+if (typeof globalThis.Response === 'undefined') {
+  globalThis.Response = _fetchPonyfillBrowser.Response;
+}

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

@@ -0,0 +1,16 @@
+"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;
+}
+if (typeof globalThis.Headers === 'undefined') {
+  globalThis.Headers = _fetchPonyfillUndiciNode.Headers || _fetchPonyfillNodeFetchNode.Headers;
+}
+if (typeof globalThis.Request === 'undefined') {
+  globalThis.Request = _fetchPonyfillUndiciNode.Request || _fetchPonyfillNodeFetchNode.Request;
+}
+if (typeof globalThis.Response === 'undefined') {
+  globalThis.Response = _fetchPonyfillUndiciNode.Response || _fetchPonyfillNodeFetchNode.Response;
+}

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

@@ -0,0 +1,9 @@
+"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;

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

@@ -0,0 +1,8 @@
+"use strict";
+
+exports.__esModule = true;
+var _undici = require("undici");
+exports.fetch = _undici.fetch;
+exports.Response = _undici.Response;
+exports.Headers = _undici.Headers;
+exports.Request = _undici.Request;

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

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

package/lib/http/index.js

@@ -11,12 +11,11 @@ exports.self = void 0;
 exports.serializeHeaders = serializeHeaders;
 exports.serializeRes = serializeRes;
 exports.shouldDownloadAsText = void 0;
-require("cross-fetch/polyfill");
 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");
-var _foldFormdataToRequestNode = _interopRequireDefault(require("./fold-formdata-to-request.node.js"));
 // For testing
 const self = {
   serializeRes,
@@ -24,7 +23,7 @@ const self = {
 };
 
 // Handles fetch-like syntax and the case where there is only one object passed-in
-// (which will have the URL as a property). Also serilizes the response.
+// (which will have the URL as a property). Also serializes the response.
 exports.self = self;
 async function http(url, request) {
   if (request === void 0) {
@@ -42,7 +41,7 @@ async function http(url, request) {
   self.mergeInQueryOrForm(request);
 
   // Newlines in header values cause weird error messages from `window.fetch`,
-  // so let's massage them out.
+  // so let's message them out.
   // Context: https://stackoverflow.com/a/50709178
   if (request.headers) {
     Object.keys(request.headers).forEach(headerName => {
@@ -60,11 +59,12 @@ async function http(url, request) {
     request = (await request.requestInterceptor(request)) || request;
   }
 
-  // for content-type=multipart\/form-data remove content-type from request before fetch
-  // so that correct one with `boundary` is set when request body is different than boundary encoded string
+  /**
+   *  For content-type=multipart/form-data remove content-type from request before fetch,
+   *  so that correct one with `boundary` is set when request body is different from boundary encoded string.
+   */
   const contentType = request.headers['content-type'] || request.headers['Content-Type'];
-  // TODO(vladimir.gorej@gmail.com): assertion of FormData instance can be removed when migrated to node-fetch@2.x
-  if (/multipart\/form-data/i.test(contentType) && request.body instanceof _formdataNode.FormData) {
+  if (/multipart\/form-data/i.test(contentType)) {
     delete request.headers['content-type'];
     delete request.headers['Content-Type'];
   }
@@ -457,7 +457,8 @@ function mergeInQueryOrForm(req) {
     const contentType = req.headers['content-type'] || req.headers['Content-Type'];
     if (hasFile || /multipart\/form-data/i.test(contentType)) {
       const formdata = buildFormData(req.form);
-      (0, _foldFormdataToRequestNode.default)(formdata, req);
+      req.formdata = formdata;
+      req.body = formdata;
     } else {
       req.body = encodeFormOrQuery(form);
     }

package/lib/index.js

@@ -1,10 +1,9 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime-corejs3/helpers/interopRequireWildcard").default;
 exports.__esModule = true;
 exports.helpers = exports.default = void 0;
-var _url = _interopRequireDefault(require("url"));
 var _index = _interopRequireWildcard(require("./http/index.js"));
 var _index2 = require("./resolver/index.js");
 var _index3 = require("./subtree-resolver/index.js");
@@ -137,7 +136,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
   const specUrl = this.url;
   // TODO: OAS3: support servers here
   if (specUrl && specUrl.startsWith('http')) {
-    const parsed = _url.default.parse(specUrl);
+    const parsed = new URL(specUrl);
     if (!spec.host) {
       spec.host = parsed.host;
     }

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

@@ -3,8 +3,9 @@
 var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-require("cross-fetch/polyfill");
+var _abortController = _interopRequireDefault(require("abort-controller"));
 var _empty = require("@swagger-api/apidom-reference/configuration/empty");
+require("../../../../../../helpers/fetch-polyfill.node.js");
 var _index = _interopRequireDefault(require("../../../../../../http/index.js"));
 const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
   props: {
@@ -24,7 +25,7 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
     },
     async read(file) {
       const client = this.getHttpClient();
-      const controller = new AbortController();
+      const controller = new _abortController.default();
       const {
         signal
       } = controller;
@@ -32,7 +33,7 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
         controller.abort();
       }, this.timeout);
       const credentials = this.getHttpClient().withCredentials || this.withCredentials ? 'include' : 'same-origin';
-      const redirects = this.redirects === 0 ? 'error' : 'follow';
+      const redirect = this.redirects === 0 ? 'error' : 'follow';
       const follow = this.redirects > 0 ? this.redirects : undefined;
       try {
         const response = await client({
@@ -41,7 +42,7 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
           userFetch: async (resource, options) => {
             let res = await fetch(resource, options);
             try {
-              // node-fetch supports mutations
+              // undici supports mutations
               res.headers.delete('Content-Type');
             } catch {
               // Fetch API has guards which prevent mutations
@@ -54,7 +55,7 @@ const HttpResolverSwaggerClient = _empty.HttpResolver.compose({
             return res;
           },
           credentials,
-          redirects,
+          redirect,
           follow,
           ...this.swaggerHTTPClientConfig
         });

package/lib/specmap/helpers.js

@@ -6,7 +6,7 @@ exports.absolutifyPointer = absolutifyPointer;
 exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
 exports.isFreelyNamed = isFreelyNamed;
 var _traverse = _interopRequireDefault(require("traverse"));
-var _url = _interopRequireDefault(require("url"));
+var _empty = require("@swagger-api/apidom-reference/configuration/empty");
 // This will match if the direct parent's key exactly matches an item.
 const freelyNamedKeyParents = ['properties'];
 
@@ -57,6 +57,6 @@ function generateAbsoluteRefPatches(obj, basePath, _temp) {
 }
 function absolutifyPointer(pointer, baseUrl) {
   const [urlPart, fragmentPart] = pointer.split('#');
-  const newRefUrlPart = _url.default.resolve(urlPart || '', baseUrl || '');
+  const newRefUrlPart = _empty.url.resolve(baseUrl || '', urlPart || '');
   return fragmentPart ? `${newRefUrlPart}#${fragmentPart}` : newRefUrlPart;
 }