refactor: more strict types

Author: pi0

.gitignore

@@ -6,3 +6,4 @@ coverage
 dist
 types
 .conf*
+tsconfig.tsbuildinfo

src/base.ts

@@ -1,2 +1,2 @@
-export * from "./fetch";
-export * from "./error";
+export * from "./fetch.ts";
+export * from "./error.ts";

src/error.ts

@@ -1,4 +1,4 @@
-import type { FetchContext, IFetchError } from "./types";
+import type { FetchContext, IFetchError } from "./types.ts";
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class FetchError<T = any> extends Error implements IFetchError<T> {

src/fetch.ts

@@ -1,14 +1,14 @@
 import type { Readable } from "node:stream";
 import destr from "destr";
 import { withBase, withQuery } from "ufo";
-import { createFetchError } from "./error";
+import { createFetchError } from "./error.ts";
 import {
   isPayloadMethod,
   isJSONSerializable,
   detectResponseType,
   resolveFetchOptions,
   callHooks,
-} from "./utils";
+} from "./utils.ts";
 import type {
   CreateFetchOptions,
   FetchResponse,
@@ -17,7 +17,7 @@ import type {
   $Fetch,
   FetchRequest,
   FetchOptions,
-} from "./types";
+} from "./types.ts";
 
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Status
 const retryStatusCodes = new Set([

src/index.ts

@@ -1,8 +1,9 @@
-import { createFetch } from "./base";
+import { createFetch } from "./base.ts";
+import type { $Fetch } from "./types.ts";
 
-export * from "./base";
+export * from "./base.ts";
 
-export type * from "./types";
+export type * from "./types.ts";
 
 // ref: https://github.com/tc39/proposal-global
 const _globalThis = (function () {
@@ -24,12 +25,13 @@ const _globalThis = (function () {
 })();
 
 // ref: https://github.com/unjs/ofetch/issues/295
-export const fetch = _globalThis.fetch
+export const fetch: typeof globalThis.fetch = _globalThis.fetch
   ? (...args: Parameters<typeof globalThis.fetch>) => _globalThis.fetch(...args)
   : () => Promise.reject(new Error("[ofetch] global.fetch is not supported!"));
 
-export const Headers = _globalThis.Headers;
-export const AbortController = _globalThis.AbortController;
+export const Headers: typeof globalThis.Headers = _globalThis.Headers;
+export const AbortController: typeof globalThis.AbortController =
+  _globalThis.AbortController;
 
-export const ofetch = createFetch({ fetch, Headers, AbortController });
-export const $fetch = ofetch;
+export const ofetch: $Fetch = createFetch({ fetch, Headers, AbortController });
+export const $fetch: $Fetch = ofetch;

src/node.ts

@@ -1,16 +1,17 @@
 import http from "node:http";
-import https, { AgentOptions } from "node:https";
+import https, { type AgentOptions } from "node:https";
 import nodeFetch, {
   Headers as _Headers,
   AbortController as _AbortController,
 } from "node-fetch-native";
 
-import { createFetch } from "./base";
+import { createFetch } from "./base.ts";
+import type { $Fetch } from "./types.ts";
 
-export * from "./base";
-export type * from "./types";
+export * from "./base.ts";
+export type * from "./types.ts";
 
-export function createNodeFetch() {
+export function createNodeFetch(): typeof globalThis.fetch {
   const useKeepAlive = JSON.parse(process.env.FETCH_KEEP_ALIVE || "false");
   if (!useKeepAlive) {
     return nodeFetch;
@@ -31,15 +32,17 @@ export function createNodeFetch() {
     init?: RequestInit
   ) {
     return (nodeFetch as any)(input, { ...nodeFetchOptions, ...init });
-  };
+  } as any;
 }
 
-export const fetch = globalThis.fetch
+export const fetch: typeof globalThis.fetch = globalThis.fetch
   ? (...args: Parameters<typeof globalThis.fetch>) => globalThis.fetch(...args)
   : (createNodeFetch() as typeof globalThis.fetch);
 
-export const Headers = globalThis.Headers || _Headers;
-export const AbortController = globalThis.AbortController || _AbortController;
+export const Headers: typeof globalThis.Headers =
+  globalThis.Headers || _Headers;
+export const AbortController: typeof globalThis.AbortController =
+  globalThis.AbortController || _AbortController;
 
-export const ofetch = createFetch({ fetch, Headers, AbortController });
-export const $fetch = ofetch;
+export const ofetch: $Fetch = createFetch({ fetch, Headers, AbortController });
+export const $fetch: $Fetch = ofetch;

src/utils.ts

@@ -5,16 +5,16 @@ import type {
   FetchRequest,
   ResolvedFetchOptions,
   ResponseType,
-} from "./types";
+} from "./types.ts";
 
 const payloadMethods = new Set(
   Object.freeze(["PATCH", "POST", "PUT", "DELETE"])
 );
-export function isPayloadMethod(method = "GET") {
+export function isPayloadMethod(method = "GET"): boolean {
   return payloadMethods.has(method.toUpperCase());
 }
 
-export function isJSONSerializable(value: any) {
+export function isJSONSerializable(value: any): boolean {
   if (value === undefined) {
     return false;
   }

test/index.test.ts

@@ -11,7 +11,7 @@ import { Readable } from "node:stream";
 import { H3, HTTPError, readBody, serve } from "h3";
 import { Headers, FormData, Blob } from "node-fetch-native";
 import { nodeMajorVersion } from "std-env";
-import { $fetch } from "../src/node";
+import { $fetch } from "../src/node.ts";
 
 describe("ofetch", () => {
   let listener: ReturnType<typeof serve>;
@@ -237,7 +237,7 @@ describe("ofetch", () => {
   });
 
   it("404", async () => {
-    const error = await $fetch(getURL("404")).catch((error_) => error_);
+    const error = await $fetch(getURL("404")).catch((error_: any) => error_);
     expect(error.toString()).toBe(
       `FetchError: [GET] "${getURL("404")}": 404 Not Found`
     );
@@ -267,7 +267,7 @@ describe("ofetch", () => {
 
   it("baseURL with retry", async () => {
     const error = await $fetch("", { baseURL: getURL("404"), retry: 3 }).catch(
-      (error_) => error_
+      (error_: any) => error_
     );
     expect(error.request).to.equal(getURL("404"));
   });
@@ -316,7 +316,7 @@ describe("ofetch", () => {
 
   it("passing request obj should return request obj in error", async () => {
     const error = await $fetch(getURL("/403"), { method: "post" }).catch(
-      (error) => error
+      (error: any) => error
     );
     expect(error.toString()).toBe(
       `FetchError: [POST] "${getURL("403")}": 403 Forbidden`
@@ -340,7 +340,7 @@ describe("ofetch", () => {
     await $fetch(getURL("timeout"), {
       timeout: 100,
       retry: 0,
-    }).catch((error) => {
+    }).catch((error: any) => {
       expect(error.cause.message).to.include(
         "The operation was aborted due to timeout"
       );
@@ -468,7 +468,7 @@ describe("ofetch", () => {
       onRequestError,
       onResponse,
       onResponseError,
-    }).catch((error) => error);
+    }).catch((error: any) => error);
 
     expect(onRequest).toHaveBeenCalledOnce();
     expect(onRequestError).not.toHaveBeenCalled();

tsconfig.json

@@ -1,13 +1,21 @@
 {
   "compilerOptions": {
     "target": "ESNext",
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "esModuleInterop": true,
-    "outDir": "dist",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
+    "resolveJsonModule": true,
+    "esModuleInterop": false,
+    "allowSyntheticDefaultImports": true,
+    "skipLibCheck": true,
     "strict": true,
-    "declaration": true,
-    "types": ["node"]
+    "verbatimModuleSyntax": true,
+    "isolatedModules": true,
+    "composite": true,
+    "allowImportingTsExtensions": true,
+    "isolatedDeclarations": true,
+    "forceConsistentCasingInFileNames": true,
+    "noImplicitOverride": true,
+    "noEmit": true
   },
-  "include": ["src"]
+  "include": ["src", "test"]
 }