Add tests for Bun

.changeset/cuddly-peas-complain.md

@@ -0,0 +1,7 @@
+---
+'@whatwg-node/node-fetch': patch
+'@whatwg-node/server': patch
+'@whatwg-node/fetch': patch
+---
+
+Small improvements for Bun support

.github/workflows/tests.yml

@@ -89,6 +89,35 @@ jobs:
           max_attempts: 5
           command: yarn test --ci
 
+  unit-bun:
+    name: unit / bun ${{matrix.node-version}}
+    runs-on: ubuntu-latest
+    services:
+      httpbin:
+        image: kennethreitz/httpbin
+        ports:
+          - 8888:80
+    strategy:
+      fail-fast: false
+    steps:
+      - name: Checkout Master
+        uses: actions/checkout@v4
+      - name: Install Required Libraries
+        run: sudo apt update && sudo apt install -y libcurl4-openssl-dev libssl-dev
+      - name: Setup env
+        uses: the-guild-org/shared-config/setup@main
+        with:
+          nodeVersion: 22
+      - name: Cache Jest
+        uses: actions/cache@v4
+        with:
+          path: .cache/jest
+          key: ${{ runner.os }}-${{matrix.node-version}}-jest-${{ hashFiles('yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-${{matrix.node-version}}-jest-
+      - name: Test
+        run: yarn test:bun --ci
+
   unit-leaks:
     name: unit / leaks / node ${{matrix.node-version}}
     runs-on: ubuntu-latest

package.json

@@ -22,6 +22,7 @@
     "prettier:check": "prettier --ignore-path .gitignore --ignore-path .prettierignore --check .",
     "release": "changeset publish",
     "test": "jest --runInBand --forceExit",
+    "test:bun": "bun test --bail",
     "test:leaks": "LEAK_TEST=1 jest --runInBand --detectOpenHandles --detectLeaks --logHeapUsage --forceExit",
     "ts:check": "tsc --noEmit"
   },
@@ -37,13 +38,15 @@
     "@changesets/changelog-github": "0.5.0",
     "@changesets/cli": "2.27.9",
     "@theguild/prettier-config": "2.0.7",
+    "@types/bun": "1.1.13",
     "@types/jest": "29.5.14",
     "@types/node": "22.9.0",
     "@types/react-dom": "18.2.18",
     "@typescript-eslint/eslint-plugin": "7.18.0",
     "@typescript-eslint/parser": "7.18.0",
     "babel-jest": "29.7.0",
     "bob-the-bundler": "7.0.1",
+    "bun": "1.1.34",
     "cross-env": "7.0.3",
     "eslint": "9.15.0",
     "eslint-config-prettier": "9.1.0",

packages/fetch/dist/create-node-ponyfill.js

@@ -1,4 +1,5 @@
 const shouldSkipPonyfill = require('./shouldSkipPonyfill');
+let newNodeFetch;
 
 module.exports = function createNodePonyfill(opts = {}) {
   const ponyfills = {};
@@ -11,7 +12,10 @@ module.exports = function createNodePonyfill(opts = {}) {
     ponyfills.URLPattern = urlPatternModule.URLPattern;
   }
 
-  if (opts.skipPonyfill || shouldSkipPonyfill()) {
+  if (
+    (opts.skipPonyfill || shouldSkipPonyfill())
+    && opts.skipPonyfill !== false
+  ) {
     return {
       fetch: globalThis.fetch,
       Headers: globalThis.Headers,
@@ -37,7 +41,7 @@ module.exports = function createNodePonyfill(opts = {}) {
     };
   }
 
-  const newNodeFetch = require('@whatwg-node/node-fetch');
+  newNodeFetch ||= require('@whatwg-node/node-fetch');
 
   ponyfills.fetch = newNodeFetch.fetch;
   ponyfills.Request = newNodeFetch.Request;

packages/node-fetch/src/URL.ts

@@ -7,8 +7,9 @@ import { PonyfillURLSearchParams } from './URLSearchParams.js';
 
 FastUrl.queryString = FastQuerystring;
 
-export class PonyfillURL extends FastUrl implements URL {
-  constructor(url: string, base?: string | URL) {
+class PonyfillURL extends FastUrl {
+  constructor(url: string | URL, base?: string | URL | undefined) {
+    url = url.toString();
     super();
     if (url.startsWith('data:')) {
       this.protocol = 'data:';
@@ -24,6 +25,16 @@ export class PonyfillURL extends FastUrl implements URL {
     }
   }
 
+  canParse(url: string, base?: string): boolean {
+    try {
+      // eslint-disable-next-line no-new
+      new PonyfillURL(url, base);
+      return true;
+    } catch {
+      return false;
+    }
+  }
+
   get origin(): string {
     return `${this.protocol}//${this.host}`;
   }
@@ -63,6 +74,14 @@ export class PonyfillURL extends FastUrl implements URL {
 
   private static blobRegistry = new Map<string, Blob>();
 
+  createObjectURL(obj: Blob): string {
+    return PonyfillURL.createObjectURL(obj);
+  }
+
+  revokeObjectURL(url: string): void {
+    PonyfillURL.resolveObjectURL(url);
+  }
+
   static createObjectURL(blob: Blob): string {
     const blobUrl = `blob:whatwgnode:${randomUUID()}`;
     this.blobRegistry.set(blobUrl, blob);
@@ -81,3 +100,7 @@ export class PonyfillURL extends FastUrl implements URL {
     return (this.blobRegistry.get(url) || resolveObjectURL(url)) as Blob | PonyfillBlob | undefined;
   }
 }
+
+const URLCtor = PonyfillURL as unknown as typeof URL;
+
+export { URLCtor as PonyfillURL };

packages/node-fetch/src/index.ts

@@ -1,8 +1,11 @@
 export { fetchPonyfill as fetch } from './fetch.js';
 export { PonyfillHeaders as Headers } from './Headers.js';
 export { PonyfillBody as Body } from './Body.js';
-export { PonyfillRequest as Request, RequestPonyfillInit as RequestInit } from './Request.js';
-export { PonyfillResponse as Response, ResponsePonyfilInit as ResponseInit } from './Response.js';
+export { PonyfillRequest as Request, type RequestPonyfillInit as RequestInit } from './Request.js';
+export {
+  PonyfillResponse as Response,
+  type ResponsePonyfilInit as ResponseInit,
+} from './Response.js';
 export { PonyfillReadableStream as ReadableStream } from './ReadableStream.js';
 export { PonyfillFile as File } from './File.js';
 export { PonyfillFormData as FormData } from './FormData.js';

packages/node-fetch/tests/Body.spec.ts

@@ -78,6 +78,11 @@ describe('Body', () => {
         type: 'multipart/form-data; boundary=Boundary_with_capital_letters',
       }),
     );
-    await expect(() => body.formData()).rejects.toThrow(TypeError);
+    try {
+      await body.formData();
+      expect(true).toBe(false);
+    } catch (e) {
+      expect(e).toBeInstanceOf(TypeError);
+    }
   });
 });

packages/node-fetch/tests/FormData.spec.ts

@@ -133,9 +133,12 @@ describe('Form Data', () => {
         fileSize: 1,
       },
     });
-    await expect(() => requestWillParse.formData()).rejects.toThrowError(
-      'File size limit exceeded: 1 bytes',
-    );
+    try {
+      await requestWillParse.formData();
+      expect(true).toBe(false);
+    } catch (error: any) {
+      expect(error.message).toBe('File size limit exceeded: 1 bytes');
+    }
   });
   it('support native Blob', async () => {
     const formData = new PonyfillFormData();

packages/node-fetch/tests/ReadableStream.spec.ts

@@ -30,7 +30,7 @@ describe('ReadableStream', () => {
       }
       chunksStr += (value as Buffer).toString('utf-8');
     }
-    expect(chunksStr).toMatchInlineSnapshot(`"{"cnt":0}{"cnt":1}{"cnt":2}{"cnt":3}"`);
+    expect(chunksStr).toBe(`{"cnt":0}{"cnt":1}{"cnt":2}{"cnt":3}`);
   });
   it('should send data from start and push lazily', async () => {
     let interval: any;
@@ -73,28 +73,26 @@ describe('ReadableStream', () => {
         break;
       }
     }
-    expect(chunksStr).toMatchInlineSnapshot(`
-      "startCount: 0
-      startCount: 1
-      startCount: 2
-      pullCount: 0
-      startCount: 3
-      startCount: 4
-      startCount: 5
-      startCount: 6
-      pullCount: 1
-      startCount: 7
-      startCount: 8
-      startCount: 9
-      startCount: 10
-      pullCount: 2
-      startCount: 11
-      startCount: 12
-      startCount: 13
-      startCount: 14
-      pullCount: 3
-      "
-    `);
+    expect(chunksStr).toBe(`startCount: 0
+startCount: 1
+startCount: 2
+pullCount: 0
+startCount: 3
+startCount: 4
+startCount: 5
+startCount: 6
+pullCount: 1
+startCount: 7
+startCount: 8
+startCount: 9
+startCount: 10
+pullCount: 2
+startCount: 11
+startCount: 12
+startCount: 13
+startCount: 14
+pullCount: 3
+`);
   });
   it('should send data from start without pull lazily', async () => {
     let interval: any;
@@ -122,15 +120,13 @@ describe('ReadableStream', () => {
         break;
       }
     }
-    expect(chunks).toMatchInlineSnapshot(`
-      [
-        "startCount: 0",
-        "startCount: 1",
-        "startCount: 2",
-        "startCount: 3",
-        "startCount: 4",
-        "startCount: 5",
-      ]
-    `);
+    expect(chunks).toEqual([
+      'startCount: 0',
+      'startCount: 1',
+      'startCount: 2',
+      'startCount: 3',
+      'startCount: 4',
+      'startCount: 5',
+    ]);
   });
 });

packages/node-fetch/tests/TextEncoderDecoderStream.spec.ts

@@ -1,4 +1,4 @@
-import { runTestsForEachFetchImpl } from '../../server/test/test-fetch';
+import { runTestsForEachFetchImpl } from '../../server/tests/test-fetch';
 
 describe('TextEncoderDecoderStream', () => {
   runTestsForEachFetchImpl((_, { fetchAPI }) => {

packages/node-fetch/tests/cleanup-resources.spec.ts

@@ -1,5 +1,5 @@
-import { runTestsForEachFetchImpl } from '../../server/test/test-fetch';
-import { runTestsForEachServerImpl } from '../../server/test/test-server';
+import { runTestsForEachFetchImpl } from '../../server/tests/test-fetch';
+import { runTestsForEachServerImpl } from '../../server/tests/test-server';
 
 describe('Cleanup Resources', () => {
   runTestsForEachFetchImpl((_, { createServerAdapter, fetchAPI: { Response, fetch } }) => {