@taserjs/router 0.0.3 → 0.0.5

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

@@ -0,0 +1,11 @@
+import { RouteManifestShape, TaserRuntime } from '@taserjs/router-core';
+declare class TaserServeView {
+    protected readonly runtime: TaserRuntime;
+    readonly fetch: (request: Request, env?: unknown, executionCtx?: unknown) => Promise<Response> | Response;
+    constructor(runtime: TaserRuntime);
+}
+export declare class TaserApp<TManifest extends RouteManifestShape = RouteManifestShape> extends TaserServeView {
+    readonly __manifest?: TManifest;
+    constructor(runtime: TaserRuntime, manifest?: TManifest);
+}
+export {};

package/dist/esm/builder/app.js

@@ -0,0 +1,22 @@
+//#region src/builder/app.ts
+var TaserServeView = class {
+	runtime;
+	fetch;
+	constructor(runtime) {
+		this.runtime = runtime;
+		this.fetch = (request, env, executionCtx) => {
+			return this.runtime.fetch(request, env, executionCtx);
+		};
+	}
+};
+var TaserApp = class extends TaserServeView {
+	__manifest;
+	constructor(runtime, manifest) {
+		super(runtime);
+		if (manifest !== void 0) this.__manifest = manifest;
+	}
+};
+//#endregion
+export { TaserApp };
+
+//# sourceMappingURL=app.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"app.js","names":[],"sources":["../../../src/builder/app.ts"],"sourcesContent":["import type { RouteManifestShape, TaserRuntime } from \"@taserjs/router-core\";\n\nclass TaserServeView {\n  readonly fetch: (\n    request: Request,\n    env?: unknown,\n    executionCtx?: unknown,\n  ) => Promise<Response> | Response;\n\n  constructor(protected readonly runtime: TaserRuntime) {\n    this.fetch = (request: Request, env?: unknown, executionCtx?: unknown) => {\n      return this.runtime.fetch(request, env, executionCtx as never);\n    };\n  }\n}\n\nexport class TaserApp<\n  TManifest extends RouteManifestShape = RouteManifestShape,\n> extends TaserServeView {\n  readonly __manifest?: TManifest;\n\n  constructor(runtime: TaserRuntime, manifest?: TManifest) {\n    super(runtime);\n    if (manifest !== undefined) {\n      this.__manifest = manifest;\n    }\n  }\n}\n"],"mappings":";AAEA,IAAM,iBAAN,MAAqB;CAOY;CAN/B;CAMA,YAAY,SAA0C;EAAvB,KAAA,UAAA;EAC7B,KAAK,SAAS,SAAkB,KAAe,iBAA2B;GACxE,OAAO,KAAK,QAAQ,MAAM,SAAS,KAAK,YAAqB;EAC/D;CACF;AACF;AAEA,IAAa,WAAb,cAEU,eAAe;CACvB;CAEA,YAAY,SAAuB,UAAsB;EACvD,MAAM,OAAO;EACb,IAAI,aAAa,KAAA,GACf,KAAK,aAAa;CAEtB;AACF"}

package/dist/esm/{constants.js → builder/constants.js}

@@ -1,4 +1,4 @@
-//#region src/constants.ts
+//#region src/builder/constants.ts
 /** Input schema keys validated by middleware and route handlers. Headers/cookies are parsed only. */
 var SCHEMA_KEYS = [
 	"query",

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

@@ -0,0 +1 @@
+{"version":3,"file":"constants.js","names":[],"sources":["../../../src/builder/constants.ts"],"sourcesContent":["/** Input schema keys validated by middleware and route handlers. Headers/cookies are parsed only. */\nexport const SCHEMA_KEYS = [\"query\", \"params\", \"body\"] as const;\n\nexport type SchemaKey = (typeof SCHEMA_KEYS)[number];\n\nexport const HANDLER_SCHEMA_KEY_MAP = {\n  query: \"handlerQuery\",\n  params: \"handlerParams\",\n  body: \"handlerBody\",\n} as const satisfies Record<SchemaKey, string>;\n"],"mappings":";;AACA,IAAa,cAAc;CAAC;CAAS;CAAU;AAAM;AAIrD,IAAa,yBAAyB;CACpC,OAAO;CACP,QAAQ;CACR,MAAM;AACR"}

package/dist/esm/{factories.d.ts → builder/factories.d.ts}

@@ -1,5 +1,5 @@
-import { RouteBuilder, RoutePath, Schema } from './types/index.js';
-import { AppContext, HttpMethod } from './types/units.js';
+import { RouteBuilder, RoutePath, Schema } from '../types/index.js';
+import { AppContext, HttpMethod } from '../types/units.js';
 type WithoutBodyOptions<TQuery, TParams, TQueryIn = unknown, TParamsIn = unknown> = {
     query?: Schema<TQuery, TQueryIn>;
     params?: Schema<TParams, TParamsIn>;

package/dist/esm/{factories.js → builder/factories.js}

@@ -1,5 +1,5 @@
 import { createRouteBuilder } from "./route.js";
-//#region src/factories.ts
+//#region src/builder/factories.ts
 function createWithoutBodyRoute(method) {
 	return ((path, options) => createRouteBuilder(path, method, options));
 }

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

@@ -0,0 +1 @@
+{"version":3,"file":"factories.js","names":[],"sources":["../../../src/builder/factories.ts"],"sourcesContent":["import { createRouteBuilder } from \"./route.js\";\nimport type { RouteBuilder, RoutePath, Schema } from \"../types/index.js\";\nimport type { AppContext, HttpMethod } from \"../types/units.js\";\n\ntype WithoutBodyOptions<TQuery, TParams, TQueryIn = unknown, TParamsIn = unknown> = {\n  query?: Schema<TQuery, TQueryIn>;\n  params?: Schema<TParams, TParamsIn>;\n};\n\ntype WithBodyOptions<\n  TQuery,\n  TParams,\n  TBody,\n  TQueryIn = unknown,\n  TParamsIn = unknown,\n  TBodyIn = unknown,\n> = WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn> & {\n  body?: Schema<TBody, TBodyIn>;\n};\n\nexport type CreateWithoutBodyRoute<\n  M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n  >(\n    path: Path,\n    options: WithoutBodyOptions<TQuery, TParams, TQueryIn, TParamsIn>,\n  ): RouteBuilder<\n    Path,\n    M,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateWithBodyRoute<\n  M extends \"POST\" | \"PUT\" | \"PATCH\",\n  TAppContext extends Record<string, unknown> = AppContext,\n> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, M, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    M,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateAnyRoute<TAppContext extends Record<string, unknown> = AppContext> = {\n  <const Path extends RoutePath, const Methods extends readonly HttpMethod[]>(\n    path: Path,\n    methods: Methods,\n  ): RouteBuilder<Path, Methods[number], readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    const Methods extends readonly HttpMethod[],\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    methods: Methods,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    Methods[number],\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nexport type CreateAllRoute<TAppContext extends Record<string, unknown> = AppContext> = {\n  <const Path extends RoutePath>(\n    path: Path,\n  ): RouteBuilder<Path, HttpMethod, readonly [], {}, {}, TAppContext>;\n  <\n    const Path extends RoutePath,\n    TQuery = unknown,\n    TParams = unknown,\n    TBody = unknown,\n    TQueryIn = unknown,\n    TParamsIn = unknown,\n    TBodyIn = unknown,\n  >(\n    path: Path,\n    options: WithBodyOptions<TQuery, TParams, TBody, TQueryIn, TParamsIn, TBodyIn>,\n  ): RouteBuilder<\n    Path,\n    HttpMethod,\n    readonly [],\n    {\n      query: TQuery;\n      params: TParams;\n      body: TBody;\n      queryIn: TQueryIn;\n      paramsIn: TParamsIn;\n      bodyIn: TBodyIn;\n    },\n    {},\n    TAppContext\n  >;\n};\n\nfunction createWithoutBodyRoute<M extends \"GET\" | \"DELETE\" | \"OPTIONS\" | \"HEAD\">(\n  method: M,\n): CreateWithoutBodyRoute<M> {\n  return ((path: string, options?: WithoutBodyOptions<unknown, unknown>) =>\n    createRouteBuilder(path, method, options)) as unknown as CreateWithoutBodyRoute<M>;\n}\n\nfunction createWithBodyRoute<M extends \"POST\" | \"PUT\" | \"PATCH\">(\n  method: M,\n): CreateWithBodyRoute<M> {\n  return ((path: string, options?: WithBodyOptions<unknown, unknown, unknown>) =>\n    createRouteBuilder(path, method, options)) as unknown as CreateWithBodyRoute<M>;\n}\n\nexport const createGetRoute = createWithoutBodyRoute(\"GET\");\nexport const createDeleteRoute = createWithoutBodyRoute(\"DELETE\");\nexport const createOptionsRoute = createWithoutBodyRoute(\"OPTIONS\");\nexport const createHeadRoute = createWithoutBodyRoute(\"HEAD\");\nexport const createPostRoute = createWithBodyRoute(\"POST\");\nexport const createPutRoute = createWithBodyRoute(\"PUT\");\nexport const createPatchRoute = createWithBodyRoute(\"PATCH\");\n\nexport const createAnyRoute: CreateAnyRoute = ((\n  path: string,\n  methods: readonly HttpMethod[],\n  options?: WithBodyOptions<unknown, unknown, unknown>,\n) => createRouteBuilder(path, \"ANY\", options, methods)) as unknown as CreateAnyRoute;\n\nexport const createAllRoute: CreateAllRoute = ((\n  path: string,\n  options?: WithBodyOptions<unknown, unknown, unknown>,\n) => createRouteBuilder(path, \"ALL\", options)) as unknown as CreateAllRoute;\n"],"mappings":";;AAyJA,SAAS,uBACP,QAC2B;CAC3B,SAAS,MAAc,YACrB,mBAAmB,MAAM,QAAQ,OAAO;AAC5C;AAEA,SAAS,oBACP,QACwB;CACxB,SAAS,MAAc,YACrB,mBAAmB,MAAM,QAAQ,OAAO;AAC5C;AAEA,IAAa,iBAAiB,uBAAuB,KAAK;AAC1D,IAAa,oBAAoB,uBAAuB,QAAQ;AAChE,IAAa,qBAAqB,uBAAuB,SAAS;AAClE,IAAa,kBAAkB,uBAAuB,MAAM;AAC5D,IAAa,kBAAkB,oBAAoB,MAAM;AACzD,IAAa,iBAAiB,oBAAoB,KAAK;AACvD,IAAa,mBAAmB,oBAAoB,OAAO;AAE3D,IAAa,mBACX,MACA,SACA,YACG,mBAAmB,MAAM,OAAO,SAAS,OAAO;AAErD,IAAa,mBACX,MACA,YACG,mBAAmB,MAAM,OAAO,OAAO"}

package/dist/esm/{middleware.d.ts → builder/middleware.d.ts}

@@ -1,2 +1,2 @@
-import { LayoutId, MiddlewareBuilder } from './types/index.js';
+import { LayoutId, MiddlewareBuilder } from '../types/index.js';
 export declare function createMiddleware<const Layout extends LayoutId>(layout: Layout): MiddlewareBuilder<Layout, readonly []>;

package/dist/esm/{middleware.js → builder/middleware.js}

@@ -1,4 +1,4 @@
-//#region src/middleware.ts
+//#region src/builder/middleware.ts
 function createMiddleware(layout) {
 	const entries = [];
 	const chain = {

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

@@ -0,0 +1 @@
+{"version":3,"file":"middleware.js","names":[],"sources":["../../../src/builder/middleware.ts"],"sourcesContent":["import type { LayoutId, MiddlewareBuilder } from \"../types/index.js\";\nimport type { MiddlewareDefinition } from \"../types/units.js\";\n\nexport function createMiddleware<const Layout extends LayoutId>(\n  layout: Layout,\n): MiddlewareBuilder<Layout, readonly []> {\n  const entries: MiddlewareDefinition[] = [];\n\n  const chain = {\n    layout,\n    middlewares: entries,\n    use(definition: MiddlewareDefinition) {\n      entries.push(definition);\n      return chain;\n    },\n  };\n\n  return chain as unknown as MiddlewareBuilder<Layout, readonly []>;\n}\n"],"mappings":";AAGA,SAAgB,iBACd,QACwC;CACxC,MAAM,UAAkC,CAAC;CAEzC,MAAM,QAAQ;EACZ;EACA,aAAa;EACb,IAAI,YAAkC;GACpC,QAAQ,KAAK,UAAU;GACvB,OAAO;EACT;CACF;CAEA,OAAO;AACT"}

package/dist/esm/{route.d.ts → builder/route.d.ts}

@@ -1,5 +1,5 @@
-import { Method, RouteBuilder, RoutePath, ValidatorParts } from './types/index.js';
-import { HttpMethod } from './types/units.js';
-import { SchemaValidators } from './define/validators.js';
+import { Method, RouteBuilder, RoutePath, ValidatorParts } from '../types/index.js';
+import { HttpMethod } from '../types/units.js';
+import { SchemaValidators } from '../define/validators.js';
 /** Shared internal builder — not part of the public `@taserjs/router` API. */
 export declare function createRouteBuilder(path: string, method: HttpMethod | "ANY" | "ALL", validators?: SchemaValidators, methods?: readonly HttpMethod[]): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts>;

package/dist/esm/{route.js → builder/route.js}

@@ -1,8 +1,8 @@
-import { isHandlerUnit } from "./types/units.js";
+import { isHandlerUnit } from "../types/units.js";
 import { HANDLER_SCHEMA_KEY_MAP } from "./constants.js";
-import { pickDefinedSchemas } from "./define/validators.js";
+import { pickDefinedSchemas } from "../define/validators.js";
 import { collectReturnsFromDefinitions, hasInputSchemas, mergeReturnsMaps, withAuto422 } from "@taserjs/router-utils";
-//#region src/route.ts
+//#region src/builder/route.ts
 function toUtilsMap(map) {
 	if (!map) return {};
 	const out = {};
@@ -42,46 +42,32 @@ function createRouteBuilder(path, method, validators = {}, methods) {
 		handler(fnOrUnit) {
 			const routeSchemas = pickDefinedSchemas(validators);
 			const base = buildRouteBase(path, method, methods, middlewares);
-			if (isHandlerUnit(fnOrUnit)) {
-				const handlerSchemas = pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP);
-				const returns = buildEffectiveReturns({
-					middlewareReturns: collectReturnsFromDefinitions(middlewares),
-					routeReturns,
-					handlerMiddlewareReturns: collectReturnsFromDefinitions(fnOrUnit.middlewares),
-					handlerReturns: fnOrUnit.returns,
-					schemas: {
-						...validators,
-						handlerQuery: fnOrUnit.query,
-						handlerParams: fnOrUnit.params,
-						handlerBody: fnOrUnit.body,
-						middlewares,
-						handlerMiddlewares: fnOrUnit.middlewares
-					}
-				});
-				return {
-					...base,
-					handlerMiddlewares: [...fnOrUnit.middlewares],
-					handler: fnOrUnit.handler,
-					...routeSchemas,
-					...handlerSchemas,
-					...returns ? { returns } : {}
-				};
-			}
+			const unit = isHandlerUnit(fnOrUnit) ? fnOrUnit : {
+				handler: fnOrUnit,
+				middlewares: [],
+				returns: void 0
+			};
+			const handlerSchemas = isHandlerUnit(fnOrUnit) ? pickDefinedSchemas(fnOrUnit, HANDLER_SCHEMA_KEY_MAP) : {};
 			const returns = buildEffectiveReturns({
 				middlewareReturns: collectReturnsFromDefinitions(middlewares),
 				routeReturns,
-				handlerMiddlewareReturns: {},
-				handlerReturns: void 0,
+				handlerMiddlewareReturns: collectReturnsFromDefinitions(unit.middlewares),
+				handlerReturns: unit.returns,
 				schemas: {
 					...validators,
-					middlewares
+					handlerQuery: unit.query,
+					handlerParams: unit.params,
+					handlerBody: unit.body,
+					middlewares,
+					handlerMiddlewares: unit.middlewares
 				}
 			});
 			return {
 				...base,
-				handlerMiddlewares: [],
-				handler: fnOrUnit,
+				handlerMiddlewares: [...unit.middlewares],
+				handler: unit.handler,
 				...routeSchemas,
+				...handlerSchemas,
 				...returns ? { returns } : {}
 			};
 		}

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

@@ -0,0 +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\";\n\nimport type {\n  Method,\n  RouteBuilder,\n  RoutePath,\n  ReturnsMap,\n  ValidatorParts,\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  validators: SchemaValidators = {},\n  methods?: readonly HttpMethod[],\n): RouteBuilder<RoutePath, Method, readonly [], ValidatorParts> {\n  const middlewares: MiddlewareDefinition[] = [];\n  let routeReturns: Record<number, StandardSchemaV1> = {};\n\n  const builder = {\n    path,\n    method,\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        ...(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,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,aAA+B,CAAC,GAChC,SAC8D;CAC9D,MAAM,cAAsC,CAAC;CAC7C,IAAI,eAAiD,CAAC;CAEtD,MAAM,UAAU;EACd;EACA;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,UAAU,EAAE,QAAQ,IAAI,CAAC;GAC/B;EACF;CACF;CAEA,OAAO;AACT"}

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

@@ -0,0 +1,48 @@
+import { createTaserCompatHandler, NotFoundHandler, OnErrorHandler, RouteManifestShape } from '@taserjs/router-core';
+import { DefineMiddlewareOptions, MultiScopedMiddlewareOptions, ScopedMiddlewareOptions } from '../define/middleware.js';
+import { TaserApp } from './app.js';
+import { ContextDefinition, CreateTaserAppOptions, OnErrorOptions } from '../types/app.js';
+import { AppContext, ExtractState, IsUnknown, MiddlewareReturnFromParts, MiddlewareUnit } from '../types/units.js';
+import { HandlerBuilder, 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;
+    contextDef: ContextDefinition<Record<string, unknown>, Record<string, unknown>>;
+    onError?: OnErrorHandler;
+    notFound?: NotFoundHandler;
+};
+export declare class TaserRouter<TAppContext extends Record<string, unknown> = AppContext> {
+    private readonly state;
+    constructor(options?: CreateTaserAppOptions, state?: Partial<Omit<RouterState, "options">>);
+    context<TBoot extends Record<string, unknown>, TReq extends Record<string, unknown>>(definition: ContextDefinition<TBoot, TReq>): TaserRouter<TBoot & TReq>;
+    onError<TResponses extends ReturnsMap = ReturnsMap>(options: OnErrorOptions<TResponses> | OnErrorOptions<TResponses>["handle"]): this;
+    notFound(handler: (ctx: unknown) => Response | Promise<Response> | unknown): this;
+    get: CreateWithoutBodyRoute<"GET", TAppContext>;
+    post: CreateWithBodyRoute<"POST", TAppContext>;
+    put: CreateWithBodyRoute<"PUT", TAppContext>;
+    patch: CreateWithBodyRoute<"PATCH", TAppContext>;
+    delete: CreateWithoutBodyRoute<"DELETE", TAppContext>;
+    options: CreateWithoutBodyRoute<"OPTIONS", TAppContext>;
+    head: CreateWithoutBodyRoute<"HEAD", TAppContext>;
+    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(middleware: Parameters<typeof createTaserCompatHandler>[0]): MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>, {}, null, {}>;
+    defineMiddleware<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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layout, TRequires>;
+    defineMiddleware<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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layouts, TRequires>;
+    defineMiddleware<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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, null, TRequires>;
+    create<const TManifest extends RouteManifestShape>(manifest: TManifest): TaserApp<TManifest>;
+}
+export declare function createTaserApp(options?: CreateTaserAppOptions): TaserRouter;
+export {};

package/dist/esm/{taser-router.js → builder/router.js}

@@ -1,10 +1,11 @@
 import { createAllRoute, createAnyRoute, createDeleteRoute, createGetRoute, createHeadRoute, createOptionsRoute, createPatchRoute, createPostRoute, createPutRoute } from "./factories.js";
-import { defineHandler } from "./define/handler.js";
+import { defineHandler } from "../define/handler.js";
+import { defineMiddleware } from "../define/middleware.js";
 import { createMiddleware } from "./middleware.js";
-import { TaserApp } from "./taser-app.js";
-import { normalizeOnError } from "@taserjs/router-utils";
+import { TaserApp } from "./app.js";
+import { isPromise, normalizeOnError } from "@taserjs/router-utils";
 import { createTaserRuntime } from "@taserjs/router-core";
-//#region src/taser-router.ts
+//#region src/builder/router.ts
 function toOnErrorHandler(onErrorOptions) {
 	return normalizeOnError(onErrorOptions);
 }
@@ -46,19 +47,45 @@ var TaserRouter = class {
 	defineHandler(options) {
 		return options === void 0 ? defineHandler() : defineHandler(options);
 	}
+	defineMiddleware(first, second) {
+		return defineMiddleware(first, second);
+	}
 	create(manifest) {
 		const definition = this.state.contextDef;
 		const validateResponse = this.state.options.response?.validate ?? true;
 		const onValidationFailure = this.state.options.response?.onValidationFailure;
 		const basePath = this.state.options.basePath;
 		const hasCustomContext = definition.boot !== void 0 || definition.request !== void 0;
-		const bootPromise = hasCustomContext ? Promise.resolve(definition.boot?.() ?? {}) : void 0;
-		return new TaserApp(createTaserRuntime(manifest, hasCustomContext ? async ({ native } = {}) => {
-			const bootContext = await bootPromise ?? {};
-			const requestContext = await definition.request?.({ native }) ?? {};
-			return {
+		let bootContextResolved;
+		let bootPromise;
+		if (definition.boot !== void 0) {
+			const bootResult = definition.boot();
+			if (isPromise(bootResult)) bootPromise = bootResult.then((ctx) => {
+				bootContextResolved = ctx ?? {};
+				return bootContextResolved;
+			});
+			else bootContextResolved = bootResult ?? {};
+		} else if (hasCustomContext) bootContextResolved = {};
+		return new TaserApp(createTaserRuntime(manifest, hasCustomContext ? (req) => {
+			if (bootPromise !== void 0 && bootContextResolved === void 0) return bootPromise.then(async (bootContext) => {
+				if (!definition.request) return { ...bootContext };
+				const requestResult = definition.request(req);
+				const requestContext = isPromise(requestResult) ? await requestResult : requestResult;
+				return {
+					...bootContext,
+					...requestContext
+				};
+			});
+			const bootContext = bootContextResolved ?? {};
+			if (!definition.request) return { ...bootContext };
+			const requestResult = definition.request(req);
+			if (isPromise(requestResult)) return requestResult.then((requestContext) => ({
 				...bootContext,
 				...requestContext
+			}));
+			return {
+				...bootContext,
+				...requestResult
 			};
 		} : () => ({}), {
 			...basePath !== void 0 ? { basePath } : {},
@@ -78,4 +105,4 @@ function createTaserApp(options = {}) {
 //#endregion
 export { TaserRouter, createTaserApp };
 
-//# sourceMappingURL=taser-router.js.map
+//# sourceMappingURL=router.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"router.js","names":[],"sources":["../../../src/builder/router.ts"],"sourcesContent":["import {\n  createTaserCompatHandler,\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 {\n  defineMiddleware,\n  type DefineMiddlewareOptions,\n  type MultiScopedMiddlewareOptions,\n  type ScopedMiddlewareOptions,\n} 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 {\n  AppContext,\n  ExtractState,\n  IsUnknown,\n  MiddlewareReturnFromParts,\n  MiddlewareUnit,\n} 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<TAppContext extends Record<string, unknown> = AppContext> {\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> {\n    this.state.contextDef = definition;\n    return this as unknown as TaserRouter<TBoot & TReq>;\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(handler: (ctx: unknown) => Response | Promise<Response> | unknown): this {\n    this.state.notFound = (ctx) => handler(ctx);\n    return this;\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(\n    middleware: Parameters<typeof createTaserCompatHandler>[0],\n  ): MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>, {}, null, {}>;\n\n  defineMiddleware<\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  ): MiddlewareUnit<\n    MiddlewareReturnFromParts<\n      TQuery,\n      TParams,\n      TBody,\n      IsUnknown<TState> extends true ? ExtractState<R> : TState,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn\n    >,\n    TReturns,\n    Layout,\n    TRequires\n  >;\n\n  defineMiddleware<\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  ): MiddlewareUnit<\n    MiddlewareReturnFromParts<\n      TQuery,\n      TParams,\n      TBody,\n      IsUnknown<TState> extends true ? ExtractState<R> : TState,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn\n    >,\n    TReturns,\n    Layouts,\n    TRequires\n  >;\n\n  defineMiddleware<\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  ): MiddlewareUnit<\n    MiddlewareReturnFromParts<\n      TQuery,\n      TParams,\n      TBody,\n      IsUnknown<TState> extends true ? ExtractState<R> : TState,\n      TQueryIn,\n      TParamsIn,\n      TBodyIn\n    >,\n    TReturns,\n    null,\n    TRequires\n  >;\n\n  defineMiddleware(first: any, second?: any): any {\n    return defineMiddleware(first, second);\n  }\n\n  create<const TManifest extends RouteManifestShape>(manifest: TManifest): TaserApp<TManifest> {\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 = this.state.options.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);\n  }\n}\n\nexport function createTaserApp(options: CreateTaserAppOptions = {}): TaserRouter {\n  return new TaserRouter(options);\n}\n"],"mappings":";;;;;;;;AA+CA,SAAS,iBACP,gBACgB;CAChB,OAAO,iBAAiB,cAAc;AACxC;AASA,IAAM,eAAoF,CAAC;AAE3F,IAAa,cAAb,MAAmF;CACjF;CAEA,YAAY,UAAiC,CAAC,GAAG,OAA+C;EAC9F,KAAK,QAAQ;GACX;GACA,YAAY,OAAO,cAAc;GACjC,GAAI,OAAO,YAAY,KAAA,IAAY,EAAE,SAAS,MAAM,QAAQ,IAAI,CAAC;GACjE,GAAI,OAAO,aAAa,KAAA,IAAY,EAAE,UAAU,MAAM,SAAS,IAAI,CAAC;EACtE;CACF;CAEA,QACE,YAC2B;EAC3B,KAAK,MAAM,aAAa;EACxB,OAAO;CACT;CAEA,QACE,SACM;EACN,KAAK,MAAM,UAAU,iBAAiB,OAAO;EAC7C,OAAO;CACT;CAEA,SAAS,SAAyE;EAChF,KAAK,MAAM,YAAY,QAAQ,QAAQ,GAAG;EAC1C,OAAO;CACT;CAEA,MAAkD;CAIlD,OAAiD;CAIjD,MAA+C;CAI/C,QAAmD;CAInD,SACE;CACF,UACE;CACF,OAAoD;CAIpD,MAAmC;CACnC,MAAmC;CAEnC,WACE,QACqD;EACrD,OAAO,iBAAiB,MAAM;CAChC;CAEA,cAAoE,SASlE;EACA,OAAO,YAAY,KAAA,IACf,cAA2B,IAC3B,cAA2B,OAAO;CACxC;CAoIA,iBAAiB,OAAY,QAAmB;EAC9C,OAAO,iBAAiB,OAAO,MAAM;CACvC;CAEA,OAAmD,UAA0C;EAC3F,MAAM,aAAa,KAAK,MAAM;EAC9B,MAAM,mBAAmB,KAAK,MAAM,QAAQ,UAAU,YAAY;EAClE,MAAM,sBAAsB,KAAK,MAAM,QAAQ,UAAU;EACzD,MAAM,WAAW,KAAK,MAAM,QAAQ;EAEpC,MAAM,mBAAmB,WAAW,SAAS,KAAA,KAAa,WAAW,YAAY,KAAA;EACjF,IAAI;EACJ,IAAI;EAEJ,IAAI,WAAW,SAAS,KAAA,GAAW;GACjC,MAAM,aAAa,WAAW,KAAK;GACnC,IAAI,UAAU,UAAU,GACtB,cAAc,WAAW,MAAM,QAAQ;IACrC,sBAAuB,OAAO,CAAC;IAC/B,OAAO;GACT,CAAC;QAED,sBAAuB,cAAc,CAAC;EAE1C,OAAO,IAAI,kBACT,sBAAsB,CAAC;EA4CzB,OAAO,IAAI,SAXK,mBAAmB,UA9BZ,oBAClB,QAAkB;GACjB,IAAI,gBAAgB,KAAA,KAAa,wBAAwB,KAAA,GACvD,OAAO,YAAY,KAAK,OAAO,gBAAgB;IAC7C,IAAI,CAAC,WAAW,SACd,OAAO,EAAE,GAAG,YAAY;IAE1B,MAAM,gBAAgB,WAAW,QAAQ,GAAI;IAC7C,MAAM,iBAAiB,UAAU,aAAa,IAAI,MAAM,gBAAgB;IACxE,OAAO;KAAE,GAAG;KAAa,GAAG;IAAe;GAC7C,CAAC;GAGH,MAAM,cAAc,uBAAuB,CAAC;GAC5C,IAAI,CAAC,WAAW,SACd,OAAO,EAAE,GAAG,YAAY;GAG1B,MAAM,gBAAgB,WAAW,QAAQ,GAAI;GAC7C,IAAI,UAAU,aAAa,GACzB,OAAO,cAAc,MAAM,oBAAoB;IAC7C,GAAG;IACH,GAAG;GACL,EAAE;GAGJ,OAAO;IAAE,GAAG;IAAa,GAAI;GAA0C;EACzE,WACO,CAAC,IAEiD;GAC3D,GAAI,aAAa,KAAA,IAAY,EAAE,SAAS,IAAI,CAAC;GAC7C,UAAU;IACR,UAAU;IACV,GAAI,wBAAwB,KAAA,IAAY,EAAE,oBAAoB,IAAI,CAAC;GACrE;GACA,GAAI,KAAK,MAAM,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,MAAM,QAAQ,IAAI,CAAC;GAC1E,GAAI,KAAK,MAAM,aAAa,KAAA,IAAY,EAAE,UAAU,KAAK,MAAM,SAAS,IAAI,CAAC;GAC7E,GAAI,KAAK,MAAM,QAAQ,YAAY,KAAA,IAAY,EAAE,SAAS,KAAK,MAAM,QAAQ,QAAQ,IAAI,CAAC;EAC5F,CAEoB,GAAS,QAAQ;CACvC;AACF;AAEA,SAAgB,eAAe,UAAiC,CAAC,GAAgB;CAC/E,OAAO,IAAI,YAAY,OAAO;AAChC"}

package/dist/esm/{create-context.d.ts → context/create-context.d.ts}

@@ -1,5 +1,5 @@
 import { ReservedContextKey } from '@taserjs/router-core';
-import { ContextDefinition } from './types/app.js';
+import { 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;
 export declare function createContext<TBoot extends Record<string, unknown> = Record<string, never>, TReq extends Record<string, unknown> = Record<string, never>>(definition: ContextDefinition<TBoot, TReq> & NoReservedKeysConstraint<TBoot, TReq>): ContextDefinition<TBoot, TReq>;
-export type { ContextDefinition, InferAppContext } from './types/app.js';
+export type { ContextDefinition, InferAppContext } from '../types/app.js';

package/dist/esm/{create-context.js → context/create-context.js}

@@ -1,4 +1,4 @@
-//#region src/create-context.ts
+//#region src/context/create-context.ts
 function createContext(definition) {
 	return definition;
 }

package/dist/esm/context/create-context.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"create-context.js","names":[],"sources":["../../../src/context/create-context.ts"],"sourcesContent":["import type { ReservedContextKey } from \"@taserjs/router-core\";\n\nimport type { ContextDefinition } from \"../types/app.js\";\n\ntype NoReservedKeysConstraint<\n  TBoot extends Record<string, unknown>,\n  TReq extends Record<string, unknown>,\n> = Extract<keyof TBoot | keyof TReq, ReservedContextKey> extends never ? unknown : never;\n\nexport function createContext<\n  TBoot extends Record<string, unknown> = Record<string, never>,\n  TReq extends Record<string, unknown> = Record<string, never>,\n>(\n  definition: ContextDefinition<TBoot, TReq> & NoReservedKeysConstraint<TBoot, TReq>,\n): ContextDefinition<TBoot, TReq> {\n  return definition;\n}\n\nexport type { ContextDefinition, InferAppContext } from \"../types/app.js\";\n"],"mappings":";AASA,SAAgB,cAId,YACgC;CAChC,OAAO;AACT"}

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

@@ -1,16 +1,33 @@
 import { createTaserCompatHandler, Awaitable } from '@taserjs/router-core';
 import { ReturnsMap } from '../types/returns.js';
 import { AppContext, ExtractState, IsUnknown, MiddlewareReturnFromParts, MiddlewareUnit, NextFn, StandaloneMiddlewareContext } from '../types/units.js';
+import { LayoutId, ResolveLayoutMiddlewaresState, ResolveLayoutsState } from '../types/index.js';
 import { Schema } from '../types/schema.js';
 type HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];
-type HonoMiddlewareUnit = MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;
-export type DefineMiddlewareOptions<TState = unknown, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, TAppContext extends Record<string, unknown> = AppContext, R = unknown> = {
+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>, next: NextFn<NoInfer<TState>>) => Awaitable<R>;
+    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 declare function defineMiddleware(middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;
-export declare function defineMiddleware<TState = unknown, TAppContext extends Record<string, unknown> = AppContext, TQuery = unknown, TParams = unknown, TBody = unknown, TReturns extends ReturnsMap = {}, TQueryIn = unknown, TParamsIn = unknown, TBodyIn = unknown, R = unknown>(options: DefineMiddlewareOptions<TState, TQuery, TParams, TBody, TReturns, TQueryIn, TParamsIn, TBodyIn, TAppContext, R>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns>;
+export declare function defineMiddleware<const Layout extends LayoutId, TState = unknown, TRequires = {}, TAppContext extends Record<string, unknown> = AppContext, 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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layout, TRequires>;
+export declare function defineMiddleware<const Layouts extends readonly [LayoutId, ...LayoutId[]], TState = unknown, TRequires = {}, TAppContext extends Record<string, unknown> = AppContext, 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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, Layouts, TRequires>;
+export declare function defineMiddleware<TState = unknown, TRequires = {}, TAppContext extends Record<string, unknown> = AppContext, 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>): MiddlewareUnit<MiddlewareReturnFromParts<TQuery, TParams, TBody, IsUnknown<TState> extends true ? ExtractState<R> : TState, TQueryIn, TParamsIn, TBodyIn>, TReturns, null, TRequires>;
 export {};

package/dist/esm/define/middleware.js

@@ -1,10 +1,20 @@
 import { createTaserCompatHandler } from "@taserjs/router-core";
 //#region src/define/middleware.ts
-function defineMiddleware(options) {
-	if (typeof options === "function") {
-		const honoMiddleware = options;
+function defineMiddleware(first, second) {
+	if (typeof first === "string" || Array.isArray(first)) {
+		const options = second;
+		return {
+			...options,
+			__middlewareAcc: void 0,
+			...options?.returns ? { __returns: options.returns } : {},
+			__requiredLayouts: 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,

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  ExtractState,\n  IsUnknown,\n  MiddlewareReturnFromParts,\n  MiddlewareUnit,\n  NextFn,\n  StandaloneMiddlewareContext,\n} from \"../types/units.js\";\nimport type { Schema } from \"../types/schema.js\";\n\ntype HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];\n\ntype HonoMiddlewareUnit = MiddlewareUnit<MiddlewareReturnFromParts<unknown, unknown, unknown, {}>>;\n\nexport type DefineMiddlewareOptions<\n  TState = unknown,\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>,\n    next: NextFn<NoInfer<TState>>,\n  ) => Awaitable<R>;\n};\n\nexport function defineMiddleware(middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;\n\nexport function defineMiddleware<\n  TState = unknown,\n  TAppContext extends Record<string, unknown> = AppContext,\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    TQuery,\n    TParams,\n    TBody,\n    TReturns,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn,\n    TAppContext,\n    R\n  >,\n): MiddlewareUnit<\n  MiddlewareReturnFromParts<\n    TQuery,\n    TParams,\n    TBody,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn\n  >,\n  TReturns\n>;\n\nexport function defineMiddleware(\n  options:\n    | HonoMiddlewareHandler\n    | DefineMiddlewareOptions<any, any, any, any, any, any, any, any, any, any>,\n): unknown {\n  if (typeof options === \"function\") {\n    const honoMiddleware = options as HonoMiddlewareHandler;\n    return defineMiddleware({\n      handler: (ctx, next) => createTaserCompatHandler(honoMiddleware)(ctx, next),\n    });\n  }\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":";;AA+EA,SAAgB,iBACd,SAGS;CACT,IAAI,OAAO,YAAY,YAAY;EACjC,MAAM,iBAAiB;EACvB,OAAO,iBAAiB,EACtB,UAAU,KAAK,SAAS,yBAAyB,cAAc,CAAC,CAAC,KAAK,IAAI,EAC5E,CAAC;CACH;CAQA,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 { createTaserCompatHandler, type Awaitable } from \"@taserjs/router-core\";\n\nimport type { ReturnsMap } from \"../types/returns.js\";\nimport type {\n  AppContext,\n  ExtractState,\n  IsUnknown,\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\ntype HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];\n\ntype 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 function defineMiddleware(middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;\n\nexport function defineMiddleware<\n  const Layout extends LayoutId,\n  TState = unknown,\n  TRequires = {},\n  TAppContext extends Record<string, unknown> = AppContext,\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): MiddlewareUnit<\n  MiddlewareReturnFromParts<\n    TQuery,\n    TParams,\n    TBody,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn\n  >,\n  TReturns,\n  Layout,\n  TRequires\n>;\n\nexport function defineMiddleware<\n  const Layouts extends readonly [LayoutId, ...LayoutId[]],\n  TState = unknown,\n  TRequires = {},\n  TAppContext extends Record<string, unknown> = AppContext,\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): MiddlewareUnit<\n  MiddlewareReturnFromParts<\n    TQuery,\n    TParams,\n    TBody,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn\n  >,\n  TReturns,\n  Layouts,\n  TRequires\n>;\n\nexport function defineMiddleware<\n  TState = unknown,\n  TRequires = {},\n  TAppContext extends Record<string, unknown> = AppContext,\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): MiddlewareUnit<\n  MiddlewareReturnFromParts<\n    TQuery,\n    TParams,\n    TBody,\n    IsUnknown<TState> extends true ? ExtractState<R> : TState,\n    TQueryIn,\n    TParamsIn,\n    TBodyIn\n  >,\n  TReturns,\n  null,\n  TRequires\n>;\n\nexport function defineMiddleware(\n  first:\n    | string\n    | readonly string[]\n    | HonoMiddlewareHandler\n    | DefineMiddlewareOptions<any, any, any, any, any, any, any, any, any, any, any>,\n  second?: DefineMiddlewareOptions<any, any, any, any, any, any, any, any, any, any, any>,\n): unknown {\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, next) => 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":";;AAkPA,SAAgB,iBACd,OAKA,QACS;CACT,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,KAAK,SAAS,yBAAyB,cAAc,CAAC,CAAC,KAAK,IAAI,EAC5E,CAAC;CACH;CAEA,MAAM,UAAU;CAmBhB,OAAO;EALL,GAAG;EACH,iBAAiB,KAAA;EACjB,GAAI,QAAQ,UAAU,EAAE,WAAW,QAAQ,QAAQ,IAAI,CAAC;CAGnD;AACT"}

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

@@ -1,5 +1,5 @@
 import { Schema } from '../types/schema.js';
-import { SchemaKey } from '../constants.js';
+import { SchemaKey } from '../builder/constants.js';
 export type SchemaValidators = {
     query?: Schema<unknown>;
     params?: Schema<unknown>;

package/dist/esm/define/validators.js

@@ -1,4 +1,4 @@
-import { SCHEMA_KEYS } from "../constants.js";
+import { SCHEMA_KEYS } from "../builder/constants.js";
 //#region src/define/validators.ts
 function pickDefinedSchemas(source, keyMap) {
 	const result = {};

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

@@ -1 +1 @@
-{"version":3,"file":"validators.js","names":[],"sources":["../../../src/define/validators.ts"],"sourcesContent":["import type { Schema } from \"../types/schema.js\";\nimport { SCHEMA_KEYS, type SchemaKey } from \"../constants.js\";\n\nexport type SchemaValidators = {\n  query?: Schema<unknown>;\n  params?: Schema<unknown>;\n  body?: Schema<unknown>;\n};\n\nexport function pickDefinedSchemas(\n  source: SchemaValidators,\n  keyMap?: Partial<Record<SchemaKey, string>>,\n): Record<string, Schema<unknown>> {\n  const result: Record<string, Schema<unknown>> = {};\n  for (const key of SCHEMA_KEYS) {\n    const value = source[key];\n    if (value !== undefined) {\n      result[keyMap?.[key] ?? key] = value;\n    }\n  }\n  return result;\n}\n"],"mappings":";;AASA,SAAgB,mBACd,QACA,QACiC;CACjC,MAAM,SAA0C,CAAC;CACjD,KAAK,MAAM,OAAO,aAAa;EAC7B,MAAM,QAAQ,OAAO;EACrB,IAAI,UAAU,KAAA,GACZ,OAAO,SAAS,QAAQ,OAAO;CAEnC;CACA,OAAO;AACT"}
+{"version":3,"file":"validators.js","names":[],"sources":["../../../src/define/validators.ts"],"sourcesContent":["import type { Schema } from \"../types/schema.js\";\nimport { SCHEMA_KEYS, type SchemaKey } from \"../builder/constants.js\";\n\nexport type SchemaValidators = {\n  query?: Schema<unknown>;\n  params?: Schema<unknown>;\n  body?: Schema<unknown>;\n};\n\nexport function pickDefinedSchemas(\n  source: SchemaValidators,\n  keyMap?: Partial<Record<SchemaKey, string>>,\n): Record<string, Schema<unknown>> {\n  const result: Record<string, Schema<unknown>> = {};\n  for (const key of SCHEMA_KEYS) {\n    const value = source[key];\n    if (value !== undefined) {\n      result[keyMap?.[key] ?? key] = value;\n    }\n  }\n  return result;\n}\n"],"mappings":";;AASA,SAAgB,mBACd,QACA,QACiC;CACjC,MAAM,SAA0C,CAAC;CACjD,KAAK,MAAM,OAAO,aAAa;EAC7B,MAAM,QAAQ,OAAO;EACrB,IAAI,UAAU,KAAA,GACZ,OAAO,SAAS,QAAQ,OAAO;CAEnC;CACA,OAAO;AACT"}

package/dist/esm/index.d.ts

@@ -1,12 +1,11 @@
 export type { RouterRegister } from './register.js';
-export type { InferInput, InferOutput, Method, PathParams, ReturnsMap, RoutePath, Schema, Simplify, } from './types/index.js';
-export type { ContextDefinition, CreateContextArgs, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, TaserHandler, } from './types/app.js';
-export { isReplyResult, reply, stream, ValidationError, validationErrorSchema, } from '@taserjs/router-utils';
+export type { InferInput, InferOutput, InferRouteContext, InferRouteInput, InferRouteOutput, Method, PathParams, ReturnsMap, RouteDefinition, RouteExport, RoutePath, Schema, Simplify, } from './types/index.js';
+export type { ContextDefinition, CreateTaserAppOptions, InferAppContext, InferAppManifest, OnErrorOptions, RouteManifestShape, TaserHandler, } from './types/app.js';
+export { reply, stream, ValidationError, validationErrorSchema } from '@taserjs/router-utils';
 export type { ReplyBodyKind, ReplyOf, ResponseValidationFailureHandler, SuccessReplyData, SuccessStatusCode, } from '@taserjs/router-utils';
-export { createAnyRoute, createAllRoute } from './factories.js';
-export { createTaserApp, TaserRouter } from './taser-router.js';
-export { TaserApp, TaserNativeBound } from './taser-app.js';
-export { createContext } from './create-context.js';
+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 type { TaserCookieJar, TaserHeaders } from '@taserjs/router-core';

package/dist/esm/index.js

@@ -1,8 +1,7 @@
-import { createAllRoute, createAnyRoute } from "./factories.js";
 import { defineHandler } from "./define/handler.js";
-import { TaserApp, TaserNativeBound } from "./taser-app.js";
-import { TaserRouter, createTaserApp } from "./taser-router.js";
-import { createContext } from "./create-context.js";
 import { defineMiddleware } from "./define/middleware.js";
-import { ValidationError, isReplyResult, reply, stream, validationErrorSchema } from "@taserjs/router-utils";
-export { TaserApp, TaserNativeBound, TaserRouter, ValidationError, createAllRoute, createAnyRoute, createContext, createTaserApp, defineHandler, defineMiddleware, isReplyResult, reply, stream, validationErrorSchema };
+import { TaserApp } from "./builder/app.js";
+import { TaserRouter, createTaserApp } from "./builder/router.js";
+import { createContext } from "./context/create-context.js";
+import { ValidationError, reply, stream, validationErrorSchema } from "@taserjs/router-utils";
+export { TaserApp, TaserRouter, ValidationError, createContext, createTaserApp, defineHandler, defineMiddleware, reply, stream, validationErrorSchema };

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

@@ -1,9 +1,9 @@
 import { wrapHonoMiddleware } from "./wrap-hono.js";
 import { bodyLimit as bodyLimit$1 } from "hono/body-limit";
 //#region src/middleware/body-limit.ts
-var honoBodyLimitMiddleware = wrapHonoMiddleware(bodyLimit$1);
+var wrapped = wrapHonoMiddleware(bodyLimit$1);
 function bodyLimit(...args) {
-	return honoBodyLimitMiddleware(...args);
+	return wrapped(...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 honoBodyLimitMiddleware = wrapHonoMiddleware(honoBodyLimit);\n\nexport function bodyLimit(...args: Parameters<typeof honoBodyLimit>) {\n  return honoBodyLimitMiddleware(...args);\n}\n\nexport type BodyLimitOptions = Parameters<typeof honoBodyLimit>[0];\n"],"mappings":";;;AAIA,IAAM,0BAA0B,mBAAmB,WAAa;AAEhE,SAAgB,UAAU,GAAG,MAAwC;CACnE,OAAO,wBAAwB,GAAG,IAAI;AACxC"}
+{"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"}

package/dist/esm/middleware/compress.js

@@ -1,9 +1,9 @@
 import { wrapHonoMiddleware } from "./wrap-hono.js";
 import { compress as compress$1 } from "hono/compress";
 //#region src/middleware/compress.ts
-var honoCompressMiddleware = wrapHonoMiddleware(compress$1);
+var wrapped = wrapHonoMiddleware(compress$1);
 function compress(...args) {
-	return honoCompressMiddleware(...args);
+	return wrapped(...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 honoCompressMiddleware = wrapHonoMiddleware(honoCompress);\n\nexport function compress(...args: Parameters<typeof honoCompress>) {\n  return honoCompressMiddleware(...args);\n}\n\nexport type CompressOptions = NonNullable<Parameters<typeof honoCompress>[0]>;\n"],"mappings":";;;AAIA,IAAM,yBAAyB,mBAAmB,UAAY;AAE9D,SAAgB,SAAS,GAAG,MAAuC;CACjE,OAAO,uBAAuB,GAAG,IAAI;AACvC"}
+{"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"}

package/dist/esm/middleware/cors.js

@@ -1,9 +1,9 @@
 import { wrapHonoMiddleware } from "./wrap-hono.js";
 import { cors as cors$1 } from "hono/cors";
 //#region src/middleware/cors.ts
-var honoCorsMiddleware = wrapHonoMiddleware(cors$1);
+var wrapped = wrapHonoMiddleware(cors$1);
 function cors(...args) {
-	return honoCorsMiddleware(...args);
+	return wrapped(...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 honoCorsMiddleware = wrapHonoMiddleware(honoCors);\n\nexport function cors(...args: Parameters<typeof honoCors>) {\n  return honoCorsMiddleware(...args);\n}\n\nexport type CorsOptions = NonNullable<Parameters<typeof honoCors>[0]>;\n"],"mappings":";;;AAIA,IAAM,qBAAqB,mBAAmB,MAAQ;AAEtD,SAAgB,KAAK,GAAG,MAAmC;CACzD,OAAO,mBAAmB,GAAG,IAAI;AACnC"}
+{"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"}