fix(sirv): separate ESM vs CJS type definitions

lukeed · Oct 11, 2024 · 982fcc8 · 982fcc8
1 parent 912af6f
commit 982fcc8
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 9 deletions.
diff --git a/packages/sirv/index.d.mts b/packages/sirv/index.d.mts
@@ -0,0 +1,29 @@
+import type { Stats } from "node:fs";
+import type { IncomingMessage, ServerResponse } from "node:http";
+
+type Arrayable<T> = T | T[];
+
+export type NextHandler = () => void | Promise<void>;
+
+export type RequestHandler = (
+	req: IncomingMessage,
+	res: ServerResponse,
+	next?: NextHandler,
+) => void;
+
+export interface Options {
+	dev?: boolean;
+	etag?: boolean;
+	maxAge?: number;
+	immutable?: boolean;
+	single?: string | boolean;
+	ignores?: false | Arrayable<string | RegExp>;
+	extensions?: string[];
+	dotfiles?: boolean;
+	brotli?: boolean;
+	gzip?: boolean;
+	onNoMatch?: (req: IncomingMessage, res: ServerResponse) => void;
+	setHeaders?: (res: ServerResponse, pathname: string, stats: Stats) => void;
+}
+
+export default function (dir?: string, opts?: Options): RequestHandler;
diff --git a/packages/sirv/sirv.d.ts → packages/sirv/index.d.ts b/packages/sirv/sirv.d.ts → packages/sirv/index.d.ts
@@ -1,10 +1,16 @@
-declare module 'sirv' {
-	import type { Stats } from 'fs';
-	import type { IncomingMessage, ServerResponse } from 'http';
+import type { Stats } from "node:fs";
+import type { IncomingMessage, ServerResponse } from "node:http";
 
+declare namespace sirv {
 	type Arrayable<T> = T | T[];
+
 	export type NextHandler = () => void | Promise<void>;
-	export type RequestHandler = (req: IncomingMessage, res: ServerResponse, next?: NextHandler) => void;
+
+	export type RequestHandler = (
+		req: IncomingMessage,
+		res: ServerResponse,
+		next?: NextHandler,
+	) => void;
 
 	export interface Options {
 		dev?: boolean;
@@ -20,6 +26,8 @@ declare module 'sirv' {
 		onNoMatch?: (req: IncomingMessage, res: ServerResponse) => void;
 		setHeaders?: (res: ServerResponse, pathname: string, stats: Stats) => void;
 	}
-
-	export default function(dir?: string, opts?: Options): RequestHandler;
 }
+
+declare function sirv(dir?: string, opts?: sirv.Options): sirv.RequestHandler;
+
+export = sirv;
diff --git a/packages/sirv/package.json b/packages/sirv/package.json
@@ -9,16 +9,16 @@
   "license": "MIT",
   "files": [
     "build.*",
-    "sirv.d.ts"
+    "index.d.*"
   ],
   "exports": {
     ".": {
       "import": {
-        "types": "./sirv.d.ts",
+        "types": "./index.d.mts",
         "default": "./build.mjs"
       },
       "require": {
-        "types": "./sirv.d.ts",
+        "types": "./index.d.ts",
         "default": "./build.js"
       }
     },