refactor: use isolated declaration for runtime

Author: pi0

build.config.ts

@@ -40,6 +40,7 @@ export default defineBuildConfig({
       input: "src/presets/",
       outDir: "dist/presets",
       filter: (id) => id.includes("runtime/"),
+      dts: false,
     },
   ],
   hooks: {

package.json

@@ -136,7 +136,7 @@
     "miniflare": "^4.20260217.0",
     "mlly": "^1.8.0",
     "nypm": "^0.6.5",
-    "obuild": "^0.4.28",
+    "obuild": "^0.4.31",
     "oxfmt": "^0.33.0",
     "oxlint": "^1.48.0",
     "pathe": "^2.0.3",
@@ -200,8 +200,8 @@
   },
   "resolutions": {
     "nitro": "link:.",
-    "vite": "8.0.0-beta.14",
-    "rolldown": "^1.0.0-rc.5"
+    "rolldown": "^1.0.0-rc.5",
+    "vite": "8.0.0-beta.14"
   },
   "engines": {
     "node": "^20.19.0 || >=22.12.0"

pnpm-lock.yaml

@@ -3,9 +3,9 @@ import type { ServerRequest } from "srvx";
 
 import { AsyncLocalStorage } from "node:async_hooks";
 import { HTTPError } from "h3";
-import { getContext } from "unctx";
+import { getContext, type UseContext } from "unctx";
 
-export const nitroAsyncContext = /* @__PURE__ */ (() =>
+export const nitroAsyncContext: UseContext<NitroAsyncContext> = /* @__PURE__ */ (() =>
   getContext<NitroAsyncContext>("nitro-app", {
     asyncContext: import.meta._asyncContext,
     AsyncLocalStorage: import.meta._asyncContext ? AsyncLocalStorage : undefined,

src/runtime/internal/context.ts

@@ -9,14 +9,19 @@ import { SourceMapConsumer } from "source-map";
 import { defineNitroErrorHandler } from "./utils.ts";
 import type { InternalHandlerResponse } from "./utils.ts";
 import { FastResponse } from "srvx";
+import type { NitroErrorHandler } from "nitro/types";
+
+const errorHandler: NitroErrorHandler = defineNitroErrorHandler(
+  async function defaultNitroErrorHandler(error, event) {
+    const res = await defaultHandler(error, event);
+    return new FastResponse(
+      typeof res.body === "string" ? res.body : JSON.stringify(res.body, null, 2),
+      res
+    );
+  }
+);
 
-export default defineNitroErrorHandler(async function defaultNitroErrorHandler(error, event) {
-  const res = await defaultHandler(error, event);
-  return new FastResponse(
-    typeof res.body === "string" ? res.body : JSON.stringify(res.body, null, 2),
-    res
-  );
-});
+export default errorHandler;
 
 export async function defaultHandler(
   error: HTTPError,
@@ -106,7 +111,7 @@ export async function defaultHandler(
 
 // ---- Source Map support ----
 
-export async function loadStackTrace(error: any) {
+export async function loadStackTrace(error: any): Promise<void> {
   if (!(error instanceof Error)) {
     return;
   }

src/runtime/internal/error/dev.ts

@@ -1,11 +1,11 @@
 import { useNitroApp } from "../app.ts";
 
-function _captureError(error: Error, type: string) {
+function _captureError(error: Error, type: string): void {
   console.error(`[${type}]`, error);
   useNitroApp().captureError?.(error, { tags: [type] });
 }
 
-export function trapUnhandledErrors() {
+export function trapUnhandledErrors(): void {
   process.on("unhandledRejection", (error: Error) => _captureError(error, "unhandledRejection"));
   process.on("uncaughtException", (error: Error) => _captureError(error, "uncaughtException"));
 }

src/runtime/internal/error/hooks.ts

@@ -1,5 +1,5 @@
 import type { NitroRouteMeta } from "nitro/types";
 
-export function defineRouteMeta(meta: NitroRouteMeta) {
+export function defineRouteMeta(meta: NitroRouteMeta): NitroRouteMeta {
   return meta;
 }

src/runtime/internal/meta.ts

@@ -1,7 +1,7 @@
 import type { NitroAppPlugin } from "nitro/types";
 
-export function defineNitroPlugin(def: NitroAppPlugin) {
+export function defineNitroPlugin(def: NitroAppPlugin): NitroAppPlugin {
   return def;
 }
 
-export const nitroPlugin = defineNitroPlugin;
+export const nitroPlugin: (def: NitroAppPlugin) => NitroAppPlugin = defineNitroPlugin;

src/runtime/internal/plugin.ts

@@ -9,15 +9,15 @@ import { defineCachedHandler } from "./cache.ts";
 type RouteRuleCtor<T extends keyof NitroRouteRules> = (m: MatchedRouteRule<T>) => Middleware;
 
 // Headers route rule
-export const headers = ((m) =>
+export const headers: RouteRuleCtor<"headers"> = ((m) =>
   function headersRouteRule(event) {
     for (const [key, value] of Object.entries(m.options || {})) {
       event.res.headers.set(key, value);
     }
   }) satisfies RouteRuleCtor<"headers">;
 
 // Redirect route rule
-export const redirect = ((m) =>
+export const redirect: RouteRuleCtor<"redirect"> = ((m) =>
   function redirectRouteRule(event) {
     let target = m.options?.to;
     if (!target) {
@@ -37,7 +37,7 @@ export const redirect = ((m) =>
   }) satisfies RouteRuleCtor<"redirect">;
 
 // Proxy route rule
-export const proxy = ((m) =>
+export const proxy: RouteRuleCtor<"proxy"> = ((m) =>
   function proxyRouteRule(event) {
     let target = m.options?.to;
     if (!target) {
@@ -59,7 +59,7 @@ export const proxy = ((m) =>
   }) satisfies RouteRuleCtor<"proxy">;
 
 // Cache route rule
-export const cache = ((m) =>
+export const cache: RouteRuleCtor<"cache"> = ((m) =>
   function cacheRouteRule(event, next) {
     if (!event.context.matchedRoute) {
       return next();

src/runtime/internal/route-rules.ts

@@ -3,7 +3,7 @@ import { runTask } from "../task.ts";
 
 import { scheduledTasks, tasks } from "#nitro/virtual/tasks";
 
-export default new H3()
+const app: H3 = new H3()
   .get("/_nitro/tasks", async () => {
     const _tasks = await Promise.all(
       Object.entries(tasks).map(async ([name, task]) => {
@@ -28,3 +28,5 @@ export default new H3()
       payload,
     });
   });
+
+export default app;