Remove the event-stream dependency

jackwakefield · jackwakefield · commit bdb4a9fa448f · 2024-02-11T14:36:37.000Z
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -72,16 +72,15 @@
     "eslint-plugin-jest": "^26.1.3",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-simple-import-sort": "^7.0.0",
-    "markdownlint-cli2": "^0.5.1",
     "jest": "^27.5.1",
+    "markdownlint-cli2": "^0.5.1",
     "prettier": "^2.6.2",
     "ts-jest": "^27.1.4",
     "type-fest": "^2.12.2",
     "typescript": "^4.6.3"
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "event-stream": "4.0.1",
     "form-data": "4.0.0",
     "har-schema": "^2.0.0",
     "stringify-object": "3.3.0",
diff --git a/src/httpsnippet.ts b/src/httpsnippet.ts
@@ -1,4 +1,3 @@
-import { map as eventStreamMap } from 'event-stream';
 import FormData from 'form-data';
 import { Param, PostDataCommon, Request as NpmHarRequest } from 'har-format';
 import { stringify as queryStringify } from 'querystring';
@@ -176,61 +175,26 @@ export class HTTPSnippet {
         if (request.postData?.params) {
           const form = new FormData();
 
-          // The `form-data` module returns one of two things: a native FormData object, or its own polyfill
-          // Since the polyfill does not support the full API of the native FormData object, when this library is running in a browser environment it'll fail on two things:
-          //
-          //  1. The API for `form.append()` has three arguments and the third should only be present when the second is a
-          //    Blob or USVString.
-          //  1. `FormData.pipe()` isn't a function.
-          //
-          // Since the native FormData object is iterable, we easily detect what version of `form-data` we're working with here to allow `multipart/form-data` requests to be compiled under both browser and Node environments.
-          //
-          // This hack is pretty awful but it's the only way we can use this library in the browser as if we code this against just the native FormData object, we can't polyfill that back into Node because Blob and File objects, which something like `formdata-polyfill` requires, don't exist there.
-          // @ts-expect-error TODO
-          const isNativeFormData = typeof form[Symbol.iterator] === 'function';
-
           // TODO: THIS ABSOLUTELY MUST BE REMOVED.
           // IT BREAKS SOME USE-CASES FOR MULTIPART FORMS THAT DEPEND ON BEING ABLE TO SET THE BOUNDARY.
           // easter egg
           const boundary = '---011000010111000001101001'; // this is binary for "api". yep.
-          if (!isNativeFormData) {
-            // @ts-expect-error THIS IS WRONG.  VERY WRONG.
-            form._boundary = boundary;
-          }
 
           request.postData?.params.forEach(param => {
             const name = param.name;
             const value = param.value || '';
             const filename = param.fileName || null;
 
-            if (isNativeFormData) {
-              if (isBlob(value)) {
-                // @ts-expect-error TODO
-                form.append(name, value, filename);
-              } else {
-                form.append(name, value);
-              }
+            if (isBlob(value)) {
+              // @ts-expect-error TODO
+              form.append(name, value, filename);
             } else {
-              form.append(name, value, {
-                // @ts-expect-error TODO
-                filename,
-                // @ts-expect-error TODO
-                contentType: param.contentType || null,
-              });
+              form.append(name, value);
             }
           });
 
-          if (isNativeFormData) {
-            for (const data of formDataIterator(form, boundary)) {
-              request.postData.text += data;
-            }
-          } else {
-            form.pipe(
-              // @ts-expect-error TODO
-              eventStreamMap(data => {
-                request.postData.text += data;
-              }),
-            );
+          for (const data of formDataIterator(form, boundary)) {
+            request.postData.text += data;
           }
 
           request.postData.boundary = boundary;
