swagger-client 3.13.6 → 3.15.0

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

@@ -0,0 +1,5 @@
+var foldFormDataToRequest = function foldFormDataToRequest(formdata, request) {
+  request.body = formdata;
+};
+
+export default foldFormDataToRequest;

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

@@ -0,0 +1,26 @@
+import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
+import { Readable } from 'stream';
+import { Encoder } 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
+ */
+
+var foldFormDataToRequest = function foldFormDataToRequest(formdata, request) {
+  var encoder = new Encoder(formdata);
+  var 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/es/{http.js → http/index.js}

@@ -20,8 +20,9 @@ import jsYaml from 'js-yaml';
 import pick from 'lodash/pick';
 import isFunction from 'lodash/isFunction';
 import { Buffer } from 'buffer';
-import FormData from './internal/form-data-monkey-patch';
-import { encodeDisallowedCharacters } from './execute/oas3/style-serializer'; // For testing
+import { FormData } from 'formdata-node';
+import { encodeDisallowedCharacters } from '../execute/oas3/style-serializer';
+import foldFormDataToRequest from './fold-formdata-to-request.node'; // For testing
 
 export var self = {
   serializeRes: serializeRes,
@@ -97,10 +98,10 @@ function _http() {
 
           case 12:
             // for content-type=multipart\/form-data remove content-type from request before fetch
-            // so that correct one with `boundary` is set
-            contentType = request.headers['content-type'] || request.headers['Content-Type'];
+            // so that correct one with `boundary` is set when request body is different than boundary encoded string
+            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)) {
+            if (/multipart\/form-data/i.test(contentType) && request.body instanceof FormData) {
               delete request.headers['content-type'];
               delete request.headers['Content-Type'];
             } // eslint-disable-next-line no-undef
@@ -196,7 +197,7 @@ function parseBody(body, contentType) {
     return JSON.parse(body);
   }
 
-  return jsYaml.safeLoad(body);
+  return jsYaml.load(body);
 } // Serialize the response, returns a promise with headers and the body part of the hash
 
 
@@ -577,7 +578,8 @@ export function mergeInQueryOrForm() {
     var contentType = req.headers['content-type'] || req.headers['Content-Type'];
 
     if (hasFile || /multipart\/form-data/i.test(contentType)) {
-      req.body = buildFormData(req.form);
+      var formdata = buildFormData(req.form);
+      foldFormDataToRequest(formdata, req);
     } else {
       req.body = encodeFormOrQuery(form);
     }

package/es/index.js

@@ -78,7 +78,8 @@ Swagger.prototype = {
       allowMetaPatches: this.allowMetaPatches,
       useCircularStructures: this.useCircularStructures,
       requestInterceptor: this.requestInterceptor || null,
-      responseInterceptor: this.responseInterceptor || null
+      responseInterceptor: this.responseInterceptor || null,
+      skipNormalization: this.skipNormalization || false
     }, options)).then(function (obj) {
       _this2.originalSpec = _this2.spec;
       _this2.spec = obj.spec;

package/es/specmap/lib/refs.js

@@ -6,7 +6,9 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import { fetch } from 'cross-fetch';
+import 'cross-fetch/polyfill';
+/* global fetch */
+
 import jsYaml from 'js-yaml';
 import qs from 'querystring-browser';
 import url from 'url';
@@ -391,7 +393,7 @@ function fetchJSON(docPath) {
   }).then(function (res) {
     return res.text();
   }).then(function (text) {
-    return jsYaml.safeLoad(text);
+    return jsYaml.load(text);
   });
 }
 /**
@@ -530,7 +532,7 @@ function pointerAlreadyInPath(pointer, basePath, parent, specmap) {
 
   var 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/lib/http/fold-formdata-to-request.browser.js

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

@@ -0,0 +1,40 @@
+"use strict";
+
+exports.__esModule = true;
+exports.default = void 0;
+
+var _stream = require("stream");
+
+var _formDataEncoder = require("form-data-encoder");
+
+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; }
+
+/**
+ * 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.Encoder(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;

package/lib/{http.js → http/index.js}

@@ -22,9 +22,11 @@ var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
 
 var _buffer = require("buffer");
 
-var _formDataMonkeyPatch = _interopRequireDefault(require("./internal/form-data-monkey-patch"));
+var _formdataNode = require("formdata-node");
 
-var _styleSerializer = require("./execute/oas3/style-serializer");
+var _styleSerializer = require("../execute/oas3/style-serializer");
+
+var _foldFormdataToRequest = _interopRequireDefault(require("./fold-formdata-to-request.node"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -68,12 +70,12 @@ async function http(url, request = {}) {
   if (request.requestInterceptor) {
     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
+  // so that correct one with `boundary` is set when request body is different than boundary encoded string
 
 
-  const contentType = request.headers['content-type'] || request.headers['Content-Type'];
+  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)) {
+  if (/multipart\/form-data/i.test(contentType) && request.body instanceof _formdataNode.FormData) {
     delete request.headers['content-type'];
     delete request.headers['Content-Type'];
   } // eslint-disable-next-line no-undef
@@ -123,7 +125,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
 
 
@@ -370,7 +372,7 @@ function buildFormData(reqForm) {
     }
 
     return formData;
-  }, new _formDataMonkeyPatch.default());
+  }, new _formdataNode.FormData());
 } // Encodes an object using appropriate serializer.
 
 
@@ -420,7 +422,8 @@ function mergeInQueryOrForm(req = {}) {
     const contentType = req.headers['content-type'] || req.headers['Content-Type'];
 
     if (hasFile || /multipart\/form-data/i.test(contentType)) {
-      req.body = buildFormData(req.form);
+      const formdata = buildFormData(req.form);
+      (0, _foldFormdataToRequest.default)(formdata, req);
     } else {
       req.body = encodeFormOrQuery(form);
     }

package/lib/index.js

@@ -98,7 +98,8 @@ Swagger.prototype = {
       allowMetaPatches: this.allowMetaPatches,
       useCircularStructures: this.useCircularStructures,
       requestInterceptor: this.requestInterceptor || null,
-      responseInterceptor: this.responseInterceptor || null
+      responseInterceptor: this.responseInterceptor || null,
+      skipNormalization: this.skipNormalization || false
     }, options)).then(obj => {
       this.originalSpec = this.spec;
       this.spec = obj.spec;

package/lib/specmap/lib/refs.js

@@ -3,7 +3,7 @@
 exports.__esModule = true;
 exports.default = void 0;
 
-var _crossFetch = require("cross-fetch");
+require("cross-fetch/polyfill");
 
 var _jsYaml = _interopRequireDefault(require("js-yaml"));
 
@@ -21,6 +21,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 +342,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.
@@ -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,7 +1,12 @@
 {
   "name": "swagger-client",
-  "version": "3.13.6",
+  "version": "3.15.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"
+  },
   "main": "lib/commonjs.js",
   "module": "es/index.js",
   "jsnext:main": "es/index.js",
@@ -41,7 +46,7 @@
     "test:unit:coverage": "cross-env BABEL_ENV=commonjs jest --runInBand --config ./config/jest/jest.unit.coverage.config.js",
     "test:unit:watch": "cross-env BABEL_ENV=commonjs jest --runInBand --watch --config ./config/jest/jest.unit.config.js",
     "test:artifact": "run-s test:artifact:umd:browser test:artifact:es test:artifact:commonjs",
-    "test:artifact:umd:browser": "npm run build:umd:browser && cross-env BABEL_ENV=commonjs jest --config ./config/jest/jest.artifact-umd-browser.config.js",
+    "test:artifact:umd:browser": "npm run build:umd:browser && cross-env BABEL_ENV=browser jest --config ./config/jest/jest.artifact-umd-browser.config.js",
     "test:artifact:es": "npm run build:es && cross-env BABEL_ENV=commonjs jest --config ./config/jest/jest.artifact-es.config.js",
     "test:artifact:commonjs": "npm run build:commonjs && cross-env BABEL_ENV=commonjs jest --config ./config/jest/jest.artifact-commonjs.config.js",
     "deps:license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",
@@ -60,20 +65,20 @@
   ],
   "license": "Apache-2.0",
   "devDependencies": {
-    "@babel/cli": "=7.14.5",
-    "@babel/core": "=7.14.6",
+    "@babel/cli": "=7.14.8",
+    "@babel/core": "=7.15.0",
     "@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.7",
+    "@babel/plugin-transform-runtime": "=7.15.0",
+    "@babel/preset-env": "=7.15.0",
     "@babel/register": "=7.14.5",
     "@char0n/npm-audit": "gist:2964395223d7943c10396f59df9a8ea0",
-    "@commitlint/cli": "^12.0.0",
-    "@commitlint/config-conventional": "^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.30.0",
+    "eslint": "=7.32.0",
     "eslint-config-airbnb-base": "=14.2.1",
     "eslint-config-prettier": "=8.3.0",
     "eslint-plugin-import": "=2.23.4",
@@ -81,13 +86,13 @@
     "expect": "=27.0.6",
     "fetch-mock": "=9.11.0",
     "glob": "=7.1.7",
-    "husky": "=6.0.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.0.0",
+    "lint-staged": "=11.1.2",
     "lodash-webpack-plugin": "=0.11.6",
     "nock": "=13.1.1",
     "node-fetch": "=2.6.1",
@@ -95,7 +100,7 @@
     "prettier": "^2.3.0",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.43.0",
+    "webpack": "=5.49.0",
     "webpack-bundle-size-analyzer": "=3.1.0",
     "webpack-cli": "=4.7.2",
     "webpack-stats-plugin": "=1.0.3",
@@ -109,8 +114,9 @@
     "cross-fetch": "^3.1.4",
     "deep-extend": "~0.6.0",
     "fast-json-patch": "^3.0.0-1",
-    "isomorphic-form-data": "~2.0.0",
-    "js-yaml": "^3.14.0",
+    "form-data-encoder": "^1.0.1",
+    "formdata-node": "^3.6.2",
+    "js-yaml": "^4.1.0",
     "lodash": "^4.17.19",
     "qs": "^6.9.4",
     "querystring-browser": "^1.0.4",

package/es/internal/form-data-monkey-patch.js

@@ -1,104 +0,0 @@
-import _classCallCheck from "@babel/runtime-corejs3/helpers/classCallCheck";
-import _createClass from "@babel/runtime-corejs3/helpers/createClass";
-import _get from "@babel/runtime-corejs3/helpers/get";
-import _getPrototypeOf from "@babel/runtime-corejs3/helpers/getPrototypeOf";
-import _inherits from "@babel/runtime-corejs3/helpers/inherits";
-import _createSuper from "@babel/runtime-corejs3/helpers/createSuper";
-import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import isFunction from 'lodash/isFunction';
-import IsomorphicFormData from 'isomorphic-form-data'; // patches FormData type by mutating it.
-// patch :: FormData -> PatchedFormData
-
-export var patch = function patch(FormData) {
-  var createEntry = function createEntry(field, value) {
-    return {
-      name: field,
-      value: value
-    };
-  };
-  /** We return original type if prototype already contains one of methods we're trying to patch.
-   * Reasoning: if one of the methods already exists, it would access data in other
-   * property than our `_entryList`. That could potentially create nasty
-   * hardly detectable bugs if `form-data` library implements only couple of
-   * methods that it misses, instead of implementing all of them.
-   * Current solution will fail the tests to let us know that form-data library
-   * already implements some of the methods that we try to monkey-patch, and our
-   * monkey-patch code should then compensate the library changes easily.
-   */
-
-
-  if (isFunction(FormData.prototype.set) || isFunction(FormData.prototype.get) || isFunction(FormData.prototype.getAll) || isFunction(FormData.prototype.has)) {
-    return FormData;
-  }
-
-  var PatchedFormData = /*#__PURE__*/function (_FormData) {
-    _inherits(PatchedFormData, _FormData);
-
-    var _super = _createSuper(PatchedFormData);
-
-    function PatchedFormData(form) {
-      var _this;
-
-      _classCallCheck(this, PatchedFormData);
-
-      _this = _super.call(this, form);
-      _this.entryList = [];
-      return _this;
-    }
-
-    _createClass(PatchedFormData, [{
-      key: "append",
-      value: function append(field, value, options) {
-        this.entryList.push(createEntry(field, value));
-        return _get(_getPrototypeOf(PatchedFormData.prototype), "append", this).call(this, field, value, options);
-      }
-    }, {
-      key: "set",
-      value: function set(field, value) {
-        var _context;
-
-        var newEntry = createEntry(field, value);
-        this.entryList = _filterInstanceProperty(_context = this.entryList).call(_context, function (entry) {
-          return entry.name !== field;
-        });
-        this.entryList.push(newEntry);
-      }
-    }, {
-      key: "get",
-      value: function get(field) {
-        var _context2;
-
-        var foundEntry = _findInstanceProperty(_context2 = this.entryList).call(_context2, function (entry) {
-          return entry.name === field;
-        });
-
-        return foundEntry === undefined ? null : foundEntry;
-      }
-    }, {
-      key: "getAll",
-      value: function getAll(field) {
-        var _context3, _context4;
-
-        return _mapInstanceProperty(_context3 = _filterInstanceProperty(_context4 = this.entryList).call(_context4, function (entry) {
-          return entry.name === field;
-        })).call(_context3, function (entry) {
-          return entry.value;
-        });
-      }
-    }, {
-      key: "has",
-      value: function has(field) {
-        return this.entryList.some(function (entry) {
-          return entry.name === field;
-        });
-      }
-    }]);
-
-    return PatchedFormData;
-  }(FormData);
-
-  return PatchedFormData;
-};
-export default patch(IsomorphicFormData);

package/lib/internal/form-data-monkey-patch.js

@@ -1,73 +0,0 @@
-"use strict";
-
-exports.__esModule = true;
-exports.default = exports.patch = void 0;
-
-var _isFunction = _interopRequireDefault(require("lodash/isFunction"));
-
-var _isomorphicFormData = _interopRequireDefault(require("isomorphic-form-data"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// patches FormData type by mutating it.
-// patch :: FormData -> PatchedFormData
-const patch = FormData => {
-  const createEntry = (field, value) => ({
-    name: field,
-    value
-  });
-  /** We return original type if prototype already contains one of methods we're trying to patch.
-   * Reasoning: if one of the methods already exists, it would access data in other
-   * property than our `_entryList`. That could potentially create nasty
-   * hardly detectable bugs if `form-data` library implements only couple of
-   * methods that it misses, instead of implementing all of them.
-   * Current solution will fail the tests to let us know that form-data library
-   * already implements some of the methods that we try to monkey-patch, and our
-   * monkey-patch code should then compensate the library changes easily.
-   */
-
-
-  if ((0, _isFunction.default)(FormData.prototype.set) || (0, _isFunction.default)(FormData.prototype.get) || (0, _isFunction.default)(FormData.prototype.getAll) || (0, _isFunction.default)(FormData.prototype.has)) {
-    return FormData;
-  }
-
-  class PatchedFormData extends FormData {
-    constructor(form) {
-      super(form);
-      this.entryList = [];
-    }
-
-    append(field, value, options) {
-      this.entryList.push(createEntry(field, value));
-      return super.append(field, value, options);
-    }
-
-    set(field, value) {
-      const newEntry = createEntry(field, value);
-      this.entryList = this.entryList.filter(entry => entry.name !== field);
-      this.entryList.push(newEntry);
-    }
-
-    get(field) {
-      const foundEntry = this.entryList.find(entry => entry.name === field);
-      return foundEntry === undefined ? null : foundEntry;
-    }
-
-    getAll(field) {
-      return this.entryList.filter(entry => entry.name === field).map(entry => entry.value);
-    }
-
-    has(field) {
-      return this.entryList.some(entry => entry.name === field);
-    }
-
-  }
-
-  return PatchedFormData;
-};
-
-exports.patch = patch;
-
-var _default = patch(_isomorphicFormData.default);
-
-exports.default = _default;