@whatwg-node/node-fetch 0.4.6-alpha-20230613182236-ce4ebc7 → 0.4.6

package/cjs/Body.js

@@ -232,21 +232,14 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
-        let contentLength;
+        const buffer = Buffer.from(bodyInit);
+        const contentLength = buffer.byteLength;
         return {
             bodyType: BodyInitType.String,
             contentType: 'text/plain;charset=UTF-8',
-            get contentLength() {
-                if (contentLength == null) {
-                    contentLength = Buffer.byteLength(bodyInit);
-                }
-                return contentLength;
-            },
-            set contentLength(value) {
-                contentLength = value;
-            },
+            contentLength,
             bodyFactory() {
-                const readable = stream_1.Readable.from(bodyInit);
+                const readable = stream_1.Readable.from(buffer);
                 return new ReadableStream_js_1.PonyfillReadableStream(readable);
             },
         };

package/cjs/Headers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PonyfillHeaders = exports.isHeadersLike = void 0;
+exports.splitSetCookieHeader = exports.PonyfillHeaders = exports.isHeadersLike = void 0;
+const node_util_1 = require("node:util");
 function isHeadersLike(headers) {
     return headers?.get && headers?.forEach;
 }
@@ -169,8 +170,57 @@ class PonyfillHeaders {
         }
         return this.getMap().entries();
     }
+    getSetCookie() {
+        const setCookieHeader = this.get('set-cookie');
+        if (!setCookieHeader) {
+            return [];
+        }
+        return splitSetCookieHeader(setCookieHeader);
+    }
     [Symbol.iterator]() {
         return this.entries();
     }
+    [Symbol.for('nodejs.util.inspect.custom')]() {
+        const record = {};
+        this.forEach((value, key) => {
+            if (key === 'set-cookie') {
+                record['set-cookie'] = this.getSetCookie();
+            }
+            else {
+                record[key] = value.includes(',') ? value.split(',').map(el => el.trim()) : value;
+            }
+        });
+        return `Headers ${(0, node_util_1.inspect)(record)}`;
+    }
 }
 exports.PonyfillHeaders = PonyfillHeaders;
+function splitSetCookieHeader(setCookieHeader) {
+    const setCookieHeaders = [];
+    let currentStr = '';
+    let ignoreComma = false;
+    for (const ch of setCookieHeader) {
+        if (currentStr.endsWith('Expires=')) {
+            ignoreComma = true;
+        }
+        if (ignoreComma) {
+            if (ch === ';') {
+                ignoreComma = false;
+            }
+            if (ch === ',' && currentStr.split('Expires=')[1].length > 3) {
+                ignoreComma = false;
+            }
+        }
+        if (ch === ',' && !ignoreComma) {
+            setCookieHeaders.push(currentStr.trim());
+            currentStr = '';
+        }
+        else {
+            currentStr += ch;
+        }
+    }
+    if (currentStr) {
+        setCookieHeaders.push(currentStr.trim());
+    }
+    return setCookieHeaders;
+}
+exports.splitSetCookieHeader = splitSetCookieHeader;

package/esm/Body.js

@@ -227,21 +227,14 @@ function processBodyInit(bodyInit) {
         };
     }
     if (typeof bodyInit === 'string') {
-        let contentLength;
+        const buffer = Buffer.from(bodyInit);
+        const contentLength = buffer.byteLength;
         return {
             bodyType: BodyInitType.String,
             contentType: 'text/plain;charset=UTF-8',
-            get contentLength() {
-                if (contentLength == null) {
-                    contentLength = Buffer.byteLength(bodyInit);
-                }
-                return contentLength;
-            },
-            set contentLength(value) {
-                contentLength = value;
-            },
+            contentLength,
             bodyFactory() {
-                const readable = Readable.from(bodyInit);
+                const readable = Readable.from(buffer);
                 return new PonyfillReadableStream(readable);
             },
         };

package/esm/Headers.js

@@ -1,3 +1,4 @@
+import { inspect } from 'node:util';
 export function isHeadersLike(headers) {
     return headers?.get && headers?.forEach;
 }
@@ -165,7 +166,55 @@ export class PonyfillHeaders {
         }
         return this.getMap().entries();
     }
+    getSetCookie() {
+        const setCookieHeader = this.get('set-cookie');
+        if (!setCookieHeader) {
+            return [];
+        }
+        return splitSetCookieHeader(setCookieHeader);
+    }
     [Symbol.iterator]() {
         return this.entries();
     }
+    [Symbol.for('nodejs.util.inspect.custom')]() {
+        const record = {};
+        this.forEach((value, key) => {
+            if (key === 'set-cookie') {
+                record['set-cookie'] = this.getSetCookie();
+            }
+            else {
+                record[key] = value.includes(',') ? value.split(',').map(el => el.trim()) : value;
+            }
+        });
+        return `Headers ${inspect(record)}`;
+    }
+}
+export function splitSetCookieHeader(setCookieHeader) {
+    const setCookieHeaders = [];
+    let currentStr = '';
+    let ignoreComma = false;
+    for (const ch of setCookieHeader) {
+        if (currentStr.endsWith('Expires=')) {
+            ignoreComma = true;
+        }
+        if (ignoreComma) {
+            if (ch === ';') {
+                ignoreComma = false;
+            }
+            if (ch === ',' && currentStr.split('Expires=')[1].length > 3) {
+                ignoreComma = false;
+            }
+        }
+        if (ch === ',' && !ignoreComma) {
+            setCookieHeaders.push(currentStr.trim());
+            currentStr = '';
+        }
+        else {
+            currentStr += ch;
+        }
+    }
+    if (currentStr) {
+        setCookieHeaders.push(currentStr.trim());
+    }
+    return setCookieHeaders;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.6-alpha-20230613182236-ce4ebc7",
+  "version": "0.4.6",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Headers.d.cts

@@ -17,5 +17,7 @@ export declare class PonyfillHeaders implements Headers {
     keys(): IterableIterator<string>;
     values(): IterableIterator<string>;
     entries(): IterableIterator<[string, string]>;
+    getSetCookie(): string[];
     [Symbol.iterator](): IterableIterator<[string, string]>;
 }
+export declare function splitSetCookieHeader(setCookieHeader: string): string[];

package/typings/Headers.d.ts

@@ -17,5 +17,7 @@ export declare class PonyfillHeaders implements Headers {
     keys(): IterableIterator<string>;
     values(): IterableIterator<string>;
     entries(): IterableIterator<[string, string]>;
+    getSetCookie(): string[];
     [Symbol.iterator](): IterableIterator<[string, string]>;
 }
+export declare function splitSetCookieHeader(setCookieHeader: string): string[];