@taserjs/router 0.0.1 → 0.0.3

package/dist/esm/types/units.d.ts

@@ -5,7 +5,7 @@ import { MergeMiddlewareField, MergePart, RequestShape, RuntimeContextFields, Si
 import { ReturnsMap } from './returns.js';
 import { Schema } from './schema.js';
 export type { HttpMethod, Method } from './type-utils.js';
-export type { EmptyReturns, MergeReturns, ReturnsMap, HandlerReply, HasReturns, StatusCode, ValidHandlerReply, EnforceHandlerReply } from './returns.js';
+export type { EmptyReturns, MergeReturns, ReturnsMap, HandlerReply, HasReturns, StatusCode, ValidHandlerReply, EnforceHandlerReply, } from './returns.js';
 /** Default empty app context for standalone units without a bound router instance. */
 export type AppContext = Record<never, never>;
 export type NativeContext = RouterRegister extends {
@@ -19,27 +19,32 @@ export type ValidatorParts = {
     paramsIn?: unknown;
     bodyIn?: unknown;
 };
-export type MiddlewareNext = {
-    (args?: {
-        state?: unknown;
-        ctx?: unknown;
-    }): Promise<ReplyResult>;
+export declare const StateBrand: unique symbol;
+export type NextResult<TState = unknown> = ReplyResult & {
+    readonly [StateBrand]?: TState;
 };
+export type ExtractState<T> = [Extract<Awaited<T>, {
+    [StateBrand]?: unknown;
+}>] extends [never] ? {} : Extract<Awaited<T>, {
+    [StateBrand]?: unknown;
+}> extends {
+    [StateBrand]?: infer S;
+} ? [S] extends [never] ? {} : S : {};
+export type IsUnknown<T> = [unknown] extends [T] ? true : false;
+export type NextFn<TExpectedState = unknown> = IsUnknown<TExpectedState> extends true ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>> : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;
+export type MiddlewareNext = NextFn;
 export type MiddlewareDefinition = {
-    state?: unknown;
-    ctx?: unknown;
     query?: unknown;
     params?: unknown;
     body?: unknown;
     returns?: ReturnsMap;
     handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<ReplyResult | Response | unknown>;
 };
-export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx = unknown, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
+export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TQueryIn = TQuery, TParamsIn = TParams, TBodyIn = TBody> = {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
     body: Simplify<UnwrapPart<TBody>>;
     state: Simplify<UnwrapPart<TState>>;
-    ctx: Simplify<UnwrapPart<TCtx>>;
     /** Pre-parse shapes merged into route `$Infer.Input`. */
     input: {
         query: RequestShape<TQueryIn, TQuery>;
@@ -47,7 +52,7 @@ export type MiddlewareReturnFromParts<TQuery, TParams, TBody, TState, TCtx = unk
         body: RequestShape<TBodyIn, TBody>;
     };
 };
-type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, 'var'>;
+type UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, "var">;
 export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBody = unknown, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<UnwrapPart<TQuery>>;
     params: Simplify<UnwrapPart<TParams>>;
@@ -56,17 +61,17 @@ export type StandaloneMiddlewareContext<TQuery = unknown, TParams = unknown, TBo
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
-export type HandlerContext<Acc extends readonly unknown[], Validators extends ValidatorParts, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & MergeMiddlewareField<Acc, 'ctx'> & {
+export type HandlerContext<Acc extends readonly unknown[], Validators extends ValidatorParts, TAppContext extends Record<string, unknown> = AppContext> = Simplify<TAppContext & UnitRuntimeContext & {
     query: Simplify<MergePart<Validators extends {
         query?: infer Q;
-    } ? Q : unknown, MergeMiddlewareField<Acc, 'query'>>>;
+    } ? Q : unknown, MergeMiddlewareField<Acc, "query">>>;
     params: Simplify<MergePart<Validators extends {
         params?: infer P;
-    } ? P : unknown, MergeMiddlewareField<Acc, 'params'>>>;
+    } ? P : unknown, MergeMiddlewareField<Acc, "params">>>;
     body: Simplify<MergePart<Validators extends {
         body?: infer B;
-    } ? B : unknown, MergeMiddlewareField<Acc, 'body'>>>;
-    state: Simplify<MergeMiddlewareField<Acc, 'state'>>;
+    } ? B : unknown, MergeMiddlewareField<Acc, "body">>>;
+    state: Simplify<MergeMiddlewareField<Acc, "state">>;
     headers: TaserHeaders;
     cookies: TaserCookieJar;
 }>;
@@ -86,13 +91,11 @@ export type HandlerUnit<_Acc extends readonly unknown[], _Validators extends Val
     params?: Schema<unknown>;
     body?: Schema<unknown>;
 };
-export type InlineMiddlewareOptions = {
-    state?: Schema<unknown>;
-    ctx?: Schema<unknown>;
-    query?: Schema<unknown>;
-    params?: Schema<unknown>;
-    body?: Schema<unknown>;
-    returns?: ReturnsMap;
-    handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<unknown>;
+export type InlineMiddlewareOptions<Ctx = unknown, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown> = {
+    query?: Schema<TQuery, TQueryIn>;
+    params?: Schema<TParams, TParamsIn>;
+    body?: Schema<TBody, TBodyIn>;
+    returns?: TReturns;
+    handler: (ctx: Ctx, next: NextFn) => Awaitable<R>;
 };
 export declare function isHandlerUnit(value: unknown): value is HandlerUnit<readonly unknown[], ValidatorParts>;

package/dist/esm/types/units.js.map

@@ -1 +1 @@
-{"version":3,"file":"units.js","names":[],"sources":["../../../src/types/units.ts"],"sourcesContent":["import type { Awaitable, TaserCookieJar, TaserHeaders } from '@taserjs/router-core'\nimport type { ReplyResult } from '@taserjs/router-utils'\n\nimport type { RouterRegister } from '../register.js'\nimport type {\n  MergeMiddlewareField,\n  MergePart,\n  RequestShape,\n  RuntimeContextFields,\n  Simplify,\n  UnwrapPart,\n} from './type-utils.js'\nimport type { ReturnsMap } from './returns.js'\nimport type { Schema } from './schema.js'\n\nexport type { HttpMethod, Method } from './type-utils.js'\nexport type { EmptyReturns, MergeReturns, ReturnsMap, HandlerReply, HasReturns, StatusCode, ValidHandlerReply, EnforceHandlerReply } from './returns.js'\n\n/** Default empty app context for standalone units without a bound router instance. */\nexport type AppContext = Record<never, never>\n\nexport type NativeContext = RouterRegister extends { NativeContext: infer N } ? N : unknown\n\nexport type ValidatorParts = {\n  query?: unknown\n  params?: unknown\n  body?: unknown\n  queryIn?: unknown\n  paramsIn?: unknown\n  bodyIn?: unknown\n}\n\nexport type MiddlewareNext = {\n  (args?: { state?: unknown, ctx?: unknown }): Promise<ReplyResult>\n}\n\nexport type MiddlewareDefinition = {\n  state?: unknown\n  ctx?: unknown\n  query?: unknown\n  params?: unknown\n  body?: unknown\n  returns?: ReturnsMap\n  handler: (\n    ctx: unknown,\n    next: MiddlewareNext,\n  ) => Awaitable<ReplyResult | Response | unknown>\n}\n\nexport type MiddlewareReturnFromParts<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  TCtx = unknown,\n  TQueryIn = TQuery,\n  TParamsIn = TParams,\n  TBodyIn = TBody,\n> = {\n  query: Simplify<UnwrapPart<TQuery>>\n  params: Simplify<UnwrapPart<TParams>>\n  body: Simplify<UnwrapPart<TBody>>\n  state: Simplify<UnwrapPart<TState>>\n  ctx: Simplify<UnwrapPart<TCtx>>\n  /** Pre-parse shapes merged into route `$Infer.Input`. */\n  input: {\n    query: RequestShape<TQueryIn, TQuery>\n    params: RequestShape<TParamsIn, TParams>\n    body: RequestShape<TBodyIn, TBody>\n  }\n}\n\ntype UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, 'var'>\n\nexport type StandaloneMiddlewareContext<\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext & UnitRuntimeContext & {\n    query: Simplify<UnwrapPart<TQuery>>\n    params: Simplify<UnwrapPart<TParams>>\n    body: Simplify<UnwrapPart<TBody>>\n    state: {}\n    headers: TaserHeaders\n    cookies: TaserCookieJar\n  }\n>\n\nexport type HandlerContext<\n  Acc extends readonly unknown[],\n  Validators extends ValidatorParts,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext\n  & UnitRuntimeContext\n  & MergeMiddlewareField<Acc, 'ctx'>\n  & {\n    query: Simplify<MergePart<\n      Validators extends { query?: infer Q } ? Q : unknown,\n      MergeMiddlewareField<Acc, 'query'>\n    >>\n    params: Simplify<MergePart<\n      Validators extends { params?: infer P } ? P : unknown,\n      MergeMiddlewareField<Acc, 'params'>\n    >>\n    body: Simplify<MergePart<\n      Validators extends { body?: infer B } ? B : unknown,\n      MergeMiddlewareField<Acc, 'body'>\n    >>\n    state: Simplify<MergeMiddlewareField<Acc, 'state'>>\n    headers: TaserHeaders\n    cookies: TaserCookieJar\n  }\n>\n\nexport type MiddlewareUnit<\n  TAcc = unknown,\n  TReturns extends ReturnsMap = {},\n> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc\n  readonly __returns?: TReturns\n}\n\nexport type HandlerUnit<\n  _Acc extends readonly unknown[],\n  _Validators extends ValidatorParts,\n  TReturns extends ReturnsMap = {},\n  TOutput = Response,\n> = {\n  readonly __returns?: TReturns\n  readonly $Infer: {\n    Output: TOutput\n  }\n  middlewares: readonly MiddlewareDefinition[]\n  handler: (ctx: unknown) => Awaitable<ReplyResult | Response>\n  returns?: ReturnsMap\n  query?: Schema<unknown>\n  params?: Schema<unknown>\n  body?: Schema<unknown>\n}\n\nexport type InlineMiddlewareOptions = {\n  state?: Schema<unknown>\n  ctx?: Schema<unknown>\n  query?: Schema<unknown>\n  params?: Schema<unknown>\n  body?: Schema<unknown>\n  returns?: ReturnsMap\n  handler: (\n    ctx: unknown,\n    next: MiddlewareNext,\n  ) => Awaitable<unknown>\n}\n\nexport function isHandlerUnit(\n  value: unknown,\n): value is HandlerUnit<readonly unknown[], ValidatorParts> {\n  return (\n    typeof value === 'object'\n    && value !== null\n    && 'handler' in value\n    && 'middlewares' in value\n    && Array.isArray((value as HandlerUnit<readonly unknown[], ValidatorParts>).middlewares)\n  )\n}\n"],"mappings":";AA4JA,SAAgB,cACd,OAC0D;CAC1D,OACE,OAAO,UAAU,YACd,UAAU,QACV,aAAa,SACb,iBAAiB,SACjB,MAAM,QAAS,MAA0D,WAAW;AAE3F"}
+{"version":3,"file":"units.js","names":[],"sources":["../../../src/types/units.ts"],"sourcesContent":["import type { Awaitable, TaserCookieJar, TaserHeaders } from \"@taserjs/router-core\";\nimport type { ReplyResult } from \"@taserjs/router-utils\";\n\nimport type { RouterRegister } from \"../register.js\";\nimport type {\n  MergeMiddlewareField,\n  MergePart,\n  RequestShape,\n  RuntimeContextFields,\n  Simplify,\n  UnwrapPart,\n} from \"./type-utils.js\";\nimport type { ReturnsMap } from \"./returns.js\";\nimport type { Schema } from \"./schema.js\";\n\nexport type { HttpMethod, Method } from \"./type-utils.js\";\nexport type {\n  EmptyReturns,\n  MergeReturns,\n  ReturnsMap,\n  HandlerReply,\n  HasReturns,\n  StatusCode,\n  ValidHandlerReply,\n  EnforceHandlerReply,\n} from \"./returns.js\";\n\n/** Default empty app context for standalone units without a bound router instance. */\nexport type AppContext = Record<never, never>;\n\nexport type NativeContext = RouterRegister extends { NativeContext: infer N } ? N : unknown;\n\nexport type ValidatorParts = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  queryIn?: unknown;\n  paramsIn?: unknown;\n  bodyIn?: unknown;\n};\n\nexport declare const StateBrand: unique symbol;\n\nexport type NextResult<TState = unknown> = ReplyResult & {\n  readonly [StateBrand]?: TState;\n};\n\nexport type ExtractState<T> = [Extract<Awaited<T>, { [StateBrand]?: unknown }>] extends [never]\n  ? {}\n  : Extract<Awaited<T>, { [StateBrand]?: unknown }> extends { [StateBrand]?: infer S }\n    ? [S] extends [never]\n      ? {}\n      : S\n    : {};\n\nexport type IsUnknown<T> = [unknown] extends [T] ? true : false;\n\nexport type NextFn<TExpectedState = unknown> =\n  IsUnknown<TExpectedState> extends true\n    ? <S extends Record<string, unknown> = {}>(state?: S) => Promise<NextResult<S>>\n    : (state: TExpectedState) => Promise<NextResult<TExpectedState>>;\n\nexport type MiddlewareNext = NextFn;\n\nexport type MiddlewareDefinition = {\n  query?: unknown;\n  params?: unknown;\n  body?: unknown;\n  returns?: ReturnsMap;\n  handler: (ctx: unknown, next: MiddlewareNext) => Awaitable<ReplyResult | Response | unknown>;\n};\n\nexport type MiddlewareReturnFromParts<\n  TQuery,\n  TParams,\n  TBody,\n  TState,\n  TQueryIn = TQuery,\n  TParamsIn = TParams,\n  TBodyIn = TBody,\n> = {\n  query: Simplify<UnwrapPart<TQuery>>;\n  params: Simplify<UnwrapPart<TParams>>;\n  body: Simplify<UnwrapPart<TBody>>;\n  state: Simplify<UnwrapPart<TState>>;\n  /** Pre-parse shapes merged into route `$Infer.Input`. */\n  input: {\n    query: RequestShape<TQueryIn, TQuery>;\n    params: RequestShape<TParamsIn, TParams>;\n    body: RequestShape<TBodyIn, TBody>;\n  };\n};\n\ntype UnitRuntimeContext = Omit<RuntimeContextFields<NativeContext>, \"var\">;\n\nexport type StandaloneMiddlewareContext<\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<UnwrapPart<TQuery>>;\n      params: Simplify<UnwrapPart<TParams>>;\n      body: Simplify<UnwrapPart<TBody>>;\n      state: {};\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type HandlerContext<\n  Acc extends readonly unknown[],\n  Validators extends ValidatorParts,\n  TAppContext extends Record<string, unknown> = AppContext,\n> = Simplify<\n  TAppContext &\n    UnitRuntimeContext & {\n      query: Simplify<\n        MergePart<\n          Validators extends { query?: infer Q } ? Q : unknown,\n          MergeMiddlewareField<Acc, \"query\">\n        >\n      >;\n      params: Simplify<\n        MergePart<\n          Validators extends { params?: infer P } ? P : unknown,\n          MergeMiddlewareField<Acc, \"params\">\n        >\n      >;\n      body: Simplify<\n        MergePart<\n          Validators extends { body?: infer B } ? B : unknown,\n          MergeMiddlewareField<Acc, \"body\">\n        >\n      >;\n      state: Simplify<MergeMiddlewareField<Acc, \"state\">>;\n      headers: TaserHeaders;\n      cookies: TaserCookieJar;\n    }\n>;\n\nexport type MiddlewareUnit<\n  TAcc = unknown,\n  TReturns extends ReturnsMap = {},\n> = MiddlewareDefinition & {\n  readonly __middlewareAcc: TAcc;\n  readonly __returns?: TReturns;\n};\n\nexport type HandlerUnit<\n  _Acc extends readonly unknown[],\n  _Validators extends ValidatorParts,\n  TReturns extends ReturnsMap = {},\n  TOutput = Response,\n> = {\n  readonly __returns?: TReturns;\n  readonly $Infer: {\n    Output: TOutput;\n  };\n  middlewares: readonly MiddlewareDefinition[];\n  handler: (ctx: unknown) => Awaitable<ReplyResult | Response>;\n  returns?: ReturnsMap;\n  query?: Schema<unknown>;\n  params?: Schema<unknown>;\n  body?: Schema<unknown>;\n};\n\nexport type InlineMiddlewareOptions<\n  Ctx = unknown,\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (ctx: Ctx, next: NextFn) => Awaitable<R>;\n};\n\nexport function isHandlerUnit(\n  value: unknown,\n): value is HandlerUnit<readonly unknown[], ValidatorParts> {\n  return (\n    typeof value === \"object\" &&\n    value !== null &&\n    \"handler\" in value &&\n    \"middlewares\" in value &&\n    Array.isArray((value as HandlerUnit<readonly unknown[], ValidatorParts>).middlewares)\n  );\n}\n"],"mappings":";AA2LA,SAAgB,cACd,OAC0D;CAC1D,OACE,OAAO,UAAU,YACjB,UAAU,QACV,aAAa,SACb,iBAAiB,SACjB,MAAM,QAAS,MAA0D,WAAW;AAExF"}

package/package.json

@@ -1,7 +1,17 @@
 {
   "name": "@taserjs/router",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "Type-safe Node.js router with runtime validation and middleware",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/taserjs/taserjs.git",
+    "directory": "packages/router"
+  },
+  "files": [
+    "dist",
+    "src"
+  ],
   "type": "module",
   "sideEffects": false,
   "main": "./dist/cjs/index.cjs",
@@ -18,6 +28,26 @@
         "default": "./dist/cjs/index.cjs"
       }
     },
+    "./reply": {
+      "import": {
+        "types": "./dist/esm/reply.d.ts",
+        "default": "./dist/esm/reply.js"
+      },
+      "require": {
+        "types": "./dist/cjs/reply.d.cts",
+        "default": "./dist/cjs/reply.cjs"
+      }
+    },
+    "./stream": {
+      "import": {
+        "types": "./dist/esm/stream.d.ts",
+        "default": "./dist/esm/stream.js"
+      },
+      "require": {
+        "types": "./dist/cjs/stream.d.cts",
+        "default": "./dist/cjs/stream.cjs"
+      }
+    },
     "./body-limit": {
       "import": {
         "types": "./dist/esm/middleware/body-limit.d.ts",
@@ -110,15 +140,15 @@
     },
     "./package.json": "./package.json"
   },
-  "files": [
-    "dist",
-    "src"
-  ],
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
+  },
   "dependencies": {
     "@standard-schema/spec": "^1.1.0",
     "hono": "^4.10.3",
-    "@taserjs/router-core": "0.0.1",
-    "@taserjs/router-utils": "0.0.1"
+    "@taserjs/router-core": "0.0.3",
+    "@taserjs/router-utils": "0.0.3"
   },
   "devDependencies": {
     "@tanstack/vite-config": "^0.6.0",
@@ -130,16 +160,6 @@
   "engines": {
     "node": ">=20.19"
   },
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/taserjs/taserjs.git",
-    "directory": "packages/router"
-  },
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org"
-  },
   "scripts": {
     "clean": "rimraf dist",
     "build": "vite build && publint --strict",

package/src/constants.ts

@@ -1,10 +1,10 @@
 /** Input schema keys validated by middleware and route handlers. Headers/cookies are parsed only. */
-export const SCHEMA_KEYS = ['query', 'params', 'body'] as const
+export const SCHEMA_KEYS = ["query", "params", "body"] as const;
 
-export type SchemaKey = (typeof SCHEMA_KEYS)[number]
+export type SchemaKey = (typeof SCHEMA_KEYS)[number];
 
 export const HANDLER_SCHEMA_KEY_MAP = {
-  query: 'handlerQuery',
-  params: 'handlerParams',
-  body: 'handlerBody',
-} as const satisfies Record<SchemaKey, string>
+  query: "handlerQuery",
+  params: "handlerParams",
+  body: "handlerBody",
+} as const satisfies Record<SchemaKey, string>;

package/src/create-context.ts

@@ -1,11 +1,11 @@
-import type { ReservedContextKey } from '@taserjs/router-core'
+import type { ReservedContextKey } from "@taserjs/router-core";
 
-import type { ContextDefinition } from './types/app.js'
+import type { ContextDefinition } from "./types/app.js";
 
-type NoReservedKeysConstraint<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>
-  = Extract<keyof TBoot | keyof TReq, ReservedContextKey> extends never
-    ? unknown
-    : never
+type NoReservedKeysConstraint<
+  TBoot extends Record<string, unknown>,
+  TReq extends Record<string, unknown>,
+> = Extract<keyof TBoot | keyof TReq, ReservedContextKey> extends never ? unknown : never;
 
 export function createContext<
   TBoot extends Record<string, unknown> = Record<string, never>,
@@ -13,7 +13,7 @@ export function createContext<
 >(
   definition: ContextDefinition<TBoot, TReq> & NoReservedKeysConstraint<TBoot, TReq>,
 ): ContextDefinition<TBoot, TReq> {
-  return definition
+  return definition;
 }
 
-export type { ContextDefinition, InferAppContext } from './types/app.js'
+export type { ContextDefinition, InferAppContext } from "./types/app.js";

package/src/define/handler.ts

@@ -1,14 +1,14 @@
-import type { HandlerBuilder } from '../types/index.js'
+import type { HandlerBuilder } from "../types/index.js";
 import type {
   AppContext,
   HandlerUnit,
   MiddlewareDefinition,
   ReturnsMap,
   ValidatorParts,
-} from '../types/units.js'
-import type { Schema } from '../types/schema.js'
-import { pickDefinedSchemas, type SchemaValidators } from './validators.js'
-import { collectReturnsFromDefinitions } from '@taserjs/router-utils'
+} from "../types/units.js";
+import type { Schema } from "../types/schema.js";
+import { pickDefinedSchemas, type SchemaValidators } from "./validators.js";
+import { collectReturnsFromDefinitions } from "@taserjs/router-utils";
 
 function createHandlerBuilder<TAppContext extends Record<string, unknown> = AppContext>(
   validators: SchemaValidators,
@@ -17,56 +17,46 @@ function createHandlerBuilder<TAppContext extends Record<string, unknown> = AppC
 ): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {
   const builder = {
     returns(map: ReturnsMap) {
-      return createHandlerBuilder<TAppContext>(validators, middlewares, { ...returnsMap, ...map })
+      return createHandlerBuilder<TAppContext>(validators, middlewares, { ...returnsMap, ...map });
     },
     use(unitOrOptions: MiddlewareDefinition) {
-      middlewares.push(unitOrOptions)
-      return builder
+      middlewares.push(unitOrOptions);
+      return builder;
     },
     handler(fn: (ctx: unknown) => unknown) {
-      const mwReturns = collectReturnsFromDefinitions(middlewares)
-      const mergedReturns = { ...mwReturns, ...returnsMap }
+      const mwReturns = collectReturnsFromDefinitions(middlewares);
+      const mergedReturns = { ...mwReturns, ...returnsMap };
       const unit = {
         $Infer: { Output: undefined as unknown as Response },
         middlewares: [...middlewares],
-        handler: fn as HandlerUnit<readonly [], ValidatorParts>['handler'],
+        handler: fn as HandlerUnit<readonly [], ValidatorParts>["handler"],
         ...pickDefinedSchemas(validators),
         ...(Object.keys(mergedReturns).length > 0 ? { returns: mergedReturns } : {}),
-      } as HandlerUnit<readonly [], ValidatorParts>
-      return unit
+      } as HandlerUnit<readonly [], ValidatorParts>;
+      return unit;
     },
-  }
+  };
 
-  return builder as unknown as HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext>
+  return builder as unknown as HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext>;
 }
 
-export function defineHandler<TAppContext extends Record<string, unknown> = AppContext>(): HandlerBuilder<
-  readonly [],
-  {},
-  {},
-  TAppContext
->
+export function defineHandler<
+  TAppContext extends Record<string, unknown> = AppContext,
+>(): HandlerBuilder<readonly [], {}, {}, TAppContext>;
 
 export function defineHandler<
   TAppContext extends Record<string, unknown> = AppContext,
   TQuery = unknown,
   TParams = unknown,
   TBody = unknown,
->(
-  options: {
-    query?: Schema<TQuery>
-    params?: Schema<TParams>
-    body?: Schema<TBody>
-  },
-): HandlerBuilder<
-  readonly [],
-  { query: TQuery, params: TParams, body: TBody },
-  {},
-  TAppContext
->
+>(options: {
+  query?: Schema<TQuery>;
+  params?: Schema<TParams>;
+  body?: Schema<TBody>;
+}): HandlerBuilder<readonly [], { query: TQuery; params: TParams; body: TBody }, {}, TAppContext>;
 
 export function defineHandler<TAppContext extends Record<string, unknown> = AppContext>(
   options?: SchemaValidators,
 ): HandlerBuilder<readonly [], ValidatorParts, {}, TAppContext> {
-  return createHandlerBuilder<TAppContext>(options ?? {}, [], {})
+  return createHandlerBuilder<TAppContext>(options ?? {}, [], {});
 }