feat!: export native fetch on the web (#53)

Author: Gozala

packages/fetch/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@web-std/fetch",
-  "version": "3.0.3",
-  "description": "Web compatible Fetch API implementation for node.js",
-  "main": "./dist/index.cjs",
-  "module": "./src/index.js",
-  "types": "./dist/src/index.d.ts",
+  "version": "4.0.0",
+  "description": "Web API compatible fetch implementation",
+  "main": "./dist/lib.node.cjs",
+  "module": "./src/lib.node.js",
+  "types": "./dist/src/lib.node.d.ts",
   "sideEffects": false,
   "type": "module",
   "exports": {
     ".": {
-      "import": "./src/index.js",
-      "require": "./dist/index.cjs",
-      "types": "./dist/src/index.d.ts"
+      "browser": "./src/lib.js",
+      "require": "./dist/lib.node.cjs",
+      "import": "./src/lib.node.js",
+      "types": "./dist/src/lib.node.d.ts"
     },
     "./package.json": "./package.json",
     "./body": {
@@ -72,6 +73,10 @@
   },
   "homepage": "https://github.com/web-std/io",
   "devDependencies": {
+    "@types/chai": "^4.3.0",
+    "@types/mocha": "^9.1.0",
+    "@types/chai-as-promised": "^7.1.5",
+    "@types/chai-string": "^1.4.2",
     "abort-controller": "^3.0.0",
     "abortcontroller-polyfill": "^1.7.1",
     "busboy": "^0.3.1",

packages/fetch/rollup.config.js

@@ -2,17 +2,17 @@ import {builtinModules} from 'module';
 import {dependencies} from './package.json';
 
 export default {
-	input: 'src/index.js',
+	input: 'src/lib.node.js',
 	output: {
-		file: 'dist/index.cjs',
+		file: 'dist/lib.node.cjs',
 		format: 'cjs',
 		esModule: false,
 		interop: false,
 		sourcemap: true,
 		preferConst: true,
 		exports: 'named',
 		// https://github.com/rollup/rollup/issues/1961#issuecomment-534977678
-		intro: 'exports = module.exports = fetch;'
+		outro: 'exports = module.exports = Object.assign(fetch, exports);'
 	},
 	external: [...builtinModules, ...Object.keys(dependencies)]
 };

packages/fetch/src/index.js renamed to packages/fetch/src/fetch.js

@@ -23,7 +23,7 @@ import * as Stream from 'stream';
 import { ReadableStream, Blob, FormData  } from './package.js';
 
 
-export {Headers, Request, Response, FetchError, AbortError, isRedirect, ReadableStream, Blob, FormData};
+export {Headers, Request, Response, ReadableStream, Blob, FormData};
 
 const supportedSchemas = new Set(['data:', 'http:', 'https:']);
 
@@ -34,7 +34,7 @@ const supportedSchemas = new Set(['data:', 'http:', 'https:']);
  * @param   {RequestInit} [options_] - Fetch options
  * @return  {Promise<import('./response').default>}
  */
-export default async function fetch(url, options_ = {}) {
+async function fetch(url, options_ = {}) {
 	return new Promise((resolve, reject) => {
 		// Build request object
 		const request = new Request(url, options_);
@@ -339,3 +339,6 @@ function fixResponseChunkedTransferBadEnding(request, errorCallback) {
 		}
 	});
 }
+
+export default fetch
+export { fetch }

packages/fetch/src/lib.js

@@ -0,0 +1,7 @@
+
+
+// On the web we just export native fetch implementation
+export { ReadableStream, Blob, FormData  } from './package.js';
+export const { Headers, Request, Response } = globalThis;
+export default globalThis.fetch
+

packages/fetch/src/lib.node.js

@@ -0,0 +1,15 @@
+import * as WebFetch from "./fetch.js"
+
+export { ReadableStream, Blob, FormData  } from './package.js';
+// Electron-renderer should get the browser implementation instead of node
+// Browser configuration is not enough
+
+// Marking export as a DOM File object instead of custom class.
+export const fetch = /** @type {typeof globalThis.fetch} */
+  (typeof globalThis.fetch === "function" ? globalThis.fetch : WebFetch.fetch)
+
+export const Headers = globalThis.Headers || WebFetch.Headers
+export const Request = globalThis.Request || WebFetch.Request
+export const Response = global.Response || WebFetch.Response
+
+export default fetch

packages/fetch/test/commonjs/test-artifact.js

@@ -1,19 +1,15 @@
 // @ts-nocheck
 
 const assert = require('assert');
-const fetch = require('../../');
+const fetch = require('@web-std/fetch');
 assert.strictEqual(
 	typeof fetch,
 	'function',
 	'default import must be a function'
 );
 
-const {Request, Response, Headers, FetchError, AbortError} = require('../../');
-assert.ok(new FetchError() instanceof Error, 'FetchError must be an Error');
-assert.ok(
-	new AbortError() instanceof Error,
-	'AbortError must be an extension of Error'
-);
+const {Request, Response, Headers} = require('@web-std/fetch');
+
 assert.ok(
 	new Request('https://www.test.com').headers instanceof Headers,
 	'Request class is not exposing correct functionality'

packages/fetch/test/external-encoding.js

@@ -1,4 +1,4 @@
-import fetch from '../src/index.js';
+import fetch from '@web-std/fetch';
 import chai from 'chai';
 
 const {expect} = chai;

packages/fetch/test/headers.js

@@ -1,5 +1,5 @@
 import util from 'util';
-import {Headers} from '../src/index.js';
+import {Headers} from '@web-std/fetch';
 import chai from 'chai';
 import chaiIterator from 'chai-iterator';
 

packages/fetch/test/main.js

@@ -24,12 +24,11 @@ const AbortControllerPolyfill = abortControllerPolyfill.AbortController;
 import {Blob} from '@web-std/blob';
 
 import fetch, {
-	FetchError,
 	Headers,
 	Request,
 	Response
-} from '../src/index.js';
-import {FetchError as FetchErrorOrig} from '../src/errors/fetch-error.js';
+} from '@web-std/fetch';
+import {FetchError} from '../src/errors/fetch-error.js';
 import HeadersOrig, {fromRawHeaders} from '../src/headers.js';
 import RequestOrig from '../src/request.js';
 import ResponseOrig from '../src/response.js';
@@ -90,7 +89,6 @@ describe('node-fetch', () => {
 	});
 
 	it('should expose Headers, Response and Request constructors', () => {
-		expect(FetchError).to.equal(FetchErrorOrig);
 		expect(Headers).to.equal(HeadersOrig);
 		expect(Response).to.equal(ResponseOrig);
 		expect(Request).to.equal(RequestOrig);

packages/fetch/test/request.js

@@ -8,7 +8,7 @@ import {Blob} from '@web-std/fetch';
 import { ReadableStream } from '@web-std/fetch';
 
 import TestServer from './utils/server.js';
-import {Request} from '../src/index.js';
+import {Request} from '@web-std/fetch';
 
 const {expect} = chai;