@whatwg-node/node-fetch 0.4.4-alpha-20230613122807-eff9007 → 0.4.4-alpha-20230613124545-3a09f74

package/cjs/Headers.js

@@ -7,14 +7,11 @@ function isHeadersLike(headers) {
 exports.isHeadersLike = isHeadersLike;
 class PonyfillHeaders {
     constructor(headersInit) {
+        this.headersInit = headersInit;
         this.map = new Map();
         this.mapIsBuilt = false;
         this.objectNormalizedKeysOfHeadersInit = [];
         this.objectOriginalKeysOfHeadersInit = [];
-        if (isHeadersLike(headersInit)) {
-            return headersInit;
-        }
-        this.headersInit = headersInit;
     }
     // perf: we don't need to build `this.map` for Requests, as we can access the headers directly
     _get(key) {

package/cjs/Response.js

@@ -4,6 +4,14 @@ exports.PonyfillResponse = void 0;
 const http_1 = require("http");
 const Body_js_1 = require("./Body.js");
 const Headers_js_1 = require("./Headers.js");
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
+const DEFAULT_JSON_HEADERS_INIT = {
+    'content-type': JSON_CONTENT_TYPE,
+};
+const DEFAULT_JSON_HEADERS = new Headers_js_1.PonyfillHeaders(DEFAULT_JSON_HEADERS_INIT);
+const DEFAULT_JSON_INIT = {
+    headers: DEFAULT_JSON_HEADERS_INIT,
+};
 class PonyfillResponse extends Body_js_1.PonyfillBody {
     constructor(body, init) {
         super(body || null, init);
@@ -14,7 +22,7 @@ class PonyfillResponse extends Body_js_1.PonyfillBody {
         this.redirected = false;
         this.type = 'default';
         if (init) {
-            this.headers = new Headers_js_1.PonyfillHeaders(init.headers);
+            this.headers = (0, Headers_js_1.isHeadersLike)(init.headers) ? init.headers : new Headers_js_1.PonyfillHeaders(init.headers);
             this.status = init.status || 200;
             this.statusText = init.statusText || http_1.STATUS_CODES[this.status] || 'OK';
             this.url = init.url || '';
@@ -63,9 +71,16 @@ class PonyfillResponse extends Body_js_1.PonyfillBody {
             status,
         });
     }
-    static json(data, init = {}) {
-        init.headers = new Headers_js_1.PonyfillHeaders(init.headers);
-        init.headers.set('content-type', 'application/json; charset=utf-8');
+    static json(data, init = DEFAULT_JSON_INIT) {
+        if (init.headers != null) {
+            init.headers = new Headers_js_1.PonyfillHeaders(init.headers);
+            if (!init.headers.has('content-type')) {
+                init.headers.set('content-type', JSON_CONTENT_TYPE);
+            }
+        }
+        else {
+            init.headers = DEFAULT_JSON_HEADERS;
+        }
         return new PonyfillResponse(JSON.stringify(data), init);
     }
 }

package/esm/Headers.js

@@ -3,14 +3,11 @@ export function isHeadersLike(headers) {
 }
 export class PonyfillHeaders {
     constructor(headersInit) {
+        this.headersInit = headersInit;
         this.map = new Map();
         this.mapIsBuilt = false;
         this.objectNormalizedKeysOfHeadersInit = [];
         this.objectOriginalKeysOfHeadersInit = [];
-        if (isHeadersLike(headersInit)) {
-            return headersInit;
-        }
-        this.headersInit = headersInit;
     }
     // perf: we don't need to build `this.map` for Requests, as we can access the headers directly
     _get(key) {

package/esm/Response.js

@@ -1,6 +1,14 @@
 import { STATUS_CODES } from 'http';
 import { PonyfillBody } from './Body.js';
-import { PonyfillHeaders } from './Headers.js';
+import { isHeadersLike, PonyfillHeaders } from './Headers.js';
+const JSON_CONTENT_TYPE = 'application/json; charset=utf-8';
+const DEFAULT_JSON_HEADERS_INIT = {
+    'content-type': JSON_CONTENT_TYPE,
+};
+const DEFAULT_JSON_HEADERS = new PonyfillHeaders(DEFAULT_JSON_HEADERS_INIT);
+const DEFAULT_JSON_INIT = {
+    headers: DEFAULT_JSON_HEADERS_INIT,
+};
 export class PonyfillResponse extends PonyfillBody {
     constructor(body, init) {
         super(body || null, init);
@@ -11,7 +19,7 @@ export class PonyfillResponse extends PonyfillBody {
         this.redirected = false;
         this.type = 'default';
         if (init) {
-            this.headers = new PonyfillHeaders(init.headers);
+            this.headers = isHeadersLike(init.headers) ? init.headers : new PonyfillHeaders(init.headers);
             this.status = init.status || 200;
             this.statusText = init.statusText || STATUS_CODES[this.status] || 'OK';
             this.url = init.url || '';
@@ -60,9 +68,16 @@ export class PonyfillResponse extends PonyfillBody {
             status,
         });
     }
-    static json(data, init = {}) {
-        init.headers = new PonyfillHeaders(init.headers);
-        init.headers.set('content-type', 'application/json; charset=utf-8');
+    static json(data, init = DEFAULT_JSON_INIT) {
+        if (init.headers != null) {
+            init.headers = new PonyfillHeaders(init.headers);
+            if (!init.headers.has('content-type')) {
+                init.headers.set('content-type', JSON_CONTENT_TYPE);
+            }
+        }
+        else {
+            init.headers = DEFAULT_JSON_HEADERS;
+        }
         return new PonyfillResponse(JSON.stringify(data), init);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.4.4-alpha-20230613122807-eff9007",
+  "version": "0.4.4-alpha-20230613124545-3a09f74",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "dependencies": {

package/typings/Headers.d.cts

@@ -1,12 +1,12 @@
 export type PonyfillHeadersInit = [string, string][] | Record<string, string | string[] | undefined> | Headers;
 export declare function isHeadersLike(headers: any): headers is Headers;
 export declare class PonyfillHeaders implements Headers {
+    private headersInit?;
     private map;
     private mapIsBuilt;
     private objectNormalizedKeysOfHeadersInit;
     private objectOriginalKeysOfHeadersInit;
-    private headersInit?;
-    constructor(headersInit?: PonyfillHeadersInit);
+    constructor(headersInit?: PonyfillHeadersInit | undefined);
     private _get;
     private getMap;
     append(name: string, value: string): void;

package/typings/Headers.d.ts

@@ -1,12 +1,12 @@
 export type PonyfillHeadersInit = [string, string][] | Record<string, string | string[] | undefined> | Headers;
 export declare function isHeadersLike(headers: any): headers is Headers;
 export declare class PonyfillHeaders implements Headers {
+    private headersInit?;
     private map;
     private mapIsBuilt;
     private objectNormalizedKeysOfHeadersInit;
     private objectOriginalKeysOfHeadersInit;
-    private headersInit?;
-    constructor(headersInit?: PonyfillHeadersInit);
+    constructor(headersInit?: PonyfillHeadersInit | undefined);
     private _get;
     private getMap;
     append(name: string, value: string): void;