feat(formdata): use formdata-node to handle form data

This remove use of isomorphic-form-data.

Refs #2008

Author: char0n

package-lock.json

@@ -41,7 +41,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",
@@ -109,7 +109,7 @@
     "cross-fetch": "^3.1.4",
     "deep-extend": "~0.6.0",
     "fast-json-patch": "^3.0.0-1",
-    "isomorphic-form-data": "~2.0.0",
+    "formdata-node": "^3.6.2",
     "js-yaml": "^3.14.0",
     "lodash": "^4.17.19",
     "qs": "^6.9.4",

package.json

@@ -4,8 +4,8 @@ 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 from './internal/form-data-monkey-patch';
 import { encodeDisallowedCharacters } from './execute/oas3/style-serializer';
 
 // For testing

src/http.js

@@ -1,4 +1,5 @@
-import FormData from '../../src/internal/form-data-monkey-patch';
+import { FormData } from 'formdata-node';
+
 import { execute, buildRequest, self as stubs } from '../../src/execute';
 import { normalizeSwagger } from '../../src/helpers';
 

src/internal/form-data-monkey-patch.js

@@ -1,6 +1,6 @@
 import fetchMock from 'fetch-mock';
+import { FormData } from 'formdata-node';
 
-import FormData from '../src/internal/form-data-monkey-patch';
 import { buildRequest } from '../src/execute';
 import sampleMultipartOpenApi2 from './data/sample-multipart-oas2';
 import sampleMultipartOpenApi3 from './data/sample-multipart-oas3';
@@ -132,10 +132,9 @@ describe('buildRequest - openapi 2.0', () => {
           expect(json.data.email.length).toEqual(2);
           expect(json.data.email[0]).toEqual('person1');
           expect(json.data.email[1]).toEqual('person2');
-          // duck typing that fetch received a FormData instance instead of plain object
+          // fetch received a FormData instance instead of plain object
           const lastOptions = fetchMock.lastOptions();
-          expect(lastOptions.body.readable).toEqual(true);
-          // expect(lastOptions.body._streams).toBeDefined()
+          expect(lastOptions.body).toBeInstanceOf(FormData);
         });
     });
   });
@@ -222,10 +221,9 @@ describe('buildRequest - openapi 3.0', () => {
           expect(json.data.email.length).toEqual(2);
           expect(json.data.email[0]).toEqual('person1');
           expect(json.data.email[1]).toEqual('person2');
-          // duck typing that fetch received a FormData instance instead of plain object
+          // fetch received a FormData instance instead of plain object
           const lastOptions = fetchMock.lastOptions();
-          expect(lastOptions.body.readable).toEqual(true);
-          // expect(lastOptions.body._streams).toBeDefined()
+          expect(lastOptions.body).toBeInstanceOf(FormData);
         });
     });
   });
@@ -243,7 +241,7 @@ describe('buildRequest - openapi 3.0', () => {
       },
     });
 
-    test('should return FormData entry list and item entries (in order)', () => {
+    test('should return FormData entry list and item entries (in order)', async () => {
       expect(req).toMatchObject({
         method: 'POST',
         url: '/api/v1/land/content/uploadImage',
@@ -255,9 +253,10 @@ describe('buildRequest - openapi 3.0', () => {
       const validateFormDataInstance = req.body instanceof FormData;
       expect(validateFormDataInstance).toEqual(true);
       const itemEntries = req.body.getAll('images[]');
+
       expect(itemEntries.length).toEqual(2);
-      expect(itemEntries[0]).toEqual(file1);
-      expect(itemEntries[1]).toEqual(file2);
+      expect(await itemEntries[0].text()).toEqual(file1.toString());
+      expect(await itemEntries[1].text()).toEqual(file2.toString());
     });
   });
 
@@ -318,10 +317,10 @@ describe('buildRequest - openapi 3.0', () => {
         },
       });
 
-      expect(Array.from(req.body.entryList)).toEqual([
-        { name: 'color[R]', value: '100' },
-        { name: 'color[G]', value: '200' },
-        { name: 'color[B]', value: '150' },
+      expect(Array.from(req.body)).toEqual([
+        ['color[R]', '100'],
+        ['color[G]', '200'],
+        ['color[B]', '150'],
       ]);
     });
   });