@whatwg-node/node-fetch 0.0.1-alpha-20221225172458-8684a84 → 0.0.1-alpha-20221225175918-b8ec28d

package/Body.d.ts

@@ -7,14 +7,11 @@ export type BodyPonyfillInit = XMLHttpRequestBodyInit | Readable | PonyfillReada
 export declare class PonyfillBody implements Body {
     private bodyInit;
     bodyUsed: boolean;
+    readonly body: PonyfillReadableStream<Uint8Array> | null;
     contentType: string | null;
     contentLength: number | null;
     constructor(bodyInit: BodyPonyfillInit | null);
     private bodyType?;
-    private _bodyProcessed;
-    private _processedBody;
-    get body(): PonyfillReadableStream<Uint8Array> | null;
-    private processBody;
     arrayBuffer(): Promise<ArrayBuffer>;
     blob(): Promise<PonyfillBlob>;
     formData(): Promise<PonyfillFormData>;

package/Headers.d.ts

@@ -8,4 +8,6 @@ export declare class PonyfillHeaders implements Headers {
     set(name: string, value: string): void;
     delete(name: string): void;
     forEach(callback: (value: string, key: string, parent: Headers) => void): void;
+    entries(): IterableIterator<[string, string]>;
+    [Symbol.iterator](): IterableIterator<[string, string]>;
 }

package/Request.d.ts

@@ -6,9 +6,6 @@ export type RequestPonyfillInit = Omit<RequestInit, 'body' | 'headers'> & {
 };
 export declare class PonyfillRequest extends PonyfillBody implements Request {
     constructor(input: RequestInfo | URL, options?: RequestPonyfillInit);
-    get body(): import("./ReadableStream").PonyfillReadableStream<Uint8Array> | null;
-    private postProcessedBody;
-    private postProcessBody;
     cache: RequestCache;
     credentials: RequestCredentials;
     destination: RequestDestination;

package/index.js

@@ -276,46 +276,36 @@ class PonyfillBody {
     constructor(bodyInit) {
         this.bodyInit = bodyInit;
         this.bodyUsed = false;
+        this.body = null;
         this.contentType = null;
         this.contentLength = null;
-        this._bodyProcessed = false;
-        this._processedBody = null;
-    }
-    get body() {
-        if (!this._bodyProcessed) {
-            this._processedBody = this.processBody();
-            this._bodyProcessed = true;
-        }
-        return this._processedBody;
-    }
-    processBody() {
         if (this.bodyInit == null) {
-            return null;
+            this.body = null;
         }
-        if (typeof this.bodyInit === 'string') {
+        else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            return new PonyfillReadableStream(stream.Readable.from(buffer));
+            this.body = new PonyfillReadableStream(stream.Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            return this.bodyInit;
+            this.body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            return new PonyfillReadableStream(blobStream);
+            this.body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            return new PonyfillReadableStream({
+            this.body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -350,16 +340,16 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            return new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
+            this.body = new PonyfillReadableStream(stream.Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            return new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
+            this.body = new PonyfillReadableStream(stream.Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof stream.Readable) {
             this.bodyType = BodyInitType.Readable;
-            return new PonyfillReadableStream(this.bodyInit);
+            this.body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
@@ -453,9 +443,7 @@ class PonyfillHeaders {
         if (this.map.has(key)) {
             value = this.map.get(key) + ', ' + value;
         }
-        else {
-            this.map.set(key, value);
-        }
+        this.map.set(key, value);
     }
     get(name) {
         const key = name.toLowerCase();
@@ -478,6 +466,12 @@ class PonyfillHeaders {
             callback(value, key, this);
         });
     }
+    entries() {
+        return this.map.entries();
+    }
+    [Symbol.iterator]() {
+        return this.map.entries();
+    }
 }
 
 function isRequest(input) {
@@ -504,7 +498,6 @@ class PonyfillRequest extends PonyfillBody {
             requestInit = options;
         }
         super(bodyInit);
-        this.postProcessedBody = false;
         this.destination = '';
         this.priority = 'auto';
         this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
@@ -524,15 +517,6 @@ class PonyfillRequest extends PonyfillBody {
                 this.headers.set('connection', 'keep-alive');
             }
         }
-    }
-    get body() {
-        const actualBody = super.body;
-        if (!this.postProcessedBody) {
-            this.postProcessBody();
-        }
-        return actualBody;
-    }
-    postProcessBody() {
         if (!this.headers.has('content-type')) {
             if (this.contentType) {
                 this.headers.set('content-type', this.contentType);

package/index.mjs

@@ -272,46 +272,36 @@ class PonyfillBody {
     constructor(bodyInit) {
         this.bodyInit = bodyInit;
         this.bodyUsed = false;
+        this.body = null;
         this.contentType = null;
         this.contentLength = null;
-        this._bodyProcessed = false;
-        this._processedBody = null;
-    }
-    get body() {
-        if (!this._bodyProcessed) {
-            this._processedBody = this.processBody();
-            this._bodyProcessed = true;
-        }
-        return this._processedBody;
-    }
-    processBody() {
         if (this.bodyInit == null) {
-            return null;
+            this.body = null;
         }
-        if (typeof this.bodyInit === 'string') {
+        else if (typeof this.bodyInit === 'string') {
             this.bodyType = BodyInitType.String;
             const buffer = Buffer.from(this.bodyInit);
             this.contentType = 'text/plain;charset=UTF-8';
             this.contentLength = buffer.length;
-            return new PonyfillReadableStream(Readable.from(buffer));
+            this.body = new PonyfillReadableStream(Readable.from(buffer));
         }
         else if (this.bodyInit instanceof PonyfillReadableStream) {
             this.bodyType = BodyInitType.ReadableStream;
-            return this.bodyInit;
+            this.body = this.bodyInit;
         }
         else if (this.bodyInit instanceof PonyfillBlob) {
             this.bodyType = BodyInitType.Blob;
             const blobStream = this.bodyInit.stream();
             this.contentType = this.bodyInit.type;
             this.contentLength = this.bodyInit.size;
-            return new PonyfillReadableStream(blobStream);
+            this.body = new PonyfillReadableStream(blobStream);
         }
         else if (this.bodyInit instanceof PonyfillFormData) {
             this.bodyType = BodyInitType.FormData;
             const boundary = Math.random().toString(36).substr(2);
             const formData = this.bodyInit;
             this.contentType = `multipart/form-data; boundary=${boundary}`;
-            return new PonyfillReadableStream({
+            this.body = new PonyfillReadableStream({
                 start: async (controller) => {
                     controller.enqueue(Buffer.from(`--${boundary}\r\n`));
                     const entries = [];
@@ -346,16 +336,16 @@ class PonyfillBody {
         }
         else if ('buffer' in this.bodyInit) {
             this.contentLength = this.bodyInit.byteLength;
-            return new PonyfillReadableStream(Readable.from(this.bodyInit));
+            this.body = new PonyfillReadableStream(Readable.from(this.bodyInit));
         }
         else if (this.bodyInit instanceof ArrayBuffer) {
             this.bodyType = BodyInitType.ArrayBuffer;
             this.contentLength = this.bodyInit.byteLength;
-            return new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
+            this.body = new PonyfillReadableStream(Readable.from(Buffer.from(this.bodyInit)));
         }
         else if (this.bodyInit instanceof Readable) {
             this.bodyType = BodyInitType.Readable;
-            return new PonyfillReadableStream(this.bodyInit);
+            this.body = new PonyfillReadableStream(this.bodyInit);
         }
         else {
             throw new Error('Unknown body type');
@@ -449,9 +439,7 @@ class PonyfillHeaders {
         if (this.map.has(key)) {
             value = this.map.get(key) + ', ' + value;
         }
-        else {
-            this.map.set(key, value);
-        }
+        this.map.set(key, value);
     }
     get(name) {
         const key = name.toLowerCase();
@@ -474,6 +462,12 @@ class PonyfillHeaders {
             callback(value, key, this);
         });
     }
+    entries() {
+        return this.map.entries();
+    }
+    [Symbol.iterator]() {
+        return this.map.entries();
+    }
 }
 
 function isRequest(input) {
@@ -500,7 +494,6 @@ class PonyfillRequest extends PonyfillBody {
             requestInit = options;
         }
         super(bodyInit);
-        this.postProcessedBody = false;
         this.destination = '';
         this.priority = 'auto';
         this.cache = (requestInit === null || requestInit === void 0 ? void 0 : requestInit.cache) || 'default';
@@ -520,15 +513,6 @@ class PonyfillRequest extends PonyfillBody {
                 this.headers.set('connection', 'keep-alive');
             }
         }
-    }
-    get body() {
-        const actualBody = super.body;
-        if (!this.postProcessedBody) {
-            this.postProcessBody();
-        }
-        return actualBody;
-    }
-    postProcessBody() {
         if (!this.headers.has('content-type')) {
             if (this.contentType) {
                 this.headers.set('content-type', this.contentType);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20221225172458-8684a84",
+  "version": "0.0.1-alpha-20221225175918-b8ec28d",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {