swagger-client 3.15.0 → 3.16.0

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime-corejs3/helpers/objectSpread2";
 import { Readable } from 'stream';
-import { Encoder } from 'form-data-encoder';
+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
@@ -10,7 +10,7 @@ import { Encoder } from 'form-data-encoder';
  */
 
 var foldFormDataToRequest = function foldFormDataToRequest(formdata, request) {
-  var encoder = new Encoder(formdata);
+  var encoder = new FormDataEncoder(formdata);
   var readableStream = Readable.from(encoder); // get rid of previous headers
 
   delete request.headers['content-type'];

package/es/http/index.js

@@ -20,7 +20,7 @@ import jsYaml from 'js-yaml';
 import pick from 'lodash/pick';
 import isFunction from 'lodash/isFunction';
 import { Buffer } from 'buffer';
-import { FormData } from 'formdata-node';
+import { FormData, File, Blob } from 'formdata-node';
 import { encodeDisallowedCharacters } from '../execute/oas3/style-serializer';
 import foldFormDataToRequest from './fold-formdata-to-request.node'; // For testing
 
@@ -272,16 +272,14 @@ export function isFile(obj, navigatorObj) {
   }
 
   if (typeof File !== 'undefined' && obj instanceof File) {
-    // eslint-disable-line no-undef
     return true;
   }
 
   if (typeof Blob !== 'undefined' && obj instanceof Blob) {
-    // eslint-disable-line no-undef
     return true;
   }
 
-  if (typeof Buffer !== 'undefined' && obj instanceof Buffer) {
+  if (Buffer.isBuffer(obj)) {
     return true;
   }
 
@@ -465,6 +463,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
    */
@@ -491,13 +494,23 @@ function buildFormData(reqForm) {
           try {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var v = _step2.value;
-              formData.append(key, v);
+
+              if (Buffer.isBuffer(v)) {
+                var blob = new Blob([v]);
+                formData.append(key, blob);
+              } else {
+                formData.append(key, v);
+              }
             }
           } catch (err) {
             _iterator2.e(err);
           } finally {
             _iterator2.f();
           }
+        } else if (Buffer.isBuffer(value)) {
+          var _blob = new Blob([value]);
+
+          formData.append(key, _blob);
         } else {
           formData.append(key, value);
         }

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

@@ -192,17 +192,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 (_buffer.Buffer.isBuffer(obj)) {
     return true;
   }
 
@@ -355,6 +353,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 +367,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 (_buffer.Buffer.isBuffer(v)) {
+            const blob = new _formdataNode.Blob([v]);
+            formData.append(key, blob);
+          } else {
+            formData.append(key, v);
+          }
         }
+      } else if (_buffer.Buffer.isBuffer(value)) {
+        const blob = new _formdataNode.Blob([value]);
+        formData.append(key, blob);
       } else {
         formData.append(key, value);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "swagger-client",
-  "version": "3.15.0",
+  "version": "3.16.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",
@@ -71,7 +71,7 @@
     "@babel/plugin-proposal-object-rest-spread": "=7.14.7",
     "@babel/plugin-transform-runtime": "=7.15.0",
     "@babel/preset-env": "=7.15.0",
-    "@babel/register": "=7.14.5",
+    "@babel/register": "=7.15.3",
     "@char0n/npm-audit": "gist:2964395223d7943c10396f59df9a8ea0",
     "@commitlint/cli": "^13.1.0",
     "@commitlint/config-conventional": "^13.1.0",
@@ -81,7 +81,7 @@
     "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-import": "=2.24.1",
     "eslint-plugin-prettier": "=3.4.0",
     "expect": "=27.0.6",
     "fetch-mock": "=9.11.0",
@@ -100,9 +100,9 @@
     "prettier": "^2.3.0",
     "rimraf": "=3.0.2",
     "terser-webpack-plugin": "^5.0.3",
-    "webpack": "=5.49.0",
+    "webpack": "=5.51.1",
     "webpack-bundle-size-analyzer": "=3.1.0",
-    "webpack-cli": "=4.7.2",
+    "webpack-cli": "=4.8.0",
     "webpack-stats-plugin": "=1.0.3",
     "xmock": "=0.3.0"
   },
@@ -114,8 +114,8 @@
     "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",
+    "form-data-encoder": "^1.4.3",
+    "formdata-node": "^4.0.0",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.19",
     "qs": "^6.9.4",