@whatwg-node/node-fetch 0.0.1-alpha-20230102102521-2e7c4e5 → 0.0.1-alpha-20230117081522-969e299

package/Body.d.ts

@@ -16,7 +16,7 @@ export interface FormDataLimits {
 export interface PonyfillBodyOptions {
     formDataLimits?: FormDataLimits;
 }
-export declare class PonyfillBody implements Body {
+export declare class PonyfillBody<TJSON = any> implements Body {
     private bodyInit;
     private options;
     bodyUsed: boolean;
@@ -31,6 +31,6 @@ export declare class PonyfillBody implements Body {
     formData(opts?: {
         formDataLimits: FormDataLimits;
     }): Promise<PonyfillFormData>;
-    json(): Promise<any>;
+    json(): Promise<TJSON>;
     text(): Promise<string>;
 }

package/Request.d.ts

@@ -4,7 +4,7 @@ export type RequestPonyfillInit = PonyfillBodyOptions & Omit<RequestInit, 'body'
     body?: BodyPonyfillInit | null;
     headers?: PonyfillHeadersInit;
 };
-export declare class PonyfillRequest extends PonyfillBody implements Request {
+export declare class PonyfillRequest<TJSON = any> extends PonyfillBody<TJSON> implements Request {
     constructor(input: RequestInfo | URL, options?: RequestPonyfillInit);
     cache: RequestCache;
     credentials: RequestCredentials;

package/Response.d.ts

@@ -4,8 +4,9 @@ export type ResponsePonyfilInit = PonyfillBodyOptions & Omit<ResponseInit, 'head
     url?: string;
     redirected?: boolean;
     headers?: PonyfillHeadersInit;
+    type?: ResponseType;
 };
-export declare class PonyfillResponse extends PonyfillBody implements Response {
+export declare class PonyfillResponse<TJSON = any> extends PonyfillBody<TJSON> implements Response {
     constructor(body?: BodyPonyfillInit | null, init?: ResponsePonyfilInit);
     headers: Headers;
     get ok(): boolean;
@@ -14,8 +15,8 @@ export declare class PonyfillResponse extends PonyfillBody implements Response {
     url: string;
     redirected: boolean;
     type: ResponseType;
-    clone(): PonyfillResponse;
-    static error(): PonyfillResponse;
-    static redirect(url: string, status?: number): PonyfillResponse;
-    static json(data: any, init?: RequestInit): PonyfillResponse;
+    clone(): PonyfillResponse<any>;
+    static error(): PonyfillResponse<any>;
+    static redirect(url: string, status?: number): PonyfillResponse<any>;
+    static json<T = any>(data: T, init?: RequestInit): PonyfillResponse<T>;
 }

package/fetch.d.ts

@@ -1,3 +1,3 @@
 import { PonyfillRequest, RequestPonyfillInit } from './Request';
 import { PonyfillResponse } from './Response';
-export declare const fetchPonyfill: (info: string | PonyfillRequest | URL, init?: RequestPonyfillInit) => Promise<PonyfillResponse>;
+export declare function fetchPonyfill<TResponseJSON = any, TRequestJSON = any>(info: string | PonyfillRequest<TRequestJSON> | URL, init?: RequestPonyfillInit): Promise<PonyfillResponse<TResponseJSON>>;

package/index.js

@@ -10,6 +10,7 @@ const events = require('@whatwg-node/events');
 const buffer = require('buffer');
 const stream = require('stream');
 const busboy = _interopDefault(require('busboy'));
+const headerCase = require('header-case');
 const url = require('url');
 const fs = require('fs');
 
@@ -580,26 +581,26 @@ class PonyfillHeaders {
         }
     }
     append(name, value) {
-        const key = name.toLowerCase();
+        const key = headerCase.headerCase(name);
         if (this.map.has(key)) {
             value = this.map.get(key) + ', ' + value;
         }
         this.map.set(key, value);
     }
     get(name) {
-        const key = name.toLowerCase();
+        const key = headerCase.headerCase(name);
         return this.map.get(key) || null;
     }
     has(name) {
-        const key = name.toLowerCase();
+        const key = headerCase.headerCase(name);
         return this.map.has(key);
     }
     set(name, value) {
-        const key = name.toLowerCase();
+        const key = headerCase.headerCase(name);
         this.map.set(key, value);
     }
     delete(name) {
-        const key = name.toLowerCase();
+        const key = headerCase.headerCase(name);
         this.map.delete(key);
     }
     forEach(callback) {
@@ -697,6 +698,7 @@ class PonyfillResponse extends PonyfillBody {
             this.statusText = init.statusText || 'OK';
             this.url = init.url || '';
             this.redirected = init.redirected || false;
+            this.type = init.type || 'default';
         }
     }
     get ok() {
@@ -706,11 +708,10 @@ class PonyfillResponse extends PonyfillBody {
         return new PonyfillResponse(this.body, this);
     }
     static error() {
-        const response = new PonyfillResponse(null, {
+        return new PonyfillResponse(null, {
             status: 500,
             statusText: 'Internal Server Error',
         });
-        return response;
     }
     static redirect(url, status = 301) {
         if (status < 300 || status > 399) {
@@ -759,7 +760,7 @@ function getRequestFnForProtocol(protocol) {
     }
     throw new Error(`Unsupported protocol: ${protocol}`);
 }
-const fetchPonyfill = (info, init) => {
+function fetchPonyfill(info, init) {
     if (typeof info === 'string' || info instanceof URL) {
         const ponyfillRequest = new PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
@@ -830,7 +831,7 @@ const fetchPonyfill = (info, init) => {
             reject(e);
         }
     });
-};
+}
 
 class PonyfillTextEncoder {
     constructor(encoding = 'utf-8') {

package/index.mjs

@@ -4,6 +4,7 @@ import { EventTarget, CustomEvent } from '@whatwg-node/events';
 import { Blob } from 'buffer';
 import { Readable } from 'stream';
 import busboy from 'busboy';
+import { headerCase } from 'header-case';
 import { fileURLToPath } from 'url';
 import { createReadStream } from 'fs';
 
@@ -574,26 +575,26 @@ class PonyfillHeaders {
         }
     }
     append(name, value) {
-        const key = name.toLowerCase();
+        const key = headerCase(name);
         if (this.map.has(key)) {
             value = this.map.get(key) + ', ' + value;
         }
         this.map.set(key, value);
     }
     get(name) {
-        const key = name.toLowerCase();
+        const key = headerCase(name);
         return this.map.get(key) || null;
     }
     has(name) {
-        const key = name.toLowerCase();
+        const key = headerCase(name);
         return this.map.has(key);
     }
     set(name, value) {
-        const key = name.toLowerCase();
+        const key = headerCase(name);
         this.map.set(key, value);
     }
     delete(name) {
-        const key = name.toLowerCase();
+        const key = headerCase(name);
         this.map.delete(key);
     }
     forEach(callback) {
@@ -691,6 +692,7 @@ class PonyfillResponse extends PonyfillBody {
             this.statusText = init.statusText || 'OK';
             this.url = init.url || '';
             this.redirected = init.redirected || false;
+            this.type = init.type || 'default';
         }
     }
     get ok() {
@@ -700,11 +702,10 @@ class PonyfillResponse extends PonyfillBody {
         return new PonyfillResponse(this.body, this);
     }
     static error() {
-        const response = new PonyfillResponse(null, {
+        return new PonyfillResponse(null, {
             status: 500,
             statusText: 'Internal Server Error',
         });
-        return response;
     }
     static redirect(url, status = 301) {
         if (status < 300 || status > 399) {
@@ -753,7 +754,7 @@ function getRequestFnForProtocol(protocol) {
     }
     throw new Error(`Unsupported protocol: ${protocol}`);
 }
-const fetchPonyfill = (info, init) => {
+function fetchPonyfill(info, init) {
     if (typeof info === 'string' || info instanceof URL) {
         const ponyfillRequest = new PonyfillRequest(info, init);
         return fetchPonyfill(ponyfillRequest);
@@ -824,7 +825,7 @@ const fetchPonyfill = (info, init) => {
             reject(e);
         }
     });
-};
+}
 
 class PonyfillTextEncoder {
     constructor(encoding = 'utf-8') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whatwg-node/node-fetch",
-  "version": "0.0.1-alpha-20230102102521-2e7c4e5",
+  "version": "0.0.1-alpha-20230117081522-969e299",
   "description": "Fetch API implementation for Node",
   "sideEffects": false,
   "peerDependencies": {
@@ -9,6 +9,7 @@
   "dependencies": {
     "@whatwg-node/events": "0.0.2",
     "busboy": "1.6.0",
+    "header-case": "^2.0.4",
     "tslib": "^2.3.1"
   },
   "repository": {