@whatwg-node/fetch 0.3.2 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @whatwg-node/fetch
 
+## 0.4.0
+
+### Minor Changes
+
+- [`005937c`](https://github.com/ardatan/whatwg-node/commit/005937c72749dfa3914c8b6193a88c772a522275) Thanks [@ardatan](https://github.com/ardatan)! - feat(fetch): new `fieldsFirst` option to allow async stream consumption for multipart forms
+
+- [`effc03d`](https://github.com/ardatan/whatwg-node/commit/effc03d58793328595183ac7cd5c9abab95dec17) Thanks [@ardatan](https://github.com/ardatan)! - Bun Support
+
 ## 0.3.2
 
 ### Patch Changes

package/dist/create-node-ponyfill.js

@@ -2,6 +2,11 @@ const handleFileRequest = require("./handle-file-request");
 
 module.exports = function createNodePonyfill(opts = {}) {
 
+  // Bun already has a Fetch API
+  if (process.versions.bun) {
+    return globalThis;
+  }
+
   const ponyfills = {};
 
   if (!opts.useNodeFetch) {

package/dist/getFormDataMethod.js

@@ -1,7 +1,35 @@
 const busboy = require('busboy');
+const { resolve } = require('path');
 const streams = require("stream");
 
 module.exports = function getFormDataMethod(File, limits) {
+  function consumeStreamAsFile({
+    name,
+    filename,
+    mimeType,
+    fileStream,
+    formData,
+  }) {
+    if (fileStream._consumedAsFile) {
+      return Promise.resolve(formData.get(name));
+    }
+    return new Promise((resolve, reject) => {
+      const chunks = [];
+      fileStream.on('limit', () => {
+        reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
+      })
+      fileStream.on('data', (chunk) => {
+        chunks.push(chunk);
+      })
+      fileStream.on('close', () => {
+        const file = new File(chunks, filename, { type: mimeType });
+        formData.set(name, file);
+        fileStream._consumedAsFile = true;
+        resolve(file);
+      });
+    })
+  }
+
   return function formData() {
     if (this.body == null) {
       return null;
@@ -17,18 +45,6 @@ module.exports = function getFormDataMethod(File, limits) {
     });
     return new Promise((resolve, reject) => {
       const formData = new Map();
-      bb.on('file', (name, fileStream, { filename, mimeType }) => {
-        const chunks = [];
-        fileStream.on('limit', () => {
-          reject(new Error(`File size limit exceeded: ${limits.fileSize} bytes`));
-        })
-        fileStream.on('data', (chunk) => {
-          chunks.push(chunk);
-        })
-        fileStream.on('close', () => {
-          formData.set(name, new File(chunks, filename, { type: mimeType }));
-        });
-      })
       bb.on('field', (name, value, { nameTruncated, valueTruncated }) => {
         if (nameTruncated) {
           reject(new Error(`Field name size exceeded: ${limits.fieldNameSize} bytes`));
@@ -38,14 +54,57 @@ module.exports = function getFormDataMethod(File, limits) {
         }
         formData.set(name, value)
       })
-      bb.on('partsLimit', () => {
-        reject(new Error(`Parts limit exceeded: ${limits.parts}`));
+      bb.on('fieldsLimit', () => {
+        reject(new Error(`Fields limit exceeded: ${limits.fields}`));
+      })
+      bb.on('file', (name, fileStream, { filename, mimeType }) => {
+        if (limits.fieldsFirst) {
+          resolve(formData);
+          const fakeFileObj = {
+            name: filename,
+            type: mimeType,
+          }
+          Object.setPrototypeOf(fakeFileObj, File.prototype);
+          formData.set(name, new Proxy(fakeFileObj, {
+            get: (target, prop) => {
+              switch(prop) {
+                case 'name':
+                  return filename;
+                case 'type':
+                  return mimeType;
+                case 'stream':
+                  return () => fileStream;
+                case 'size':
+                  throw new Error(`Cannot access file size before consuming the stream.`);
+                case 'slice':
+                  throw new Error(`Cannot slice file before consuming the stream.`);
+                case 'text':
+                case 'arrayBuffer':
+                  return () => consumeStreamAsFile({
+                    name,
+                    filename,
+                    mimeType,
+                    fileStream,
+                    formData,
+                  }).then(file => file[prop]())
+              }
+            },
+          }))
+        } else {
+          consumeStreamAsFile({
+            name,
+            filename,
+            mimeType,
+            fileStream,
+            formData,
+          }).catch(err => reject(err));
+        }
       })
       bb.on('filesLimit', () => {
         reject(new Error(`Files limit exceeded: ${limits.files}`));
       })
-      bb.on('fieldsLimit', () => {
-        reject(new Error(`Fields limit exceeded: ${limits.fields}`));
+      bb.on('partsLimit', () => {
+        reject(new Error(`Parts limit exceeded: ${limits.parts}`));
       })
       bb.on('close', () => {
         resolve(formData);

package/dist/index.d.ts

@@ -51,6 +51,8 @@ declare module "@whatwg-node/fetch" {
     parts?: number;
     /* For multipart forms, the max number of header key-value pairs to parse. Default: 2000. */
     headerSize?: number;
+    /* For multipart forms, enable this if your data has fields first, then files. Default: false. */
+    fieldsFirst?: boolean;
   }
   export const createFetch: (opts?: { useNodeFetch?: boolean; formDataLimits?: FormDataLimits }) => ({
     fetch: typeof _fetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/fetch",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "description": "Cross Platform Smart Fetch Ponyfill",
   "author": "Arda TANRIKULU <ardatanrikulu@gmail.com>",
   "repository": {