swagger-client 3.14.1 → 3.17.0

package/lib/execute/oas3/style-serializer.js

@@ -1,12 +1,8 @@
 "use strict";
 
 exports.__esModule = true;
-exports.encodeDisallowedCharacters = encodeDisallowedCharacters;
 exports.default = stylize;
-
-const {
-  Buffer
-} = require('buffer');
+exports.encodeDisallowedCharacters = encodeDisallowedCharacters;
 
 const isRfc3986Reserved = char => ":/?#[]@!$&'()*+,;=".indexOf(char) > -1;
 
@@ -44,7 +40,8 @@ function encodeDisallowedCharacters(str, {
       return char;
     }
 
-    const encoded = (Buffer.from(char).toJSON().data || []).map(byte => `0${byte.toString(16).toUpperCase()}`.slice(-2)).map(encodedByte => `%${encodedByte}`).join('');
+    const encoder = new TextEncoder();
+    const encoded = Array.from(encoder.encode(char)).map(byte => `0${byte.toString(16).toUpperCase()}`.slice(-2)).map(encodedByte => `%${encodedByte}`).join('');
     return encoded;
   }).join('');
 }

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

@@ -1,15 +1,19 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = buildRequest;
 exports.applySecurities = applySecurities;
+exports.default = buildRequest;
 
 var _btoa = _interopRequireDefault(require("btoa"));
 
-var _assign = _interopRequireDefault(require("lodash/assign"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 // This function runs after the common function,
 // `src/execute/index.js#buildRequest`
 function buildRequest(options, req) {
@@ -65,7 +69,8 @@ function applySecurities({
   operation = {},
   spec
 }) {
-  const result = (0, _assign.default)({}, request);
+  const result = _objectSpread({}, request);
+
   const {
     authorized = {},
     specSecurity = []

package/lib/helpers.js

@@ -1,20 +1,18 @@
 "use strict";
 
 exports.__esModule = true;
+exports.eachOperation = eachOperation;
+exports.findOperation = findOperation;
+exports.getOperationRaw = getOperationRaw;
+exports.idFromPathMethod = idFromPathMethod;
 exports.isOAS3 = isOAS3;
 exports.isSwagger2 = isSwagger2;
-exports.opId = opId;
-exports.idFromPathMethod = idFromPathMethod;
 exports.legacyIdFromPathMethod = legacyIdFromPathMethod;
-exports.getOperationRaw = getOperationRaw;
-exports.findOperation = findOperation;
-exports.eachOperation = eachOperation;
 exports.normalizeSwagger = normalizeSwagger;
+exports.opId = opId;
 
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 
-var _startsWith = _interopRequireDefault(require("lodash/startsWith"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const toLower = str => String.prototype.toLowerCase.call(str);
@@ -29,7 +27,7 @@ function isOAS3(spec) {
     return false;
   }
 
-  return (0, _startsWith.default)(oasVersion, '3');
+  return oasVersion.startsWith('3');
 }
 
 function isSwagger2(spec) {
@@ -39,7 +37,7 @@ function isSwagger2(spec) {
     return false;
   }
 
-  return (0, _startsWith.default)(swaggerVersion, '2');
+  return swaggerVersion.startsWith('2');
 } // Strategy for determining operationId
 
 

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

@@ -21,7 +21,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * TODO(vladimir.gorej@gmail.com): this can be removed when migrated to node-fetch@3.x
  */
 const foldFormDataToRequest = (formdata, request) => {
-  const encoder = new _formDataEncoder.Encoder(formdata);
+  const encoder = new _formDataEncoder.FormDataEncoder(formdata);
 
   const readableStream = _stream.Readable.from(encoder); // get rid of previous headers
 

package/lib/http/index.js

@@ -2,13 +2,14 @@
 
 exports.__esModule = true;
 exports.default = http;
-exports.serializeRes = serializeRes;
-exports.serializeHeaders = serializeHeaders;
-exports.isFile = isFile;
 exports.encodeFormOrQuery = encodeFormOrQuery;
-exports.mergeInQueryOrForm = mergeInQueryOrForm;
+exports.isFile = isFile;
 exports.makeHttp = makeHttp;
-exports.shouldDownloadAsText = exports.self = void 0;
+exports.mergeInQueryOrForm = mergeInQueryOrForm;
+exports.self = void 0;
+exports.serializeHeaders = serializeHeaders;
+exports.serializeRes = serializeRes;
+exports.shouldDownloadAsText = void 0;
 
 require("cross-fetch/polyfill");
 
@@ -16,12 +17,6 @@ var _qs = _interopRequireDefault(require("qs"));
 
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
-var _pick = _interopRequireDefault(require("lodash/pick"));
-
-var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
-
-var _buffer = require("buffer");
-
 var _formdataNode = require("formdata-node");
 
 var _styleSerializer = require("../execute/oas3/style-serializer");
@@ -125,7 +120,7 @@ function parseBody(body, contentType) {
     return JSON.parse(body);
   }
 
-  return _jsYaml.default.safeLoad(body);
+  return _jsYaml.default.load(body);
 } // Serialize the response, returns a promise with headers and the body part of the hash
 
 
@@ -171,7 +166,7 @@ function serializeHeaderValue(value) {
 
 
 function serializeHeaders(headers = {}) {
-  if (!(0, _isFunction.default)(headers.entries)) return {};
+  if (typeof headers.entries !== 'function') return {};
   return Array.from(headers.entries()).reduce((acc, [header, value]) => {
     acc[header] = serializeHeaderValue(value);
     return acc;
@@ -192,17 +187,15 @@ function isFile(obj, navigatorObj) {
     return false;
   }
 
-  if (typeof File !== 'undefined' && obj instanceof File) {
-    // eslint-disable-line no-undef
+  if (typeof _formdataNode.File !== 'undefined' && obj instanceof _formdataNode.File) {
     return true;
   }
 
-  if (typeof Blob !== 'undefined' && obj instanceof Blob) {
-    // eslint-disable-line no-undef
+  if (typeof _formdataNode.Blob !== 'undefined' && obj instanceof _formdataNode.Blob) {
     return true;
   }
 
-  if (typeof _buffer.Buffer !== 'undefined' && obj instanceof _buffer.Buffer) {
+  if (ArrayBuffer.isView(obj)) {
     return true;
   }
 
@@ -261,7 +254,16 @@ function formatKeyValue(key, input, skipEncoding = false) {
 
   if (encoding) {
     if ([typeof encoding.style, typeof encoding.explode, typeof encoding.allowReserved].some(type => type !== 'undefined')) {
-      return formatKeyValueBySerializationOption(key, value, skipEncoding, (0, _pick.default)(encoding, ['style', 'explode', 'allowReserved']));
+      const {
+        style,
+        explode,
+        allowReserved
+      } = encoding;
+      return formatKeyValueBySerializationOption(key, value, skipEncoding, {
+        style,
+        explode,
+        allowReserved
+      });
     }
 
     if (encoding.contentType) {
@@ -355,6 +357,11 @@ function buildFormData(reqForm) {
    * Build a new FormData instance, support array as field value
    * OAS2.0 - when collectionFormat is multi
    * OAS3.0 - when explode of Encoding Object is true
+   *
+   * This function explicitly handles Buffers (for backward compatibility)
+   * if provided as a values to FormData. FormData can only handle USVString
+   * or Blob.
+   *
    * @param {Object} reqForm - ori req.form
    * @return {FormData} - new FormData instance
    */
@@ -364,8 +371,16 @@ function buildFormData(reqForm) {
       if (Array.isArray(value)) {
         // eslint-disable-next-line no-restricted-syntax
         for (const v of value) {
-          formData.append(key, v);
+          if (ArrayBuffer.isView(v)) {
+            const blob = new _formdataNode.Blob([v]);
+            formData.append(key, blob);
+          } else {
+            formData.append(key, v);
+          }
         }
+      } else if (ArrayBuffer.isView(value)) {
+        const blob = new _formdataNode.Blob([value]);
+        formData.append(key, blob);
       } else {
         formData.append(key, value);
       }

package/lib/index.js

@@ -1,11 +1,7 @@
 "use strict";
 
 exports.__esModule = true;
-exports.default = exports.helpers = void 0;
-
-var _assign = _interopRequireDefault(require("lodash/assign"));
-
-var _startsWith = _interopRequireDefault(require("lodash/startsWith"));
+exports.helpers = exports.default = void 0;
 
 var _url = _interopRequireDefault(require("url"));
 
@@ -60,10 +56,10 @@ function Swagger(url, opts = {}) {
     return new Swagger(opts);
   }
 
-  (0, _assign.default)(this, opts);
+  Object.assign(this, opts);
   const prom = this.resolve().then(() => {
     if (!this.disableInterfaces) {
-      (0, _assign.default)(this, Swagger.makeApisTagOperation(this));
+      Object.assign(this, Swagger.makeApisTagOperation(this));
     }
 
     return this;
@@ -116,7 +112,7 @@ Swagger.prototype.applyDefaults = function applyDefaults() {
   } = this;
   const specUrl = this.url; // TODO: OAS3: support servers here
 
-  if (specUrl && (0, _startsWith.default)(specUrl, 'http')) {
+  if (specUrl && specUrl.startsWith('http')) {
     const parsed = _url.default.parse(specUrl);
 
     if (!spec.host) {

package/lib/interfaces.js

@@ -1,18 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.makeExecute = makeExecute;
-exports.makeApisTagOperationsOperationExecute = makeApisTagOperationsOperationExecute;
 exports.makeApisTagOperation = makeApisTagOperation;
+exports.makeApisTagOperationsOperationExecute = makeApisTagOperationsOperationExecute;
+exports.makeExecute = makeExecute;
 exports.mapTagOperations = mapTagOperations;
 exports.self = void 0;
 
-var _pick = _interopRequireDefault(require("lodash/pick"));
-
 var _helpers = require("./helpers");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -36,14 +32,23 @@ function makeExecute(swaggerJs = {}) {
     pathName,
     method,
     operationId
-  }) => (parameters, opts = {}) => swaggerJs.execute(_objectSpread(_objectSpread({
-    spec: swaggerJs.spec
-  }, (0, _pick.default)(swaggerJs, 'requestInterceptor', 'responseInterceptor', 'userFetch')), {}, {
-    pathName,
-    method,
-    parameters,
-    operationId
-  }, opts));
+  }) => (parameters, opts = {}) => {
+    const {
+      requestInterceptor,
+      responseInterceptor,
+      userFetch
+    } = swaggerJs;
+    return swaggerJs.execute(_objectSpread({
+      spec: swaggerJs.spec,
+      requestInterceptor,
+      responseInterceptor,
+      userFetch,
+      pathName,
+      method,
+      parameters,
+      operationId
+    }, opts));
+  };
 } // Creates an interface with tags+operations = execute
 // The shape
 // { apis: { [tag]: { operations: [operation]: { execute }}}}

package/lib/resolver.js

@@ -1,9 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
-exports.makeFetchJSON = makeFetchJSON;
 exports.clearCache = clearCache;
 exports.default = resolve;
+exports.makeFetchJSON = makeFetchJSON;
 
 var _http = _interopRequireDefault(require("./http"));
 

package/lib/specmap/helpers.js

@@ -1,16 +1,14 @@
 "use strict";
 
 exports.__esModule = true;
-exports.isFreelyNamed = isFreelyNamed;
-exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
 exports.absolutifyPointer = absolutifyPointer;
+exports.generateAbsoluteRefPatches = generateAbsoluteRefPatches;
+exports.isFreelyNamed = isFreelyNamed;
 
 var _traverse = _interopRequireDefault(require("traverse"));
 
 var _url = _interopRequireDefault(require("url"));
 
-var _isString = _interopRequireDefault(require("lodash/isString"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // This will match if the direct parent's key exactly matches an item.
@@ -47,7 +45,7 @@ function generateAbsoluteRefPatches(obj, basePath, {
 } = {}) {
   const patches = [];
   (0, _traverse.default)(obj).forEach(function callback() {
-    if (targetKeys.includes(this.key) && (0, _isString.default)(this.node)) {
+    if (targetKeys.includes(this.key) && typeof this.node === 'string') {
       const nodePath = this.path; // this node's path, relative to `obj`
 
       const fullPath = basePath.concat(this.path);

package/lib/specmap/index.js

@@ -1,12 +1,9 @@
 "use strict";
 
 exports.__esModule = true;
+exports.SpecMap = void 0;
 exports.default = mapSpec;
-exports.plugins = exports.SpecMap = void 0;
-
-var _find = _interopRequireDefault(require("lodash/find"));
-
-var _noop = _interopRequireDefault(require("lodash/noop"));
+exports.plugins = void 0;
 
 var _lib = _interopRequireDefault(require("./lib"));
 
@@ -30,6 +27,8 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 const HARD_LIMIT = 100;
 
+const noop = () => {};
+
 class SpecMap {
   static getPluginName(plugin) {
     return plugin.pluginName;
@@ -173,8 +172,7 @@ class SpecMap {
   }
 
   nextPlugin() {
-    // Array.prototype.find doesn't work in IE 11 :(
-    return (0, _find.default)(this.wrappedPlugins, plugin => {
+    return this.wrappedPlugins.find(plugin => {
       const mutations = this.getMutationsForPlugin(plugin);
       return mutations.length > 0;
     });
@@ -381,7 +379,7 @@ class SpecMap {
     if (plugin !== this.currentPlugin && this.promisedPatches.length) {
       const promises = this.promisedPatches.map(p => p.value); // Waits for all to settle instead of Promise.all which stops on rejection
 
-      return Promise.all(promises.map(promise => promise.then(_noop.default, _noop.default))).then(() => this.dispatch());
+      return Promise.all(promises.map(promise => promise.then(noop, noop))).then(() => this.dispatch());
     } // Ok, run the plugin
 
 

package/lib/specmap/lib/refs.js

@@ -3,12 +3,10 @@
 exports.__esModule = true;
 exports.default = void 0;
 
-var _crossFetch = require("cross-fetch");
+require("cross-fetch/polyfill");
 
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
-var _querystringBrowser = _interopRequireDefault(require("querystring-browser"));
-
 var _url = _interopRequireDefault(require("url"));
 
 var _ = _interopRequireDefault(require("."));
@@ -21,6 +19,7 @@ var _constants = require("../../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+/* global fetch */
 const ABSOLUTE_URL_REGEXP = new RegExp('^([a-z]+://|//)', 'i');
 const JSONRefError = (0, _createError.default)('JSONRefError', function cb(message, extra, oriError) {
   this.originalError = oriError;
@@ -341,12 +340,12 @@ function getDoc(docPath) {
 
 
 function fetchJSON(docPath) {
-  return (0, _crossFetch.fetch)(docPath, {
+  return fetch(docPath, {
     headers: {
       Accept: _constants.ACCEPT_HEADER_VALUE_FOR_DOCUMENTS
     },
     loadSpec: true
-  }).then(res => res.text()).then(text => _jsYaml.default.safeLoad(text));
+  }).then(res => res.text()).then(text => _jsYaml.default.load(text));
 }
 /**
  * Extracts a pointer from an object.
@@ -406,7 +405,8 @@ function unescapeJsonPointerToken(token) {
     return token;
   }
 
-  return _querystringBrowser.default.unescape(token.replace(/~1/g, '/').replace(/~0/g, '~'));
+  const params = new URLSearchParams(`=${token.replace(/~1/g, '/').replace(/~0/g, '~')}`);
+  return params.get('');
 }
 /**
  * Escapes a JSON pointer.
@@ -415,7 +415,8 @@ function unescapeJsonPointerToken(token) {
 
 
 function escapeJsonPointerToken(token) {
-  return _querystringBrowser.default.escape(token.replace(/~/g, '~0').replace(/\//g, '~1'));
+  const params = new URLSearchParams([['', token.replace(/~/g, '~0').replace(/\//g, '~1')]]);
+  return params.toString().slice(1);
 }
 
 function arrayToJsonPointer(arr) {
@@ -474,7 +475,7 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
 
   const rootDoc = specmap.contextTree.get([]).baseDoc;
 
-  if (basePath == rootDoc && pointerIsAParent(safeParentPointer, pointer)) {
+  if (basePath === rootDoc && pointerIsAParent(safeParentPointer, pointer)) {
     // eslint-disable-line
     return true;
   } // Case 2: indirect cycle

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.14.1",
+  "version": "3.17.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",
@@ -65,61 +65,59 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "=7.14.8",
-    "@babel/core": "=7.14.8",
+    "@babel/cli": "=7.15.7",
+    "@babel/core": "=7.15.8",
     "@babel/plugin-proposal-class-properties": "=7.14.5",
-    "@babel/plugin-proposal-object-rest-spread": "=7.14.7",
-    "@babel/plugin-transform-runtime": "=7.14.5",
-    "@babel/preset-env": "=7.14.8",
-    "@babel/register": "=7.14.5",
+    "@babel/plugin-proposal-object-rest-spread": "=7.15.6",
+    "@babel/plugin-transform-runtime": "=7.15.8",
+    "@babel/preset-env": "=7.15.8",
+    "@babel/register": "=7.15.3",
     "@char0n/npm-audit": "gist:2964395223d7943c10396f59df9a8ea0",
-    "@commitlint/cli": "^12.0.0",
+    "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",
     "babel-loader": "=8.2.2",
     "babel-plugin-lodash": "=3.3.4",
     "cross-env": "=7.0.3",
-    "eslint": "=7.31.0",
+    "eslint": "=7.32.0",
     "eslint-config-airbnb-base": "=14.2.1",
     "eslint-config-prettier": "=8.3.0",
-    "eslint-plugin-import": "=2.23.4",
-    "eslint-plugin-prettier": "=3.4.0",
-    "expect": "=27.0.6",
+    "eslint-plugin-import": "=2.25.2",
+    "eslint-plugin-prettier": "=4.0.0",
+    "expect": "=27.2.5",
     "fetch-mock": "=9.11.0",
-    "glob": "=7.1.7",
+    "glob": "=7.2.0",
     "husky": "^7.0.1",
     "inspectpack": "=4.7.1",
     "install": "=0.13.0",
     "jest": "^27.0.1",
     "json-loader": "=0.5.7",
     "license-checker": "=25.0.1",
-    "lint-staged": "=11.1.1",
+    "lint-staged": "=11.2.3",
     "lodash-webpack-plugin": "=0.11.6",
-    "nock": "=13.1.1",
+    "nock": "=13.1.3",
     "node-fetch": "=2.6.1",
     "npm-run-all": "=4.1.5",
     "prettier": "^2.3.0",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.46.0",
+    "webpack": "=5.58.2",
     "webpack-bundle-size-analyzer": "=3.1.0",
-    "webpack-cli": "=4.7.2",
+    "webpack-cli": "=4.9.0",
     "webpack-stats-plugin": "=1.0.3",
     "xmock": "=0.3.0"
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.11.2",
     "btoa": "^1.2.1",
-    "buffer": "^6.0.3",
     "cookie": "~0.4.1",
     "cross-fetch": "^3.1.4",
     "deep-extend": "~0.6.0",
     "fast-json-patch": "^3.0.0-1",
-    "form-data-encoder": "^1.0.1",
-    "formdata-node": "^3.6.2",
-    "js-yaml": "^3.14.0",
-    "lodash": "^4.17.19",
+    "form-data-encoder": "^1.4.3",
+    "formdata-node": "^4.0.0",
+    "js-yaml": "^4.1.0",
+    "lodash": "^4.17.21",
     "qs": "^6.9.4",
-    "querystring-browser": "^1.0.4",
     "traverse": "~0.6.6",
     "url": "~0.11.0"
   }