@whatwg-node/node-fetch 0.7.12 → 0.7.13-alpha-20250316014213-6b5d97cf20e1c790fba9f3c11c0cd0f6a3f67fa0

package/cjs/Body.js

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 const node_buffer_1 = require("node:buffer");
 const node_stream_1 = require("node:stream");
 const busboy_1 = tslib_1.__importDefault(require("busboy"));
+const promise_helpers_1 = require("@whatwg-node/promise-helpers");
 const Blob_js_1 = require("./Blob.js");
 const File_js_1 = require("./File.js");
 const FormData_js_1 = require("./FormData.js");
@@ -108,36 +109,37 @@ class PonyfillBody {
             return (0, utils_js_1.fakePromise)(this._chunks);
         }
         if (this.bodyType === BodyInitType.AsyncIterable) {
-            const iterator = this.bodyInit[Symbol.asyncIterator]();
-            const collectValue = () => {
-                return iterator.next().then(({ value, done }) => {
-                    this._chunks ||= [];
-                    if (value) {
-                        this._chunks.push(value);
-                    }
-                    if (!done) {
-                        return collectValue();
-                    }
+            if (Array.fromAsync) {
+                return (0, promise_helpers_1.handleMaybePromise)(() => Array.fromAsync(this.bodyInit), chunks => {
+                    this._chunks = chunks;
                     return this._chunks;
                 });
-            };
+            }
+            const iterator = this.bodyInit[Symbol.asyncIterator]();
+            const collectValue = () => (0, promise_helpers_1.handleMaybePromise)(() => iterator.next(), ({ value, done }) => {
+                this._chunks ||= [];
+                if (value) {
+                    this._chunks.push(value);
+                }
+                if (!done) {
+                    return collectValue();
+                }
+                return this._chunks;
+            });
             return collectValue();
         }
         const _body = this.generateBody();
         if (!_body) {
-            return (0, utils_js_1.fakePromise)([]);
+            this._chunks = [];
+            return (0, utils_js_1.fakePromise)(this._chunks);
         }
         this._chunks = [];
         _body.readable.on('data', chunk => {
             this._chunks.push(chunk);
         });
         return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => {
-                resolve(this._chunks);
-            });
-            _body.readable.once('error', e => {
-                reject(e);
-            });
+            _body.readable.once('end', () => resolve(this._chunks));
+            _body.readable.once('error', reject);
         });
     }
     _blob = null;
@@ -156,13 +158,13 @@ class PonyfillBody {
             });
             return (0, utils_js_1.fakePromise)(this._blob);
         }
-        return this._collectChunksFromReadable().then(chunks => {
+        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), chunks => {
             this._blob = new Blob_js_1.PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        });
+        }));
     }
     _formData = null;
     formData(opts) {
@@ -259,14 +261,14 @@ class PonyfillBody {
                 });
             }
         }
-        return this._collectChunksFromReadable().then(chunks => {
+        return (0, utils_js_1.fakePromise)((0, promise_helpers_1.handleMaybePromise)(() => this._collectChunksFromReadable(), chunks => {
             if (chunks.length === 1) {
                 this._buffer = chunks[0];
                 return this._buffer;
             }
             this._buffer = node_buffer_1.Buffer.concat(chunks);
             return this._buffer;
-        });
+        }));
     }
     bytes() {
         return this.buffer();

package/esm/Body.js

@@ -2,6 +2,7 @@
 import { Buffer } from 'node:buffer';
 import { Readable } from 'node:stream';
 import busboy from 'busboy';
+import { handleMaybePromise } from '@whatwg-node/promise-helpers';
 import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
 import { PonyfillFile } from './File.js';
 import { getStreamFromFormData, PonyfillFormData } from './FormData.js';
@@ -104,36 +105,37 @@ export class PonyfillBody {
             return fakePromise(this._chunks);
         }
         if (this.bodyType === BodyInitType.AsyncIterable) {
-            const iterator = this.bodyInit[Symbol.asyncIterator]();
-            const collectValue = () => {
-                return iterator.next().then(({ value, done }) => {
-                    this._chunks ||= [];
-                    if (value) {
-                        this._chunks.push(value);
-                    }
-                    if (!done) {
-                        return collectValue();
-                    }
+            if (Array.fromAsync) {
+                return handleMaybePromise(() => Array.fromAsync(this.bodyInit), chunks => {
+                    this._chunks = chunks;
                     return this._chunks;
                 });
-            };
+            }
+            const iterator = this.bodyInit[Symbol.asyncIterator]();
+            const collectValue = () => handleMaybePromise(() => iterator.next(), ({ value, done }) => {
+                this._chunks ||= [];
+                if (value) {
+                    this._chunks.push(value);
+                }
+                if (!done) {
+                    return collectValue();
+                }
+                return this._chunks;
+            });
             return collectValue();
         }
         const _body = this.generateBody();
         if (!_body) {
-            return fakePromise([]);
+            this._chunks = [];
+            return fakePromise(this._chunks);
         }
         this._chunks = [];
         _body.readable.on('data', chunk => {
             this._chunks.push(chunk);
         });
         return new Promise((resolve, reject) => {
-            _body.readable.once('end', () => {
-                resolve(this._chunks);
-            });
-            _body.readable.once('error', e => {
-                reject(e);
-            });
+            _body.readable.once('end', () => resolve(this._chunks));
+            _body.readable.once('error', reject);
         });
     }
     _blob = null;
@@ -152,13 +154,13 @@ export class PonyfillBody {
             });
             return fakePromise(this._blob);
         }
-        return this._collectChunksFromReadable().then(chunks => {
+        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
             this._blob = new PonyfillBlob(chunks, {
                 type: this.contentType || '',
                 size: this.contentLength,
             });
             return this._blob;
-        });
+        }));
     }
     _formData = null;
     formData(opts) {
@@ -255,14 +257,14 @@ export class PonyfillBody {
                 });
             }
         }
-        return this._collectChunksFromReadable().then(chunks => {
+        return fakePromise(handleMaybePromise(() => this._collectChunksFromReadable(), chunks => {
             if (chunks.length === 1) {
                 this._buffer = chunks[0];
                 return this._buffer;
             }
             this._buffer = Buffer.concat(chunks);
             return this._buffer;
-        });
+        }));
     }
     bytes() {
         return this.buffer();

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.7.12",
+  "version": "0.7.13-alpha-20250316014213-6b5d97cf20e1c790fba9f3c11c0cd0f6a3f67fa0",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {
     "@whatwg-node/disposablestack": "^0.0.6",
-    "@whatwg-node/promise-helpers": "^1.0.0",
+    "@whatwg-node/promise-helpers": "1.2.5-alpha-20250316014213-6b5d97cf20e1c790fba9f3c11c0cd0f6a3f67fa0",
     "busboy": "^1.6.0",
     "tslib": "^2.6.3"
   },

package/typings/Body.d.cts

@@ -1,5 +1,6 @@
 import { Buffer } from 'node:buffer';
 import { Readable } from 'node:stream';
+import { MaybePromise } from '@whatwg-node/promise-helpers';
 import { PonyfillBlob } from './Blob.cjs';
 import { PonyfillFormData } from './FormData.cjs';
 import { PonyfillReadableStream } from './ReadableStream.cjs';
@@ -33,7 +34,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     }, forceSet?: boolean): void;
     get body(): PonyfillReadableStream<Uint8Array> | null;
     _chunks: Uint8Array[] | null;
-    _collectChunksFromReadable(): Promise<Uint8Array<ArrayBufferLike>[]>;
+    _collectChunksFromReadable(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _blob: PonyfillBlob | null;
     blob(): Promise<PonyfillBlob>;
     _formData: PonyfillFormData | null;

package/typings/Body.d.ts

@@ -1,5 +1,6 @@
 import { Buffer } from 'node:buffer';
 import { Readable } from 'node:stream';
+import { MaybePromise } from '@whatwg-node/promise-helpers';
 import { PonyfillBlob } from './Blob.js';
 import { PonyfillFormData } from './FormData.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
@@ -33,7 +34,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     }, forceSet?: boolean): void;
     get body(): PonyfillReadableStream<Uint8Array> | null;
     _chunks: Uint8Array[] | null;
-    _collectChunksFromReadable(): Promise<Uint8Array<ArrayBufferLike>[]>;
+    _collectChunksFromReadable(): MaybePromise<Uint8Array<ArrayBufferLike>[]>;
     _blob: PonyfillBlob | null;
     blob(): Promise<PonyfillBlob>;
     _formData: PonyfillFormData | null;