effect-start 0.34.0 → 0.35.0

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

@@ -1,11 +1,11 @@
 import * as Stream from "effect/Stream";
 import * as Route from "../../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, Stream.Stream<string, never, never>, never, never>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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

@@ -1,7 +1,7 @@
 import * as Route from "../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, import("../../RouteBody.ts").RenderValue, never, never>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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

@@ -1,7 +1,7 @@
 import * as Route from "../../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, string, never, Route.Routes>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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

@@ -1,7 +1,7 @@
 import * as Route from "../../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, string, never, never>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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

@@ -1,11 +1,11 @@
 import * as Stream from "effect/Stream";
 import * as Route from "../../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, Stream.Stream<string, never, never>, never, never>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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

@@ -1,17 +1,13 @@
 import * as Route from "../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, 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,11 +1,11 @@
 import * as Stream from "effect/Stream";
 import * as Route from "../../../Route.ts";
-declare const _default: Omit<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>]>, "use">;
+}, {}, Stream.Stream<string, import("../../../sql/SqlClient.ts").SqlError, import("../../../sql/SqlClient.ts").SqlClient>, import("../../../sql/SqlClient.ts").SqlError, import("../../../sql/SqlClient.ts").SqlClient>]>;
 export default _default;
 //# sourceMappingURL=route.d.ts.map

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.34.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/FileRouterCodegen.ts

@@ -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> {}
+}
 `
 }
 

package/src/Route.ts

@@ -27,16 +27,16 @@ export namespace RouteDescriptor {
   }
 }
 
-export namespace RouteSet {
-  export type RouteSet<
-    D extends RouteDescriptor.Any = {},
-    B = {},
-    M extends Route.Tuple = [],
-  > = Data<D, B, M> & {
-    [TypeId]: typeof TypeId
-  } & Pipeable.Pipeable &
-    Iterable<M[number]>
+export type RouteSet<
+  D extends RouteDescriptor.Any = {},
+  B = {},
+  M extends Route.Tuple = [],
+> = RouteSet.Data<D, B, M> & {
+  [TypeId]: typeof TypeId
+} & Pipeable.Pipeable &
+  Iterable<M[number]>
 
+export namespace RouteSet {
   export type Data<D extends RouteDescriptor.Any = {}, B = {}, M extends Route.Tuple = []> = {
     [RouteItems]: M
     [RouteDescriptor]: D
@@ -44,7 +44,7 @@ export namespace RouteSet {
   }
 
   export type Proto = Pipeable.Pipeable &
-    Iterable<Route.Route<any, any, any, any, any>> & {
+    Iterable<Route<any, any, any, any, any>> & {
       [TypeId]: typeof TypeId
     }
 
@@ -58,17 +58,17 @@ export namespace RouteSet {
     T extends Data<infer D, any, any> ? D : never
 }
 
-export namespace Route {
-  export interface Route<
-    D extends RouteDescriptor.Any = {},
-    B = {},
-    A = any,
-    E = never,
-    R = never,
-  > extends RouteSet.RouteSet<D, {}, [Route<D, B, A, E, R>]> {
-    readonly handler: Handler<B & D, A, E, R>
-  }
+export interface Route<
+  D extends RouteDescriptor.Any = {},
+  B = {},
+  A = any,
+  E = never,
+  R = never,
+> extends RouteSet<D, {}, [Route<D, B, A, E, R>]> {
+  readonly handler: Route.Handler<B & D, A, E, R>
+}
 
+export namespace Route {
   export type With<D extends RouteDescriptor.Any> = Route<any, any, any, any, any> & {
     [RouteDescriptor]: D
   }
@@ -125,26 +125,26 @@ export function isRouteSet(input: unknown): input is RouteSet.Any {
   return Predicate.hasProperty(input, TypeId)
 }
 
-export function isRoute(input: unknown): input is Route.Route {
+export function isRoute(input: unknown): input is Route {
   return isRouteSet(input) && Predicate.hasProperty(input, "handler")
 }
 
 export function set<D extends RouteDescriptor.Any = {}, B = {}, I extends Route.Tuple = []>(
   items: I = [] as unknown as I,
   descriptor: D = {} as D,
-): RouteSet.RouteSet<D, B, I> {
+): RouteSet<D, B, I> {
   return Object.assign(Object.create(Proto), {
     [RouteItems]: items,
     [RouteDescriptor]: descriptor,
-  }) as RouteSet.RouteSet<D, B, I>
+  }) as RouteSet<D, B, I>
 }
 
 export function make<D extends RouteDescriptor.Any, B, A, E = never, R = never>(
   handler: Route.Handler<B & D, A, E, R>,
   descriptor?: D,
-): Route.Route<D, B, A, E, R> {
+): Route<D, B, A, E, R> {
   const items: any = []
-  const route: Route.Route<D, B, A, E, R> = Object.assign(Object.create(Proto), {
+  const route: Route<D, B, A, E, R> = Object.assign(Object.create(Proto), {
     [RouteItems]: items,
     [RouteDescriptor]: descriptor,
     handler,
@@ -185,7 +185,7 @@ export type ExtractBindings<M extends Route.Tuple> = M extends [
   infer Head,
   ...infer Tail extends Route.Tuple,
 ]
-  ? Head extends Route.Route<any, infer B, any, any, any>
+  ? Head extends Route<any, infer B, any, any, any>
     ? ShallowMerge<B, ExtractBindings<Tail>>
     : ExtractBindings<Tail>
   : {}
@@ -206,6 +206,11 @@ export * from "./RouteSchema.ts"
 
 export { del, get, head, options, patch, post, put, use } from "./RouteMount.ts"
 
+export class Request extends Context.Tag("effect-start/Route/Request")<
+  Request,
+  globalThis.Request
+>() {}
+
 export const text = RouteBody.build<string, "text">({
   format: "text",
 })
@@ -229,8 +234,8 @@ export function redirect<D extends RouteDescriptor.Any, B, I extends Route.Tuple
   url: string | URL,
   options?: { status?: 301 | 302 | 303 | 307 | 308 },
 ): (
-  self: RouteSet.RouteSet<D, B, I>,
-) => RouteSet.RouteSet<D, B, [...I, Route.Route<{}, {}, "", never, never>]> {
+  self: RouteSet<D, B, I>,
+) => RouteSet<D, B, [...I, Route<{}, {}, "", never, never>]> {
   const route = make<{}, {}, "">(() =>
     Effect.succeed(
       Entity.make("", {
@@ -243,7 +248,7 @@ export function redirect<D extends RouteDescriptor.Any, B, I extends Route.Tuple
   )
 
   return (self) =>
-    set<D, B, [...I, Route.Route<{}, {}, "", never, never>]>(
+    set<D, B, [...I, Route<{}, {}, "", never, never>]>(
       [...items(self), route],
       descriptor(self),
     )
@@ -255,6 +260,20 @@ export function layer(routes: RouteTree.RouteMap | RouteTree.RouteTree) {
   return Layer.sync(Routes, () => (RouteTree.isRouteTree(routes) ? routes : RouteTree.make(routes)))
 }
 
+export function layerMerge(routes: RouteTree.InputRouteMap | RouteTree.RouteTree) {
+  return Layer.effect(
+    Routes,
+    Effect.gen(function* () {
+      const existing = yield* Effect.serviceOption(Routes).pipe(
+        Effect.andThen(Option.getOrUndefined),
+      )
+      const tree = RouteTree.isRouteTree(routes) ? routes : RouteTree.make(routes)
+      if (!existing) return tree
+      return RouteTree.merge(existing, tree)
+    }),
+  )
+}
+
 /**
  * Creates a route that short-curcits in development.
  *
@@ -262,9 +281,9 @@ export function layer(routes: RouteTree.RouteMap | RouteTree.RouteTree) {
  * we exclude them altogeteher in development.
  */
 export function devOnly<D extends RouteDescriptor.Any, B, I extends Route.Tuple>(
-  self: RouteSet.RouteSet<D, B, I>,
-): RouteSet.RouteSet<D, B, [...I, Route.Route<{ dev: true }, { dev: true }, unknown, any, any>]> {
-  const route: Route.Route<{ dev: true }, { dev: true }, unknown, any, any> = make<
+  self: RouteSet<D, B, I>,
+): RouteSet<D, B, [...I, Route<{ dev: true }, { dev: true }, unknown, any, any>]> {
+  const route: Route<{ dev: true }, { dev: true }, unknown, any, any> = make<
     { dev: true },
     { dev: true },
     unknown,
@@ -280,12 +299,12 @@ export function devOnly<D extends RouteDescriptor.Any, B, I extends Route.Tuple>
     { dev: true },
   )
 
-  const nextItems: [...I, Route.Route<{ dev: true }, { dev: true }, unknown, any, any>] = [
+  const nextItems: [...I, Route<{ dev: true }, { dev: true }, unknown, any, any>] = [
     ...items(self),
     route,
   ]
 
-  return set<D, B, [...I, Route.Route<{ dev: true }, { dev: true }, unknown, any, any>]>(
+  return set<D, B, [...I, Route<{ dev: true }, { dev: true }, unknown, any, any>]>(
     nextItems,
     descriptor(self),
   )
@@ -309,3 +328,5 @@ export function lazy<T extends RouteSet.Any>(
     )
   })
 }
+
+export { link } from "./RouteLink.ts"