@whatwg-node/node-fetch 0.2.0-alpha-20230210105523-366e74c → 0.3.0

package/Blob.d.ts

@@ -5,6 +5,7 @@ export declare class PonyfillBlob implements Blob {
     type: string;
     private encoding;
     constructor(blobParts: BlobPart[], options?: BlobOptions);
+    buffer(): Promise<Buffer>;
     arrayBuffer(): Promise<ArrayBuffer>;
     text(): Promise<string>;
     get size(): number;

package/Body.d.ts

@@ -30,6 +30,7 @@ export declare class PonyfillBody<TJSON = any> implements Body {
     private generateBody;
     get body(): PonyfillReadableStream<Uint8Array> | null;
     arrayBuffer(): Promise<ArrayBuffer>;
+    _collectChunksFromReadable(): Promise<Uint8Array[]>;
     blob(): Promise<PonyfillBlob>;
     formData(opts?: {
         formDataLimits: FormDataLimits;

package/index.js

@@ -209,7 +209,7 @@ function getHeadersObj(headers) {
     });
     return obj;
 }
-function uint8ArrayToBuffer(uint8array) {
+function uint8ArrayToArrayBuffer(uint8array) {
     return uint8array.buffer.slice(uint8array.byteOffset, uint8array.byteOffset + uint8array.byteLength);
 }
 
@@ -241,7 +241,7 @@ class PonyfillBlob {
         this.type = (options === null || options === void 0 ? void 0 : options.type) || 'application/octet-stream';
         this.encoding = (options === null || options === void 0 ? void 0 : options.encoding) || 'utf8';
     }
-    async arrayBuffer() {
+    async buffer() {
         const bufferChunks = [];
         for (const blobPart of this.blobParts) {
             if (isBlob(blobPart)) {
@@ -254,7 +254,11 @@ class PonyfillBlob {
                 bufferChunks.push(buf);
             }
         }
-        return uint8ArrayToBuffer(Buffer.concat(bufferChunks));
+        return Buffer.concat(bufferChunks);
+    }
+    async arrayBuffer() {
+        const buffer = await this.buffer();
+        return uint8ArrayToArrayBuffer(buffer);
     }
     async text() {
         let text = '';
@@ -555,11 +559,30 @@ class PonyfillBody {
         }
         if (this.bodyType === BodyInitType.Uint8Array || this.bodyType === BodyInitType.Buffer) {
             const typedBodyInit = this.bodyInit;
-            return uint8ArrayToBuffer(typedBodyInit);
+            return uint8ArrayToArrayBuffer(typedBodyInit);
+        }
+        if (this.bodyType === BodyInitType.String) {
+            const buffer = Buffer.from(this.bodyInit);
+            return uint8ArrayToArrayBuffer(buffer);
+        }
+        if (this.bodyType === BodyInitType.Blob) {
+            const blob = this.bodyInit;
+            const arrayBuffer = await blob.arrayBuffer();
+            return arrayBuffer;
         }
         const blob = await this.blob();
         return blob.arrayBuffer();
     }
+    async _collectChunksFromReadable() {
+        const chunks = [];
+        const _body = this.generateBody();
+        if (_body) {
+            for await (const chunk of _body.readable) {
+                chunks.push(chunk);
+            }
+        }
+        return chunks;
+    }
     async blob() {
         if (this.bodyType === BodyInitType.Blob) {
             return this.bodyInit;
@@ -579,13 +602,7 @@ class PonyfillBody {
                 type: this.contentType || '',
             });
         }
-        const chunks = [];
-        const _body = this.generateBody();
-        if (_body) {
-            for await (const chunk of _body.readable) {
-                chunks.push(chunk);
-            }
-        }
+        const chunks = await this._collectChunksFromReadable();
         return new PonyfillBlob(chunks, {
             type: this.contentType || '',
         });
@@ -658,14 +675,24 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Buffer) {
             return this.bodyInit;
         }
+        if (this.bodyType === BodyInitType.String) {
+            return Buffer.from(this.bodyInit);
+        }
         if (this.bodyType === BodyInitType.Uint8Array || this.bodyType === BodyInitType.ArrayBuffer) {
             const bodyInitTyped = this.bodyInit;
             const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
             return buffer;
         }
-        const blob = await this.blob();
-        const arrayBuffer = await blob.arrayBuffer();
-        return Buffer.from(arrayBuffer, undefined, arrayBuffer.byteLength);
+        if (this.bodyType === BodyInitType.Blob) {
+            if (this.bodyInit instanceof PonyfillBlob) {
+                return this.bodyInit.buffer();
+            }
+            const bodyInitTyped = this.bodyInit;
+            const buffer = Buffer.from(await bodyInitTyped.arrayBuffer(), undefined, bodyInitTyped.size);
+            return buffer;
+        }
+        const chunks = await this._collectChunksFromReadable();
+        return Buffer.concat(chunks);
     }
     async json() {
         const text = await this.text();
@@ -675,16 +702,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.String) {
             return this.bodyInit;
         }
-        if (this.bodyType === BodyInitType.Buffer) {
-            return this.bodyInit.toString('utf-8');
-        }
-        if (this.bodyType === BodyInitType.ArrayBuffer || this.bodyType === BodyInitType.Uint8Array) {
-            const bodyInitTyped = this.bodyInit;
-            const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
-            return buffer.toString('utf-8');
-        }
-        const blob = await this.blob();
-        return blob.text();
+        const buffer = await this.buffer();
+        return buffer.toString('utf-8');
     }
 }
 function processBodyInit(bodyInit) {
@@ -1157,14 +1176,16 @@ class PonyfillURLSearchParams {
         }
     }
     *entries() {
-        for (const key in this.keys()) {
+        for (const key of this.keys()) {
             const value = this.params[key];
             if (Array.isArray(value)) {
                 for (const item of value) {
                     yield [key, item];
                 }
             }
-            yield [key, value];
+            else {
+                yield [key, value];
+            }
         }
     }
     *values() {

package/index.mjs

@@ -203,7 +203,7 @@ function getHeadersObj(headers) {
     });
     return obj;
 }
-function uint8ArrayToBuffer(uint8array) {
+function uint8ArrayToArrayBuffer(uint8array) {
     return uint8array.buffer.slice(uint8array.byteOffset, uint8array.byteOffset + uint8array.byteLength);
 }
 
@@ -235,7 +235,7 @@ class PonyfillBlob {
         this.type = (options === null || options === void 0 ? void 0 : options.type) || 'application/octet-stream';
         this.encoding = (options === null || options === void 0 ? void 0 : options.encoding) || 'utf8';
     }
-    async arrayBuffer() {
+    async buffer() {
         const bufferChunks = [];
         for (const blobPart of this.blobParts) {
             if (isBlob(blobPart)) {
@@ -248,7 +248,11 @@ class PonyfillBlob {
                 bufferChunks.push(buf);
             }
         }
-        return uint8ArrayToBuffer(Buffer.concat(bufferChunks));
+        return Buffer.concat(bufferChunks);
+    }
+    async arrayBuffer() {
+        const buffer = await this.buffer();
+        return uint8ArrayToArrayBuffer(buffer);
     }
     async text() {
         let text = '';
@@ -549,11 +553,30 @@ class PonyfillBody {
         }
         if (this.bodyType === BodyInitType.Uint8Array || this.bodyType === BodyInitType.Buffer) {
             const typedBodyInit = this.bodyInit;
-            return uint8ArrayToBuffer(typedBodyInit);
+            return uint8ArrayToArrayBuffer(typedBodyInit);
+        }
+        if (this.bodyType === BodyInitType.String) {
+            const buffer = Buffer.from(this.bodyInit);
+            return uint8ArrayToArrayBuffer(buffer);
+        }
+        if (this.bodyType === BodyInitType.Blob) {
+            const blob = this.bodyInit;
+            const arrayBuffer = await blob.arrayBuffer();
+            return arrayBuffer;
         }
         const blob = await this.blob();
         return blob.arrayBuffer();
     }
+    async _collectChunksFromReadable() {
+        const chunks = [];
+        const _body = this.generateBody();
+        if (_body) {
+            for await (const chunk of _body.readable) {
+                chunks.push(chunk);
+            }
+        }
+        return chunks;
+    }
     async blob() {
         if (this.bodyType === BodyInitType.Blob) {
             return this.bodyInit;
@@ -573,13 +596,7 @@ class PonyfillBody {
                 type: this.contentType || '',
             });
         }
-        const chunks = [];
-        const _body = this.generateBody();
-        if (_body) {
-            for await (const chunk of _body.readable) {
-                chunks.push(chunk);
-            }
-        }
+        const chunks = await this._collectChunksFromReadable();
         return new PonyfillBlob(chunks, {
             type: this.contentType || '',
         });
@@ -652,14 +669,24 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.Buffer) {
             return this.bodyInit;
         }
+        if (this.bodyType === BodyInitType.String) {
+            return Buffer.from(this.bodyInit);
+        }
         if (this.bodyType === BodyInitType.Uint8Array || this.bodyType === BodyInitType.ArrayBuffer) {
             const bodyInitTyped = this.bodyInit;
             const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
             return buffer;
         }
-        const blob = await this.blob();
-        const arrayBuffer = await blob.arrayBuffer();
-        return Buffer.from(arrayBuffer, undefined, arrayBuffer.byteLength);
+        if (this.bodyType === BodyInitType.Blob) {
+            if (this.bodyInit instanceof PonyfillBlob) {
+                return this.bodyInit.buffer();
+            }
+            const bodyInitTyped = this.bodyInit;
+            const buffer = Buffer.from(await bodyInitTyped.arrayBuffer(), undefined, bodyInitTyped.size);
+            return buffer;
+        }
+        const chunks = await this._collectChunksFromReadable();
+        return Buffer.concat(chunks);
     }
     async json() {
         const text = await this.text();
@@ -669,16 +696,8 @@ class PonyfillBody {
         if (this.bodyType === BodyInitType.String) {
             return this.bodyInit;
         }
-        if (this.bodyType === BodyInitType.Buffer) {
-            return this.bodyInit.toString('utf-8');
-        }
-        if (this.bodyType === BodyInitType.ArrayBuffer || this.bodyType === BodyInitType.Uint8Array) {
-            const bodyInitTyped = this.bodyInit;
-            const buffer = Buffer.from(bodyInitTyped, 'byteOffset' in bodyInitTyped ? bodyInitTyped.byteOffset : undefined, bodyInitTyped.byteLength);
-            return buffer.toString('utf-8');
-        }
-        const blob = await this.blob();
-        return blob.text();
+        const buffer = await this.buffer();
+        return buffer.toString('utf-8');
     }
 }
 function processBodyInit(bodyInit) {
@@ -1151,14 +1170,16 @@ class PonyfillURLSearchParams {
         }
     }
     *entries() {
-        for (const key in this.keys()) {
+        for (const key of this.keys()) {
             const value = this.params[key];
             if (Array.isArray(value)) {
                 for (const item of value) {
                     yield [key, item];
                 }
             }
-            yield [key, value];
+            else {
+                yield [key, value];
+            }
         }
     }
     *values() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.2.0-alpha-20230210105523-366e74c",
+  "version": "0.3.0",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {

package/utils.d.ts

@@ -1,2 +1,2 @@
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
-export declare function uint8ArrayToBuffer(uint8array: Uint8Array): ArrayBuffer;
+export declare function uint8ArrayToArrayBuffer(uint8array: Uint8Array): ArrayBuffer;