effect-start 0.33.0 → 0.35.0

package/dist/studio/routes/route.d.ts

@@ -1,5 +1,5 @@
 import * as Route from "../../Route.ts";
-declare const _default: import("../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "*";
 }, {}, import("../../RouteBody.ts").RenderValue, never, never>]>;

package/dist/studio/routes/routes/route.d.ts

@@ -1,5 +1,5 @@
 import * as Route from "../../../Route.ts";
-declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "html";
 }, {}, string, never, Route.Routes>]>;

package/dist/studio/routes/services/route.d.ts

@@ -1,5 +1,5 @@
 import * as Route from "../../../Route.ts";
-declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "html";
 }, {}, string, never, never>]>;

package/dist/studio/routes/system/route.d.ts

@@ -1,9 +1,9 @@
 import * as Stream from "effect/Stream";
 import * as Route from "../../../Route.ts";
-declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "html";
-}, {}, string, never, never>, Route.Route.Route<{
+}, {}, string, never, never>, Route.Route<{
     method: "GET";
     format: "sse";
 }, {}, Stream.Stream<string, never, never>, never, never>]>;

package/dist/studio/routes/traceDetail.d.ts

@@ -1,17 +1,13 @@
 import * as Route from "../../Route.ts";
-declare const _default: import("../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
 }, {
     pathParams: {
         readonly id: string;
     };
-}, unknown, import("effect/ParseResult").ParseError, never>, Route.Route.Route<{
+}, unknown, import("effect/ParseResult").ParseError, Route.Request>, Route.Route<{
     method: "GET";
     format: "html";
-}, {
-    pathParams: {
-        readonly id: string;
-    };
-}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>]>;
+}, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>]>;
 export default _default;
 //# sourceMappingURL=traceDetail.d.ts.map

package/dist/studio/routes/traceDetail.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"traceDetail.d.ts","sourceRoot":"","sources":["../../../src/studio/routes/traceDetail.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;;;;;;;;;;;;;;AAMvC,wBAqBC"}
+{"version":3,"file":"traceDetail.d.ts","sourceRoot":"","sources":["../../../src/studio/routes/traceDetail.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;;;;;;;;;;AAMvC,wBAqBC"}

package/dist/studio/routes/traces/route.d.ts

@@ -1,9 +1,9 @@
 import * as Stream from "effect/Stream";
 import * as Route from "../../../Route.ts";
-declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route.Route<{
+declare const _default: import("../../../RouteMount.ts").RouteMount.Builder<{}, [Route.Route<{
     method: "GET";
     format: "html";
-}, {}, string, import("../../../sql/SqlClient.ts").SqlError, import("../../../sql/SqlClient.ts").SqlClient>, Route.Route.Route<{
+}, {}, string, import("../../../sql/SqlClient.ts").SqlError, Route.Request | import("../../../sql/SqlClient.ts").SqlClient>, Route.Route<{
     method: "GET";
     format: "sse";
 }, {}, Stream.Stream<string, import("../../../sql/SqlClient.ts").SqlError, import("../../../sql/SqlClient.ts").SqlClient>, import("../../../sql/SqlClient.ts").SqlError, import("../../../sql/SqlClient.ts").SqlClient>]>;

package/dist/studio/routes/traces/route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/studio/routes/traces/route.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;;;;;;;;AAQ1C,wBAgEC"}
+{"version":3,"file":"route.d.ts","sourceRoot":"","sources":["../../../../src/studio/routes/traces/route.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;;;;;;;;AAQ1C,wBAiEC"}

package/dist/studio/routes/traces/route.js

@@ -7,8 +7,9 @@ import * as StudioStore from "../../StudioStore.js";
 import * as Shell from "../../ui/Shell.js";
 import * as Traces from "../../ui/Traces.js";
 const prefix = StudioStore.store.prefix;
-export default Route.get(Route.html(function* (ctx) {
-    const url = new URL(ctx.request.url);
+export default Route.get(Route.html(function* (_ctx) {
+    const request = yield* Route.Request;
+    const url = new URL(request.url);
     const search = url.searchParams.get("traceSearch") || "";
     const allSpans = StudioStore.filterOutStudioSpans(yield* StudioStore.allSpans());
     const names = Array.from(new Set(allSpans.map((s) => s.name))).sort();

package/dist/studio/routes/traces/route.js.map

@@ -1 +1 @@
-{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/studio/routes/traces/route.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"route.js","sourceRoot":"","sources":["../../../../src/studio/routes/traces/route.tsx"],"names":[],"mappings":"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"}

package/dist/studio/routes/tree.d.ts

@@ -1,161 +1,153 @@
 import * as Route from "../../Route.ts";
 declare const _default: import("../../RouteTree.ts").RouteTree<{
-    "/": [Route.Route.Route<{
+    "/": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "*";
     }, {}, import("../../RouteBody.ts").RenderValue, never, never>];
-    "/traces": [Route.Route.Route<{
+    "/traces": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, Route.Request | import("../../sql/SqlClient.ts").SqlClient>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
-    "/traces/:id": [Route.Route.Route<{
+    "/traces/:id": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
     }, {
         pathParams: {
             readonly id: string;
         };
-    }, unknown, import("effect/ParseResult").ParseError, never>, Route.Route.Route<{
+    }, unknown, import("effect/ParseResult").ParseError, Route.Request>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {
-        pathParams: {
-            readonly id: string;
-        };
-    }, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
-    "/metrics": [Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
+    "/metrics": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, never, never>, Route.Route.Route<{
+    }, {}, string, never, never>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, never, never>, never, never>];
-    "/logs": [Route.Route.Route<{
+    "/logs": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, Route.Request | import("../../sql/SqlClient.ts").SqlClient>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, never, never>, never, never>];
-    "/errors": [Route.Route.Route<{
+    "/errors": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, Route.Request | import("../../sql/SqlClient.ts").SqlClient>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, never, never>, never, never>];
-    "/fibers": [Route.Route.Route<{
+    "/fibers": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
-    "/fibers/:id": [Route.Route.Route<{
+    "/fibers/:id": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
     }, {
         pathParams: {
             readonly id: string;
         };
-    }, unknown, import("effect/ParseResult").ParseError, never>, Route.Route.Route<{
+    }, unknown, import("effect/ParseResult").ParseError, Route.Request>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {
-        pathParams: {
-            readonly id: string;
-        };
-    }, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
-    "/routes": [Route.Route.Route<{
+    }, {}, string, import("../../sql/SqlClient.ts").SqlError, import("../../sql/SqlClient.ts").SqlClient>];
+    "/routes": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
     }, {}, string, never, Route.Routes>];
-    "/system": [Route.Route.Route<{
+    "/system": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
-    }, {}, string, never, never>, Route.Route.Route<{
+    }, {}, string, never, never>, Route.Route<{
         method: "GET";
         format: "sse";
     }, {}, import("effect/Stream").Stream<string, never, never>, never, never>];
-    "/services": [Route.Route.Route<{
+    "/services": [Route.Route<{
         method: "*";
-    }, {}, unknown, never, never>, Route.Route.Route<{
+    }, {}, unknown, never, never>, Route.Route<{
         method: "*";
         bunPrefix: string;
         bunLoad: () => Promise<Bun.HTMLBundle>;
         format: "html";
-    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, import("../../bun/BunServer.ts").BunServer>, Route.Route.Route<{
+    }, {}, string, import("../../bun/BunRoute.ts").BunRouteError, Route.Request | import("../../bun/BunServer.ts").BunServer>, Route.Route<{
         method: "GET";
         format: "html";
     }, {}, string, never, never>];

package/dist/studio/routes/tree.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/studio/routes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcvC,wBAaE"}
+{"version":3,"file":"tree.d.ts","sourceRoot":"","sources":["../../../src/studio/routes/tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcvC,wBAaE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "effect-start",
-  "version": "0.33.0",
+  "version": "0.35.0",
   "license": "MIT",
   "files": [
     "src/",
@@ -118,6 +118,7 @@
       "bun": "./src/Unique.ts",
       "default": "./dist/Unique.js"
     },
+    "./dev": "./src/dev.d.ts",
     "./_*": null,
     "./assets.d.ts": "./src/assets.d.ts",
     "./jsx-runtime": {
@@ -205,11 +206,11 @@
     "postgres": "^3.4.8",
     "tailwindcss": "^4.1.18",
     "ts-morph": "^27.0.2",
-    "typescript": "^5.9.3"
+    "typescript": "^6.0.2"
   },
   "peerDependencies": {
     "@libsql/client": ">=0.17.0",
-    "effect": "^3.19.11",
+    "effect": "^3.21.0",
     "mssql": ">=12.2.0"
   },
   "peerDependenciesMeta": {

package/src/Entity.ts

@@ -20,7 +20,10 @@ function isBinary(v: unknown): v is Uint8Array | ArrayBuffer {
  * Header keys are guaranteed to be lowercase.
  */
 export type Headers = {
-  [header: string]: string | null | undefined
+  // `set-cookie` is the only header that supports multiple values (as an array),
+  // since it requires separate `Set-Cookie` headers per cookie (RFC 6265).
+  readonly "set-cookie"?: string | ReadonlyArray<string> | null
+  readonly [header: string]: string | ReadonlyArray<string> | null | undefined
 }
 
 export interface Entity<T = unknown, E = never> extends Effect.Effect<Entity<T, E>, E> {
@@ -48,8 +51,8 @@ export interface Entity<T = unknown, E = never> extends Effect.Effect<Entity<T,
       : [T] extends [string | Uint8Array | ArrayBuffer]
         ? Effect.Effect<unknown, ParseResult.ParseError | E>
         : [T] extends [Values.Json]
-        ? Effect.Effect<T, ParseResult.ParseError | E>
-        : Effect.Effect<unknown, ParseResult.ParseError | E>
+          ? Effect.Effect<T, ParseResult.ParseError | E>
+          : Effect.Effect<unknown, ParseResult.ParseError | E>
   readonly schemaJson: <A, I, R>(
     schema: Schema.Schema<A, I, R>,
   ) => Effect.Effect<A, ParseResult.ParseError | E, R>
@@ -303,6 +306,32 @@ export function effect<A, E, R>(body: Effect.Effect<Entity<A> | A, E, R>): Entit
   return make(body) as unknown as Entity<A, E>
 }
 
+function mergeSetCookie(
+  existing: string | ReadonlyArray<string> | null | undefined,
+  incoming: string | ReadonlyArray<string> | null | undefined,
+): string | ReadonlyArray<string> | undefined {
+  if (incoming == null) return existing ?? undefined
+  if (existing == null) return incoming
+  const a = Array.isArray(existing) ? existing : [existing]
+  const b = Array.isArray(incoming) ? incoming : [incoming]
+  return [...a, ...b]
+}
+
+export function merge<T, E>(entity: Entity<T, E>, options: Options): Entity<T, E> {
+  const headers: Headers = options.headers
+    ? {
+        ...entity.headers,
+        ...options.headers,
+        "set-cookie": mergeSetCookie(entity.headers["set-cookie"], options.headers["set-cookie"]),
+      }
+    : entity.headers
+  return make(entity.body, {
+    headers,
+    status: options.status ?? entity.status,
+    url: options.url ?? entity.url,
+  }) as Entity<T, E>
+}
+
 export function resolve<A, E>(entity: Entity<A, E>): Effect.Effect<Entity<A, E>, E, never> {
   const body = entity.body
   if (Effect.isEffect(body)) {
@@ -322,7 +351,7 @@ export function resolve<A, E>(entity: Entity<A, E>): Effect.Effect<Entity<A, E>,
 export function type(self: Entity): string {
   const h = self.headers
   if (h["content-type"]) {
-    return h["content-type"]
+    return h["content-type"] as string
   }
   const v = self.body
   if (typeof v === "string") {
@@ -337,7 +366,7 @@ export function type(self: Entity): string {
 export function length(self: Entity): number | undefined {
   const h = self.headers
   if (h["content-length"]) {
-    return parseInt(h["content-length"], 10)
+    return parseInt(h["content-length"] as string, 10)
   }
   const v = self.body
   if (typeof v === "string") {

package/src/Fetch.ts

@@ -232,7 +232,7 @@ export function followRedirects(options?: { readonly maxRedirects?: number }): M
             return entity
           }
 
-          const location = entity.headers["location"]
+          const location = entity.headers["location"] as string | undefined
           if (!location) {
             return entity
           }

package/src/FileRouterCodegen.ts

@@ -137,10 +137,10 @@ export function generateCode(fileRoutes: FileRouter.OrderedFileRoutes): string |
       currentPath = parentPath || "/"
     }
 
-    // Order: route first, then layers from innermost to outermost
+    // Order: layers from outermost to innermost, then route
     const loaders: Array<string> = [
+      ...allLayers.map((layer) => `() => import(".${layer.modulePath}")`),
       `() => import(".${route.modulePath}")`,
-      ...allLayers.reverse().map((layer) => `() => import(".${layer.modulePath}")`),
     ]
 
     entries.push({ path, loaders })
@@ -159,12 +159,18 @@ export function generateCode(fileRoutes: FileRouter.OrderedFileRoutes): string |
     .join(",\n")
 
   return `/**
- * Auto-generated by effect-start on startup and changes. Do not edit manually.
+ * Generated by effect-start. DO NOT EDIT.
  */
 
-export default {
+const routes = {
 ${routeEntries},
 } satisfies import("effect-start/FileRouter").FileRoutes
+
+export default routes
+
+declare module "effect-start/dev" {
+  export interface Routes extends Omit<typeof import("./.server.ts").default, never> {}
+}
 `
 }