@fragno-dev/core 0.1.1 → 0.1.2

package/dist/{route-B4RbOWjd.js → route-DbBZ3Ep9.js}

@@ -14,6 +14,7 @@ var RequestInputContext = class RequestInputContext {
 	#method;
 	#pathParams;
 	#searchParams;
+	#headers;
 	#body;
 	#inputSchema;
 	#shouldValidateInput;
@@ -22,6 +23,7 @@ var RequestInputContext = class RequestInputContext {
 		this.#method = config.method;
 		this.#pathParams = config.pathParams;
 		this.#searchParams = config.searchParams;
+		this.#headers = config.headers;
 		this.#body = config.body;
 		this.#inputSchema = config.inputSchema;
 		this.#shouldValidateInput = config.shouldValidateInput ?? true;
@@ -30,15 +32,13 @@ var RequestInputContext = class RequestInputContext {
 	* Create a RequestContext from a Request object for server-side handling
 	*/
 	static async fromRequest(config) {
-		const url = new URL(config.request.url);
-		const request = config.request.clone();
-		const json = request.body instanceof ReadableStream ? await request.json() : void 0;
 		return new RequestInputContext({
 			method: config.method,
 			path: config.path,
-			pathParams: config.pathParams,
-			searchParams: url.searchParams,
-			body: json,
+			pathParams: config.state.pathParams,
+			searchParams: config.state.searchParams,
+			headers: config.state.headers,
+			body: config.state.body,
 			inputSchema: config.inputSchema,
 			shouldValidateInput: config.shouldValidateInput
 		});
@@ -52,6 +52,7 @@ var RequestInputContext = class RequestInputContext {
 			path: config.path,
 			pathParams: config.pathParams,
 			searchParams: config.searchParams ?? new URLSearchParams(),
+			headers: config.headers ?? new Headers(),
 			body: "body" in config ? config.body : void 0,
 			inputSchema: "inputSchema" in config ? config.inputSchema : void 0,
 			shouldValidateInput: false
@@ -85,6 +86,13 @@ var RequestInputContext = class RequestInputContext {
 		return this.#searchParams;
 	}
 	/**
+	* [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object for request headers
+	* @remarks `Headers`
+	*/
+	get headers() {
+		return this.#headers;
+	}
+	/**
 	* @internal
 	*/
 	get rawBody() {
@@ -214,7 +222,7 @@ var OutputContext = class {
 	*
 	* Shortcut for `throw new FragnoApiError(...)`
 	*/
-	error({ message, code }, initOrStatus, headers) {
+	error = ({ message, code }, initOrStatus, headers) => {
 		if (typeof initOrStatus === "undefined") return Response.json({
 			message,
 			code
@@ -237,8 +245,8 @@ var OutputContext = class {
 			status: initOrStatus.status,
 			headers: mergedHeaders
 		});
-	}
-	empty(initOrStatus, headers) {
+	};
+	empty = (initOrStatus, headers) => {
 		const defaultHeaders = {};
 		if (typeof initOrStatus === "undefined") {
 			const mergedHeaders$1 = mergeHeaders(defaultHeaders, headers);
@@ -259,8 +267,8 @@ var OutputContext = class {
 			status: initOrStatus.status,
 			headers: mergedHeaders
 		});
-	}
-	json(object, initOrStatus, headers) {
+	};
+	json = (object, initOrStatus, headers) => {
 		if (typeof initOrStatus === "undefined") return Response.json(object, {
 			status: 200,
 			headers
@@ -274,7 +282,7 @@ var OutputContext = class {
 			status: initOrStatus.status,
 			headers: mergedHeaders
 		});
-	}
+	};
 	jsonStream = (cb, { onError, headers } = {}) => {
 		const defaultHeaders = {
 			"content-type": "application/x-ndjson; charset=utf-8",
@@ -328,4 +336,4 @@ function defineRoutes() {
 
 //#endregion
 export { RequestOutputContext as a, OutputContext as i, defineRoutes as n, RequestInputContext as o, resolveRouteFactories as r, getMountRoute as s, defineRoute as t };
-//# sourceMappingURL=route-B4RbOWjd.js.map
+//# sourceMappingURL=route-DbBZ3Ep9.js.map

package/dist/route-DbBZ3Ep9.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-DbBZ3Ep9.js","names":["#path","#method","#pathParams","#searchParams","#headers","#body","#inputSchema","#shouldValidateInput","#validateInput","#aborted","#closed","#responseReadable","#writer","#encoder","#abortSubscribers","mergedHeaders","#outputSchema","routes: any[]"],"sources":["../src/api/internal/route.ts","../src/api/request-input-context.ts","../src/api/internal/response-stream.ts","../src/api/request-output-context.ts","../src/api/route.ts"],"sourcesContent":["export function getMountRoute(opts: { mountRoute?: string; name: string }) {\n  const mountRoute = opts.mountRoute ?? `/api/${opts.name}`;\n\n  if (mountRoute.endsWith(\"/\")) {\n    return mountRoute.slice(0, -1);\n  }\n\n  return mountRoute;\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { ExtractPathParams } from \"./internal/path\";\nimport { FragnoApiValidationError, type HTTPMethod } from \"./api\";\nimport type { MutableRequestState } from \"./mutable-request-state\";\n\nexport type RequestBodyType =\n  | unknown // JSON\n  | FormData\n  | Blob\n  | null\n  | undefined;\n\nexport class RequestInputContext<\n  TPath extends string = string,\n  TInputSchema extends StandardSchemaV1 | undefined = undefined,\n> {\n  readonly #path: TPath;\n  readonly #method: string;\n  readonly #pathParams: ExtractPathParams<TPath>;\n  readonly #searchParams: URLSearchParams;\n  readonly #headers: Headers;\n  readonly #body: RequestBodyType;\n  readonly #inputSchema: TInputSchema | undefined;\n  readonly #shouldValidateInput: boolean;\n\n  constructor(config: {\n    path: TPath;\n    method: string;\n    pathParams: ExtractPathParams<TPath>;\n    searchParams: URLSearchParams;\n    headers: Headers;\n    body: RequestBodyType;\n\n    request?: Request;\n    inputSchema?: TInputSchema;\n    shouldValidateInput?: boolean;\n  }) {\n    this.#path = config.path;\n    this.#method = config.method;\n    this.#pathParams = config.pathParams;\n    this.#searchParams = config.searchParams;\n    this.#headers = config.headers;\n    this.#body = config.body;\n    this.#inputSchema = config.inputSchema;\n    this.#shouldValidateInput = config.shouldValidateInput ?? true;\n  }\n\n  /**\n   * Create a RequestContext from a Request object for server-side handling\n   */\n  static async fromRequest<\n    TPath extends string,\n    TInputSchema extends StandardSchemaV1 | undefined = undefined,\n  >(config: {\n    request: Request;\n    method: string;\n    path: TPath;\n    pathParams: ExtractPathParams<TPath>;\n    inputSchema?: TInputSchema;\n    shouldValidateInput?: boolean;\n    state: MutableRequestState;\n  }): Promise<RequestInputContext<TPath, TInputSchema>> {\n    // Use the mutable state (potentially modified by middleware)\n    return new RequestInputContext({\n      method: config.method,\n      path: config.path,\n      pathParams: config.state.pathParams as ExtractPathParams<TPath>,\n      searchParams: config.state.searchParams,\n      headers: config.state.headers,\n      body: config.state.body,\n      inputSchema: config.inputSchema,\n      shouldValidateInput: config.shouldValidateInput,\n    });\n  }\n\n  /**\n   * Create a RequestContext for server-side rendering contexts (no Request object)\n   */\n  static fromSSRContext<\n    TPath extends string,\n    TInputSchema extends StandardSchemaV1 | undefined = undefined,\n  >(\n    config:\n      | {\n          method: \"GET\";\n          path: TPath;\n          pathParams: ExtractPathParams<TPath>;\n          searchParams?: URLSearchParams;\n          headers?: Headers;\n        }\n      | {\n          method: Exclude<HTTPMethod, \"GET\">;\n          path: TPath;\n          pathParams: ExtractPathParams<TPath>;\n          searchParams?: URLSearchParams;\n          headers?: Headers;\n          body: RequestBodyType;\n          inputSchema?: TInputSchema;\n        },\n  ): RequestInputContext<TPath, TInputSchema> {\n    return new RequestInputContext({\n      method: config.method,\n      path: config.path,\n      pathParams: config.pathParams,\n      searchParams: config.searchParams ?? new URLSearchParams(),\n      headers: config.headers ?? new Headers(),\n      body: \"body\" in config ? config.body : undefined,\n      inputSchema: \"inputSchema\" in config ? config.inputSchema : undefined,\n      shouldValidateInput: false, // No input validation in SSR context\n    });\n  }\n\n  /**\n   * The HTTP method as string (e.g., `GET`, `POST`)\n   */\n  get method(): string {\n    return this.#method;\n  }\n  /**\n   * The matched route path (e.g., `/users/:id`)\n   * @remarks `string`\n   */\n  get path(): TPath {\n    return this.#path;\n  }\n  /**\n   * Extracted path parameters as object (e.g., `{ id: '123' }`)\n   * @remarks `Record<string, string>`\n   */\n  get pathParams(): ExtractPathParams<TPath> {\n    return this.#pathParams;\n  }\n  /**\n   * [URLSearchParams](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams) object for query parameters\n   * @remarks `URLSearchParams`\n   */\n  get query(): URLSearchParams {\n    return this.#searchParams;\n  }\n  /**\n   * [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object for request headers\n   * @remarks `Headers`\n   */\n  get headers(): Headers {\n    return this.#headers;\n  }\n  // TODO: Should probably remove this\n  /**\n   * @internal\n   */\n  get rawBody(): RequestBodyType {\n    return this.#body;\n  }\n  /**\n   * Input validation context (only if inputSchema is defined)\n   * @remarks `InputContext`\n   */\n  get input(): TInputSchema extends undefined\n    ? undefined\n    : {\n        schema: TInputSchema;\n        valid: () => Promise<\n          TInputSchema extends StandardSchemaV1\n            ? StandardSchemaV1.InferOutput<TInputSchema>\n            : unknown\n        >;\n      } {\n    if (!this.#inputSchema) {\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n      return undefined as any;\n    }\n\n    return {\n      schema: this.#inputSchema,\n      valid: async () => {\n        if (!this.#shouldValidateInput) {\n          // In SSR context, return the body directly without validation\n          return this.#body;\n        }\n\n        return this.#validateInput();\n      },\n      // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    } as any;\n  }\n\n  async #validateInput(): Promise<\n    TInputSchema extends StandardSchemaV1 ? StandardSchemaV1.InferOutput<TInputSchema> : never\n  > {\n    if (!this.#inputSchema) {\n      throw new Error(\"No input schema defined for this route\");\n    }\n\n    if (this.#body instanceof FormData || this.#body instanceof Blob) {\n      throw new Error(\"Schema validation is only supported for JSON data, not FormData or Blob\");\n    }\n\n    const result = await this.#inputSchema[\"~standard\"].validate(this.#body);\n\n    if (result.issues) {\n      throw new FragnoApiValidationError(\"Validation failed\", result.issues);\n    }\n\n    return result.value as TInputSchema extends StandardSchemaV1\n      ? StandardSchemaV1.InferOutput<TInputSchema>\n      : never;\n  }\n}\n","/**\n * @module\n * Stream utility.\n *\n * Modified from honojs/hono\n * Original source: https://github.com/honojs/hono/blob/0e3db674ad3f40be215a55a18062dd8e387ce525/src/utils/stream.ts\n * License: MIT\n * Date obtained: August 28 2025\n * Copyright (c) 2021-present Yusuke Wada and Hono contributors\n */\n\ntype Error<Message extends string> = { __errorMessage: Message };\n\nexport class ResponseStream<TArray> {\n  #writer: WritableStreamDefaultWriter<Uint8Array>;\n  #encoder: TextEncoder;\n  #abortSubscribers: (() => void | Promise<void>)[] = [];\n  #responseReadable: ReadableStream;\n\n  #aborted: boolean = false;\n  #closed: boolean = false;\n\n  /**\n   * Whether the stream has been aborted.\n   */\n  get aborted(): boolean {\n    return this.#aborted;\n  }\n\n  /**\n   * Whether the stream has been closed normally.\n   */\n  get closed(): boolean {\n    return this.#closed;\n  }\n\n  /**\n   * The readable stream that the response is piped to.\n   */\n  get responseReadable(): ReadableStream {\n    return this.#responseReadable;\n  }\n\n  constructor(writable: WritableStream, readable: ReadableStream) {\n    this.#writer = writable.getWriter();\n    this.#encoder = new TextEncoder();\n    const reader = readable.getReader();\n\n    // in case the user disconnects, let the reader know to cancel\n    // this in-turn results in responseReadable being closed\n    // and writeSSE method no longer blocks indefinitely\n    this.#abortSubscribers.push(async () => {\n      await reader.cancel();\n    });\n\n    this.#responseReadable = new ReadableStream({\n      async pull(controller) {\n        const { done, value } = await reader.read();\n        if (done) {\n          controller.close();\n        } else {\n          controller.enqueue(value);\n        }\n      },\n      cancel: () => {\n        this.abort();\n      },\n    });\n  }\n\n  async writeRaw(input: Uint8Array | string): Promise<void> {\n    try {\n      if (typeof input === \"string\") {\n        input = this.#encoder.encode(input);\n      }\n      await this.#writer.write(input);\n    } catch {\n      // Do nothing.\n    }\n  }\n\n  write(\n    input: TArray extends (infer U)[]\n      ? U\n      : Error<\"To use a streaming response, outputSchema must be an array.\">,\n  ): Promise<void> {\n    return this.writeRaw(JSON.stringify(input) + \"\\n\");\n  }\n\n  sleep(ms: number): Promise<unknown> {\n    return new Promise((res) => setTimeout(res, ms));\n  }\n\n  async close() {\n    try {\n      await this.#writer.close();\n    } catch {\n      // Do nothing. If you want to handle errors, create a stream by yourself.\n    } finally {\n      this.#closed = true;\n    }\n  }\n\n  onAbort(listener: () => void | Promise<void>) {\n    this.#abortSubscribers.push(listener);\n  }\n\n  /**\n   * Abort the stream.\n   * You can call this method when stream is aborted by external event.\n   */\n  abort() {\n    if (!this.aborted) {\n      this.#aborted = true;\n      this.#abortSubscribers.forEach((subscriber) => subscriber());\n    }\n  }\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { ContentlessStatusCode, StatusCode } from \"../http/http-status\";\nimport { ResponseStream } from \"./internal/response-stream\";\nimport type { InferOrUnknown } from \"../util/types-util\";\n\nexport type ResponseData = string | ArrayBuffer | ReadableStream | Uint8Array<ArrayBuffer>;\n\ninterface ResponseInit<T extends StatusCode = StatusCode> {\n  headers?: HeadersInit;\n  status?: T;\n  statusText?: string;\n}\n\n/**\n * Utility function to merge headers from multiple sources.\n * Later headers override earlier ones.\n */\nfunction mergeHeaders(...headerSources: (HeadersInit | undefined)[]): HeadersInit | undefined {\n  const mergedHeaders = new Headers();\n\n  for (const headerSource of headerSources) {\n    if (!headerSource) {\n      continue;\n    }\n\n    if (headerSource instanceof Headers) {\n      for (const [key, value] of headerSource.entries()) {\n        mergedHeaders.set(key, value);\n      }\n    } else if (Array.isArray(headerSource)) {\n      for (const [key, value] of headerSource) {\n        mergedHeaders.set(key, value);\n      }\n    } else {\n      for (const [key, value] of Object.entries(headerSource)) {\n        mergedHeaders.set(key, value);\n      }\n    }\n  }\n\n  return mergedHeaders;\n}\n\nexport abstract class OutputContext<const TOutput, const TErrorCode extends string> {\n  /**\n   * Creates an error response.\n   *\n   * Shortcut for `throw new FragnoApiError(...)`\n   */\n  error = (\n    { message, code }: { message: string; code: TErrorCode },\n    initOrStatus?: ResponseInit | StatusCode,\n    headers?: HeadersInit,\n  ): Response => {\n    if (typeof initOrStatus === \"undefined\") {\n      return Response.json({ message: message, code }, { status: 500, headers });\n    }\n\n    if (typeof initOrStatus === \"number\") {\n      return Response.json({ message: message, code }, { status: initOrStatus, headers });\n    }\n\n    const mergedHeaders = mergeHeaders(initOrStatus.headers, headers);\n    return Response.json(\n      { message: message, code },\n      { status: initOrStatus.status, headers: mergedHeaders },\n    );\n  };\n\n  empty = (\n    initOrStatus?: ResponseInit<ContentlessStatusCode> | ContentlessStatusCode,\n    headers?: HeadersInit,\n  ): Response => {\n    const defaultHeaders = {};\n\n    if (typeof initOrStatus === \"undefined\") {\n      const mergedHeaders = mergeHeaders(defaultHeaders, headers);\n      return Response.json(null, {\n        status: 201,\n        headers: mergedHeaders,\n      });\n    }\n\n    if (typeof initOrStatus === \"number\") {\n      const mergedHeaders = mergeHeaders(defaultHeaders, headers);\n      return Response.json(null, {\n        status: initOrStatus,\n        headers: mergedHeaders,\n      });\n    }\n\n    const mergedHeaders = mergeHeaders(defaultHeaders, initOrStatus.headers, headers);\n    return Response.json(null, {\n      status: initOrStatus.status,\n      headers: mergedHeaders,\n    });\n  };\n\n  json = (\n    object: TOutput,\n    initOrStatus?: ResponseInit | StatusCode,\n    headers?: HeadersInit,\n  ): Response => {\n    if (typeof initOrStatus === \"undefined\") {\n      return Response.json(object, {\n        status: 200,\n        headers,\n      });\n    }\n\n    if (typeof initOrStatus === \"number\") {\n      return Response.json(object, {\n        status: initOrStatus,\n        headers,\n      });\n    }\n\n    const mergedHeaders = mergeHeaders(initOrStatus.headers, headers);\n    return Response.json(object, {\n      status: initOrStatus.status,\n      headers: mergedHeaders,\n    });\n  };\n\n  jsonStream = (\n    cb: (stream: ResponseStream<TOutput>) => void | Promise<void>,\n    {\n      onError,\n      headers,\n    }: {\n      onError?: (error: Error, stream: ResponseStream<TOutput>) => void | Promise<void>;\n      headers?: HeadersInit;\n    } = {},\n  ): Response => {\n    // Note: this is intentionally an arrow function (=>) to keep `this` context.\n    const defaultHeaders = {\n      \"content-type\": \"application/x-ndjson; charset=utf-8\",\n      \"transfer-encoding\": \"chunked\",\n      \"cache-control\": \"no-cache\",\n    };\n\n    const { readable, writable } = new TransformStream();\n    const stream = new ResponseStream(writable, readable);\n\n    (async () => {\n      try {\n        await cb(stream);\n      } catch (e) {\n        if (e === undefined) {\n          // If reading is canceled without a reason value (e.g. by StreamingApi)\n          // then the .pipeTo() promise will reject with undefined.\n          // In this case, do nothing because the stream is already closed.\n        } else if (e instanceof Error && onError) {\n          await onError(e, stream);\n        } else {\n          console.error(e);\n        }\n      } finally {\n        stream.close();\n      }\n    })();\n\n    return new Response(stream.responseReadable, {\n      status: 200,\n      headers: mergeHeaders(defaultHeaders, headers),\n    });\n  };\n}\n\nexport class RequestOutputContext<\n  const TOutputSchema extends StandardSchemaV1 | undefined = undefined,\n  const TErrorCode extends string = string,\n> extends OutputContext<InferOrUnknown<TOutputSchema>, TErrorCode> {\n  // eslint-disable-next-line no-unused-private-class-members\n  #outputSchema?: TOutputSchema;\n\n  constructor(outputSchema?: TOutputSchema) {\n    super();\n    this.#outputSchema = outputSchema;\n  }\n}\n","import type { StandardSchemaV1 } from \"@standard-schema/spec\";\nimport type { FragnoRouteConfig, HTTPMethod } from \"./api\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyFragnoRouteConfig = FragnoRouteConfig<HTTPMethod, string, any, any, any, any>;\n\nexport interface RouteFactoryContext<TConfig, TDeps, TServices> {\n  config: TConfig;\n  deps: TDeps;\n  services: TServices;\n}\n\nexport type RouteFactory<\n  TConfig,\n  TDeps,\n  TServices,\n  TRoutes extends readonly FragnoRouteConfig<\n    HTTPMethod,\n    string,\n    StandardSchemaV1 | undefined,\n    StandardSchemaV1 | undefined,\n    string,\n    string\n  >[],\n> = (context: RouteFactoryContext<TConfig, TDeps, TServices>) => TRoutes;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyRouteOrFactory = AnyFragnoRouteConfig | RouteFactory<any, any, any, any>;\n\nexport type FlattenRouteFactories<T extends readonly AnyRouteOrFactory[]> = T extends readonly [\n  infer First,\n  ...infer Rest extends readonly AnyRouteOrFactory[],\n]\n  ? // eslint-disable-next-line @typescript-eslint/no-explicit-any\n    First extends RouteFactory<any, any, any, infer TRoutes>\n    ? [...TRoutes, ...FlattenRouteFactories<Rest>]\n    : [First, ...FlattenRouteFactories<Rest>]\n  : [];\n\n// Helper to resolve route factories into routes\nexport function resolveRouteFactories<\n  TConfig,\n  TDeps,\n  TServices,\n  const TRoutesOrFactories extends readonly AnyRouteOrFactory[],\n>(\n  context: RouteFactoryContext<TConfig, TDeps, TServices>,\n  routesOrFactories: TRoutesOrFactories,\n): FlattenRouteFactories<TRoutesOrFactories> {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  const routes: any[] = [];\n\n  for (const item of routesOrFactories) {\n    if (typeof item === \"function\") {\n      // It's a route factory\n      const factoryRoutes = item(context);\n      routes.push(...factoryRoutes);\n    } else {\n      // It's a direct route\n      routes.push(item);\n    }\n  }\n\n  return routes as FlattenRouteFactories<TRoutesOrFactories>;\n}\n\n// TODO(Wilco): Do these overloads actually do anything?\n// TODO(Wilco): ValidPath<T> should be added back in here.\n\n// Overload for routes without inputSchema\nexport function defineRoute<\n  const TMethod extends HTTPMethod,\n  const TPath extends string,\n  const TOutputSchema extends StandardSchemaV1 | undefined,\n  const TErrorCode extends string = string,\n  const TQueryParameters extends string = string,\n>(\n  config: FragnoRouteConfig<\n    TMethod,\n    TPath,\n    undefined,\n    TOutputSchema,\n    TErrorCode,\n    TQueryParameters\n  > & { inputSchema?: undefined },\n): FragnoRouteConfig<TMethod, TPath, undefined, TOutputSchema, TErrorCode, TQueryParameters>;\n\n// Overload for routes with inputSchema\nexport function defineRoute<\n  const TMethod extends HTTPMethod,\n  const TPath extends string,\n  const TInputSchema extends StandardSchemaV1,\n  const TOutputSchema extends StandardSchemaV1 | undefined,\n  const TErrorCode extends string = string,\n  const TQueryParameters extends string = string,\n>(\n  config: FragnoRouteConfig<\n    TMethod,\n    TPath,\n    TInputSchema,\n    TOutputSchema,\n    TErrorCode,\n    TQueryParameters\n  > & { inputSchema: TInputSchema },\n): FragnoRouteConfig<TMethod, TPath, TInputSchema, TOutputSchema, TErrorCode, TQueryParameters>;\n\n// implementation\nexport function defineRoute<\n  const TMethod extends HTTPMethod,\n  const TPath extends string,\n  const TInputSchema extends StandardSchemaV1 | undefined,\n  const TOutputSchema extends StandardSchemaV1 | undefined,\n  const TErrorCode extends string = string,\n  const TQueryParameters extends string = string,\n>(\n  config: FragnoRouteConfig<\n    TMethod,\n    TPath,\n    TInputSchema,\n    TOutputSchema,\n    TErrorCode,\n    TQueryParameters\n  >,\n): FragnoRouteConfig<TMethod, TPath, TInputSchema, TOutputSchema, TErrorCode, TQueryParameters> {\n  return config;\n}\n\nexport function defineRoutes<TConfig = {}, TDeps = {}, TServices = {}>() {\n  return {\n    create: <\n      const TRoutes extends readonly FragnoRouteConfig<\n        HTTPMethod,\n        string,\n        StandardSchemaV1 | undefined,\n        StandardSchemaV1 | undefined,\n        string,\n        string\n      >[],\n    >(\n      fn: (context: RouteFactoryContext<TConfig, TDeps, TServices>) => TRoutes,\n    ): RouteFactory<TConfig, TDeps, TServices, TRoutes> => {\n      return fn;\n    },\n  };\n}\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fragno-dev/core",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "exports": {
     ".": {
       "bun": "./src/mod.ts",

package/src/api/fragment-instantiation.ts

@@ -18,6 +18,7 @@ import {
   type FragnoMiddlewareCallback,
 } from "./request-middleware";
 import type { FragmentDefinition } from "./fragment-builder";
+import { MutableRequestState } from "./mutable-request-state";
 
 export interface FragnoPublicConfig {
   mountRoute?: string;
@@ -267,14 +268,25 @@ export function createFragment<
 
       const outputContext = new RequestOutputContext(outputSchema);
 
+      // Create mutable request state that can be modified by middleware
+      // Clone the request to avoid consuming the body stream
+      const clonedReq = req.clone();
+      const requestBody =
+        clonedReq.body instanceof ReadableStream ? await clonedReq.json() : undefined;
+
+      const requestState = new MutableRequestState({
+        pathParams: route.params ?? {},
+        searchParams: url.searchParams,
+        body: requestBody,
+        headers: new Headers(req.headers),
+      });
+
       if (middlewareHandler) {
         const middlewareInputContext = new RequestMiddlewareInputContext(routes, {
           method: req.method as HTTPMethod,
           path,
-          pathParams: route.params,
-          searchParams: new URL(req.url).searchParams,
-          body: req.body,
           request: req,
+          state: requestState,
         });
 
         const middlewareOutputContext = new RequestMiddlewareOutputContext(dependencies, services);
@@ -310,6 +322,7 @@ export function createFragment<
         path,
         pathParams: (route.params ?? {}) as ExtractPathParams<typeof path>,
         inputSchema,
+        state: requestState,
       });
 
       try {

package/src/api/mutable-request-state.ts

@@ -0,0 +1,107 @@
+import type { RequestBodyType } from "./request-input-context";
+
+/**
+ * Holds mutable request state that can be modified by middleware and consumed by handlers.
+ *
+ * This class provides a structural way for middleware to modify request data:
+ * - Path parameters can be modified
+ * - Query/search parameters can be modified
+ * - Request body can be overridden
+ * - Request headers can be modified
+ *
+ * @example
+ * ```typescript
+ * // In middleware
+ * const state = new MutableRequestState({
+ *   pathParams: { id: "123" },
+ *   searchParams: new URLSearchParams("?role=user"),
+ *   body: { name: "John" },
+ *   headers: new Headers()
+ * });
+ *
+ * // Modify query parameters
+ * state.searchParams.set("role", "admin");
+ *
+ * // Override body
+ * state.setBody({ name: "Jane" });
+ *
+ * // Modify headers
+ * state.headers.set("X-Custom", "value");
+ * ```
+ */
+export class MutableRequestState {
+  readonly #pathParams: Record<string, string>;
+  readonly #searchParams: URLSearchParams;
+  readonly #headers: Headers;
+  // oxlint-disable-next-line no-unused-private-class-members False Positive?
+  readonly #initialBody: RequestBodyType;
+  #bodyOverride: RequestBodyType | undefined;
+
+  constructor(config: {
+    pathParams: Record<string, string>;
+    searchParams: URLSearchParams;
+    body: RequestBodyType;
+    headers: Headers;
+  }) {
+    this.#pathParams = config.pathParams;
+    this.#searchParams = config.searchParams;
+    this.#headers = config.headers;
+    this.#initialBody = config.body;
+    this.#bodyOverride = undefined;
+  }
+
+  /**
+   * Path parameters extracted from the route.
+   * Can be modified directly (e.g., `state.pathParams.id = "456"`).
+   */
+  get pathParams(): Record<string, string> {
+    return this.#pathParams;
+  }
+
+  /**
+   * URLSearchParams for query parameters.
+   * Can be modified using URLSearchParams API (e.g., `state.searchParams.set("key", "value")`).
+   */
+  get searchParams(): URLSearchParams {
+    return this.#searchParams;
+  }
+
+  /**
+   * Request headers.
+   * Can be modified using Headers API (e.g., `state.headers.set("X-Custom", "value")`).
+   */
+  get headers(): Headers {
+    return this.#headers;
+  }
+
+  /**
+   * Get the current body value.
+   * Returns the override if set, otherwise the initial body.
+   */
+  get body(): RequestBodyType {
+    return this.#bodyOverride !== undefined ? this.#bodyOverride : this.#initialBody;
+  }
+
+  /**
+   * Override the request body.
+   * This allows middleware to replace the body that will be seen by the handler.
+   *
+   * @param body - The new body value
+   *
+   * @example
+   * ```typescript
+   * // In middleware
+   * state.setBody({ modifiedField: "new value" });
+   * ```
+   */
+  setBody(body: RequestBodyType): void {
+    this.#bodyOverride = body;
+  }
+
+  /**
+   * Check if the body has been overridden by middleware.
+   */
+  get hasBodyOverride(): boolean {
+    return this.#bodyOverride !== undefined;
+  }
+}

package/src/api/request-input-context.test.ts

@@ -2,6 +2,7 @@ import { test, expect, describe } from "vitest";
 import { RequestInputContext } from "./request-input-context";
 import { FragnoApiValidationError } from "./api";
 import type { StandardSchemaV1 } from "@standard-schema/spec";
+import { MutableRequestState } from "./mutable-request-state";
 
 // Mock schema implementations for testing
 const createMockSchema = (shouldPass: boolean, returnValue?: unknown): StandardSchemaV1 => ({
@@ -40,6 +41,7 @@ describe("RequestContext", () => {
       path: "/",
       pathParams: {},
       searchParams: new URLSearchParams(),
+      headers: new Headers(),
       body: undefined,
     });
 
@@ -59,6 +61,7 @@ describe("RequestContext", () => {
       path: "/api/test",
       pathParams: {},
       searchParams: new URLSearchParams(),
+      headers: new Headers(),
       body: jsonBody,
     });
 
@@ -73,6 +76,7 @@ describe("RequestContext", () => {
       path: "/api/form",
       pathParams: {},
       searchParams: new URLSearchParams(),
+      headers: new Headers(),
       body: formData,
       method: "POST",
     });
@@ -87,6 +91,7 @@ describe("RequestContext", () => {
       path: "/api/upload",
       pathParams: {},
       searchParams: new URLSearchParams(),
+      headers: new Headers(),
       body: blob,
       method: "POST",
     });
@@ -101,11 +106,23 @@ describe("RequestContext", () => {
     });
 
     const bodyData = { test: "data" };
+    const url = new URL(request.url);
+    const clonedReq = request.clone();
+    const body = clonedReq.body instanceof ReadableStream ? await clonedReq.json() : undefined;
+
+    const state = new MutableRequestState({
+      pathParams: {},
+      searchParams: url.searchParams,
+      body,
+      headers: new Headers(request.headers),
+    });
+
     const ctx = await RequestInputContext.fromRequest({
       request,
       method: "POST",
       path: "/api/test",
       pathParams: {},
+      state,
     });
 
     expect(ctx.path).toBe("/api/test");
@@ -131,6 +148,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: { test: "data" },
         method: "POST",
       });
@@ -143,6 +161,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: { test: "data" },
         inputSchema: validStringSchema,
         method: "POST",
@@ -158,6 +177,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: "test string",
         inputSchema: validStringSchema,
         method: "POST",
@@ -172,6 +192,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: 123, // Invalid for string schema
         inputSchema: invalidSchema,
         method: "POST",
@@ -185,6 +206,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: 123,
         inputSchema: invalidSchema,
         method: "POST",
@@ -213,6 +235,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: 123,
         inputSchema: invalidSchema,
         shouldValidateInput: false,
@@ -232,6 +255,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: formData,
         inputSchema: validStringSchema,
         method: "POST",
@@ -249,6 +273,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: blob,
         inputSchema: validStringSchema,
         method: "POST",
@@ -264,6 +289,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: null,
         inputSchema: validStringSchema,
         method: "POST",
@@ -278,6 +304,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         body: undefined,
         inputSchema: validStringSchema,
         method: "POST",
@@ -294,6 +321,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         inputSchema: validStringSchema,
         method: "POST",
         body: undefined,
@@ -308,6 +336,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         inputSchema: validStringSchema,
         shouldValidateInput: true,
         method: "POST",
@@ -322,6 +351,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         inputSchema: validStringSchema,
         shouldValidateInput: false,
         method: "POST",
@@ -346,6 +376,14 @@ describe("RequestContext", () => {
 
     test("Should pass through shouldValidateInput from fromRequest", async () => {
       const request = new Request("https://example.com/api/test");
+      const url = new URL(request.url);
+      const state = new MutableRequestState({
+        pathParams: {},
+        searchParams: url.searchParams,
+        body: undefined,
+        headers: new Headers(request.headers),
+      });
+
       const ctx = await RequestInputContext.fromRequest({
         request,
         path: "/test",
@@ -353,6 +391,7 @@ describe("RequestContext", () => {
         inputSchema: validStringSchema,
         shouldValidateInput: false,
         method: "POST",
+        state,
       });
 
       expect(ctx.input).toBeDefined();
@@ -365,6 +404,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         method: "POST",
         body: undefined,
       });
@@ -377,6 +417,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams: new URLSearchParams(),
+        headers: new Headers(),
         method: "POST",
         body: undefined,
       });
@@ -390,6 +431,7 @@ describe("RequestContext", () => {
         path: "/test",
         pathParams: {},
         searchParams,
+        headers: new Headers(),
         method: "POST",
         body: undefined,
       });
@@ -400,11 +442,20 @@ describe("RequestContext", () => {
 
     test("Should extract search params from request URL in fromRequest", async () => {
       const request = new Request("https://example.com/api/test?param=value");
+      const url = new URL(request.url);
+      const state = new MutableRequestState({
+        pathParams: {},
+        searchParams: url.searchParams,
+        body: undefined,
+        headers: new Headers(request.headers),
+      });
+
       const ctx = await RequestInputContext.fromRequest({
         request,
         path: "/test",
         pathParams: {},
         method: "POST",
+        state,
       });
 
       expect(ctx.query.get("param")).toBe("value");

package/src/api/request-input-context.ts

@@ -1,6 +1,7 @@
 import type { StandardSchemaV1 } from "@standard-schema/spec";
 import type { ExtractPathParams } from "./internal/path";
 import { FragnoApiValidationError, type HTTPMethod } from "./api";
+import type { MutableRequestState } from "./mutable-request-state";
 
 export type RequestBodyType =
   | unknown // JSON
@@ -17,6 +18,7 @@ export class RequestInputContext<
   readonly #method: string;
   readonly #pathParams: ExtractPathParams<TPath>;
   readonly #searchParams: URLSearchParams;
+  readonly #headers: Headers;
   readonly #body: RequestBodyType;
   readonly #inputSchema: TInputSchema | undefined;
   readonly #shouldValidateInput: boolean;
@@ -26,6 +28,7 @@ export class RequestInputContext<
     method: string;
     pathParams: ExtractPathParams<TPath>;
     searchParams: URLSearchParams;
+    headers: Headers;
     body: RequestBodyType;
 
     request?: Request;
@@ -36,6 +39,7 @@ export class RequestInputContext<
     this.#method = config.method;
     this.#pathParams = config.pathParams;
     this.#searchParams = config.searchParams;
+    this.#headers = config.headers;
     this.#body = config.body;
     this.#inputSchema = config.inputSchema;
     this.#shouldValidateInput = config.shouldValidateInput ?? true;
@@ -54,22 +58,16 @@ export class RequestInputContext<
     pathParams: ExtractPathParams<TPath>;
     inputSchema?: TInputSchema;
     shouldValidateInput?: boolean;
+    state: MutableRequestState;
   }): Promise<RequestInputContext<TPath, TInputSchema>> {
-    const url = new URL(config.request.url);
-
-    // Clone the request to avoid consuming the body stream
-    // TODO: Probably we should just cache the result instead
-    const request = config.request.clone();
-
-    // TODO: Support other body types other than json
-    const json = request.body instanceof ReadableStream ? await request.json() : undefined;
-
+    // Use the mutable state (potentially modified by middleware)
     return new RequestInputContext({
       method: config.method,
       path: config.path,
-      pathParams: config.pathParams,
-      searchParams: url.searchParams,
-      body: json,
+      pathParams: config.state.pathParams as ExtractPathParams<TPath>,
+      searchParams: config.state.searchParams,
+      headers: config.state.headers,
+      body: config.state.body,
       inputSchema: config.inputSchema,
       shouldValidateInput: config.shouldValidateInput,
     });
@@ -88,12 +86,14 @@ export class RequestInputContext<
           path: TPath;
           pathParams: ExtractPathParams<TPath>;
           searchParams?: URLSearchParams;
+          headers?: Headers;
         }
       | {
           method: Exclude<HTTPMethod, "GET">;
           path: TPath;
           pathParams: ExtractPathParams<TPath>;
           searchParams?: URLSearchParams;
+          headers?: Headers;
           body: RequestBodyType;
           inputSchema?: TInputSchema;
         },
@@ -103,13 +103,13 @@ export class RequestInputContext<
       path: config.path,
       pathParams: config.pathParams,
       searchParams: config.searchParams ?? new URLSearchParams(),
+      headers: config.headers ?? new Headers(),
       body: "body" in config ? config.body : undefined,
       inputSchema: "inputSchema" in config ? config.inputSchema : undefined,
       shouldValidateInput: false, // No input validation in SSR context
     });
   }
 
-  // TODO(Wilco): We should support reading/modifying headers here.
   /**
    * The HTTP method as string (e.g., `GET`, `POST`)
    */
@@ -137,6 +137,13 @@ export class RequestInputContext<
   get query(): URLSearchParams {
     return this.#searchParams;
   }
+  /**
+   * [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers) object for request headers
+   * @remarks `Headers`
+   */
+  get headers(): Headers {
+    return this.#headers;
+  }
   // TODO: Should probably remove this
   /**
    * @internal