swagger-client 3.20.1 → 3.21.0

package/lib/specmap/lib/refs.js

@@ -1,15 +1,15 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.default = void 0;
-require("cross-fetch/polyfill");
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
-var _url = _interopRequireDefault(require("url"));
+var _empty = require("@swagger-api/apidom-reference/configuration/empty");
+require("../../helpers/fetch-polyfill.node.js");
 var _index = _interopRequireDefault(require("./index.js"));
 var _createError = _interopRequireDefault(require("./create-error.js"));
 var _helpers = require("../helpers.js");
 var _constants = require("../../constants.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const ABSOLUTE_URL_REGEXP = /^([a-z]+:\/\/|\/\/)/i;
 const JSONRefError = (0, _createError.default)('JSONRefError', function cb(message, extra, oriError) {
   this.originalError = oriError;
@@ -212,7 +212,7 @@ function absoluteify(path, basePath) {
     if (!basePath) {
       throw new JSONRefError(`Tried to resolve a relative URL, without having a basePath. path: '${path}' basePath: '${basePath}'`);
     }
-    return _url.default.resolve(basePath, path);
+    return _empty.url.resolve(basePath, path);
   }
   return path;
 }

package/lib/subtree-resolver/index.js

@@ -1,18 +1,13 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime-corejs3/helpers/interopRequireDefault").default;
 exports.__esModule = true;
 exports.makeResolveSubtree = exports.default = void 0;
-var _get = _interopRequireDefault(require("lodash/get"));
 var _index = _interopRequireDefault(require("../resolver/index.js"));
 var _index2 = _interopRequireDefault(require("../resolver/strategies/generic/index.js"));
 var _index3 = _interopRequireDefault(require("../resolver/strategies/openapi-2/index.js"));
 var _index4 = _interopRequireDefault(require("../resolver/strategies/openapi-3-0/index.js"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } // The subtree resolver is a higher-level interface that allows you to
+// The subtree resolver is a higher-level interface that allows you to
 // get the same result that you would from `Swagger.resolve`, but focuses on
 // a subtree of your object.
 //
@@ -34,7 +29,11 @@ function _toPrimitive(input, hint) { if (typeof input !== "object" || input ===
 // future versions.
 //
 // TODO: move the remarks above into project documentation
-const resolveSubtree = async (obj, path, options = {}) => {
+
+const resolveSubtree = async function (obj, path, options) {
+  if (options === void 0) {
+    options = {};
+  }
   const {
     returnEntireTree,
     baseDoc,
@@ -58,18 +57,25 @@ const resolveSubtree = async (obj, path, options = {}) => {
   };
   const strategy = strategies.find(strg => strg.match(resolveOptions));
   const normalized = strategy.normalize(resolveOptions);
-  const result = await (0, _index.default)(_objectSpread(_objectSpread({}, resolveOptions), {}, {
+  const result = await (0, _index.default)({
+    ...resolveOptions,
     spec: normalized,
     allowMetaPatches: true,
     skipNormalization: true
-  }));
+  });
   if (!returnEntireTree && Array.isArray(path) && path.length) {
-    result.spec = (0, _get.default)(result.spec, path) || null;
+    result.spec = path.reduce((acc, pathSegment) => acc == null ? void 0 : acc[pathSegment], result.spec) || null;
   }
   return result;
 };
-const makeResolveSubtree = defaultOptions => async (obj, path, options = {}) => {
-  const mergedOptions = _objectSpread(_objectSpread({}, defaultOptions), options);
+const makeResolveSubtree = defaultOptions => async function (obj, path, options) {
+  if (options === void 0) {
+    options = {};
+  }
+  const mergedOptions = {
+    ...defaultOptions,
+    ...options
+  };
   return resolveSubtree(obj, path, mergedOptions);
 };
 exports.makeResolveSubtree = makeResolveSubtree;

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "swagger-client",
-  "version": "3.20.1",
+  "version": "3.21.0",
   "description": "SwaggerJS - a collection of interfaces for OAI specs",
   "browser": {
-    "./src/http/fold-formdata-to-request.node.js": "./src/http/fold-formdata-to-request.browser.js",
-    "./lib/http/fold-formdata-to-request.node.js": "./lib/http/fold-formdata-to-request.browser.js",
-    "./es/http/fold-formdata-to-request.node.js": "./es/http/fold-formdata-to-request.browser.js",
     "./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"
+    "./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"
   },
   "main": "lib/commonjs.js",
   "module": "es/index.js",
@@ -40,7 +40,7 @@
   },
   "scripts": {
     "analyze:umd:browser": "source-map-explorer 'dist/swagger-client.browser.min.js'",
-    "prepublishOnly": "npm run clean && npm run lint && npm run test && npm run build && node ./scripts/overrides.js",
+    "prepublishOnly": "npm run clean && npm run lint && npm run test && npm run build",
     "build": "run-s build:umd:browser build:commonjs build:es",
     "build:umd:browser": "cross-env BABEL_ENV=browser webpack --progress --config config/webpack/browser.config.babel.js",
     "build:commonjs": "cross-env BABEL_ENV=commonjs babel src --out-dir lib",
@@ -71,24 +71,19 @@
   "devDependencies": {
     "@babel/cli": "^7.21.0",
     "@babel/core": "^7.21.0",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
     "@babel/plugin-transform-runtime": "^7.21.0",
     "@babel/preset-env": "^7.20.2",
     "@babel/register": "^7.21.0",
     "@commitlint/cli": "^17.0.0",
     "@commitlint/config-conventional": "^17.0.0",
-    "abort-controller": "^3.0.0",
     "babel-loader": "=9.1.3",
-    "babel-plugin-lodash": "=3.3.4",
     "cross-env": "=7.0.3",
     "eslint": "^8.42.0",
     "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "=8.10.0",
+    "eslint-config-prettier": "=9.0.0",
     "eslint-plugin-import": "=2.28.1",
     "eslint-plugin-prettier": "=5.0.0",
     "expect": "^29.0.3",
-    "fetch-mock": "=9.11.0",
     "glob": "=10.3.4",
     "husky": "^8.0.1",
     "inspectpack": "=4.7.1",
@@ -98,9 +93,7 @@
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
     "lint-staged": "=14.0.1",
-    "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.3.3",
-    "node-fetch": "^2.6.7",
+    "lodash": "^4.17.21",
     "npm-run-all": "=4.1.5",
     "prettier": "^3.0.0",
     "rimraf": "=5.0.1",
@@ -109,27 +102,25 @@
     "webpack": "=5.88.2",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=5.1.4",
-    "webpack-stats-plugin": "=1.1.3",
-    "xmock": "=0.3.0"
+    "webpack-stats-plugin": "=1.1.3"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.20.13",
-    "@swagger-api/apidom-core": ">=0.76.1 <1.0.0",
-    "@swagger-api/apidom-json-pointer": ">=0.76.1 <1.0.0",
-    "@swagger-api/apidom-ns-openapi-3-1": ">=0.76.1 <1.0.0",
-    "@swagger-api/apidom-reference": ">=0.76.1 <1.0.0",
+    "@babel/runtime-corejs3": "^7.22.15",
+    "@swagger-api/apidom-core": ">=0.76.2 <1.0.0",
+    "@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",
-    "cross-fetch": "^3.1.5",
     "deepmerge": "~4.3.0",
     "fast-json-patch": "^3.0.0-1",
-    "form-data-encoder": "^1.4.3",
     "formdata-node": "^4.0.0",
     "is-plain-object": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "lodash": "^4.17.21",
+    "node-fetch-commonjs": "^3.3.1",
     "qs": "^6.10.2",
     "traverse": "~0.6.6",
-    "url": "~0.11.0"
+    "undici": "^5.24.0"
   },
   "overrides": {
     "@swagger-api/apidom-reference": {

package/es/http/fold-formdata-to-request.browser.js

@@ -1,4 +0,0 @@
-const foldFormDataToRequest = (formdata, request) => {
-  request.body = formdata;
-};
-export default foldFormDataToRequest;

package/es/http/fold-formdata-to-request.node.js

@@ -1,29 +0,0 @@
-import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
-import { Readable } from 'stream';
-import { FormDataEncoder } from 'form-data-encoder';
-
-/**
- * formdata-node works in node-fetch@2.x via form-data-encoder only.
- * FormData instance is converted to Encoder instance which gets converted
- * to Readable Stream.
- *
- * TODO(vladimir.gorej@gmail.com): this can be removed when migrated to node-fetch@3.x
- */
-const foldFormDataToRequest = (formdata, request) => {
-  const encoder = new FormDataEncoder(formdata);
-  const readableStream = Readable.from(encoder);
-
-  // get rid of previous headers
-  delete request.headers['content-type'];
-  delete request.headers['Content-Type'];
-
-  // set computed headers
-  request.headers = _objectSpread(_objectSpread({}, request.headers), encoder.headers);
-
-  // set FormData instance to request for debugging purposes
-  request.formdata = formdata;
-
-  // assign readable stream as request body
-  request.body = readableStream;
-};
-export default foldFormDataToRequest;

package/lib/http/fold-formdata-to-request.browser.js

@@ -1,9 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.default = void 0;
-const foldFormDataToRequest = (formdata, request) => {
-  request.body = formdata;
-};
-var _default = foldFormDataToRequest;
-exports.default = _default;

package/lib/http/fold-formdata-to-request.node.js

@@ -1,37 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.default = void 0;
-var _stream = require("stream");
-var _formDataEncoder = require("form-data-encoder");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
-/**
- * formdata-node works in node-fetch@2.x via form-data-encoder only.
- * FormData instance is converted to Encoder instance which gets converted
- * to Readable Stream.
- *
- * TODO(vladimir.gorej@gmail.com): this can be removed when migrated to node-fetch@3.x
- */
-const foldFormDataToRequest = (formdata, request) => {
-  const encoder = new _formDataEncoder.FormDataEncoder(formdata);
-  const readableStream = _stream.Readable.from(encoder);
-
-  // get rid of previous headers
-  delete request.headers['content-type'];
-  delete request.headers['Content-Type'];
-
-  // set computed headers
-  request.headers = _objectSpread(_objectSpread({}, request.headers), encoder.headers);
-
-  // set FormData instance to request for debugging purposes
-  request.formdata = formdata;
-
-  // assign readable stream as request body
-  request.body = readableStream;
-};
-var _default = foldFormDataToRequest;
-exports.default = _default;