@whatwg-node/node-fetch 0.4.13-alpha-20230821122741-21a9569 → 0.4.13-alpha-20230821124424-6f3a2b1

package/cjs/Blob.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillBlob = void 0;
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 const ReadableStream_js_1 = require("./ReadableStream.js");
+const utils_js_1 = require("./utils.js");
 function getBlobPartAsBuffer(blobPart) {
     if (typeof blobPart === 'string') {
         return Buffer.from(blobPart);
@@ -10,10 +11,7 @@ function getBlobPartAsBuffer(blobPart) {
     else if (Buffer.isBuffer(blobPart)) {
         return blobPart;
     }
-    else if (blobPart instanceof Uint8Array) {
-        return Buffer.from(blobPart);
-    }
-    else if ('buffer' in blobPart) {
+    else if ((0, utils_js_1.isArrayBufferView)(blobPart)) {
         return Buffer.from(blobPart.buffer, blobPart.byteOffset, blobPart.byteLength);
     }
     else {
@@ -21,7 +19,7 @@ function getBlobPartAsBuffer(blobPart) {
     }
 }
 function isBlob(obj) {
-    return obj != null && typeof obj === 'object' && obj.arrayBuffer != null;
+    return obj != null && obj.arrayBuffer != null;
 }
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
@@ -55,7 +53,7 @@ class PonyfillBlob {
             if (typeof blobPart === 'string') {
                 text += blobPart;
             }
-            else if ('text' in blobPart) {
+            else if (isBlob(blobPart)) {
                 text += await blobPart.text();
             }
             else {
@@ -74,10 +72,7 @@ class PonyfillBlob {
             else if (isBlob(blobPart)) {
                 size += blobPart.size;
             }
-            else if ('length' in blobPart) {
-                size += blobPart.length;
-            }
-            else if ('byteLength' in blobPart) {
+            else if ((0, utils_js_1.isArrayBufferView)(blobPart)) {
                 size += blobPart.byteLength;
             }
         }

package/cjs/Body.js

@@ -187,14 +187,6 @@ class PonyfillBody {
         if (this._buffer) {
             return (0, utils_js_1.fakePromise)(Buffer.from(this._buffer.buffer, this._buffer.byteOffset, this._buffer.byteLength));
         }
-        if (this.bodyType === BodyInitType.String) {
-            return (0, utils_js_1.fakePromise)(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 (0, utils_js_1.fakePromise)(buffer);
-        }
         if (this.bodyType === BodyInitType.Blob) {
             if (this.bodyInit instanceof Blob_js_1.PonyfillBlob) {
                 return this.bodyInit.buffer();
@@ -271,27 +263,15 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Uint8Array) {
+    if ((0, utils_js_1.isArrayBufferView)(bodyInit)) {
         const contentLength = bodyInit.byteLength;
+        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
         return {
             bodyType: BodyInitType.Uint8Array,
-            contentLength,
-            contentType: null,
-            buffer: bodyInit,
-            bodyFactory() {
-                const readable = stream_1.Readable.from(bodyInit);
-                const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
-    if ('buffer' in bodyInit) {
-        const contentLength = bodyInit.byteLength;
-        return {
+            buffer,
             contentLength,
             contentType: null,
             bodyFactory() {
-                const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
                 const readable = stream_1.Readable.from(buffer);
                 const body = new ReadableStream_js_1.PonyfillReadableStream(readable);
                 return body;
@@ -324,7 +304,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('stream' in bodyInit) {
+    if (isBlob(bodyInit)) {
         return {
             contentType: bodyInit.type,
             contentLength: bodyInit.size,
@@ -335,7 +315,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('sort' in bodyInit) {
+    if (isURLSearchParams(bodyInit)) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {
             bodyType: BodyInitType.String,
@@ -347,7 +327,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('forEach' in bodyInit) {
+    if (isFormData(bodyInit)) {
         const boundary = Math.random().toString(36).substr(2);
         const contentType = `multipart/form-data; boundary=${boundary}`;
         return {
@@ -370,3 +350,12 @@ function processBodyInit(bodyInit) {
     }
     throw new Error('Unknown body type');
 }
+function isFormData(value) {
+    return value?.forEach != null;
+}
+function isBlob(value) {
+    return value?.stream != null;
+}
+function isURLSearchParams(value) {
+    return value?.sort != null;
+}

package/cjs/ReadableStream.js

@@ -43,16 +43,22 @@ function createController(desiredSize, readable) {
         },
     };
 }
+function isNodeReadable(obj) {
+    return obj?.read != null;
+}
+function isReadableStream(obj) {
+    return obj?.getReader != null;
+}
 class PonyfillReadableStream {
     constructor(underlyingSource) {
         this.locked = false;
         if (underlyingSource instanceof PonyfillReadableStream) {
             this.readable = underlyingSource.readable;
         }
-        else if (underlyingSource && 'read' in underlyingSource) {
+        else if (isNodeReadable(underlyingSource)) {
             this.readable = underlyingSource;
         }
-        else if (underlyingSource && 'getReader' in underlyingSource) {
+        else if (isReadableStream(underlyingSource)) {
             let reader;
             let started = false;
             this.readable = new stream_1.Readable({
@@ -162,7 +168,7 @@ class PonyfillReadableStream {
         return readable;
     }
     static [Symbol.hasInstance](instance) {
-        return instance != null && typeof instance === 'object' && 'getReader' in instance;
+        return isReadableStream(instance);
     }
 }
 exports.PonyfillReadableStream = PonyfillReadableStream;

package/cjs/Request.js

@@ -6,6 +6,9 @@ const Headers_js_1 = require("./Headers.js");
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
+function isURL(obj) {
+    return obj?.href != null;
+}
 class PonyfillRequest extends Body_js_1.PonyfillBody {
     constructor(input, options) {
         let url;
@@ -14,7 +17,7 @@ class PonyfillRequest extends Body_js_1.PonyfillBody {
         if (typeof input === 'string') {
             url = input;
         }
-        else if ('href' in input) {
+        else if (isURL(input)) {
             url = input.toString();
         }
         else if (isRequest(input)) {

package/cjs/URLSearchParams.js

@@ -3,6 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PonyfillURLSearchParams = void 0;
 const tslib_1 = require("tslib");
 const fast_querystring_1 = tslib_1.__importDefault(require("fast-querystring"));
+function isURLSearchParams(value) {
+    return value?.entries != null;
+}
 class PonyfillURLSearchParams {
     constructor(init) {
         if (init) {
@@ -15,7 +18,7 @@ class PonyfillURLSearchParams {
                     this.params[key] = value;
                 }
             }
-            else if ('entries' in init) {
+            else if (isURLSearchParams(init)) {
                 this.params = {};
                 for (const [key, value] of init.entries()) {
                     this.params[key] = value;

package/cjs/fetch.js

@@ -35,8 +35,11 @@ function getResponseForDataUri(url) {
         },
     });
 }
+function isURL(obj) {
+    return obj != null && obj.href != null;
+}
 function fetchPonyfill(info, init) {
-    if (typeof info === 'string' || 'href' in info) {
+    if (typeof info === 'string' || isURL(info)) {
         const ponyfillRequest = new Request_js_1.PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
     }

package/cjs/fetchCurl.js

@@ -24,7 +24,7 @@ function fetchCurl(fetchRequest) {
     }
     else {
         const nodeReadable = (fetchRequest.body != null
-            ? 'pipe' in fetchRequest.body
+            ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
                 ? fetchRequest.body
                 : node_stream_1.Readable.from(fetchRequest.body)
             : null);

package/cjs/fetchNodeHttp.js

@@ -24,7 +24,7 @@ function fetchNodeHttp(fetchRequest) {
         try {
             const requestFn = getRequestFnForProtocol(fetchRequest.url);
             const nodeReadable = (fetchRequest.body != null
-                ? 'pipe' in fetchRequest.body
+                ? (0, utils_js_1.isNodeReadable)(fetchRequest.body)
                     ? fetchRequest.body
                     : stream_1.Readable.from(fetchRequest.body)
                 : null);

package/cjs/utils.js

@@ -1,8 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = void 0;
+exports.isNodeReadable = exports.isArrayBufferView = exports.fakePromise = exports.defaultHeadersSerializer = exports.getHeadersObj = void 0;
+function isHeadersInstance(obj) {
+    return obj?.forEach != null;
+}
 function getHeadersObj(headers) {
-    if (headers == null || !('forEach' in headers)) {
+    if (headers == null || !isHeadersInstance(headers)) {
         return headers;
     }
     const obj = {};
@@ -57,3 +60,15 @@ function fakePromise(value) {
     };
 }
 exports.fakePromise = fakePromise;
+function isArrayBufferView(obj) {
+    return (obj != null &&
+        typeof obj === 'object' &&
+        obj.buffer != null &&
+        obj.byteLength != null &&
+        obj.byteOffset != null);
+}
+exports.isArrayBufferView = isArrayBufferView;
+function isNodeReadable(obj) {
+    return obj != null && obj.pipe != null;
+}
+exports.isNodeReadable = isNodeReadable;

package/esm/Blob.js

@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-declaration-merging */
 import { PonyfillReadableStream } from './ReadableStream.js';
+import { isArrayBufferView } from './utils.js';
 function getBlobPartAsBuffer(blobPart) {
     if (typeof blobPart === 'string') {
         return Buffer.from(blobPart);
@@ -7,10 +8,7 @@ function getBlobPartAsBuffer(blobPart) {
     else if (Buffer.isBuffer(blobPart)) {
         return blobPart;
     }
-    else if (blobPart instanceof Uint8Array) {
-        return Buffer.from(blobPart);
-    }
-    else if ('buffer' in blobPart) {
+    else if (isArrayBufferView(blobPart)) {
         return Buffer.from(blobPart.buffer, blobPart.byteOffset, blobPart.byteLength);
     }
     else {
@@ -18,7 +16,7 @@ function getBlobPartAsBuffer(blobPart) {
     }
 }
 function isBlob(obj) {
-    return obj != null && typeof obj === 'object' && obj.arrayBuffer != null;
+    return obj != null && obj.arrayBuffer != null;
 }
 // Will be removed after v14 reaches EOL
 // Needed because v14 doesn't have .stream() implemented
@@ -52,7 +50,7 @@ export class PonyfillBlob {
             if (typeof blobPart === 'string') {
                 text += blobPart;
             }
-            else if ('text' in blobPart) {
+            else if (isBlob(blobPart)) {
                 text += await blobPart.text();
             }
             else {
@@ -71,10 +69,7 @@ export class PonyfillBlob {
             else if (isBlob(blobPart)) {
                 size += blobPart.size;
             }
-            else if ('length' in blobPart) {
-                size += blobPart.length;
-            }
-            else if ('byteLength' in blobPart) {
+            else if (isArrayBufferView(blobPart)) {
                 size += blobPart.byteLength;
             }
         }

package/esm/Body.js

@@ -4,7 +4,7 @@ import { PonyfillBlob } from './Blob.js';
 import { PonyfillFile } from './File.js';
 import { getStreamFromFormData, PonyfillFormData } from './FormData.js';
 import { PonyfillReadableStream } from './ReadableStream.js';
-import { fakePromise } from './utils.js';
+import { fakePromise, isArrayBufferView } from './utils.js';
 var BodyInitType;
 (function (BodyInitType) {
     BodyInitType["ReadableStream"] = "ReadableStream";
@@ -183,14 +183,6 @@ export class PonyfillBody {
         if (this._buffer) {
             return fakePromise(Buffer.from(this._buffer.buffer, this._buffer.byteOffset, this._buffer.byteLength));
         }
-        if (this.bodyType === BodyInitType.String) {
-            return fakePromise(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 fakePromise(buffer);
-        }
         if (this.bodyType === BodyInitType.Blob) {
             if (this.bodyInit instanceof PonyfillBlob) {
                 return this.bodyInit.buffer();
@@ -266,27 +258,15 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if (bodyInit instanceof Uint8Array) {
+    if (isArrayBufferView(bodyInit)) {
         const contentLength = bodyInit.byteLength;
+        const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
         return {
             bodyType: BodyInitType.Uint8Array,
-            contentLength,
-            contentType: null,
-            buffer: bodyInit,
-            bodyFactory() {
-                const readable = Readable.from(bodyInit);
-                const body = new PonyfillReadableStream(readable);
-                return body;
-            },
-        };
-    }
-    if ('buffer' in bodyInit) {
-        const contentLength = bodyInit.byteLength;
-        return {
+            buffer,
             contentLength,
             contentType: null,
             bodyFactory() {
-                const buffer = Buffer.from(bodyInit.buffer, bodyInit.byteOffset, bodyInit.byteLength);
                 const readable = Readable.from(buffer);
                 const body = new PonyfillReadableStream(readable);
                 return body;
@@ -319,7 +299,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('stream' in bodyInit) {
+    if (isBlob(bodyInit)) {
         return {
             contentType: bodyInit.type,
             contentLength: bodyInit.size,
@@ -330,7 +310,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('sort' in bodyInit) {
+    if (isURLSearchParams(bodyInit)) {
         const contentType = 'application/x-www-form-urlencoded;charset=UTF-8';
         return {
             bodyType: BodyInitType.String,
@@ -342,7 +322,7 @@ function processBodyInit(bodyInit) {
             },
         };
     }
-    if ('forEach' in bodyInit) {
+    if (isFormData(bodyInit)) {
         const boundary = Math.random().toString(36).substr(2);
         const contentType = `multipart/form-data; boundary=${boundary}`;
         return {
@@ -365,3 +345,12 @@ function processBodyInit(bodyInit) {
     }
     throw new Error('Unknown body type');
 }
+function isFormData(value) {
+    return value?.forEach != null;
+}
+function isBlob(value) {
+    return value?.stream != null;
+}
+function isURLSearchParams(value) {
+    return value?.sort != null;
+}

package/esm/ReadableStream.js

@@ -40,16 +40,22 @@ function createController(desiredSize, readable) {
         },
     };
 }
+function isNodeReadable(obj) {
+    return obj?.read != null;
+}
+function isReadableStream(obj) {
+    return obj?.getReader != null;
+}
 export class PonyfillReadableStream {
     constructor(underlyingSource) {
         this.locked = false;
         if (underlyingSource instanceof PonyfillReadableStream) {
             this.readable = underlyingSource.readable;
         }
-        else if (underlyingSource && 'read' in underlyingSource) {
+        else if (isNodeReadable(underlyingSource)) {
             this.readable = underlyingSource;
         }
-        else if (underlyingSource && 'getReader' in underlyingSource) {
+        else if (isReadableStream(underlyingSource)) {
             let reader;
             let started = false;
             this.readable = new Readable({
@@ -159,6 +165,6 @@ export class PonyfillReadableStream {
         return readable;
     }
     static [Symbol.hasInstance](instance) {
-        return instance != null && typeof instance === 'object' && 'getReader' in instance;
+        return isReadableStream(instance);
     }
 }

package/esm/Request.js

@@ -3,6 +3,9 @@ import { isHeadersLike, PonyfillHeaders } from './Headers.js';
 function isRequest(input) {
     return input[Symbol.toStringTag] === 'Request';
 }
+function isURL(obj) {
+    return obj?.href != null;
+}
 export class PonyfillRequest extends PonyfillBody {
     constructor(input, options) {
         let url;
@@ -11,7 +14,7 @@ export class PonyfillRequest extends PonyfillBody {
         if (typeof input === 'string') {
             url = input;
         }
-        else if ('href' in input) {
+        else if (isURL(input)) {
             url = input.toString();
         }
         else if (isRequest(input)) {

package/esm/URLSearchParams.js

@@ -1,4 +1,7 @@
 import FastQuerystring from 'fast-querystring';
+function isURLSearchParams(value) {
+    return value?.entries != null;
+}
 export class PonyfillURLSearchParams {
     constructor(init) {
         if (init) {
@@ -11,7 +14,7 @@ export class PonyfillURLSearchParams {
                     this.params[key] = value;
                 }
             }
-            else if ('entries' in init) {
+            else if (isURLSearchParams(init)) {
                 this.params = {};
                 for (const [key, value] of init.entries()) {
                     this.params[key] = value;

package/esm/fetch.js

@@ -32,8 +32,11 @@ function getResponseForDataUri(url) {
         },
     });
 }
+function isURL(obj) {
+    return obj != null && obj.href != null;
+}
 export function fetchPonyfill(info, init) {
-    if (typeof info === 'string' || 'href' in info) {
+    if (typeof info === 'string' || isURL(info)) {
         const ponyfillRequest = new PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
     }

package/esm/fetchCurl.js

@@ -1,7 +1,7 @@
 import { Readable } from 'node:stream';
 import { PonyfillAbortError } from './AbortError.js';
 import { PonyfillResponse } from './Response.js';
-import { defaultHeadersSerializer } from './utils.js';
+import { defaultHeadersSerializer, isNodeReadable } from './utils.js';
 export function fetchCurl(fetchRequest) {
     const { Curl, CurlCode, CurlFeature, CurlPause, CurlProgressFunc } = globalThis['libcurl'];
     const curlHandle = new Curl();
@@ -21,7 +21,7 @@ export function fetchCurl(fetchRequest) {
     }
     else {
         const nodeReadable = (fetchRequest.body != null
-            ? 'pipe' in fetchRequest.body
+            ? isNodeReadable(fetchRequest.body)
                 ? fetchRequest.body
                 : Readable.from(fetchRequest.body)
             : null);

package/esm/fetchNodeHttp.js

@@ -6,7 +6,7 @@ import { PonyfillAbortError } from './AbortError.js';
 import { PonyfillRequest } from './Request.js';
 import { PonyfillResponse } from './Response.js';
 import { PonyfillURL } from './URL.js';
-import { getHeadersObj } from './utils.js';
+import { getHeadersObj, isNodeReadable } from './utils.js';
 function getRequestFnForProtocol(url) {
     if (url.startsWith('http:')) {
         return httpRequest;
@@ -21,7 +21,7 @@ export function fetchNodeHttp(fetchRequest) {
         try {
             const requestFn = getRequestFnForProtocol(fetchRequest.url);
             const nodeReadable = (fetchRequest.body != null
-                ? 'pipe' in fetchRequest.body
+                ? isNodeReadable(fetchRequest.body)
                     ? fetchRequest.body
                     : Readable.from(fetchRequest.body)
                 : null);

package/esm/utils.js

@@ -1,5 +1,8 @@
+function isHeadersInstance(obj) {
+    return obj?.forEach != null;
+}
 export function getHeadersObj(headers) {
-    if (headers == null || !('forEach' in headers)) {
+    if (headers == null || !isHeadersInstance(headers)) {
         return headers;
     }
     const obj = {};
@@ -51,3 +54,13 @@ export function fakePromise(value) {
         [Symbol.toStringTag]: 'Promise',
     };
 }
+export function isArrayBufferView(obj) {
+    return (obj != null &&
+        typeof obj === 'object' &&
+        obj.buffer != null &&
+        obj.byteLength != null &&
+        obj.byteOffset != null);
+}
+export function isNodeReadable(obj) {
+    return obj != null && obj.pipe != null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.13-alpha-20230821122741-21a9569",
+  "version": "0.4.13-alpha-20230821124424-6f3a2b1",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/utils.d.cts

@@ -1,3 +1,7 @@
+/// <reference types="node" />
+import { Readable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export declare function fakePromise<T>(value: T): Promise<T>;
+export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
+export declare function isNodeReadable(obj: any): obj is Readable;

package/typings/utils.d.ts

@@ -1,3 +1,7 @@
+/// <reference types="node" />
+import { Readable } from 'node:stream';
 export declare function getHeadersObj(headers: Headers): Record<string, string>;
 export declare function defaultHeadersSerializer(headers: Headers, onContentLength?: (value: string) => void): string[];
 export declare function fakePromise<T>(value: T): Promise<T>;
+export declare function isArrayBufferView(obj: any): obj is ArrayBufferView;
+export declare function isNodeReadable(obj: any): obj is Readable;