@taserjs/router 0.0.5 → 0.1.0

package/src/define/middleware.ts

@@ -3,8 +3,7 @@ import { createTaserCompatHandler, type Awaitable } from "@taserjs/router-core";
 import type { ReturnsMap } from "../types/returns.js";
 import type {
   AppContext,
-  ExtractState,
-  IsUnknown,
+  DefineMiddlewareResult,
   MiddlewareReturnFromParts,
   MiddlewareUnit,
   NextFn,
@@ -17,9 +16,9 @@ import type {
 } from "../types/index.js";
 import type { Schema } from "../types/schema.js";
 
-type HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];
+export type HonoMiddlewareHandler = Parameters<typeof createTaserCompatHandler>[0];
 
-type HonoMiddlewareUnit = MiddlewareUnit<
+export type HonoMiddlewareUnit = MiddlewareUnit<
   MiddlewareReturnFromParts<unknown, unknown, unknown, {}>,
   {},
   null,
@@ -109,145 +108,137 @@ export type MultiScopedMiddlewareOptions<
   ) => Awaitable<R>;
 };
 
-export function defineMiddleware(middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;
+export interface DefineMiddlewareFn<TAppContext extends Record<string, unknown> = AppContext> {
+  (middleware: HonoMiddlewareHandler): HonoMiddlewareUnit;
 
-export 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,
+  <
+    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,
-    TReturns,
+    TState,
+    R,
     TQueryIn,
     TParamsIn,
     TBodyIn,
-    TAppContext,
-    R
-  >,
-): MiddlewareUnit<
-  MiddlewareReturnFromParts<
-    TQuery,
-    TParams,
-    TBody,
-    IsUnknown<TState> extends true ? ExtractState<R> : TState,
-    TQueryIn,
-    TParamsIn,
-    TBodyIn
-  >,
-  TReturns,
-  Layout,
-  TRequires
->;
+    TReturns,
+    Layout,
+    TRequires
+  >;
 
-export 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,
+  <
+    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,
-    TReturns,
+    TState,
+    R,
     TQueryIn,
     TParamsIn,
     TBodyIn,
-    TAppContext,
-    R
-  >,
-): MiddlewareUnit<
-  MiddlewareReturnFromParts<
-    TQuery,
-    TParams,
-    TBody,
-    IsUnknown<TState> extends true ? ExtractState<R> : TState,
-    TQueryIn,
-    TParamsIn,
-    TBodyIn
-  >,
-  TReturns,
-  Layouts,
-  TRequires
->;
+    TReturns,
+    Layouts,
+    TRequires
+  >;
 
-export 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,
+  <
+    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,
-    TReturns,
+    TState,
+    R,
     TQueryIn,
     TParamsIn,
     TBodyIn,
-    TAppContext,
-    R
-  >,
-): MiddlewareUnit<
-  MiddlewareReturnFromParts<
-    TQuery,
-    TParams,
-    TBody,
-    IsUnknown<TState> extends true ? ExtractState<R> : TState,
-    TQueryIn,
-    TParamsIn,
-    TBodyIn
-  >,
-  TReturns,
-  null,
-  TRequires
->;
+    TReturns,
+    null,
+    TRequires
+  >;
+}
 
-export function defineMiddleware(
-  first:
-    | string
-    | readonly string[]
-    | HonoMiddlewareHandler
-    | DefineMiddlewareOptions<any, any, any, any, any, any, any, any, any, any, any>,
-  second?: DefineMiddlewareOptions<any, any, any, any, any, any, any, any, any, any, any>,
-): unknown {
+export const defineMiddleware: DefineMiddlewareFn<AppContext> = function defineMiddleware(
+  first: any,
+  second?: any,
+): any {
   if (typeof first === "string" || Array.isArray(first)) {
     const options = second!;
     const unit = {
@@ -262,7 +253,8 @@ export function defineMiddleware(
   if (typeof first === "function") {
     const honoMiddleware = first as HonoMiddlewareHandler;
     return defineMiddleware({
-      handler: (ctx, next) => createTaserCompatHandler(honoMiddleware)(ctx, next),
+      handler: (ctx: unknown, next: (state?: Record<string, unknown>) => unknown) =>
+        createTaserCompatHandler(honoMiddleware)(ctx, next),
     });
   }
 
@@ -286,4 +278,4 @@ export function defineMiddleware(
   };
 
   return unit;
-}
+};

package/src/index.ts

@@ -1,11 +1,13 @@
 export type { RouterRegister } from "./register.js";
 export type {
+  HttpMethod,
   InferInput,
   InferOutput,
   InferRouteContext,
   InferRouteInput,
   InferRouteOutput,
   Method,
+  MiddlewareDefinition,
   PathParams,
   ReturnsMap,
   RouteDefinition,
@@ -13,6 +15,7 @@ export type {
   RoutePath,
   Schema,
   Simplify,
+  StatusCode,
 } from "./types/index.js";
 export type {
   ContextDefinition,
@@ -21,17 +24,10 @@ export type {
   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 { 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";

package/src/reply.ts

@@ -1,11 +1 @@
-export { errorReply, reply, successReply } from "@taserjs/router-utils/reply";
-export type {
-  BinaryBody,
-  BodyKind,
-  FileReplyInit,
-  RedirectInit,
-  ReplyBodyKind,
-  ReplyInit,
-  ReplyOf,
-  SuccessReplyData,
-} from "@taserjs/router-utils/reply";
+export * from "@taserjs/router-utils/reply";

package/src/stream.ts

@@ -1 +1 @@
-export { blob, buffer, file, pipe, stream } from "@taserjs/router-utils";
+export * from "@taserjs/router-utils/stream";

package/src/types/app.ts

@@ -1,4 +1,4 @@
-import type { RouteManifestShape } from "@taserjs/router-core";
+import type { CookieRuntimeConfig, RouteManifestShape } from "@taserjs/router-core";
 import type { ResponseValidationFailureHandler } from "@taserjs/router-utils";
 
 import type { TaserApp } from "../builder/app.js";
@@ -6,23 +6,13 @@ import type { ReturnsMap } from "./returns.js";
 import type { Schema } from "./schema.js";
 
 export type CreateTaserAppOptions = {
-  basePath?: string;
   response?: {
     /** Validate handler replies against returns maps. Default true. */
     validate?: boolean;
     onValidationFailure?: ResponseValidationFailureHandler;
   };
   /** Global cookie defaults and signing secret. Per-call `ctx.cookies.set` options override defaults. */
-  cookies?: {
-    secret?: string | BufferSource;
-    path?: string;
-    httpOnly?: boolean;
-    sameSite?: "Strict" | "Lax" | "None" | "strict" | "lax" | "none";
-    secure?: boolean;
-    domain?: string;
-    maxAge?: number;
-    expires?: Date;
-  };
+  cookies?: CookieRuntimeConfig;
 };
 
 export type ContextDefinition<
@@ -43,7 +33,7 @@ export type OnErrorOptions<TResponses extends ReturnsMap = ReturnsMap> = {
 };
 
 export type InferAppManifest<TApp> =
-  TApp extends TaserApp<infer TManifest>
+  TApp extends TaserApp<infer TManifest, any>
     ? TManifest
     : TApp extends { manifest: infer TManifest }
       ? TManifest
@@ -51,15 +41,6 @@ export type InferAppManifest<TApp> =
         ? TApp
         : never;
 
-export type TaserHandler<TFrameworkApp> = {
-  /**
-   * Mount the Taser handler on a framework app.
-   * Use universal wildcard patterns (`/*`, `/prefix/*`) for Hono/Fastify.
-   * Use framework-native splat patterns for Express (e.g. `/{*splat}`, `/*splat`).
-   */
-  mount(pattern: string, frameworkApp: TFrameworkApp): void;
-};
-
 export type { RouteManifestShape } from "@taserjs/router-core";
 
 export type { Schema };

package/src/types/index.ts

@@ -5,9 +5,9 @@ import type {
   MergeMiddlewareInputField,
   MergePart,
   RequestShape,
-  RuntimeContextFields,
   Simplify,
   UnionToIntersection,
+  UnitRuntimeContext,
 } from "./type-utils.js";
 import type { ReturnsMap, ValidHandlerReply } from "./returns.js";
 import type { Schema } from "./schema.js";
@@ -39,6 +39,7 @@ export type {
   MergePart,
   RequestShape,
   Simplify,
+  UnitRuntimeContext,
   UnwrapPart,
 } from "./type-utils.js";
 export type {
@@ -167,13 +168,29 @@ type RouteLayoutChain<Path extends RoutePath, TMethod extends Method> =
       ? readonly [RouteParent<Path, TMethod>]
       : readonly [];
 
+export type RouteLayoutMiddlewares<
+  Path extends RoutePath,
+  TMethod extends Method,
+> = ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>;
+
+export type RouteLayoutField<
+  Path extends RoutePath,
+  TMethod extends Method,
+  Field extends "query" | "params" | "body" | "state",
+> = MergeMiddlewareField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
+
+export type RouteLayoutInputField<
+  Path extends RoutePath,
+  TMethod extends Method,
+  Field extends "query" | "params" | "body",
+> = MergeMiddlewareInputField<RouteLayoutMiddlewares<Path, TMethod>, Field>;
+
 type RouteResolvedField<
   Path extends RoutePath,
   TMethod extends Method,
   Acc extends readonly unknown[],
   Field extends "query" | "params" | "body" | "state",
-> = MergeMiddlewareField<ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>, Field> &
-  MergeMiddlewareField<Acc, Field>;
+> = RouteLayoutField<Path, TMethod, Field> & MergeMiddlewareField<Acc, Field>;
 
 type RouteChainField<
   Path extends RoutePath,
@@ -182,8 +199,6 @@ type RouteChainField<
   Field extends "query" | "params" | "body" | "state",
 > = RouteResolvedField<Path, TMethod, Acc, Field>;
 
-type UnitRuntimeContext = Omit<RuntimeContextFields, "var">;
-
 export type RouteChainContext<
   Path extends RoutePath,
   TMethod extends Method,
@@ -292,11 +307,7 @@ type RouteResolvedInputField<
   TMethod extends Method,
   Acc extends readonly unknown[],
   Field extends "query" | "params" | "body",
-> = MergeMiddlewareInputField<
-  ResolveLayoutChainMiddlewares<RouteLayoutChain<Path, TMethod>>,
-  Field
-> &
-  MergeMiddlewareInputField<Acc, Field>;
+> = RouteLayoutInputField<Path, TMethod, Field> & MergeMiddlewareInputField<Acc, Field>;
 
 type IsNever<T> = [T] extends [never] ? true : false;
 
@@ -414,12 +425,16 @@ export type InferRouteInputFromPath<Path extends RoutePath, TMethod extends Meth
       : never
     : never;
 
+export type MiddlewareLayoutField<
+  Layout extends LayoutId,
+  Field extends "query" | "params" | "body" | "state",
+> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field>;
+
 type MiddlewareChainField<
   Layout extends LayoutId,
   Acc extends readonly unknown[],
   Field extends "query" | "params" | "body" | "state",
-> = MergeMiddlewareField<ResolveLayoutMiddlewares<LayoutParent<Layout>>, Field> &
-  MergeMiddlewareField<Acc, Field>;
+> = MiddlewareLayoutField<Layout, Field> & MergeMiddlewareField<Acc, Field>;
 
 export type MiddlewareChainContext<
   Layout extends LayoutId,
@@ -519,6 +534,7 @@ export type RouteExport<
   readonly middlewares: readonly MiddlewareDefinition[];
   readonly handlerMiddlewares: readonly MiddlewareDefinition[];
   readonly returns?: TReturns;
+  readonly bodyMode?: "json" | "form" | "urlencoded";
   handler: (ctx: unknown) => Awaitable<Response>;
   readonly $Infer: {
     Context: TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS"
@@ -557,7 +573,7 @@ type RouteHandleResult<
   };
 };
 
-export type RouteBuilder<
+export type RouteBuilderBase<
   Path extends RoutePath,
   TMethod extends Method,
   Acc extends readonly unknown[] = readonly [],
@@ -576,6 +592,26 @@ export type RouteBuilder<
       : RouteHandleInput<Path, TMethod, Acc, Validators>;
     Output: TReturns;
   };
+  query<TQuery, TQueryIn = unknown>(
+    schema: Schema<TQuery, TQueryIn>,
+  ): RouteBuilder<
+    Path,
+    TMethod,
+    Acc,
+    Omit<Validators, "query" | "queryIn"> & { query: TQuery; queryIn: TQueryIn },
+    TReturns,
+    TAppContext
+  >;
+  params<TParams, TParamsIn = unknown>(
+    schema: Schema<TParams, TParamsIn>,
+  ): RouteBuilder<
+    Path,
+    TMethod,
+    Acc,
+    Omit<Validators, "params" | "paramsIn"> & { params: TParams; paramsIn: TParamsIn },
+    TReturns,
+    TAppContext
+  >;
   returns<const M extends ReturnsMap>(
     map: M,
   ): RouteBuilder<Path, TMethod, Acc, Validators, Omit<TReturns, keyof M> & M, TAppContext>;
@@ -676,6 +712,40 @@ export type RouteBuilder<
   >;
 };
 
+export type RouteBuilder<
+  Path extends RoutePath,
+  TMethod extends Method,
+  Acc extends readonly unknown[] = readonly [],
+  Validators extends ValidatorParts = {},
+  TReturns extends ReturnsMap = {},
+  TAppContext extends Record<string, unknown> = AppContext,
+> = RouteBuilderBase<Path, TMethod, Acc, Validators, TReturns, TAppContext> &
+  (TMethod extends "GET" | "DELETE" | "HEAD" | "OPTIONS"
+    ? {}
+    : {
+        body<TBody, TBodyIn = unknown>(
+          schema: Schema<TBody, TBodyIn>,
+        ): RouteBuilder<
+          Path,
+          TMethod,
+          Acc,
+          Omit<Validators, "body" | "bodyIn"> & { body: TBody; bodyIn: TBodyIn },
+          TReturns,
+          TAppContext
+        >;
+        body<Mode extends "json" | "form" | "urlencoded", TBody, TBodyIn = unknown>(
+          mode: Mode,
+          schema: Schema<TBody, TBodyIn>,
+        ): RouteBuilder<
+          Path,
+          TMethod,
+          Acc,
+          Omit<Validators, "body" | "bodyIn"> & { body: TBody; bodyIn: TBodyIn },
+          TReturns,
+          TAppContext
+        >;
+      });
+
 export type HandlerBuilder<
   Acc extends readonly unknown[] = readonly [],
   Validators extends ValidatorParts = {},

package/src/types/returns.ts

@@ -1,82 +1,15 @@
-import type { ReplyOf } from "@taserjs/router-utils";
+import type { ReplyOf } from "@taserjs/router-utils/reply";
+import type { StatusCode } from "@taserjs/router-utils";
 
 import type { Simplify } from "./type-utils.js";
 import type { Schema } from "./schema.js";
 import type { InferOutput } from "./schema.js";
 
-/**
- * Known HTTP status codes. `number & {}` allows custom codes while keeping
- * literal autocomplete / inference for well-known values.
- */
-export type StatusCode =
-  | 100
-  | 101
-  | 102
-  | 103
-  | 200
-  | 201
-  | 202
-  | 203
-  | 204
-  | 205
-  | 206
-  | 207
-  | 208
-  | 226
-  | 300
-  | 301
-  | 302
-  | 303
-  | 304
-  | 305
-  | 306
-  | 307
-  | 308
-  | 400
-  | 401
-  | 402
-  | 403
-  | 404
-  | 405
-  | 406
-  | 407
-  | 408
-  | 409
-  | 410
-  | 411
-  | 412
-  | 413
-  | 414
-  | 415
-  | 416
-  | 417
-  | 418
-  | 421
-  | 422
-  | 423
-  | 424
-  | 425
-  | 426
-  | 428
-  | 429
-  | 431
-  | 451
-  | 500
-  | 501
-  | 502
-  | 503
-  | 504
-  | 505
-  | 506
-  | 507
-  | 508
-  | 510
-  | 511
-  | (number & {});
+export type { StatusCode };
 
 /** Status-code → Standard Schema map for route/middleware/handler outputs. */
 export type ReturnsMap = {
-  readonly [K in StatusCode]?: Schema<unknown>;
+  readonly [status: number]: Schema<unknown> | undefined;
 };
 
 /** Later map wins on overlapping status keys. */
@@ -84,12 +17,10 @@ export type MergeReturns<A extends ReturnsMap, B extends ReturnsMap> = Omit<A, k
 
 /** Typed reply union for statuses declared in a returns map. */
 export type ReplyFor<M extends ReturnsMap> = {
-  [S in keyof M]-?: S extends StatusCode
-    ? M[S] extends Schema<unknown>
-      ? ReplyOf<S, Simplify<InferOutput<M[S]>>>
-      : never
+  [S in keyof M & number]: M[S] extends Schema<unknown>
+    ? ReplyOf<S, Simplify<InferOutput<M[S]>>>
     : never;
-}[keyof M];
+}[keyof M & number];
 
 export type EmptyReturns = {};