@taserjs/router 0.1.3 → 0.1.4

package/dist/esm/builder/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","names":[],"sources":["../../../src/builder/route.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport {\n  collectReturnsFromDefinitions,\n  hasInputSchemas,\n  mergeReturnsMaps,\n  withAuto422,\n} from \"@taserjs/router-utils\";\nimport type { BodyMode } from \"@taserjs/router-core\";\n\nimport type {\n  Method,\n  RouteBuilder,\n  RoutePath,\n  ReturnsMap,\n  ValidatorParts,\n  Schema,\n} from \"../types/index.js\";\nimport type { HttpMethod, MiddlewareDefinition } from \"../types/units.js\";\nimport { isHandlerUnit } from \"../types/units.js\";\nimport { HANDLER_SCHEMA_KEY_MAP } from \"./constants.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nfunction toUtilsMap(map: ReturnsMap | undefined): Record<number, StandardSchemaV1> {\n  if (!map) {\n    return {};\n  }\n  const out: Record<number, StandardSchemaV1> = {};\n  for (const [key, schema] of Object.entries(map)) {\n    if (schema !== undefined) {\n      out[Number(key)] = schema;\n    }\n  }\n  return out;\n}\n\nfunction buildEffectiveReturns(args: {\n  middlewareReturns: ReturnsMap;\n  routeReturns: ReturnsMap;\n  handlerMiddlewareReturns: ReturnsMap;\n  handlerReturns: ReturnsMap | undefined;\n  schemas: {\n    query?: unknown;\n    params?: unknown;\n    body?: unknown;\n    handlerQuery?: unknown;\n    handlerParams?: unknown;\n    handlerBody?: unknown;\n    middlewares?: readonly MiddlewareDefinition[];\n    handlerMiddlewares?: readonly MiddlewareDefinition[];\n  };\n}): Record<number, StandardSchemaV1> | undefined {\n  const merged = mergeReturnsMaps(\n    toUtilsMap(args.middlewareReturns),\n    toUtilsMap(args.routeReturns),\n    toUtilsMap(args.handlerMiddlewareReturns),\n    toUtilsMap(args.handlerReturns),\n  );\n  const with422 = withAuto422(merged, hasInputSchemas(args.schemas));\n  return Object.keys(with422).length > 0 ? with422 : undefined;\n}\n\nfunction buildRouteBase(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods: readonly HttpMethod[] | undefined,\n  middlewares: MiddlewareDefinition[],\n) {\n  return {\n    path,\n    method,\n    ...(methods ? { methods: [...methods] } : {}),\n    middlewares: [...middlewares],\n  };\n}\n\n/** Shared internal builder — not part of the public `@taserjs/router` API. */\nexport function createRouteBuilder(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods?: readonly HttpMethod[],\n): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {\n  const middlewares: MiddlewareDefinition[] = [];\n  let routeReturns: Record<number, StandardSchemaV1> = {};\n  const validators: SchemaValidators = {};\n  let bodyMode: BodyMode | undefined;\n\n  const builder = {\n    path,\n    method,\n    query(schema: Schema<unknown>) {\n      validators.query = schema;\n      return builder;\n    },\n    params(schema: Schema<unknown>) {\n      validators.params = schema;\n      return builder;\n    },\n    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {\n      if (typeof modeOrSchema === \"string\") {\n        bodyMode = modeOrSchema as BodyMode;\n        if (schema !== undefined) {\n          validators.body = schema;\n        }\n      } else {\n        bodyMode = \"json\";\n        validators.body = modeOrSchema;\n      }\n      return builder;\n    },\n    returns(map: ReturnsMap) {\n      routeReturns = { ...routeReturns, ...toUtilsMap(map) };\n      return builder;\n    },\n    use(definition: MiddlewareDefinition) {\n      middlewares.push(definition);\n      return builder;\n    },\n    handler(fnOrUnit: ((ctx: unknown) => unknown) | unknown) {\n      const routeSchemas = pickDefinedSchemas(validators);\n      const base = buildRouteBase(path, method, methods, middlewares);\n\n      const unit = isHandlerUnit(fnOrUnit)\n        ? fnOrUnit\n        : {\n            handler: fnOrUnit as (ctx: unknown) => Response | Promise<Response>,\n            middlewares: [] as MiddlewareDefinition[],\n            returns: undefined as ReturnsMap | undefined,\n          };\n\n      const handlerSchemas = isHandlerUnit(fnOrUnit)\n        ? pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP)\n        : {};\n\n      const returns = buildEffectiveReturns({\n        middlewareReturns: collectReturnsFromDefinitions(middlewares),\n        routeReturns,\n        handlerMiddlewareReturns: collectReturnsFromDefinitions(unit.middlewares),\n        handlerReturns: unit.returns,\n        schemas: {\n          ...validators,\n          handlerQuery: (unit as any).query,\n          handlerParams: (unit as any).params,\n          handlerBody: (unit as any).body,\n          middlewares,\n          handlerMiddlewares: unit.middlewares,\n        },\n      });\n\n      return {\n        ...base,\n        handlerMiddlewares: [...unit.middlewares],\n        handler: unit.handler,\n        ...routeSchemas,\n        ...handlerSchemas,\n        ...(bodyMode ? { bodyMode } : {}),\n        ...(returns ? { returns } : {}),\n      };\n    },\n  };\n\n  return builder as unknown as RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;\n}\n"],"mappings":";;;;;AAsBA,SAAS,WAAW,KAA+D;CACjF,IAAI,CAAC,KACH,OAAO,CAAC;CAEV,MAAM,MAAwC,CAAC;CAC/C,KAAK,MAAM,CAAC,KAAK,WAAW,OAAO,QAAQ,GAAG,GAC5C,IAAI,WAAW,KAAA,GACb,IAAI,OAAO,GAAG,KAAK;CAGvB,OAAO;AACT;AAEA,SAAS,sBAAsB,MAekB;CAO/C,MAAM,UAAU,YAND,iBACb,WAAW,KAAK,iBAAiB,GACjC,WAAW,KAAK,YAAY,GAC5B,WAAW,KAAK,wBAAwB,GACxC,WAAW,KAAK,cAAc,CAEJ,GAAQ,gBAAgB,KAAK,OAAO,CAAC;CACjE,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,KAAA;AACrD;AAEA,SAAS,eACP,MACA,QACA,SACA,aACA;CACA,OAAO;EACL;EACA;EACA,GAAI,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC;EAC3C,aAAa,CAAC,GAAG,WAAW;CAC9B;AACF;;AAGA,SAAgB,mBACd,MACA,QACA,SAC8D;CAC9D,MAAM,cAAsC,CAAC;CAC7C,IAAI,eAAiD,CAAC;CACtD,MAAM,aAA+B,CAAC;CACtC,IAAI;CAEJ,MAAM,UAAU;EACd;EACA;EACA,MAAM,QAAyB;GAC7B,WAAW,QAAQ;GACnB,OAAO;EACT;EACA,OAAO,QAAyB;GAC9B,WAAW,SAAS;GACpB,OAAO;EACT;EACA,KAAK,cAA0C,QAA0B;GACvE,IAAI,OAAO,iBAAiB,UAAU;IACpC,WAAW;IACX,IAAI,WAAW,KAAA,GACb,WAAW,OAAO;GAEtB,OAAO;IACL,WAAW;IACX,WAAW,OAAO;GACpB;GACA,OAAO;EACT;EACA,QAAQ,KAAiB;GACvB,eAAe;IAAE,GAAG;IAAc,GAAG,WAAW,GAAG;GAAE;GACrD,OAAO;EACT;EACA,IAAI,YAAkC;GACpC,YAAY,KAAK,UAAU;GAC3B,OAAO;EACT;EACA,QAAQ,UAAiD;GACvD,MAAM,eAAe,mBAAmB,UAAU;GAClD,MAAM,OAAO,eAAe,MAAM,QAAQ,SAAS,WAAW;GAE9D,MAAM,OAAO,cAAc,QAAQ,IAC/B,WACA;IACE,SAAS;IACT,aAAa,CAAC;IACd,SAAS,KAAA;GACX;GAEJ,MAAM,iBAAiB,cAAc,QAAQ,IACzC,mBAAmB,UAAU,sBAAsB,IACnD,CAAC;GAEL,MAAM,UAAU,sBAAsB;IACpC,mBAAmB,8BAA8B,WAAW;IAC5D;IACA,0BAA0B,8BAA8B,KAAK,WAAW;IACxE,gBAAgB,KAAK;IACrB,SAAS;KACP,GAAG;KACH,cAAe,KAAa;KAC5B,eAAgB,KAAa;KAC7B,aAAc,KAAa;KAC3B;KACA,oBAAoB,KAAK;IAC3B;GACF,CAAC;GAED,OAAO;IACL,GAAG;IACH,oBAAoB,CAAC,GAAG,KAAK,WAAW;IACxC,SAAS,KAAK;IACd,GAAG;IACH,GAAG;IACH,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;IAC/B,GAAI,UAAU,EAAE,QAAQ,IAAI,CAAC;GAC/B;EACF;CACF;CAEA,OAAO;AACT"}
+{"version":3,"file":"route.js","names":[],"sources":["../../../src/builder/route.ts"],"sourcesContent":["import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport {\n  collectReturnsFromDefinitions,\n  hasInputSchemas,\n  mergeReturnsMaps,\n  withAuto422,\n} from \"@taserjs/router-utils\";\nimport type { BodyMode } from \"@taserjs/router-core\";\n\nimport type {\n  Method,\n  RouteBuilder,\n  RoutePath,\n  ReturnsMap,\n  ValidatorParts,\n  Schema,\n} from \"../types/index.js\";\nimport type { HttpMethod, MiddlewareDefinition } from \"../types/units.js\";\nimport { pickDefinedSchemas, type SchemaValidators } from \"../define/validators.js\";\n\nfunction toUtilsMap(map: ReturnsMap | undefined): Record<number, StandardSchemaV1> {\n  if (!map) {\n    return {};\n  }\n  const out: Record<number, StandardSchemaV1> = {};\n  for (const [key, schema] of Object.entries(map)) {\n    if (schema !== undefined) {\n      out[Number(key)] = schema;\n    }\n  }\n  return out;\n}\n\nfunction buildEffectiveReturns(args: {\n  middlewareReturns: ReturnsMap;\n  routeReturns: ReturnsMap;\n  schemas: {\n    query?: unknown;\n    params?: unknown;\n    body?: unknown;\n    middlewares?: readonly MiddlewareDefinition[];\n  };\n}): Record<number, StandardSchemaV1> | undefined {\n  const merged = mergeReturnsMaps(\n    toUtilsMap(args.middlewareReturns),\n    toUtilsMap(args.routeReturns),\n  );\n  const with422 = withAuto422(merged, hasInputSchemas(args.schemas));\n  return Object.keys(with422).length > 0 ? with422 : undefined;\n}\n\nfunction buildRouteBase(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods: readonly HttpMethod[] | undefined,\n  middlewares: MiddlewareDefinition[],\n) {\n  return {\n    path,\n    method,\n    ...(methods ? { methods: [...methods] } : {}),\n    middlewares: [...middlewares],\n  };\n}\n\n/** Shared internal builder — not part of the public `@taserjs/router` API. */\nexport function createRouteBuilder(\n  path: string,\n  method: HttpMethod | \"ANY\" | \"ALL\",\n  methods?: readonly HttpMethod[],\n): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {\n  const middlewares: MiddlewareDefinition[] = [];\n  let routeReturns: Record<number, StandardSchemaV1> = {};\n  const validators: SchemaValidators = {};\n  let bodyMode: BodyMode | undefined;\n\n  const builder = {\n    path,\n    method,\n    query(schema: Schema<unknown>) {\n      validators.query = schema;\n      return builder;\n    },\n    params(schema: Schema<unknown>) {\n      validators.params = schema;\n      return builder;\n    },\n    body(modeOrSchema: BodyMode | Schema<unknown>, schema?: Schema<unknown>) {\n      if (typeof modeOrSchema === \"string\") {\n        bodyMode = modeOrSchema as BodyMode;\n        if (schema !== undefined) {\n          validators.body = schema;\n        }\n      } else {\n        bodyMode = \"json\";\n        validators.body = modeOrSchema;\n      }\n      return builder;\n    },\n    returns(map: ReturnsMap) {\n      routeReturns = { ...routeReturns, ...toUtilsMap(map) };\n      return builder;\n    },\n    use(definition: MiddlewareDefinition | ((ctx: any, next: any) => any)) {\n      if (typeof definition === \"function\") {\n        middlewares.push({ handler: definition as any });\n      } else {\n        middlewares.push(definition);\n      }\n      return builder;\n    },\n    handler(fn: (ctx: unknown) => Response | Promise<Response>) {\n      const routeSchemas = pickDefinedSchemas(validators);\n      const base = buildRouteBase(path, method, methods, middlewares);\n\n      const returns = buildEffectiveReturns({\n        middlewareReturns: collectReturnsFromDefinitions(middlewares),\n        routeReturns,\n        schemas: {\n          ...validators,\n          middlewares,\n        },\n      });\n\n      return {\n        ...base,\n        handler: fn,\n        ...routeSchemas,\n        ...(bodyMode ? { bodyMode } : {}),\n        ...(returns ? { returns } : {}),\n      };\n    },\n  };\n\n  return builder as unknown as RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;\n}\n"],"mappings":";;;AAoBA,SAAS,WAAW,KAA+D;CACjF,IAAI,CAAC,KACH,OAAO,CAAC;CAEV,MAAM,MAAwC,CAAC;CAC/C,KAAK,MAAM,CAAC,KAAK,WAAW,OAAO,QAAQ,GAAG,GAC5C,IAAI,WAAW,KAAA,GACb,IAAI,OAAO,GAAG,KAAK;CAGvB,OAAO;AACT;AAEA,SAAS,sBAAsB,MASkB;CAK/C,MAAM,UAAU,YAJD,iBACb,WAAW,KAAK,iBAAiB,GACjC,WAAW,KAAK,YAAY,CAEF,GAAQ,gBAAgB,KAAK,OAAO,CAAC;CACjE,OAAO,OAAO,KAAK,OAAO,CAAC,CAAC,SAAS,IAAI,UAAU,KAAA;AACrD;AAEA,SAAS,eACP,MACA,QACA,SACA,aACA;CACA,OAAO;EACL;EACA;EACA,GAAI,UAAU,EAAE,SAAS,CAAC,GAAG,OAAO,EAAE,IAAI,CAAC;EAC3C,aAAa,CAAC,GAAG,WAAW;CAC9B;AACF;;AAGA,SAAgB,mBACd,MACA,QACA,SAC8D;CAC9D,MAAM,cAAsC,CAAC;CAC7C,IAAI,eAAiD,CAAC;CACtD,MAAM,aAA+B,CAAC;CACtC,IAAI;CAEJ,MAAM,UAAU;EACd;EACA;EACA,MAAM,QAAyB;GAC7B,WAAW,QAAQ;GACnB,OAAO;EACT;EACA,OAAO,QAAyB;GAC9B,WAAW,SAAS;GACpB,OAAO;EACT;EACA,KAAK,cAA0C,QAA0B;GACvE,IAAI,OAAO,iBAAiB,UAAU;IACpC,WAAW;IACX,IAAI,WAAW,KAAA,GACb,WAAW,OAAO;GAEtB,OAAO;IACL,WAAW;IACX,WAAW,OAAO;GACpB;GACA,OAAO;EACT;EACA,QAAQ,KAAiB;GACvB,eAAe;IAAE,GAAG;IAAc,GAAG,WAAW,GAAG;GAAE;GACrD,OAAO;EACT;EACA,IAAI,YAAmE;GACrE,IAAI,OAAO,eAAe,YACxB,YAAY,KAAK,EAAE,SAAS,WAAkB,CAAC;QAE/C,YAAY,KAAK,UAAU;GAE7B,OAAO;EACT;EACA,QAAQ,IAAoD;GAC1D,MAAM,eAAe,mBAAmB,UAAU;GAClD,MAAM,OAAO,eAAe,MAAM,QAAQ,SAAS,WAAW;GAE9D,MAAM,UAAU,sBAAsB;IACpC,mBAAmB,8BAA8B,WAAW;IAC5D;IACA,SAAS;KACP,GAAG;KACH;IACF;GACF,CAAC;GAED,OAAO;IACL,GAAG;IACH,SAAS;IACT,GAAG;IACH,GAAI,WAAW,EAAE,SAAS,IAAI,CAAC;IAC/B,GAAI,UAAU,EAAE,QAAQ,IAAI,CAAC;GAC/B;EACF;CACF;CAEA,OAAO;AACT"}

package/dist/esm/builder/router.d.ts

@@ -3,9 +3,8 @@ import { DefineMiddlewareFn } from '../define/middleware.js';
 import { TaserApp } from './app.js';
 import { ContextDefinition, CreateTaserAppOptions, OnErrorOptions } from '../types/app.js';
 import { AppContext } from '../types/units.js';
-import { HandlerBuilder, LayoutId, MiddlewareBuilder } from '../types/index.js';
+import { LayoutId, MiddlewareBuilder } from '../types/index.js';
 import { ReturnsMap } from '../types/returns.js';
-import { Schema } from '../types/schema.js';
 import { CreateAllRoute, CreateAnyRoute, CreateWithBodyRoute, CreateWithoutBodyRoute } from './factories.js';
 type RouterState = {
     options: CreateTaserAppOptions;
@@ -29,15 +28,6 @@ export declare class TaserRouter<TAppContext extends Record<string, unknown> = A
     any: CreateAnyRoute<TAppContext>;
     all: CreateAllRoute<TAppContext>;
     middleware<const Layout extends LayoutId>(layout: Layout): MiddlewareBuilder<Layout, readonly [], TAppContext>;
-    defineHandler<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>;
     defineMiddleware: DefineMiddlewareFn<TAppContext>;
     create<const TManifest extends RouteManifestShape>(manifest: TManifest, runtimeOptions?: {
         basePath?: string;

package/dist/esm/builder/router.js

@@ -1,5 +1,4 @@
 import { createAllRoute, createAnyRoute, createDeleteRoute, createGetRoute, createHeadRoute, createOptionsRoute, createPatchRoute, createPostRoute, createPutRoute } from "./factories.js";
-import { defineHandler } from "../define/handler.js";
 import { defineMiddleware } from "../define/middleware.js";
 import { createMiddleware } from "./middleware.js";
 import { TaserApp } from "./app.js";
@@ -44,9 +43,6 @@ var TaserRouter = class {
 	middleware(layout) {
 		return createMiddleware(layout);
 	}
-	defineHandler(options) {
-		return options === void 0 ? defineHandler() : defineHandler(options);
-	}
 	defineMiddleware = defineMiddleware;
 	create(manifest, runtimeOptions) {
 		const definition = this.state.contextDef;

package/dist/esm/builder/router.js.map

@@ -1 +1 @@
-{"version":3,"file":"router.js","names":[],"sources":["../../../src/builder/router.ts"],"sourcesContent":["import {\n  createTaserRuntime,\n  type NotFoundHandler,\n  type OnErrorHandler,\n  type RouteManifestShape,\n} from \"@taserjs/router-core\";\nimport { isPromise, normalizeOnError } from \"@taserjs/router-utils\";\n\nimport {\n  createAllRoute,\n  createAnyRoute,\n  createDeleteRoute,\n  createGetRoute,\n  createHeadRoute,\n  createOptionsRoute,\n  createPatchRoute,\n  createPostRoute,\n  createPutRoute,\n} from \"./factories.js\";\nimport { defineHandler } from \"../define/handler.js\";\nimport { defineMiddleware, type DefineMiddlewareFn } from \"../define/middleware.js\";\nimport { createMiddleware } from \"./middleware.js\";\nimport { TaserApp } from \"./app.js\";\nimport type { ContextDefinition, CreateTaserAppOptions, OnErrorOptions } from \"../types/app.js\";\nimport type { AppContext } from \"../types/units.js\";\nimport type { HandlerBuilder, LayoutId, MiddlewareBuilder } from \"../types/index.js\";\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type { Schema } from \"../types/schema.js\";\nimport type {\n  CreateAllRoute,\n  CreateAnyRoute,\n  CreateWithBodyRoute,\n  CreateWithoutBodyRoute,\n} from \"./factories.js\";\n\nfunction toOnErrorHandler(\n  onErrorOptions: OnErrorOptions | OnErrorOptions[\"handle\"],\n): OnErrorHandler {\n  return normalizeOnError(onErrorOptions);\n}\n\ntype RouterState = {\n  options: CreateTaserAppOptions;\n  contextDef: ContextDefinition<Record<string, unknown>, Record<string, unknown>>;\n  onError?: OnErrorHandler;\n  notFound?: NotFoundHandler;\n};\n\nconst emptyContext: ContextDefinition<Record<string, unknown>, Record<string, unknown>> = {};\n\nexport class TaserRouter<\n  TAppContext extends Record<string, unknown> = AppContext,\n  THasNotFound extends boolean = false,\n> {\n  private readonly state: RouterState;\n\n  constructor(options: CreateTaserAppOptions = {}, state?: Partial<Omit<RouterState, \"options\">>) {\n    this.state = {\n      options,\n      contextDef: state?.contextDef ?? emptyContext,\n      ...(state?.onError !== undefined ? { onError: state.onError } : {}),\n      ...(state?.notFound !== undefined ? { notFound: state.notFound } : {}),\n    };\n  }\n\n  context<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>(\n    definition: ContextDefinition<TBoot, TReq>,\n  ): TaserRouter<TBoot & TReq, THasNotFound> {\n    this.state.contextDef = definition;\n    return this as unknown as TaserRouter<TBoot & TReq, THasNotFound>;\n  }\n\n  onError<TResponses extends ReturnsMap = ReturnsMap>(\n    options: OnErrorOptions<TResponses> | OnErrorOptions<TResponses>[\"handle\"],\n  ): this {\n    this.state.onError = toOnErrorHandler(options);\n    return this;\n  }\n\n  notFound(\n    handler: (ctx: unknown) => Response | Promise<Response> | unknown,\n  ): TaserRouter<TAppContext, true> {\n    this.state.notFound = (ctx) => handler(ctx);\n    return this as unknown as TaserRouter<TAppContext, true>;\n  }\n\n  get: CreateWithoutBodyRoute<\"GET\", TAppContext> = createGetRoute as CreateWithoutBodyRoute<\n    \"GET\",\n    TAppContext\n  >;\n  post: CreateWithBodyRoute<\"POST\", TAppContext> = createPostRoute as CreateWithBodyRoute<\n    \"POST\",\n    TAppContext\n  >;\n  put: CreateWithBodyRoute<\"PUT\", TAppContext> = createPutRoute as CreateWithBodyRoute<\n    \"PUT\",\n    TAppContext\n  >;\n  patch: CreateWithBodyRoute<\"PATCH\", TAppContext> = createPatchRoute as CreateWithBodyRoute<\n    \"PATCH\",\n    TAppContext\n  >;\n  delete: CreateWithoutBodyRoute<\"DELETE\", TAppContext> =\n    createDeleteRoute as CreateWithoutBodyRoute<\"DELETE\", TAppContext>;\n  options: CreateWithoutBodyRoute<\"OPTIONS\", TAppContext> =\n    createOptionsRoute as CreateWithoutBodyRoute<\"OPTIONS\", TAppContext>;\n  head: CreateWithoutBodyRoute<\"HEAD\", TAppContext> = createHeadRoute as CreateWithoutBodyRoute<\n    \"HEAD\",\n    TAppContext\n  >;\n  any: CreateAnyRoute<TAppContext> = createAnyRoute as CreateAnyRoute<TAppContext>;\n  all: CreateAllRoute<TAppContext> = createAllRoute as CreateAllRoute<TAppContext>;\n\n  middleware<const Layout extends LayoutId>(\n    layout: Layout,\n  ): MiddlewareBuilder<Layout, readonly [], TAppContext> {\n    return createMiddleware(layout) as MiddlewareBuilder<Layout, readonly [], TAppContext>;\n  }\n\n  defineHandler<TQuery = unknown, TParams = unknown, TBody = unknown>(options?: {\n    query?: Schema<TQuery>;\n    params?: Schema<TParams>;\n    body?: Schema<TBody>;\n  }): HandlerBuilder<\n    readonly [],\n    { query: TQuery; params: TParams; body: TBody },\n    {},\n    TAppContext\n  > {\n    return options === undefined\n      ? defineHandler<TAppContext>()\n      : defineHandler<TAppContext>(options);\n  }\n\n  defineMiddleware: DefineMiddlewareFn<TAppContext> =\n    defineMiddleware as DefineMiddlewareFn<TAppContext>;\n\n  create<const TManifest extends RouteManifestShape>(\n    manifest: TManifest,\n    runtimeOptions?: { basePath?: string },\n  ): TaserApp<TManifest, THasNotFound> {\n    const definition = this.state.contextDef;\n    const validateResponse = this.state.options.response?.validate ?? true;\n    const onValidationFailure = this.state.options.response?.onValidationFailure;\n    const basePath = runtimeOptions?.basePath;\n\n    const hasCustomContext = definition.boot !== undefined || definition.request !== undefined;\n    let bootContextResolved: Record<string, unknown> | undefined;\n    let bootPromise: Promise<Record<string, unknown>> | undefined;\n\n    if (definition.boot !== undefined) {\n      const bootResult = definition.boot();\n      if (isPromise(bootResult)) {\n        bootPromise = bootResult.then((ctx) => {\n          bootContextResolved = (ctx ?? {}) as Record<string, unknown>;\n          return bootContextResolved;\n        });\n      } else {\n        bootContextResolved = (bootResult ?? {}) as Record<string, unknown>;\n      }\n    } else if (hasCustomContext) {\n      bootContextResolved = {};\n    }\n\n    const contextFactory = hasCustomContext\n      ? (req?: Request) => {\n          if (bootPromise !== undefined && bootContextResolved === undefined) {\n            return bootPromise.then(async (bootContext) => {\n              if (!definition.request) {\n                return { ...bootContext };\n              }\n              const requestResult = definition.request(req!);\n              const requestContext = isPromise(requestResult) ? await requestResult : requestResult;\n              return { ...bootContext, ...requestContext };\n            });\n          }\n\n          const bootContext = bootContextResolved ?? {};\n          if (!definition.request) {\n            return { ...bootContext };\n          }\n\n          const requestResult = definition.request(req!);\n          if (isPromise(requestResult)) {\n            return requestResult.then((requestContext) => ({\n              ...bootContext,\n              ...requestContext,\n            }));\n          }\n\n          return { ...bootContext, ...(requestResult as Record<string, unknown>) };\n        }\n      : () => ({});\n\n    const runtime = createTaserRuntime(manifest, contextFactory, {\n      ...(basePath !== undefined ? { basePath } : {}),\n      response: {\n        validate: validateResponse,\n        ...(onValidationFailure !== undefined ? { onValidationFailure } : {}),\n      },\n      ...(this.state.onError !== undefined ? { onError: this.state.onError } : {}),\n      ...(this.state.notFound !== undefined ? { notFound: this.state.notFound } : {}),\n      ...(this.state.options.cookies !== undefined ? { cookies: this.state.options.cookies } : {}),\n    });\n\n    return new TaserApp(runtime, manifest) as unknown as TaserApp<TManifest, THasNotFound>;\n  }\n}\n\nexport function createTaserApp(\n  options: CreateTaserAppOptions = {},\n): TaserRouter<AppContext, false> {\n  return new TaserRouter<AppContext, false>(options);\n}\n"],"mappings":"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"}
+{"version":3,"file":"router.js","names":[],"sources":["../../../src/builder/router.ts"],"sourcesContent":["import {\n  createTaserRuntime,\n  type NotFoundHandler,\n  type OnErrorHandler,\n  type RouteManifestShape,\n} from \"@taserjs/router-core\";\nimport { isPromise, normalizeOnError } from \"@taserjs/router-utils\";\n\nimport {\n  createAllRoute,\n  createAnyRoute,\n  createDeleteRoute,\n  createGetRoute,\n  createHeadRoute,\n  createOptionsRoute,\n  createPatchRoute,\n  createPostRoute,\n  createPutRoute,\n} from \"./factories.js\";\nimport { defineMiddleware, type DefineMiddlewareFn } from \"../define/middleware.js\";\nimport { createMiddleware } from \"./middleware.js\";\nimport { TaserApp } from \"./app.js\";\nimport type { ContextDefinition, CreateTaserAppOptions, OnErrorOptions } from \"../types/app.js\";\nimport type { AppContext } from \"../types/units.js\";\nimport type { LayoutId, MiddlewareBuilder } from \"../types/index.js\";\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type {\n  CreateAllRoute,\n  CreateAnyRoute,\n  CreateWithBodyRoute,\n  CreateWithoutBodyRoute,\n} from \"./factories.js\";\n\nfunction toOnErrorHandler(\n  onErrorOptions: OnErrorOptions | OnErrorOptions[\"handle\"],\n): OnErrorHandler {\n  return normalizeOnError(onErrorOptions);\n}\n\ntype RouterState = {\n  options: CreateTaserAppOptions;\n  contextDef: ContextDefinition<Record<string, unknown>, Record<string, unknown>>;\n  onError?: OnErrorHandler;\n  notFound?: NotFoundHandler;\n};\n\nconst emptyContext: ContextDefinition<Record<string, unknown>, Record<string, unknown>> = {};\n\nexport class TaserRouter<\n  TAppContext extends Record<string, unknown> = AppContext,\n  THasNotFound extends boolean = false,\n> {\n  private readonly state: RouterState;\n\n  constructor(options: CreateTaserAppOptions = {}, state?: Partial<Omit<RouterState, \"options\">>) {\n    this.state = {\n      options,\n      contextDef: state?.contextDef ?? emptyContext,\n      ...(state?.onError !== undefined ? { onError: state.onError } : {}),\n      ...(state?.notFound !== undefined ? { notFound: state.notFound } : {}),\n    };\n  }\n\n  context<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>(\n    definition: ContextDefinition<TBoot, TReq>,\n  ): TaserRouter<TBoot & TReq, THasNotFound> {\n    this.state.contextDef = definition;\n    return this as unknown as TaserRouter<TBoot & TReq, THasNotFound>;\n  }\n\n  onError<TResponses extends ReturnsMap = ReturnsMap>(\n    options: OnErrorOptions<TResponses> | OnErrorOptions<TResponses>[\"handle\"],\n  ): this {\n    this.state.onError = toOnErrorHandler(options);\n    return this;\n  }\n\n  notFound(\n    handler: (ctx: unknown) => Response | Promise<Response> | unknown,\n  ): TaserRouter<TAppContext, true> {\n    this.state.notFound = (ctx) => handler(ctx);\n    return this as unknown as TaserRouter<TAppContext, true>;\n  }\n\n  get: CreateWithoutBodyRoute<\"GET\", TAppContext> = createGetRoute as CreateWithoutBodyRoute<\n    \"GET\",\n    TAppContext\n  >;\n  post: CreateWithBodyRoute<\"POST\", TAppContext> = createPostRoute as CreateWithBodyRoute<\n    \"POST\",\n    TAppContext\n  >;\n  put: CreateWithBodyRoute<\"PUT\", TAppContext> = createPutRoute as CreateWithBodyRoute<\n    \"PUT\",\n    TAppContext\n  >;\n  patch: CreateWithBodyRoute<\"PATCH\", TAppContext> = createPatchRoute as CreateWithBodyRoute<\n    \"PATCH\",\n    TAppContext\n  >;\n  delete: CreateWithoutBodyRoute<\"DELETE\", TAppContext> =\n    createDeleteRoute as CreateWithoutBodyRoute<\"DELETE\", TAppContext>;\n  options: CreateWithoutBodyRoute<\"OPTIONS\", TAppContext> =\n    createOptionsRoute as CreateWithoutBodyRoute<\"OPTIONS\", TAppContext>;\n  head: CreateWithoutBodyRoute<\"HEAD\", TAppContext> = createHeadRoute as CreateWithoutBodyRoute<\n    \"HEAD\",\n    TAppContext\n  >;\n  any: CreateAnyRoute<TAppContext> = createAnyRoute as CreateAnyRoute<TAppContext>;\n  all: CreateAllRoute<TAppContext> = createAllRoute as CreateAllRoute<TAppContext>;\n\n  middleware<const Layout extends LayoutId>(\n    layout: Layout,\n  ): MiddlewareBuilder<Layout, readonly [], TAppContext> {\n    return createMiddleware(layout) as MiddlewareBuilder<Layout, readonly [], TAppContext>;\n  }\n\n  defineMiddleware: DefineMiddlewareFn<TAppContext> =\n    defineMiddleware as DefineMiddlewareFn<TAppContext>;\n\n  create<const TManifest extends RouteManifestShape>(\n    manifest: TManifest,\n    runtimeOptions?: { basePath?: string },\n  ): TaserApp<TManifest, THasNotFound> {\n    const definition = this.state.contextDef;\n    const validateResponse = this.state.options.response?.validate ?? true;\n    const onValidationFailure = this.state.options.response?.onValidationFailure;\n    const basePath = runtimeOptions?.basePath;\n\n    const hasCustomContext = definition.boot !== undefined || definition.request !== undefined;\n    let bootContextResolved: Record<string, unknown> | undefined;\n    let bootPromise: Promise<Record<string, unknown>> | undefined;\n\n    if (definition.boot !== undefined) {\n      const bootResult = definition.boot();\n      if (isPromise(bootResult)) {\n        bootPromise = bootResult.then((ctx) => {\n          bootContextResolved = (ctx ?? {}) as Record<string, unknown>;\n          return bootContextResolved;\n        });\n      } else {\n        bootContextResolved = (bootResult ?? {}) as Record<string, unknown>;\n      }\n    } else if (hasCustomContext) {\n      bootContextResolved = {};\n    }\n\n    const contextFactory = hasCustomContext\n      ? (req?: Request) => {\n          if (bootPromise !== undefined && bootContextResolved === undefined) {\n            return bootPromise.then(async (bootContext) => {\n              if (!definition.request) {\n                return { ...bootContext };\n              }\n              const requestResult = definition.request(req!);\n              const requestContext = isPromise(requestResult) ? await requestResult : requestResult;\n              return { ...bootContext, ...requestContext };\n            });\n          }\n\n          const bootContext = bootContextResolved ?? {};\n          if (!definition.request) {\n            return { ...bootContext };\n          }\n\n          const requestResult = definition.request(req!);\n          if (isPromise(requestResult)) {\n            return requestResult.then((requestContext) => ({\n              ...bootContext,\n              ...requestContext,\n            }));\n          }\n\n          return { ...bootContext, ...(requestResult as Record<string, unknown>) };\n        }\n      : () => ({});\n\n    const runtime = createTaserRuntime(manifest, contextFactory, {\n      ...(basePath !== undefined ? { basePath } : {}),\n      response: {\n        validate: validateResponse,\n        ...(onValidationFailure !== undefined ? { onValidationFailure } : {}),\n      },\n      ...(this.state.onError !== undefined ? { onError: this.state.onError } : {}),\n      ...(this.state.notFound !== undefined ? { notFound: this.state.notFound } : {}),\n      ...(this.state.options.cookies !== undefined ? { cookies: this.state.options.cookies } : {}),\n    });\n\n    return new TaserApp(runtime, manifest) as unknown as TaserApp<TManifest, THasNotFound>;\n  }\n}\n\nexport function createTaserApp(\n  options: CreateTaserAppOptions = {},\n): TaserRouter<AppContext, false> {\n  return new TaserRouter<AppContext, false>(options);\n}\n"],"mappings":"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"}

package/dist/esm/define/middleware.d.ts

@@ -1,35 +1,46 @@
-import { createTaserCompatHandler, Awaitable } from '@taserjs/router-core';
-import { ReturnsMap } from '../types/returns.js';
-import { AppContext, DefineMiddlewareResult, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
+import { Awaitable } from '@taserjs/router-core';
+import { AppContext, DefineMiddlewareResult, ExtractState, IsUnknown, MiddlewareUnitBuilder, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
 import { LayoutId, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
-import { Schema } from '../types/schema.js';
-export type HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];
-export type HonoMiddlewareUnit = MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>, {}, null, {}>;
-export type DefineMiddlewareOptions<TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TAppContext extends Record<string, unknown> = AppContext, R = unknown> = {
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>;
-};
-export type ScopedMiddlewareOptions<Layout extends LayoutId, TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TAppContext extends Record<string, unknown> = AppContext, R = unknown> = {
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, ResolveLayoutMiddlewaresState<Layout> & TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>;
-};
-export type MultiScopedMiddlewareOptions<Layouts extends readonly LayoutId[], TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TAppContext extends Record<string, unknown> = AppContext, R = unknown> = {
-    query?: Schema<TQuery, TQueryIn>;
-    params?: Schema<TParams, TParamsIn>;
-    body?: Schema<TBody, TBodyIn>;
-    returns?: TReturns;
-    handler: (ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, ResolveLayoutsState<Layouts> & TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>;
-};
 export interface DefineMiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
-    (middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;
-    <const Layout extends LayoutId, TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(layout: Layout, options: ScopedMiddlewareOptions<Layout, TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, Layout, TRequires>;
-    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(layouts: Layouts, options: MultiScopedMiddlewareOptions<Layouts, TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, Layouts, TRequires>;
-    <TState = unknown, TRequires = {}, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: DefineMiddlewareOptions<TState, TRequires, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): DefineMiddlewareResult<TQuery, TParams, TBody, TState, R, TQueryIn, TParamsIn, TBodyIn, TReturns, null, TRequires>;
+    /**
+     * Constructs a fluent unscoped middleware builder.
+     *
+     * @example
+     * ```ts
+     * const auth = defineMiddleware()
+     *   .query(z.object({ token: z.string() }))
+     *   .body("form", z.object({ file: z.instanceof(File) }))
+     *   .returns({ 401: z.string() })
+     *   .handler(async (ctx, next) => next({ user: "alice" }));
+     * ```
+     */
+    (): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, null, {}, TAppContext>;
+    /**
+     * Constructs a fluent middleware builder scoped to a single layout branch.
+     */
+    <const Layout extends LayoutId>(layout: Layout): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layout, {}, TAppContext, ResolveLayoutMiddlewaresState<Layout>>;
+    /**
+     * Constructs a fluent middleware builder scoped to multiple layout branches (branch union).
+     */
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]]>(layouts: Layouts): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, Layouts, {}, TAppContext, ResolveLayoutsState<Layouts>>;
+    /**
+     * Defines a standalone middleware scoped to a single layout branch using a short function signature.
+     */
+    <const Layout extends LayoutId, TState = unknown, TRequires = {}, R = unknown>(layout: Layout, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutMiddlewaresState<Layout> & TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layout, TRequires>;
+    /**
+     * Defines a standalone middleware scoped to multiple layout branches using a short function signature.
+     */
+    <const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires = {}, R = unknown>(layouts: Layouts, fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, ResolveLayoutsState<Layouts> & TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, Layouts, TRequires>;
+    /**
+     * Defines a standalone, unscoped middleware using a short function signature.
+     *
+     * @example
+     * ```ts
+     * const auth = defineMiddleware((ctx, next) => {
+     *   return next({ user: "alice" });
+     * });
+     * ```
+     */
+    <TState = unknown, TRequires = {}, R = unknown>(fn: (ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, TRequires>, next: NextFn<NoInfer<TState>>) => Awaitable<R>): DefineMiddlewareResult<unknown, unknown, unknown, IsUnknown<TState> extends true ? ExtractState<R> : TState, R, unknown, unknown, unknown, {}, null, TRequires>;
 }
 export declare const defineMiddleware: DefineMiddlewareFn<AppContext>;

package/dist/esm/define/middleware.js

@@ -1,25 +1,21 @@
-import { createTaserCompatHandler } from "@taserjs/router-core";
+import { createMiddlewareUnitBuilder } from "../builder/middleware-unit.js";
+import "@taserjs/router-core";
 //#region src/define/middleware.ts
 var defineMiddleware = function defineMiddleware(first, second) {
+	if (first === void 0) return createMiddlewareUnitBuilder();
 	if (typeof first === "string" || Array.isArray(first)) {
-		const options = second;
-		return {
-			...options,
+		if (typeof second === "function") return {
+			handler: second,
 			__middlewareAcc: void 0,
-			...options?.returns ? { __returns: options.returns } : {},
 			__requiredLayouts: first
 		};
+		return createMiddlewareUnitBuilder(first);
 	}
-	if (typeof first === "function") {
-		const honoMiddleware = first;
-		return defineMiddleware({ handler: (ctx, next) => createTaserCompatHandler(honoMiddleware)(ctx, next) });
-	}
-	const options = first;
-	return {
-		...options,
-		__middlewareAcc: void 0,
-		...options.returns ? { __returns: options.returns } : {}
+	if (typeof first === "function") return {
+		handler: first,
+		__middlewareAcc: void 0
 	};
+	return createMiddlewareUnitBuilder();
 };
 //#endregion
 export { defineMiddleware };

package/dist/esm/define/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { createTaserCompatHandler, type Awaitable } from \"@taserjs/router-core\";\n\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type {\n  AppContext,\n  DefineMiddlewareResult,\n  MiddlewareReturnFromParts,\n  MiddlewareUnit,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  LayoutId,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\nimport type { Schema } from \"../types/schema.js\";\n\nexport type HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];\n\nexport type HonoMiddlewareUnit = MiddlewareUnit<\n  MiddlewareReturnFromParts<unknown, unknown, unknown, {}>,\n  {},\n  null,\n  {}\n>;\n\nexport type DefineMiddlewareOptions<\n  TState = unknown,\n  TRequires = {},\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (\n    ctx: StandaloneMiddlewareContext<TQuery, TParams, TBody, TAppContext, TRequires>,\n    next: NextFn<NoInfer<TState>>,\n  ) => Awaitable<R>;\n};\n\nexport type ScopedMiddlewareOptions<\n  Layout extends LayoutId,\n  TState = unknown,\n  TRequires = {},\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (\n    ctx: StandaloneMiddlewareContext<\n      TQuery,\n      TParams,\n      TBody,\n      TAppContext,\n      ResolveLayoutMiddlewaresState<Layout> & TRequires\n    >,\n    next: NextFn<NoInfer<TState>>,\n  ) => Awaitable<R>;\n};\n\nexport type MultiScopedMiddlewareOptions<\n  Layouts extends readonly LayoutId[],\n  TState = unknown,\n  TRequires = {},\n  TQuery = unknown,\n  TParams = unknown,\n  TBody = unknown,\n  TReturns extends ReturnsMap = {},\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\n  R = unknown,\n> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n  body?: Schema<TBody, TBodyIn>;\n  returns?: TReturns;\n  handler: (\n    ctx: StandaloneMiddlewareContext<\n      TQuery,\n      TParams,\n      TBody,\n      TAppContext,\n      ResolveLayoutsState<Layouts> & TRequires\n    >,\n    next: NextFn<NoInfer<TState>>,\n  ) => Awaitable<R>;\n};\n\nexport interface DefineMiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  (middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;\n\n  <\n    const Layout extends LayoutId,\n    TState = unknown,\n    TRequires = {},\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    layout: Layout,\n    options: ScopedMiddlewareOptions<\n      Layout,\n      TState,\n      TRequires,\n      TQuery,\n      TParams,\n      TBody,\n      TReturns,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn,\n      TAppContext,\n      R\n    >,\n  ): DefineMiddlewareResult<\n    TQuery,\n    TParams,\n    TBody,\n    TState,\n    R,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn,\n    TReturns,\n    Layout,\n    TRequires\n  >;\n\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires = {},\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    layouts: Layouts,\n    options: MultiScopedMiddlewareOptions<\n      Layouts,\n      TState,\n      TRequires,\n      TQuery,\n      TParams,\n      TBody,\n      TReturns,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn,\n      TAppContext,\n      R\n    >,\n  ): DefineMiddlewareResult<\n    TQuery,\n    TParams,\n    TBody,\n    TState,\n    R,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn,\n    TReturns,\n    Layouts,\n    TRequires\n  >;\n\n  <\n    TState = unknown,\n    TRequires = {},\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    options: DefineMiddlewareOptions<\n      TState,\n      TRequires,\n      TQuery,\n      TParams,\n      TBody,\n      TReturns,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn,\n      TAppContext,\n      R\n    >,\n  ): DefineMiddlewareResult<\n    TQuery,\n    TParams,\n    TBody,\n    TState,\n    R,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn,\n    TReturns,\n    null,\n    TRequires\n  >;\n}\n\nexport const defineMiddleware: DefineMiddlewareFn<AppContext> = function defineMiddleware(\n  first: any,\n  second?: any,\n): any {\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    const options = second!;\n    const unit = {\n      ...options,\n      __middlewareAcc: undefined as unknown,\n      ...(options?.returns ? { __returns: options.returns } : {}),\n      __requiredLayouts: first,\n    };\n    return unit;\n  }\n\n  if (typeof first === \"function\") {\n    const honoMiddleware = first as HonoMiddlewareHandler;\n    return defineMiddleware({\n      handler: (ctx: unknown, next: (state?: Record<string, unknown>) => unknown) =>\n        createTaserCompatHandler(honoMiddleware)(ctx, next),\n    });\n  }\n\n  const options = first as DefineMiddlewareOptions<\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any,\n    any\n  >;\n  const unit = {\n    ...options,\n    __middlewareAcc: undefined as unknown,\n    ...(options.returns ? { __returns: options.returns } : {}),\n  };\n\n  return unit;\n};\n"],"mappings":";;AA6OA,IAAa,mBAAmD,SAAS,iBACvE,OACA,QACK;CACL,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,MAAM,UAAU;EAOhB,OAAO;GALL,GAAG;GACH,iBAAiB,KAAA;GACjB,GAAI,SAAS,UAAU,EAAE,WAAW,QAAQ,QAAQ,IAAI,CAAC;GACzD,mBAAmB;EAEd;CACT;CAEA,IAAI,OAAO,UAAU,YAAY;EAC/B,MAAM,iBAAiB;EACvB,OAAO,iBAAiB,EACtB,UAAU,KAAc,SACtB,yBAAyB,cAAc,CAAC,CAAC,KAAK,IAAI,EACtD,CAAC;CACH;CAEA,MAAM,UAAU;CAmBhB,OAAO;EALL,GAAG;EACH,iBAAiB,KAAA;EACjB,GAAI,QAAQ,UAAU,EAAE,WAAW,QAAQ,QAAQ,IAAI,CAAC;CAGnD;AACT"}
+{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/define/middleware.ts"],"sourcesContent":["import { type Awaitable } from \"@taserjs/router-core\";\n\nimport { createMiddlewareUnitBuilder } from \"../builder/middleware-unit.js\";\nimport type {\n  AppContext,\n  DefineMiddlewareResult,\n  ExtractState,\n  IsUnknown,\n  MiddlewareUnitBuilder,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type {\n  LayoutId,\n  ResolveLayoutMiddlewaresState,\n  ResolveLayoutsState,\n} from \"../types/index.js\";\n\nexport interface DefineMiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {\n  /**\n   * Constructs a fluent unscoped middleware builder.\n   *\n   * @example\n   * ```ts\n   * const auth = defineMiddleware()\n   *   .query(z.object({ token: z.string() }))\n   *   .body(\"form\", z.object({ file: z.instanceof(File) }))\n   *   .returns({ 401: z.string() })\n   *   .handler(async (ctx, next) => next({ user: \"alice\" }));\n   * ```\n   */\n  (): MiddlewareUnitBuilder<unknown, unknown, unknown, {}, null, {}, TAppContext>;\n\n  /**\n   * Constructs a fluent middleware builder scoped to a single layout branch.\n   */\n  <const Layout extends LayoutId>(\n    layout: Layout,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    {},\n    TAppContext,\n    ResolveLayoutMiddlewaresState<Layout>\n  >;\n\n  /**\n   * Constructs a fluent middleware builder scoped to multiple layout branches (branch union).\n   */\n  <const Layouts extends readonly [LayoutId, ...LayoutId[]]>(\n    layouts: Layouts,\n  ): MiddlewareUnitBuilder<\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    {},\n    TAppContext,\n    ResolveLayoutsState<Layouts>\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to a single layout branch using a short function signature.\n   */\n  <const Layout extends LayoutId, TState = unknown, TRequires = {}, R = unknown>(\n    layout: Layout,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutMiddlewaresState<Layout> & TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => Awaitable<R>,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layout,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone middleware scoped to multiple layout branches using a short function signature.\n   */\n  <\n    const Layouts extends readonly [LayoutId, ...LayoutId[]],\n    TState = unknown,\n    TRequires = {},\n    R = unknown,\n  >(\n    layouts: Layouts,\n    fn: (\n      ctx: StandaloneMiddlewareContext<\n        unknown,\n        unknown,\n        unknown,\n        TAppContext,\n        ResolveLayoutsState<Layouts> & TRequires\n      >,\n      next: NextFn<NoInfer<TState>>,\n    ) => Awaitable<R>,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    Layouts,\n    TRequires\n  >;\n\n  /**\n   * Defines a standalone, unscoped middleware using a short function signature.\n   *\n   * @example\n   * ```ts\n   * const auth = defineMiddleware((ctx, next) => {\n   *   return next({ user: \"alice\" });\n   * });\n   * ```\n   */\n  <TState = unknown, TRequires = {}, R = unknown>(\n    fn: (\n      ctx: StandaloneMiddlewareContext<unknown, unknown, unknown, TAppContext, TRequires>,\n      next: NextFn<NoInfer<TState>>,\n    ) => Awaitable<R>,\n  ): DefineMiddlewareResult<\n    unknown,\n    unknown,\n    unknown,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    R,\n    unknown,\n    unknown,\n    unknown,\n    {},\n    null,\n    TRequires\n  >;\n}\n\nexport const defineMiddleware: DefineMiddlewareFn<AppContext> = function defineMiddleware(\n  first?: any,\n  second?: any,\n): any {\n  if (first === undefined) {\n    return createMiddlewareUnitBuilder();\n  }\n\n  if (typeof first === \"string\" || Array.isArray(first)) {\n    if (typeof second === \"function\") {\n      return {\n        handler: second,\n        __middlewareAcc: undefined as unknown,\n        __requiredLayouts: first,\n      };\n    }\n    return createMiddlewareUnitBuilder(first);\n  }\n\n  if (typeof first === \"function\") {\n    return {\n      handler: first,\n      __middlewareAcc: undefined as unknown,\n    };\n  }\n\n  return createMiddlewareUnitBuilder();\n};\n"],"mappings":";;;AA8JA,IAAa,mBAAmD,SAAS,iBACvE,OACA,QACK;CACL,IAAI,UAAU,KAAA,GACZ,OAAO,4BAA4B;CAGrC,IAAI,OAAO,UAAU,YAAY,MAAM,QAAQ,KAAK,GAAG;EACrD,IAAI,OAAO,WAAW,YACpB,OAAO;GACL,SAAS;GACT,iBAAiB,KAAA;GACjB,mBAAmB;EACrB;EAEF,OAAO,4BAA4B,KAAK;CAC1C;CAEA,IAAI,OAAO,UAAU,YACnB,OAAO;EACL,SAAS;EACT,iBAAiB,KAAA;CACnB;CAGF,OAAO,4BAA4B;AACrC"}

package/dist/esm/index.d.ts

@@ -1,11 +1,11 @@
 export type { RouterRegister } from './register.js';
-export type { HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteOutput, Method, MiddlewareDefinition, PathParams, ReturnsMap, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
+export type { HttpMethod, InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteOutput, Method, MiddlewareDefinition, MiddlewareUnit, MiddlewareUnitBuilder, PathParams, ReturnsMap, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, StatusCode, } from './types/index.js';
 export type { ContextDefinition, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, } from './types/app.js';
 export { ValidationError, validationErrorSchema } from '@taserjs/router-utils';
 export type { ResponseValidationFailureHandler, SuccessStatusCode } from '@taserjs/router-utils';
 export { createTaserApp, TaserRouter } from './builder/router.js';
 export { TaserApp } from './builder/app.js';
 export { createContext } from './context/create-context.js';
-export { defineHandler } from './define/handler.js';
 export { defineMiddleware } from './define/middleware.js';
+export { honoMw } from './middleware/hono-mw.js';
 export type { TaserCookieJar, TaserHeaders } from '@taserjs/router-core';

package/dist/esm/index.js

@@ -1,7 +1,7 @@
-import { defineHandler } from "./define/handler.js";
 import { defineMiddleware } from "./define/middleware.js";
 import { TaserApp } from "./builder/app.js";
 import { TaserRouter, createTaserApp } from "./builder/router.js";
 import { createContext } from "./context/create-context.js";
+import { honoMw } from "./middleware/hono-mw.js";
 import { ValidationError, validationErrorSchema } from "@taserjs/router-utils";
-export { TaserApp, TaserRouter, ValidationError, createContext, createTaserApp, defineHandler, defineMiddleware, validationErrorSchema };
+export { TaserApp, TaserRouter, ValidationError, createContext, createTaserApp, defineMiddleware, honoMw, validationErrorSchema };

package/dist/esm/middleware/body-limit.d.ts

@@ -1,3 +1,3 @@
 import { bodyLimit as honoBodyLimit } from 'hono/body-limit';
-export declare function bodyLimit(...args: Parameters<typeof honoBodyLimit>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function bodyLimit(...args: Parameters<typeof honoBodyLimit>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type BodyLimitOptions = Parameters<typeof honoBodyLimit>[0];

package/dist/esm/middleware/body-limit.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { bodyLimit as bodyLimit$1 } from "hono/body-limit";
 //#region src/middleware/body-limit.ts
-var wrapped = wrapHonoMiddleware(bodyLimit$1);
 function bodyLimit(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(bodyLimit$1(...args)));
 }
 //#endregion
 export { bodyLimit };

package/dist/esm/middleware/body-limit.js.map

@@ -1 +1 @@
-{"version":3,"file":"body-limit.js","names":[],"sources":["../../../src/middleware/body-limit.ts"],"sourcesContent":["import { bodyLimit as honoBodyLimit } from \"hono/body-limit\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoBodyLimit);\n\nexport function bodyLimit(...args: Parameters<typeof honoBodyLimit>) {\n  return wrapped(...args);\n}\n\nexport type BodyLimitOptions = Parameters<typeof honoBodyLimit>[0];\n"],"mappings":";;;AAIA,IAAM,UAAU,mBAAmB,WAAa;AAEhD,SAAgB,UAAU,GAAG,MAAwC;CACnE,OAAO,QAAQ,GAAG,IAAI;AACxB"}
+{"version":3,"file":"body-limit.js","names":[],"sources":["../../../src/middleware/body-limit.ts"],"sourcesContent":["import { bodyLimit as honoBodyLimit } from \"hono/body-limit\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function bodyLimit(...args: Parameters<typeof honoBodyLimit>) {\n  return defineMiddleware(honoMw(honoBodyLimit(...args)));\n}\n\nexport type BodyLimitOptions = Parameters<typeof honoBodyLimit>[0];\n"],"mappings":";;;;AAKA,SAAgB,UAAU,GAAG,MAAwC;CACnE,OAAO,iBAAiB,OAAO,YAAc,GAAG,IAAI,CAAC,CAAC;AACxD"}

package/dist/esm/middleware/compress.d.ts

@@ -1,3 +1,3 @@
 import { compress as honoCompress } from 'hono/compress';
-export declare function compress(...args: Parameters<typeof honoCompress>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function compress(...args: Parameters<typeof honoCompress>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;

package/dist/esm/middleware/compress.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { compress as compress$1 } from "hono/compress";
 //#region src/middleware/compress.ts
-var wrapped = wrapHonoMiddleware(compress$1);
 function compress(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(compress$1(...args)));
 }
 //#endregion
 export { compress };

package/dist/esm/middleware/compress.js.map

@@ -1 +1 @@
-{"version":3,"file":"compress.js","names":[],"sources":["../../../src/middleware/compress.ts"],"sourcesContent":["import { compress as honoCompress } from \"hono/compress\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoCompress);\n\nexport function compress(...args: Parameters<typeof honoCompress>) {\n  return wrapped(...args);\n}\n\nexport type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;\n"],"mappings":";;;AAIA,IAAM,UAAU,mBAAmB,UAAY;AAE/C,SAAgB,SAAS,GAAG,MAAuC;CACjE,OAAO,QAAQ,GAAG,IAAI;AACxB"}
+{"version":3,"file":"compress.js","names":[],"sources":["../../../src/middleware/compress.ts"],"sourcesContent":["import { compress as honoCompress } from \"hono/compress\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function compress(...args: Parameters<typeof honoCompress>) {\n  return defineMiddleware(honoMw(honoCompress(...args)));\n}\n\nexport type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;\n"],"mappings":";;;;AAKA,SAAgB,SAAS,GAAG,MAAuC;CACjE,OAAO,iBAAiB,OAAO,WAAa,GAAG,IAAI,CAAC,CAAC;AACvD"}

package/dist/esm/middleware/cors.d.ts

@@ -1,3 +1,3 @@
 import { cors as honoCors } from 'hono/cors';
-export declare function cors(...args: Parameters<typeof honoCors>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function cors(...args: Parameters<typeof honoCors>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;

package/dist/esm/middleware/cors.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { cors as cors$1 } from "hono/cors";
 //#region src/middleware/cors.ts
-var wrapped = wrapHonoMiddleware(cors$1);
 function cors(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(cors$1(...args)));
 }
 //#endregion
 export { cors };

package/dist/esm/middleware/cors.js.map

@@ -1 +1 @@
-{"version":3,"file":"cors.js","names":[],"sources":["../../../src/middleware/cors.ts"],"sourcesContent":["import { cors as honoCors } from \"hono/cors\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoCors);\n\nexport function cors(...args: Parameters<typeof honoCors>) {\n  return wrapped(...args);\n}\n\nexport type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;\n"],"mappings":";;;AAIA,IAAM,UAAU,mBAAmB,MAAQ;AAE3C,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,QAAQ,GAAG,IAAI;AACxB"}
+{"version":3,"file":"cors.js","names":[],"sources":["../../../src/middleware/cors.ts"],"sourcesContent":["import { cors as honoCors } from \"hono/cors\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function cors(...args: Parameters<typeof honoCors>) {\n  return defineMiddleware(honoMw(honoCors(...args)));\n}\n\nexport type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;\n"],"mappings":";;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,iBAAiB,OAAO,OAAS,GAAG,IAAI,CAAC,CAAC;AACnD"}

package/dist/esm/middleware/csrf.d.ts

@@ -1,3 +1,3 @@
 import { csrf as honoCsrf } from 'hono/csrf';
-export declare function csrf(...args: Parameters<typeof honoCsrf>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function csrf(...args: Parameters<typeof honoCsrf>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;

package/dist/esm/middleware/csrf.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { csrf as csrf$1 } from "hono/csrf";
 //#region src/middleware/csrf.ts
-var wrapped = wrapHonoMiddleware(csrf$1);
 function csrf(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(csrf$1(...args)));
 }
 //#endregion
 export { csrf };

package/dist/esm/middleware/csrf.js.map

@@ -1 +1 @@
-{"version":3,"file":"csrf.js","names":[],"sources":["../../../src/middleware/csrf.ts"],"sourcesContent":["import { csrf as honoCsrf } from \"hono/csrf\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoCsrf);\n\nexport function csrf(...args: Parameters<typeof honoCsrf>) {\n  return wrapped(...args);\n}\n\nexport type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;\n"],"mappings":";;;AAIA,IAAM,UAAU,mBAAmB,MAAQ;AAE3C,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,QAAQ,GAAG,IAAI;AACxB"}
+{"version":3,"file":"csrf.js","names":[],"sources":["../../../src/middleware/csrf.ts"],"sourcesContent":["import { csrf as honoCsrf } from \"hono/csrf\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function csrf(...args: Parameters<typeof honoCsrf>) {\n  return defineMiddleware(honoMw(honoCsrf(...args)));\n}\n\nexport type CsrfOptions = NonNullable<Parameters<typeof honoCsrf>[0]>;\n"],"mappings":";;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,iBAAiB,OAAO,OAAS,GAAG,IAAI,CAAC,CAAC;AACnD"}

package/dist/esm/middleware/etag.d.ts

@@ -1,3 +1,3 @@
 import { etag as honoEtag } from 'hono/etag';
-export declare function etag(...args: Parameters<typeof honoEtag>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function etag(...args: Parameters<typeof honoEtag>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;

package/dist/esm/middleware/etag.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { etag as etag$1 } from "hono/etag";
 //#region src/middleware/etag.ts
-var wrapped = wrapHonoMiddleware(etag$1);
 function etag(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(etag$1(...args)));
 }
 //#endregion
 export { etag };

package/dist/esm/middleware/etag.js.map

@@ -1 +1 @@
-{"version":3,"file":"etag.js","names":[],"sources":["../../../src/middleware/etag.ts"],"sourcesContent":["import { etag as honoEtag } from \"hono/etag\";\n\nimport { wrapHonoMiddleware } from \"./wrap-hono.js\";\n\nconst wrapped = wrapHonoMiddleware(honoEtag);\n\nexport function etag(...args: Parameters<typeof honoEtag>) {\n  return wrapped(...args);\n}\n\nexport type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;\n"],"mappings":";;;AAIA,IAAM,UAAU,mBAAmB,MAAQ;AAE3C,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,QAAQ,GAAG,IAAI;AACxB"}
+{"version":3,"file":"etag.js","names":[],"sources":["../../../src/middleware/etag.ts"],"sourcesContent":["import { etag as honoEtag } from \"hono/etag\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport function etag(...args: Parameters<typeof honoEtag>) {\n  return defineMiddleware(honoMw(honoEtag(...args)));\n}\n\nexport type EtagOptions = NonNullable<Parameters<typeof honoEtag>[0]>;\n"],"mappings":";;;;AAKA,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,iBAAiB,OAAO,OAAS,GAAG,IAAI,CAAC,CAAC;AACnD"}

package/dist/esm/middleware/hono-mw.d.ts

@@ -0,0 +1,16 @@
+import { MiddlewareHandler } from 'hono';
+/**
+ * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`
+ * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.
+ *
+ * @example
+ * ```ts
+ * import { honoMw } from "@taserjs/router";
+ * import { cors } from "hono/cors";
+ *
+ * const app = t.get("/hello").use(honoMw(cors()));
+ * // or
+ * const customCors = defineMiddleware(honoMw(cors()));
+ * ```
+ */
+export declare function honoMw(middleware: MiddlewareHandler): (ctx: unknown, next: any) => Promise<Response>;

package/dist/esm/middleware/hono-mw.js

@@ -0,0 +1,23 @@
+import { createTaserCompatHandler } from "@taserjs/router-core";
+//#region src/middleware/hono-mw.ts
+/**
+* Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`
+* into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.
+*
+* @example
+* ```ts
+* import { honoMw } from "@taserjs/router";
+* import { cors } from "hono/cors";
+*
+* const app = t.get("/hello").use(honoMw(cors()));
+* // or
+* const customCors = defineMiddleware(honoMw(cors()));
+* ```
+*/
+function honoMw(middleware) {
+	return createTaserCompatHandler(middleware);
+}
+//#endregion
+export { honoMw };
+
+//# sourceMappingURL=hono-mw.js.map

package/dist/esm/middleware/hono-mw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"hono-mw.js","names":[],"sources":["../../../src/middleware/hono-mw.ts"],"sourcesContent":["import { createTaserCompatHandler } from \"@taserjs/router-core\";\nimport type { MiddlewareHandler } from \"hono\";\n\n/**\n * Adapts a standard Web / Hono-compatible middleware function `(c, next) => ...`\n * into a Taser-compatible middleware handler function `(ctx, next) => Promise<Response>`.\n *\n * @example\n * ```ts\n * import { honoMw } from \"@taserjs/router\";\n * import { cors } from \"hono/cors\";\n *\n * const app = t.get(\"/hello\").use(honoMw(cors()));\n * // or\n * const customCors = defineMiddleware(honoMw(cors()));\n * ```\n */\nexport function honoMw(\n  middleware: MiddlewareHandler,\n): (ctx: unknown, next: any) => Promise<Response> {\n  return createTaserCompatHandler(middleware) as (ctx: unknown, next: any) => Promise<Response>;\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,SAAgB,OACd,YACgD;CAChD,OAAO,yBAAyB,UAAU;AAC5C"}

package/dist/esm/middleware/jwk.js

@@ -1,5 +1,5 @@
 import { defineMiddleware } from "../define/middleware.js";
-import { extractJwtPayload } from "./wrap-hono.js";
+import { honoMw } from "./hono-mw.js";
 import { jwk as jwk$1 } from "hono/jwk";
 //#region src/middleware/jwk.ts
 function assertJwksScheme(jwksUri, allowInsecure) {
@@ -17,7 +17,11 @@ function jwk(options, init) {
 	const jwksUri = options.jwks_uri;
 	if (typeof jwksUri === "string") assertJwksScheme(jwksUri, options.allowInsecure ?? false);
 	const { allowInsecure: _allowInsecure, ...honoOptions } = options;
-	return defineMiddleware({ handler: extractJwtPayload(jwk$1(honoOptions, init?.headers !== void 0 ? { headers: init.headers } : void 0)) });
+	const mw = honoMw(jwk$1(honoOptions, init?.headers !== void 0 ? { headers: init.headers } : void 0));
+	return defineMiddleware((ctx, next) => mw(ctx, async () => {
+		const payload = ctx.var.jwtPayload;
+		return next({ jwtPayload: payload });
+	}));
 }
 //#endregion
 export { jwk };

package/dist/esm/middleware/jwk.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwk.js","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import type { MiddlewareHandler } from \"hono\";\nimport { jwk as honoJwk } from \"hono/jwk\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { JwtMiddlewareUnit, JwtPayloadState } from \"./jwt.js\";\nimport { extractJwtPayload } from \"./wrap-hono.js\";\n\nexport type JwkOptions = Parameters<typeof honoJwk>[0];\n\nexport type JwkRequestInit = Pick<RequestInit, \"headers\">;\n\nexport type JwkMiddlewareOptions = JwkOptions & {\n  /** Allow `http://` JWKS URLs (local dev). Default false — requires `https://`. */\n  allowInsecure?: boolean;\n};\n\nfunction assertJwksScheme(jwksUri: string, allowInsecure: boolean): void {\n  const scheme = new URL(jwksUri).protocol.replace(\":\", \"\");\n  if (scheme === \"https\") {\n    return;\n  }\n  if (scheme === \"http\" && allowInsecure) {\n    return;\n  }\n  throw new Error(`JWKS URL must use https:// (or http:// with allowInsecure: true): \"${jwksUri}\"`);\n}\n\n/**\n * JWK auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n * Static `jwks_uri` must use HTTPS unless `allowInsecure: true`.\n */\nexport function jwk<TPayload = Record<string, unknown>>(\n  options: JwkMiddlewareOptions,\n  init?: JwkRequestInit,\n): JwtMiddlewareUnit<TPayload> {\n  const jwksUri = options.jwks_uri;\n  if (typeof jwksUri === \"string\") {\n    assertJwksScheme(jwksUri, options.allowInsecure ?? false);\n  }\n\n  const { allowInsecure: _allowInsecure, ...honoOptions } = options;\n  const safeInit = init?.headers !== undefined ? { headers: init.headers } : undefined;\n  const honoMw: MiddlewareHandler = honoJwk(honoOptions, safeInit);\n\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: extractJwtPayload<TPayload>(honoMw),\n  });\n}\n"],"mappings":";;;;AAgBA,SAAS,iBAAiB,SAAiB,eAA8B;CACvE,MAAM,SAAS,IAAI,IAAI,OAAO,CAAC,CAAC,SAAS,QAAQ,KAAK,EAAE;CACxD,IAAI,WAAW,SACb;CAEF,IAAI,WAAW,UAAU,eACvB;CAEF,MAAM,IAAI,MAAM,sEAAsE,QAAQ,EAAE;AAClG;;;;;;AAOA,SAAgB,IACd,SACA,MAC6B;CAC7B,MAAM,UAAU,QAAQ;CACxB,IAAI,OAAO,YAAY,UACrB,iBAAiB,SAAS,QAAQ,iBAAiB,KAAK;CAG1D,MAAM,EAAE,eAAe,gBAAgB,GAAG,gBAAgB;CAI1D,OAAO,iBAA4C,EACjD,SAAS,kBAHuB,MAAQ,aADzB,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CAIpC,CAAM,EAC7C,CAAC;AACH"}
+{"version":3,"file":"jwk.js","names":[],"sources":["../../../src/middleware/jwk.ts"],"sourcesContent":["import { jwk as honoJwk } from \"hono/jwk\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport { honoMw } from \"./hono-mw.js\";\nimport type { JwtMiddlewareUnit, JwtPayloadState } from \"./jwt.js\";\n\nexport type JwkOptions = Parameters<typeof honoJwk>[0];\n\nexport type JwkRequestInit = Pick<RequestInit, \"headers\">;\n\nexport type JwkMiddlewareOptions = JwkOptions & {\n  /** Allow `http://` JWKS URLs (local dev). Default false — requires `https://`. */\n  allowInsecure?: boolean;\n};\n\nfunction assertJwksScheme(jwksUri: string, allowInsecure: boolean): void {\n  const scheme = new URL(jwksUri).protocol.replace(\":\", \"\");\n  if (scheme === \"https\") {\n    return;\n  }\n  if (scheme === \"http\" && allowInsecure) {\n    return;\n  }\n  throw new Error(`JWKS URL must use https:// (or http:// with allowInsecure: true): \"${jwksUri}\"`);\n}\n\n/**\n * JWK auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n * Static `jwks_uri` must use HTTPS unless `allowInsecure: true`.\n */\nexport function jwk<TPayload = Record<string, unknown>>(\n  options: JwkMiddlewareOptions,\n  init?: JwkRequestInit,\n): JwtMiddlewareUnit<TPayload> {\n  const jwksUri = options.jwks_uri;\n  if (typeof jwksUri === \"string\") {\n    assertJwksScheme(jwksUri, options.allowInsecure ?? false);\n  }\n\n  const { allowInsecure: _allowInsecure, ...honoOptions } = options;\n  const safeInit = init?.headers !== undefined ? { headers: init.headers } : undefined;\n  const mw = honoMw(honoJwk(honoOptions, safeInit));\n\n  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;AAeA,SAAS,iBAAiB,SAAiB,eAA8B;CACvE,MAAM,SAAS,IAAI,IAAI,OAAO,CAAC,CAAC,SAAS,QAAQ,KAAK,EAAE;CACxD,IAAI,WAAW,SACb;CAEF,IAAI,WAAW,UAAU,eACvB;CAEF,MAAM,IAAI,MAAM,sEAAsE,QAAQ,EAAE;AAClG;;;;;;AAOA,SAAgB,IACd,SACA,MAC6B;CAC7B,MAAM,UAAU,QAAQ;CACxB,IAAI,OAAO,YAAY,UACrB,iBAAiB,SAAS,QAAQ,iBAAiB,KAAK;CAG1D,MAAM,EAAE,eAAe,gBAAgB,GAAG,gBAAgB;CAE1D,MAAM,KAAK,OAAO,MAAQ,aADT,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,QAAQ,IAAI,KAAA,CAC5B,CAAC;CAEhD,OAAO,kBAA6C,KAAK,SACvD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}

package/dist/esm/middleware/jwt.js

@@ -1,5 +1,5 @@
 import { defineMiddleware } from "../define/middleware.js";
-import { extractJwtPayload } from "./wrap-hono.js";
+import { honoMw } from "./hono-mw.js";
 import { jwt as jwt$1 } from "hono/jwt";
 //#region src/middleware/jwt.ts
 /**
@@ -7,7 +7,11 @@ import { jwt as jwt$1 } from "hono/jwt";
 * Successfully decoded payload is placed in `ctx.state.jwtPayload`.
 */
 function jwt(options) {
-	return defineMiddleware({ handler: extractJwtPayload(jwt$1(options)) });
+	const mw = honoMw(jwt$1(options));
+	return defineMiddleware((ctx, next) => mw(ctx, async () => {
+		const payload = ctx.var.jwtPayload;
+		return next({ jwtPayload: payload });
+	}));
 }
 //#endregion
 export { jwt };

package/dist/esm/middleware/jwt.js.map

@@ -1 +1 @@
-{"version":3,"file":"jwt.js","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import type { MiddlewareHandler } from \"hono\";\nimport { jwt as honoJwt } from \"hono/jwt\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\nimport { extractJwtPayload } from \"./wrap-hono.js\";\n\nexport type JwtPayloadState<TPayload> = {\n  jwtPayload: TPayload;\n};\n\nexport type JwtMiddlewareUnit<TPayload> = MiddlewareUnit<\n  MiddlewareReturnFromParts<unknown, unknown, unknown, JwtPayloadState<TPayload>>\n>;\n\nexport type JwtOptions = Parameters<typeof honoJwt>[0];\n\n/**\n * JWT auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n */\nexport function jwt<TPayload = Record<string, unknown>>(\n  options: JwtOptions,\n): JwtMiddlewareUnit<TPayload> {\n  const honoMw: MiddlewareHandler = honoJwt(options);\n  return defineMiddleware<JwtPayloadState<TPayload>>({\n    handler: extractJwtPayload<TPayload>(honoMw),\n  });\n}\n"],"mappings":";;;;;;;;AAqBA,SAAgB,IACd,SAC6B;CAE7B,OAAO,iBAA4C,EACjD,SAAS,kBAFuB,MAAQ,OAEH,CAAM,EAC7C,CAAC;AACH"}
+{"version":3,"file":"jwt.js","names":[],"sources":["../../../src/middleware/jwt.ts"],"sourcesContent":["import { jwt as honoJwt } from \"hono/jwt\";\n\nimport { defineMiddleware } from \"../define/middleware.js\";\nimport type { MiddlewareReturnFromParts, MiddlewareUnit } from \"../types/units.js\";\nimport { honoMw } from \"./hono-mw.js\";\n\nexport type JwtPayloadState<TPayload> = {\n  jwtPayload: TPayload;\n};\n\nexport type JwtMiddlewareUnit<TPayload> = MiddlewareUnit<\n  MiddlewareReturnFromParts<unknown, unknown, unknown, JwtPayloadState<TPayload>>\n>;\n\nexport type JwtOptions = Parameters<typeof honoJwt>[0];\n\n/**\n * JWT auth middleware. Invalid or missing tokens return **401** (Hono).\n * Successfully decoded payload is placed in `ctx.state.jwtPayload`.\n */\nexport function jwt<TPayload = Record<string, unknown>>(\n  options: JwtOptions,\n): JwtMiddlewareUnit<TPayload> {\n  const mw = honoMw(honoJwt(options));\n  return defineMiddleware<JwtPayloadState<TPayload>>((ctx, next) =>\n    mw(ctx, async () => {\n      const payload = (ctx as unknown as { var: { jwtPayload?: unknown } }).var.jwtPayload;\n      return next({ jwtPayload: payload as TPayload });\n    }),\n  );\n}\n"],"mappings":";;;;;;;;AAoBA,SAAgB,IACd,SAC6B;CAC7B,MAAM,KAAK,OAAO,MAAQ,OAAO,CAAC;CAClC,OAAO,kBAA6C,KAAK,SACvD,GAAG,KAAK,YAAY;EAClB,MAAM,UAAW,IAAqD,IAAI;EAC1E,OAAO,KAAK,EAAE,YAAY,QAAoB,CAAC;CACjD,CAAC,CACH;AACF"}

package/dist/esm/middleware/secure-headers.d.ts

@@ -1,3 +1,3 @@
 import { secureHeaders as honoSecureHeaders } from 'hono/secure-headers';
-export declare function secureHeaders(...args: Parameters<typeof honoSecureHeaders>): import('../types/units.js').MiddlewareUnit<import('../types/units.js').MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
+export declare function secureHeaders(...args: Parameters<typeof honoSecureHeaders>): import('../types/units.js').DefineMiddlewareResult<unknown, unknown, unknown, {}, Response, unknown, unknown, unknown, {}, null, {}>;
 export type SecureHeadersOptions = NonNullable<Parameters<typeof honoSecureHeaders>[0]>;

package/dist/esm/middleware/secure-headers.js

@@ -1,9 +1,9 @@
-import { wrapHonoMiddleware } from "./wrap-hono.js";
+import { defineMiddleware } from "../define/middleware.js";
+import { honoMw } from "./hono-mw.js";
 import { secureHeaders as secureHeaders$1 } from "hono/secure-headers";
 //#region src/middleware/secure-headers.ts
-var wrapped = wrapHonoMiddleware(secureHeaders$1);
 function secureHeaders(...args) {
-	return wrapped(...args);
+	return defineMiddleware(honoMw(secureHeaders$1(...args)));
 }
 //#endregion
 export { secureHeaders };