@whatwg-node/node-fetch 0.5.12 → 0.5.13-rc-20240720155335-786d406edf2a8e2def3091aa22b969e5384fe7ea

package/cjs/Blob.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBlob = void 0;
+exports.hasBufferMethod = hasBufferMethod;
+exports.hasArrayBufferMethod = hasArrayBufferMethod;
+exports.hasBytesMethod = hasBytesMethod;
+exports.hasTextMethod = hasTextMethod;
+exports.hasSizeProperty = hasSizeProperty;
+exports.hasStreamMethod = hasStreamMethod;
+exports.hasBlobSignature = hasBlobSignature;
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 const ReadableStream_js_1 = require("./ReadableStream.js");
 const utils_js_1 = require("./utils.js");
@@ -18,38 +25,89 @@ function getBlobPartAsBuffer(blobPart) {
         return Buffer.from(blobPart);
     }
 }
-function isBlob(obj) {
+function hasBufferMethod(obj) {
+    return obj != null && obj.buffer != null;
+}
+function hasArrayBufferMethod(obj) {
     return obj != null && obj.arrayBuffer != null;
 }
+function hasBytesMethod(obj) {
+    return obj != null && obj.bytes != null;
+}
+function hasTextMethod(obj) {
+    return obj != null && obj.text != null;
+}
+function hasSizeProperty(obj) {
+    return obj != null && typeof obj.size === 'number';
+}
+function hasStreamMethod(obj) {
+    return obj != null && obj.stream != null;
+}
+function hasBlobSignature(obj) {
+    return obj != null && obj[Symbol.toStringTag] === 'Blob';
+}
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
 class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
         this._size = null;
+        this._buffer = null;
+        this._text = null;
         this.type = options?.type || 'application/octet-stream';
         this.encoding = options?.encoding || 'utf8';
         this._size = options?.size || null;
-        if (blobParts.length === 1 && isBlob(blobParts[0])) {
+        if (blobParts.length === 1 && hasBlobSignature(blobParts[0])) {
             return blobParts[0];
         }
     }
-    arrayBuffer() {
+    buffer() {
+        if (this._buffer) {
+            return (0, utils_js_1.fakePromise)(this._buffer);
+        }
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
-            if (isBlob(blobPart)) {
-                return blobPart.arrayBuffer();
+            if (hasBufferMethod(blobPart)) {
+                return blobPart.buffer().then(buf => {
+                    this._buffer = buf;
+                    return this._buffer;
+                });
             }
-            return (0, utils_js_1.fakePromise)(getBlobPartAsBuffer(blobPart));
+            if (hasBytesMethod(blobPart)) {
+                return blobPart.bytes().then(bytes => {
+                    this._buffer = Buffer.from(bytes);
+                    return this._buffer;
+                });
+            }
+            if (hasArrayBufferMethod(blobPart)) {
+                return blobPart.arrayBuffer().then(arrayBuf => {
+                    this._buffer = Buffer.from(arrayBuf, undefined, blobPart.size);
+                    return this._buffer;
+                });
+            }
+            this._buffer = getBlobPartAsBuffer(blobPart);
+            return (0, utils_js_1.fakePromise)(this._buffer);
         }
         const jobs = [];
         const bufferChunks = this.blobParts.map((blobPart, i) => {
-            if (isBlob(blobPart)) {
+            if (hasBufferMethod(blobPart)) {
+                jobs.push(blobPart.buffer().then(buf => {
+                    bufferChunks[i] = buf;
+                }));
+                return undefined;
+            }
+            else if (hasArrayBufferMethod(blobPart)) {
                 jobs.push(blobPart.arrayBuffer().then(arrayBuf => {
                     bufferChunks[i] = Buffer.from(arrayBuf, undefined, blobPart.size);
                 }));
                 return undefined;
             }
+            else if (hasBytesMethod(blobPart)) {
+                jobs.push(blobPart.bytes().then(bytes => {
+                    bufferChunks[i] = Buffer.from(bytes);
+                }));
+                return undefined;
+            }
             else {
                 return getBlobPartAsBuffer(blobPart);
             }
@@ -59,19 +117,33 @@ class PonyfillBlob {
         }
         return (0, utils_js_1.fakePromise)(Buffer.concat(bufferChunks, this._size || undefined));
     }
+    arrayBuffer() {
+        return this.buffer();
+    }
     text() {
+        if (this._text) {
+            return (0, utils_js_1.fakePromise)(this._text);
+        }
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
             if (typeof blobPart === 'string') {
-                return (0, utils_js_1.fakePromise)(blobPart);
+                this._text = blobPart;
+                return (0, utils_js_1.fakePromise)(this._text);
             }
-            if (isBlob(blobPart)) {
-                return blobPart.text();
+            if (hasTextMethod(blobPart)) {
+                return blobPart.text().then(text => {
+                    this._text = text;
+                    return this._text;
+                });
             }
             const buf = getBlobPartAsBuffer(blobPart);
-            return (0, utils_js_1.fakePromise)(buf.toString(this.encoding));
+            this._text = buf.toString(this.encoding);
+            return (0, utils_js_1.fakePromise)(this._text);
         }
-        return this.arrayBuffer().then(buf => buf.toString(this.encoding));
+        return this.buffer().then(buf => {
+            this._text = buf.toString(this.encoding);
+            return this._text;
+        });
     }
     get size() {
         if (this._size == null) {
@@ -80,7 +152,7 @@ class PonyfillBlob {
                 if (typeof blobPart === 'string') {
                     this._size += Buffer.byteLength(blobPart);
                 }
-                else if (isBlob(blobPart)) {
+                else if (hasSizeProperty(blobPart)) {
                     this._size += blobPart.size;
                 }
                 else if ((0, utils_js_1.isArrayBufferView)(blobPart)) {
@@ -93,7 +165,7 @@ class PonyfillBlob {
     stream() {
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
-            if (isBlob(blobPart)) {
+            if (hasStreamMethod(blobPart)) {
                 return blobPart.stream();
             }
             const buf = getBlobPartAsBuffer(blobPart);
@@ -104,6 +176,14 @@ class PonyfillBlob {
                 },
             });
         }
+        if (this._buffer != null) {
+            return new ReadableStream_js_1.PonyfillReadableStream({
+                start: controller => {
+                    controller.enqueue(this._buffer);
+                    controller.close();
+                },
+            });
+        }
         let blobPartIterator;
         return new ReadableStream_js_1.PonyfillReadableStream({
             start: controller => {
@@ -120,7 +200,18 @@ class PonyfillBlob {
                     return;
                 }
                 if (blobPart) {
-                    if (isBlob(blobPart)) {
+                    if (hasBufferMethod(blobPart)) {
+                        return blobPart.buffer().then(buf => {
+                            controller.enqueue(buf);
+                        });
+                    }
+                    if (hasBytesMethod(blobPart)) {
+                        return blobPart.bytes().then(bytes => {
+                            const buf = Buffer.from(bytes);
+                            controller.enqueue(buf);
+                        });
+                    }
+                    if (hasArrayBufferMethod(blobPart)) {
                         return blobPart.arrayBuffer().then(arrayBuffer => {
                             const buf = Buffer.from(arrayBuffer, undefined, blobPart.size);
                             controller.enqueue(buf);

package/cjs/Body.js

@@ -189,22 +189,29 @@ class PonyfillBody {
             _body?.readable.pipe(bb);
         });
     }
-    arrayBuffer() {
+    buffer() {
         if (this._buffer) {
             return (0, utils_js_1.fakePromise)(this._buffer);
         }
         if (this.bodyType === BodyInitType.Blob) {
-            if (this.bodyInit instanceof Blob_js_1.PonyfillBlob) {
-                return this.bodyInit.arrayBuffer().then(buf => {
+            if ((0, Blob_js_1.hasBufferMethod)(this.bodyInit)) {
+                return this.bodyInit.buffer().then(buf => {
                     this._buffer = buf;
                     return this._buffer;
                 });
             }
-            const bodyInitTyped = this.bodyInit;
-            return bodyInitTyped.arrayBuffer().then(arrayBuffer => {
-                this._buffer = Buffer.from(arrayBuffer, undefined, bodyInitTyped.size);
-                return this._buffer;
-            });
+            if ((0, Blob_js_1.hasBytesMethod)(this.bodyInit)) {
+                return this.bodyInit.bytes().then(bytes => {
+                    this._buffer = Buffer.from(bytes);
+                    return this._buffer;
+                });
+            }
+            if ((0, Blob_js_1.hasArrayBufferMethod)(this.bodyInit)) {
+                return this.bodyInit.arrayBuffer().then(buf => {
+                    this._buffer = Buffer.from(buf, undefined, buf.byteLength);
+                    return this._buffer;
+                });
+            }
         }
         return this._collectChunksFromReadable().then(chunks => {
             if (chunks.length === 1) {
@@ -215,12 +222,26 @@ class PonyfillBody {
             return this._buffer;
         });
     }
+    bytes() {
+        return this.buffer();
+    }
+    arrayBuffer() {
+        return this.buffer();
+    }
     json() {
         if (this._json) {
             return (0, utils_js_1.fakePromise)(this._json);
         }
         return this.text().then(text => {
-            this._json = JSON.parse(text);
+            try {
+                this._json = JSON.parse(text);
+            }
+            catch (e) {
+                if (e instanceof SyntaxError) {
+                    e.message += `, "${text}" is not valid JSON`;
+                }
+                throw e;
+            }
             return this._json;
         });
     }
@@ -232,7 +253,7 @@ class PonyfillBody {
             this._text = this.bodyInit;
             return (0, utils_js_1.fakePromise)(this._text);
         }
-        return this.arrayBuffer().then(buffer => {
+        return this.buffer().then(buffer => {
             this._text = buffer.toString('utf-8');
             return this._text;
         });

package/esm/Blob.js

@@ -15,38 +15,89 @@ function getBlobPartAsBuffer(blobPart) {
         return Buffer.from(blobPart);
     }
 }
-function isBlob(obj) {
+export function hasBufferMethod(obj) {
+    return obj != null && obj.buffer != null;
+}
+export function hasArrayBufferMethod(obj) {
     return obj != null && obj.arrayBuffer != null;
 }
+export function hasBytesMethod(obj) {
+    return obj != null && obj.bytes != null;
+}
+export function hasTextMethod(obj) {
+    return obj != null && obj.text != null;
+}
+export function hasSizeProperty(obj) {
+    return obj != null && typeof obj.size === 'number';
+}
+export function hasStreamMethod(obj) {
+    return obj != null && obj.stream != null;
+}
+export function hasBlobSignature(obj) {
+    return obj != null && obj[Symbol.toStringTag] === 'Blob';
+}
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
 export class PonyfillBlob {
     constructor(blobParts, options) {
         this.blobParts = blobParts;
         this._size = null;
+        this._buffer = null;
+        this._text = null;
         this.type = options?.type || 'application/octet-stream';
         this.encoding = options?.encoding || 'utf8';
         this._size = options?.size || null;
-        if (blobParts.length === 1 && isBlob(blobParts[0])) {
+        if (blobParts.length === 1 && hasBlobSignature(blobParts[0])) {
             return blobParts[0];
         }
     }
-    arrayBuffer() {
+    buffer() {
+        if (this._buffer) {
+            return fakePromise(this._buffer);
+        }
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
-            if (isBlob(blobPart)) {
-                return blobPart.arrayBuffer();
+            if (hasBufferMethod(blobPart)) {
+                return blobPart.buffer().then(buf => {
+                    this._buffer = buf;
+                    return this._buffer;
+                });
             }
-            return fakePromise(getBlobPartAsBuffer(blobPart));
+            if (hasBytesMethod(blobPart)) {
+                return blobPart.bytes().then(bytes => {
+                    this._buffer = Buffer.from(bytes);
+                    return this._buffer;
+                });
+            }
+            if (hasArrayBufferMethod(blobPart)) {
+                return blobPart.arrayBuffer().then(arrayBuf => {
+                    this._buffer = Buffer.from(arrayBuf, undefined, blobPart.size);
+                    return this._buffer;
+                });
+            }
+            this._buffer = getBlobPartAsBuffer(blobPart);
+            return fakePromise(this._buffer);
         }
         const jobs = [];
         const bufferChunks = this.blobParts.map((blobPart, i) => {
-            if (isBlob(blobPart)) {
+            if (hasBufferMethod(blobPart)) {
+                jobs.push(blobPart.buffer().then(buf => {
+                    bufferChunks[i] = buf;
+                }));
+                return undefined;
+            }
+            else if (hasArrayBufferMethod(blobPart)) {
                 jobs.push(blobPart.arrayBuffer().then(arrayBuf => {
                     bufferChunks[i] = Buffer.from(arrayBuf, undefined, blobPart.size);
                 }));
                 return undefined;
             }
+            else if (hasBytesMethod(blobPart)) {
+                jobs.push(blobPart.bytes().then(bytes => {
+                    bufferChunks[i] = Buffer.from(bytes);
+                }));
+                return undefined;
+            }
             else {
                 return getBlobPartAsBuffer(blobPart);
             }
@@ -56,19 +107,33 @@ export class PonyfillBlob {
         }
         return fakePromise(Buffer.concat(bufferChunks, this._size || undefined));
     }
+    arrayBuffer() {
+        return this.buffer();
+    }
     text() {
+        if (this._text) {
+            return fakePromise(this._text);
+        }
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
             if (typeof blobPart === 'string') {
-                return fakePromise(blobPart);
+                this._text = blobPart;
+                return fakePromise(this._text);
             }
-            if (isBlob(blobPart)) {
-                return blobPart.text();
+            if (hasTextMethod(blobPart)) {
+                return blobPart.text().then(text => {
+                    this._text = text;
+                    return this._text;
+                });
             }
             const buf = getBlobPartAsBuffer(blobPart);
-            return fakePromise(buf.toString(this.encoding));
+            this._text = buf.toString(this.encoding);
+            return fakePromise(this._text);
         }
-        return this.arrayBuffer().then(buf => buf.toString(this.encoding));
+        return this.buffer().then(buf => {
+            this._text = buf.toString(this.encoding);
+            return this._text;
+        });
     }
     get size() {
         if (this._size == null) {
@@ -77,7 +142,7 @@ export class PonyfillBlob {
                 if (typeof blobPart === 'string') {
                     this._size += Buffer.byteLength(blobPart);
                 }
-                else if (isBlob(blobPart)) {
+                else if (hasSizeProperty(blobPart)) {
                     this._size += blobPart.size;
                 }
                 else if (isArrayBufferView(blobPart)) {
@@ -90,7 +155,7 @@ export class PonyfillBlob {
     stream() {
         if (this.blobParts.length === 1) {
             const blobPart = this.blobParts[0];
-            if (isBlob(blobPart)) {
+            if (hasStreamMethod(blobPart)) {
                 return blobPart.stream();
             }
             const buf = getBlobPartAsBuffer(blobPart);
@@ -101,6 +166,14 @@ export class PonyfillBlob {
                 },
             });
         }
+        if (this._buffer != null) {
+            return new PonyfillReadableStream({
+                start: controller => {
+                    controller.enqueue(this._buffer);
+                    controller.close();
+                },
+            });
+        }
         let blobPartIterator;
         return new PonyfillReadableStream({
             start: controller => {
@@ -117,7 +190,18 @@ export class PonyfillBlob {
                     return;
                 }
                 if (blobPart) {
-                    if (isBlob(blobPart)) {
+                    if (hasBufferMethod(blobPart)) {
+                        return blobPart.buffer().then(buf => {
+                            controller.enqueue(buf);
+                        });
+                    }
+                    if (hasBytesMethod(blobPart)) {
+                        return blobPart.bytes().then(bytes => {
+                            const buf = Buffer.from(bytes);
+                            controller.enqueue(buf);
+                        });
+                    }
+                    if (hasArrayBufferMethod(blobPart)) {
                         return blobPart.arrayBuffer().then(arrayBuffer => {
                             const buf = Buffer.from(arrayBuffer, undefined, blobPart.size);
                             controller.enqueue(buf);

package/esm/Body.js

@@ -1,6 +1,6 @@
 import { Readable } from 'stream';
 import busboy from 'busboy';
-import { PonyfillBlob } from './Blob.js';
+import { hasArrayBufferMethod, hasBufferMethod, hasBytesMethod, PonyfillBlob } from './Blob.js';
 import { PonyfillFile } from './File.js';
 import { getStreamFromFormData, PonyfillFormData } from './FormData.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
@@ -185,22 +185,29 @@ export class PonyfillBody {
             _body?.readable.pipe(bb);
         });
     }
-    arrayBuffer() {
+    buffer() {
         if (this._buffer) {
             return fakePromise(this._buffer);
         }
         if (this.bodyType === BodyInitType.Blob) {
-            if (this.bodyInit instanceof PonyfillBlob) {
-                return this.bodyInit.arrayBuffer().then(buf => {
+            if (hasBufferMethod(this.bodyInit)) {
+                return this.bodyInit.buffer().then(buf => {
                     this._buffer = buf;
                     return this._buffer;
                 });
             }
-            const bodyInitTyped = this.bodyInit;
-            return bodyInitTyped.arrayBuffer().then(arrayBuffer => {
-                this._buffer = Buffer.from(arrayBuffer, undefined, bodyInitTyped.size);
-                return this._buffer;
-            });
+            if (hasBytesMethod(this.bodyInit)) {
+                return this.bodyInit.bytes().then(bytes => {
+                    this._buffer = Buffer.from(bytes);
+                    return this._buffer;
+                });
+            }
+            if (hasArrayBufferMethod(this.bodyInit)) {
+                return this.bodyInit.arrayBuffer().then(buf => {
+                    this._buffer = Buffer.from(buf, undefined, buf.byteLength);
+                    return this._buffer;
+                });
+            }
         }
         return this._collectChunksFromReadable().then(chunks => {
             if (chunks.length === 1) {
@@ -211,12 +218,26 @@ export class PonyfillBody {
             return this._buffer;
         });
     }
+    bytes() {
+        return this.buffer();
+    }
+    arrayBuffer() {
+        return this.buffer();
+    }
     json() {
         if (this._json) {
             return fakePromise(this._json);
         }
         return this.text().then(text => {
-            this._json = JSON.parse(text);
+            try {
+                this._json = JSON.parse(text);
+            }
+            catch (e) {
+                if (e instanceof SyntaxError) {
+                    e.message += `, "${text}" is not valid JSON`;
+                }
+                throw e;
+            }
             return this._json;
         });
     }
@@ -228,7 +249,7 @@ export class PonyfillBody {
             this._text = this.bodyInit;
             return fakePromise(this._text);
         }
-        return this.arrayBuffer().then(buffer => {
+        return this.buffer().then(buffer => {
             this._text = buffer.toString('utf-8');
             return this._text;
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.5.12",
+  "version": "0.5.13-rc-20240720155335-786d406edf2a8e2def3091aa22b969e5384fe7ea",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Blob.d.cts

@@ -14,13 +14,35 @@ interface BlobOptions {
      */
     size?: number | null;
 }
+export declare function hasBufferMethod(obj: any): obj is {
+    buffer(): Promise<Buffer>;
+};
+export declare function hasArrayBufferMethod(obj: any): obj is {
+    arrayBuffer(): Promise<ArrayBuffer>;
+};
+export declare function hasBytesMethod(obj: any): obj is {
+    bytes(): Promise<Uint8Array>;
+};
+export declare function hasTextMethod(obj: any): obj is {
+    text(): Promise<string>;
+};
+export declare function hasSizeProperty(obj: any): obj is {
+    size: number;
+};
+export declare function hasStreamMethod(obj: any): obj is {
+    stream(): any;
+};
+export declare function hasBlobSignature(obj: any): obj is Blob;
 export declare class PonyfillBlob implements Blob {
     private blobParts;
     type: string;
     private encoding;
     private _size;
     constructor(blobParts: BlobPart[], options?: BlobOptions);
-    arrayBuffer(): Promise<Buffer>;
+    _buffer: Buffer | null;
+    buffer(): Promise<Buffer>;
+    arrayBuffer(): Promise<ArrayBuffer>;
+    _text: string | null;
     text(): Promise<string>;
     get size(): number;
     stream(): any;

package/typings/Blob.d.ts

@@ -14,13 +14,35 @@ interface BlobOptions {
      */
     size?: number | null;
 }
+export declare function hasBufferMethod(obj: any): obj is {
+    buffer(): Promise<Buffer>;
+};
+export declare function hasArrayBufferMethod(obj: any): obj is {
+    arrayBuffer(): Promise<ArrayBuffer>;
+};
+export declare function hasBytesMethod(obj: any): obj is {
+    bytes(): Promise<Uint8Array>;
+};
+export declare function hasTextMethod(obj: any): obj is {
+    text(): Promise<string>;
+};
+export declare function hasSizeProperty(obj: any): obj is {
+    size: number;
+};
+export declare function hasStreamMethod(obj: any): obj is {
+    stream(): any;
+};
+export declare function hasBlobSignature(obj: any): obj is Blob;
 export declare class PonyfillBlob implements Blob {
     private blobParts;
     type: string;
     private encoding;
     private _size;
     constructor(blobParts: BlobPart[], options?: BlobOptions);
-    arrayBuffer(): Promise<Buffer>;
+    _buffer: Buffer | null;
+    buffer(): Promise<Buffer>;
+    arrayBuffer(): Promise<ArrayBuffer>;
+    _text: string | null;
     text(): Promise<string>;
     get size(): number;
     stream(): any;

package/typings/Body.d.cts

@@ -36,7 +36,9 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     formData(opts?: {
         formDataLimits: FormDataLimits;
     }): Promise<PonyfillFormData>;
-    arrayBuffer(): Promise<Buffer>;
+    buffer(): Promise<Buffer>;
+    bytes(): Promise<Uint8Array>;
+    arrayBuffer(): Promise<ArrayBuffer>;
     _json: TJSON | null;
     json(): Promise<TJSON>;
     _text: string | null;

package/typings/Body.d.ts

@@ -36,7 +36,9 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     formData(opts?: {
         formDataLimits: FormDataLimits;
     }): Promise<PonyfillFormData>;
-    arrayBuffer(): Promise<Buffer>;
+    buffer(): Promise<Buffer>;
+    bytes(): Promise<Uint8Array>;
+    arrayBuffer(): Promise<ArrayBuffer>;
     _json: TJSON | null;
     json(): Promise<TJSON>;
     _text: string | null;