fibrae 0.2.2 → 0.3.0

package/dist/router/RouterBuilder.js

@@ -10,6 +10,9 @@ import * as Effect from "effect/Effect";
 import * as Context from "effect/Context";
 import * as Layer from "effect/Layer";
 import * as Option from "effect/Option";
+import { RouterError } from "./Router.js";
+/** Normalize a LoaderResult (value or Effect) into an Effect. No type erasure. */
+const liftLoader = (value) => Effect.isEffect(value) ? value : Effect.succeed(value);
 /**
  * Tag for the RouterHandlers service.
  * Provides access to all registered handlers.
@@ -18,6 +21,7 @@ export class RouterHandlers extends Context.Tag("fibrae/RouterHandlers")() {
 }
 /**
  * Create handlers builder for a route group.
+ * RouteNames is threaded through to constrain handle() calls.
  */
 function makeGroupHandlers(groupName, grp) {
     const routesByName = new Map(grp.routes.map((r) => [r.name, r]));
@@ -27,22 +31,34 @@ function makeGroupHandlers(groupName, grp) {
         handle(routeName, config) {
             const maybeRoute = Option.fromNullable(routesByName.get(routeName));
             if (Option.isNone(maybeRoute)) {
-                throw new Error(`Route "${routeName}" not found in group "${groupName}"`);
+                throw new RouterError({
+                    message: `Route "${routeName}" not found in group "${groupName}"`,
+                });
             }
             const route = maybeRoute.value;
-            // Normalize loader: default to returning null, wrap plain values in Effect
-            const normalizedLoader = (ctx) => {
-                if (!config.loader) {
-                    return Effect.succeed(null);
-                }
-                const result = config.loader(ctx);
+            // Type-erasure boundary: loader/head/getStaticPaths are stored with R = never
+            // because their actual requirements (R2) are captured by the Layer's R type parameter.
+            // Casts to LoaderContext<PathParams, SearchParams> are safe — RouterOutlet always
+            // passes correctly-typed params decoded from the route schema.
+            const loader = (ctx) => (config.loader
+                ? liftLoader(config.loader(ctx))
+                : Effect.succeed(null));
+            const head = Option.fromNullable(config.head).pipe(Option.map((fn) => (ctx) => {
+                const result = fn(ctx);
                 return (Effect.isEffect(result) ? result : Effect.succeed(result));
-            };
+            }));
+            const getStaticPaths = Option.fromNullable(config.getStaticPaths).pipe(Option.map((fn) => () => {
+                const result = fn();
+                return (Effect.isEffect(result) ? result : Effect.succeed(result));
+            }));
             const handler = {
                 routeName,
                 route,
-                loader: normalizedLoader,
+                loader,
                 component: config.component,
+                head,
+                prerender: config.prerender ?? false,
+                getStaticPaths,
             };
             return buildHandlers([...handlers, handler]);
         },
@@ -51,9 +67,10 @@ function makeGroupHandlers(groupName, grp) {
 }
 /**
  * Create handlers builder for a layout group.
+ * RouteNames is threaded through to constrain handle() calls.
  */
-function makeLayoutGroupHandlers(groupName, layoutGroup) {
-    const routesByName = new Map(layoutGroup.routes.map((r) => [r.name, r]));
+function makeLayoutGroupHandlers(groupName, layoutGrp) {
+    const routesByName = new Map(layoutGrp.routes.map((r) => [r.name, r]));
     const buildHandlers = (handlers, layoutHandler) => ({
         groupName,
         handlers,
@@ -67,44 +84,51 @@ function makeLayoutGroupHandlers(groupName, layoutGroup) {
         handle(routeName, config) {
             const maybeRoute = Option.fromNullable(routesByName.get(routeName));
             if (Option.isNone(maybeRoute)) {
-                throw new Error(`Route "${routeName}" not found in layout group "${groupName}"`);
+                throw new RouterError({
+                    message: `Route "${routeName}" not found in layout group "${groupName}"`,
+                });
             }
             const route = maybeRoute.value;
-            const normalizedLoader = (ctx) => {
-                if (!config.loader) {
-                    return Effect.succeed(null);
-                }
-                const result = config.loader(ctx);
+            // Type-erasure boundary: loader/head/getStaticPaths are stored with R = never
+            // because their actual requirements (R2) are captured by the Layer's R type parameter.
+            // Casts to LoaderContext<PathParams, SearchParams> are safe — RouterOutlet always
+            // passes correctly-typed params decoded from the route schema.
+            const loader = (ctx) => (config.loader
+                ? liftLoader(config.loader(ctx))
+                : Effect.succeed(null));
+            const head = Option.fromNullable(config.head).pipe(Option.map((fn) => (ctx) => {
+                const result = fn(ctx);
                 return (Effect.isEffect(result) ? result : Effect.succeed(result));
-            };
+            }));
+            const getStaticPaths = Option.fromNullable(config.getStaticPaths).pipe(Option.map((fn) => () => {
+                const result = fn();
+                return (Effect.isEffect(result) ? result : Effect.succeed(result));
+            }));
             const handler = {
                 routeName,
                 route,
-                loader: normalizedLoader,
+                loader,
                 component: config.component,
+                head,
+                prerender: config.prerender ?? false,
+                getStaticPaths,
             };
             return buildHandlers([...handlers, handler], layoutHandler);
         },
     });
     return buildHandlers([], null);
 }
-/**
- * Find a route group by name in a router.
- */
-function findGroup(appRouter, groupName) {
-    const maybeGroup = Option.fromNullable(appRouter.groups.find((g) => g.name === groupName));
-    if (Option.isNone(maybeGroup)) {
-        throw new Error(`Group "${groupName}" not found in router "${appRouter.name}"`);
-    }
-    return maybeGroup.value;
-}
-export function group(appRouter, groupName, build) {
-    const routeGroup = findGroup(appRouter, groupName);
-    // Check if it's a layout group - if so, throw helpful error
+export function group(_appRouter, routeGroup, build) {
+    // Validate it's not a layout group (runtime safety net — types should prevent this)
     if (routeGroup._tag === "LayoutGroup") {
-        throw new Error(`Group "${groupName}" is a LayoutGroup. Use RouterBuilder.layoutGroup() instead of RouterBuilder.group().`);
+        return Layer.effect(RouterHandlers, Effect.die(new RouterError({
+            message: `Group "${routeGroup.name}" is a LayoutGroup. Use RouterBuilder.layoutGroup() instead.`,
+        })));
     }
-    const initialHandlers = makeGroupHandlers(groupName, routeGroup);
+    const initialHandlers = makeGroupHandlers(routeGroup.name, routeGroup);
+    // The Layer construction only needs the build callback's R2. The loader requirements (R)
+    // are needed at execution time (when serverLayer/browserLayer call handler.loader).
+    // We widen the type to include R so consumers must provide loader dependencies.
     return Layer.effect(RouterHandlers, Effect.gen(function* () {
         const result = build(initialHandlers);
         const builtHandlers = Effect.isEffect(result) ? yield* result : result;
@@ -122,12 +146,14 @@ export function group(appRouter, groupName, build) {
         };
     }));
 }
-export function layoutGroup(appRouter, groupName, build) {
-    const routeGroup = findGroup(appRouter, groupName);
-    if (routeGroup._tag !== "LayoutGroup") {
-        throw new Error(`Group "${groupName}" is not a LayoutGroup. Use RouterBuilder.group() instead.`);
+export function layoutGroup(_appRouter, layoutGrp, build) {
+    // Runtime safety net — types should prevent this
+    if (layoutGrp._tag !== "LayoutGroup") {
+        return Layer.effect(RouterHandlers, Effect.die(new RouterError({
+            message: `Group "${layoutGrp.name}" is not a LayoutGroup. Use RouterBuilder.group() instead.`,
+        })));
     }
-    const initialHandlers = makeLayoutGroupHandlers(groupName, routeGroup);
+    const initialHandlers = makeLayoutGroupHandlers(layoutGrp.name, layoutGrp);
     return Layer.effect(RouterHandlers, Effect.gen(function* () {
         const result = build(initialHandlers);
         const builtHandlers = Effect.isEffect(result) ? yield* result : result;
@@ -188,4 +214,17 @@ export function executeRoute(handler, ctx) {
         });
     });
 }
+/**
+ * Extract all prerender routes with their static path parameters.
+ *
+ * For each route with `prerender: true`:
+ * - If `getStaticPaths` is defined, calls it to enumerate all param sets
+ * - Otherwise, defaults to `[{}]` (a single page with no params)
+ */
+export const getPrerenderRoutes = (handlers) => Effect.all(Array.from(handlers.handlers.values())
+    .filter((h) => h.prerender)
+    .map((handler) => Option.match(handler.getStaticPaths, {
+    onNone: () => Effect.succeed([{}]),
+    onSome: (fn) => fn(),
+}).pipe(Effect.map((paramSets) => ({ handler, paramSets })))));
 //# sourceMappingURL=RouterBuilder.js.map

package/dist/router/RouterBuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterBuilder.js","sourceRoot":"","sources":["../../src/router/RouterBuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouterBuilder.js","sourceRoot":"","sources":["../../src/router/RouterBuilder.ts"],"names":[],"mappings":"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"}

package/dist/router/RouterOutlet.d.ts

@@ -46,23 +46,6 @@ declare const OutletDepth_base: Context.TagClass<OutletDepth, "fibrae/OutletDept
  */
 export declare class OutletDepth extends OutletDepth_base {
 }
-/**
- * Props for RouterOutlet component.
- *
- * @deprecated Props are no longer needed - SSR hydration is handled via RouterStateAtom.
- */
-export interface RouterOutletProps {
-    /**
-     * @deprecated Use RouterStateAtom hydration instead.
-     * Initial loader data from SSR - skips loader on first render.
-     */
-    readonly initialLoaderData?: unknown;
-    /**
-     * @deprecated Use RouterStateAtom hydration instead.
-     * Initial route name from SSR - used with initialLoaderData.
-     */
-    readonly initialRouteName?: string;
-}
 /**
  * RouterOutlet component for reactive route rendering.
  *
@@ -77,5 +60,5 @@ export interface RouterOutletProps {
  * For SSR hydration, the RouterStateAtom is pre-populated by the server,
  * so the first render uses that data and skips the loader.
  */
-export declare function RouterOutlet(_props?: RouterOutletProps): Stream.Stream<VElement, unknown, Navigator | RouterHandlers | AtomRegistry.AtomRegistry>;
+export declare function RouterOutlet(): Stream.Stream<VElement, never, Navigator | RouterHandlers | AtomRegistry.AtomRegistry>;
 export {};

package/dist/router/RouterOutlet.js

@@ -37,10 +37,25 @@ import * as Effect from "effect/Effect";
 import * as Stream from "effect/Stream";
 import * as Option from "effect/Option";
 import * as Context from "effect/Context";
+import * as Cause from "effect/Cause";
 import { Registry as AtomRegistry } from "@effect-atom/atom";
 import { Navigator } from "./Navigator.js";
 import { RouterHandlers } from "./RouterBuilder.js";
 import { RouterStateAtom } from "./RouterState.js";
+/**
+ * Component that re-throws a caught error during render.
+ * Used by RouterOutlet to bubble per-route errors to ErrorBoundary
+ * without killing the route-change stream.
+ */
+const ErrorBubble = (cause) => {
+    const error = Cause.squash(cause);
+    return {
+        type: (() => {
+            throw error;
+        }),
+        props: { children: [] },
+    };
+};
 /**
  * Context for tracking outlet depth in nested layouts.
  * Each nested RouterOutlet increments the depth.
@@ -64,7 +79,7 @@ export class OutletDepth extends Context.Tag("fibrae/OutletDepth")() {
  * For SSR hydration, the RouterStateAtom is pre-populated by the server,
  * so the first render uses that data and skips the loader.
  */
-export function RouterOutlet(_props = {}) {
+export function RouterOutlet() {
     // Track if this is the first render (for SSR hydration)
     let isFirstRender = true;
     return Stream.unwrap(Effect.gen(function* () {
@@ -77,8 +92,11 @@ export function RouterOutlet(_props = {}) {
         const hydratedState = registry.get(RouterStateAtom);
         // Create a stream from the currentRoute atom (navigation trigger)
         const routeStream = AtomRegistry.toStream(registry, navigator.currentRoute);
-        // Map route changes to rendered VElements
-        return Stream.mapEffect(routeStream, (currentRoute) => Effect.gen(function* () {
+        // Map route changes to rendered VElements.
+        // Errors are caught per-route so the stream stays alive for navigation recovery.
+        // A failing route emits a component that re-throws during render, allowing
+        // ErrorBoundary to catch it while keeping this stream alive for the next route.
+        return routeStream.pipe(Stream.mapEffect((currentRoute) => Effect.gen(function* () {
             if (Option.isNone(currentRoute)) {
                 // No route matched - clear router state and render 404
                 registry.set(RouterStateAtom, Option.none());
@@ -116,10 +134,6 @@ export function RouterOutlet(_props = {}) {
                         },
                     };
                 }
-                // The layout component renders its own <RouterOutlet /> which will
-                // have depth = currentDepth + 1. We need to provide the incremented
-                // depth via context - this is handled by the rendering system
-                // that provides OutletDepth = currentDepth + 1 to nested outlets.
                 return layoutHandler.value.component();
             }
             // At the deepest level - render the actual route component
@@ -177,7 +191,10 @@ export function RouterOutlet(_props = {}) {
                 searchParams,
             });
             return element;
-        }));
+        }).pipe(
+        // Catch per-route errors so the stream stays alive for navigation recovery.
+        // Emit a component that re-throws during render — ErrorBoundary catches it.
+        Effect.catchAllCause((cause) => Effect.succeed(ErrorBubble(cause))))));
     }));
 }
 //# sourceMappingURL=RouterOutlet.js.map

package/dist/router/RouterOutlet.js.map

@@ -1 +1 @@
-{"version":3,"file":"RouterOutlet.js","sourceRoot":"","sources":["../../src/router/RouterOutlet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"RouterOutlet.js","sourceRoot":"","sources":["../../src/router/RouterOutlet.ts"],"names":[],"mappings":"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"}

package/dist/router/RouterState.d.ts

@@ -93,7 +93,7 @@ export declare const getRouterState: Effect.Effect<Option.Option<RouterState>, n
  * Get the current loader data (typed by the caller).
  * Returns None if no route is matched.
  */
-export declare const getLoaderData: <T>() => Effect.Effect<Option.Option<T>, never, RouterStateService | AtomRegistry.AtomRegistry>;
+export declare const getLoaderData: <T>() => Effect.Effect<Option.Option<T>, never, AtomRegistry.AtomRegistry | RouterStateService>;
 /**
  * Get the current route params.
  * Returns None if no route is matched.

package/dist/router/index.d.ts

@@ -8,20 +8,20 @@
  * - Type-safe navigation
  */
 export * as Route from "./Route.js";
+export { RouteError } from "./Route.js";
 export * as Router from "./Router.js";
 export * as RouterBuilder from "./RouterBuilder.js";
 export * as History from "./History.js";
 export * as Navigator from "./Navigator.js";
 export * as RouterState from "./RouterState.js";
-export type { LoaderContext, ComponentProps, HandlerConfig, RouteHandler, GroupHandlers, LayoutGroupHandlers, LayoutHandler, } from "./RouterBuilder.js";
-export { RouterHandlers } from "./RouterBuilder.js";
+export type { LoaderContext, ComponentProps, HandlerConfig, RouteHandler, GroupHandlers, LayoutGroupHandlers, LayoutHandler, PrerenderRoute, HeadData, HeadContext, MetaDescriptor, } from "./RouterBuilder.js";
+export { RouterHandlers, getPrerenderRoutes } from "./RouterBuilder.js";
 export type { HistoryLocation, HistoryService } from "./History.js";
 export { History as HistoryTag, BrowserHistoryLive, MemoryHistoryLive } from "./History.js";
 export type { CurrentRoute, NavigateOptions, NavigatorService } from "./Navigator.js";
-export { Navigator as NavigatorTag, NavigatorLive } from "./Navigator.js";
+export { Navigator as NavigatorTag, NavigatorLive, createGo } from "./Navigator.js";
 export type { LinkProps } from "./Link.js";
 export { createLink } from "./Link.js";
-export type { RouterOutletProps } from "./RouterOutlet.js";
 export { RouterOutlet, OutletDepth } from "./RouterOutlet.js";
 export type { ServerLayerOptions, BrowserLayerOptions, DehydratedRouterState, SSRRouteResult, RouteMatch, LayoutGroup, RouteGroup, AnyGroup, } from "./Router.js";
 export { CurrentRouteElement } from "./Router.js";

package/dist/router/index.js

@@ -9,6 +9,7 @@
  */
 // Route declaration
 export * as Route from "./Route.js";
+export { RouteError } from "./Route.js";
 // Router and groups
 export * as Router from "./Router.js";
 // Handler implementation
@@ -19,10 +20,11 @@ export * as History from "./History.js";
 export * as Navigator from "./Navigator.js";
 // Router state (unified serializable state)
 export * as RouterState from "./RouterState.js";
-export { RouterHandlers } from "./RouterBuilder.js";
+export { RouterHandlers, getPrerenderRoutes } from "./RouterBuilder.js";
 export { History as HistoryTag, BrowserHistoryLive, MemoryHistoryLive } from "./History.js";
-export { Navigator as NavigatorTag, NavigatorLive } from "./Navigator.js";
+export { Navigator as NavigatorTag, NavigatorLive, createGo } from "./Navigator.js";
 export { createLink } from "./Link.js";
+// Re-export RouterOutlet component
 export { RouterOutlet, OutletDepth } from "./RouterOutlet.js";
 export { CurrentRouteElement } from "./Router.js";
 // Re-export RouterState utilities for convenience

package/dist/router/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,oBAAoB;AACpB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AAEpC,oBAAoB;AACpB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,yBAAyB;AACzB,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD,kBAAkB;AAClB,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,oBAAoB;AACpB,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C,4CAA4C;AAC5C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAahD,OAAO,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI5F,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAI1E,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAIvC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAa9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,kDAAkD;AAClD,yEAAyE;AACzE,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,GACf,MAAM,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/router/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,oBAAoB;AACpB,OAAO,KAAK,KAAK,MAAM,YAAY,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAExC,oBAAoB;AACpB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAC;AAEtC,yBAAyB;AACzB,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAC;AAEpD,kBAAkB;AAClB,OAAO,KAAK,OAAO,MAAM,cAAc,CAAC;AAExC,oBAAoB;AACpB,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAC;AAE5C,4CAA4C;AAC5C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAC;AAiBhD,OAAO,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAIxE,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAI5F,OAAO,EAAE,SAAS,IAAI,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAIpF,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,mCAAmC;AACnC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAa9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,kDAAkD;AAClD,yEAAyE;AACzE,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,GACf,MAAM,kBAAkB,CAAC"}

package/dist/router/utils.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Shared router utilities.
+ *
+ * Consolidates duplicated helpers from Router, Navigator, and Link modules.
+ */
+import * as Option from "effect/Option";
+import type { Route } from "./Route.js";
+import type { Router, AnyGroup } from "./Router.js";
+/**
+ * Parse URL search string to a record.
+ * Handles both "?foo=bar" and "foo=bar" formats.
+ */
+export declare const parseSearchParams: (search: string) => Record<string, string>;
+/**
+ * Build a search string from a params record.
+ * Returns "" if no params, or "?key=value&..." otherwise.
+ * Filters out null and undefined values.
+ */
+export declare const buildSearchString: (params: Record<string, unknown>) => string;
+/**
+ * Strip basePath prefix from pathname for route matching.
+ * Returns "/" (not "") when pathname exactly equals basePath.
+ */
+export declare const stripBasePath: (pathname: string, basePath: string) => string;
+/**
+ * Find a route by name across all groups in a router.
+ * Returns the route and its group's basePath (empty string for non-layout groups).
+ */
+export declare const findRouteByName: (router: Router<string, never>, name: string) => Option.Option<{
+    route: Route<string, Record<string, unknown>, Record<string, unknown>>;
+    group: AnyGroup;
+}>;
+/**
+ * Get the basePath for a group (layout groups have one, regular groups don't).
+ */
+export declare const groupBasePath: (group: AnyGroup) => string;

package/dist/router/utils.js

@@ -0,0 +1,48 @@
+/**
+ * Shared router utilities.
+ *
+ * Consolidates duplicated helpers from Router, Navigator, and Link modules.
+ */
+import * as Option from "effect/Option";
+/**
+ * Parse URL search string to a record.
+ * Handles both "?foo=bar" and "foo=bar" formats.
+ */
+export const parseSearchParams = (search) => Object.fromEntries(new URLSearchParams(search));
+/**
+ * Build a search string from a params record.
+ * Returns "" if no params, or "?key=value&..." otherwise.
+ * Filters out null and undefined values.
+ */
+export const buildSearchString = (params) => {
+    const entries = Object.entries(params).filter(([, v]) => v !== undefined && v !== null);
+    if (entries.length === 0)
+        return "";
+    const sp = new URLSearchParams(entries.map(([k, v]) => [k, String(v)]));
+    return `?${sp.toString()}`;
+};
+/**
+ * Strip basePath prefix from pathname for route matching.
+ * Returns "/" (not "") when pathname exactly equals basePath.
+ */
+export const stripBasePath = (pathname, basePath) => {
+    if (!basePath || basePath === "/")
+        return pathname;
+    const normalizedBase = basePath.endsWith("/") ? basePath.slice(0, -1) : basePath;
+    if (pathname.startsWith(normalizedBase)) {
+        return pathname.slice(normalizedBase.length) || "/";
+    }
+    return pathname;
+};
+/**
+ * Find a route by name across all groups in a router.
+ * Returns the route and its group's basePath (empty string for non-layout groups).
+ */
+export const findRouteByName = (router, name) => Option.fromNullable(router.groups
+    .flatMap((group) => group.routes.filter((route) => route.name === name).map((route) => ({ route, group })))
+    .at(0));
+/**
+ * Get the basePath for a group (layout groups have one, regular groups don't).
+ */
+export const groupBasePath = (group) => group._tag === "LayoutGroup" ? group.basePath : "";
+//# sourceMappingURL=utils.js.map

package/dist/router/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/router/utils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AAIxC;;;GAGG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAc,EAA0B,EAAE,CAC1E,MAAM,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;AAElD;;;;GAIG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAA+B,EAAU,EAAE;IAC3E,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;IACxF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IACpC,MAAM,EAAE,GAAG,IAAI,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACxE,OAAO,IAAI,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,QAAgB,EAAE,QAAgB,EAAU,EAAE;IAC1E,IAAI,CAAC,QAAQ,IAAI,QAAQ,KAAK,GAAG;QAAE,OAAO,QAAQ,CAAC;IACnD,MAAM,cAAc,GAAG,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACjF,IAAI,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;QACxC,OAAO,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC;IACtD,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,MAAc,EACd,IAAY,EACsC,EAAE,CACpD,MAAM,CAAC,YAAY,CACjB,MAAM,CAAC,MAAM;KACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CACjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CACvF;KACA,EAAE,CAAC,CAAC,CAAC,CACT,CAAC;AAEJ;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,KAAe,EAAU,EAAE,CACvD,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC"}

package/dist/runtime.d.ts

@@ -5,6 +5,8 @@ import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import * as Option from "effect/Option";
 import * as Context from "effect/Context";
+import * as Mailbox from "effect/Mailbox";
+import * as RcMap from "effect/RcMap";
 import type * as EffectFiber from "effect/Fiber";
 import type * as Runtime from "effect/Runtime";
 import { Atom, Registry as AtomRegistry, Result } from "@effect-atom/atom";
@@ -15,8 +17,6 @@ export interface FiberState {
     wipRoot: Option.Option<Fiber>;
     nextUnitOfWork: Option.Option<Fiber>;
     deletions: Fiber[];
-    renderQueue: Set<Fiber>;
-    batchScheduled: boolean;
     listenerStore: WeakMap<HTMLElement, Record<string, EventListener>>;
 }
 export declare const makeFiberState: () => FiberState;
@@ -32,14 +32,17 @@ declare const FibraeRuntime_base: Effect.Service.Class<FibraeRuntime, "FibraeRun
             update: <R, W>(atom: Atom.Writable<R, W>, f: (_: R) => W) => void;
             modify: <R, W, A>(atom: Atom.Writable<R, W>, f: (_: R) => [returnValue: A, nextValue: W]) => A;
             getResult: <A, E>(atom: Atom.Atom<Result.Result<A, E>>, options?: {
-                readonly suspendOnWaiting?: boolean;
-            }) => Effect.Effect<A, E>;
-            toStreamResult: <A, E>(atom: Atom.Atom<Result.Result<A, E>>) => Stream.Stream<A, E>;
+                readonly suspendOnWaiting?: boolean | undefined;
+            } | undefined) => Effect.Effect<A, E, never>;
+            toStreamResult: <A, E>(atom: Atom.Atom<Result.Result<A, E>>) => Stream.Stream<A, E, never>;
             refresh: <A>(atom: Atom.Atom<A>) => void;
         };
         fiberState: Ref.Ref<FiberState>;
-        fullContextRef: Ref.Ref<Context.Context<unknown>>;
-    }, never, Scope.Scope | AtomRegistry.AtomRegistry>;
+        fullContextRef: Ref.Ref<Context.Context<never>>;
+        renderMailbox: Mailbox.Mailbox<Fiber, never>;
+        sseConnections: RcMap.RcMap<string, EventSource, never>;
+        sseWithCredentials: Ref.Ref<boolean>;
+    }, never, AtomRegistry.AtomRegistry | Scope.Scope>;
 }>;
 export declare class FibraeRuntime extends FibraeRuntime_base {
     static Live: Layer.Layer<FibraeRuntime, never, AtomRegistry.AtomRegistry>;

package/dist/runtime.js

@@ -6,6 +6,8 @@ import * as Layer from "effect/Layer";
 import * as Ref from "effect/Ref";
 import * as Option from "effect/Option";
 import * as Context from "effect/Context";
+import * as Mailbox from "effect/Mailbox";
+import * as RcMap from "effect/RcMap";
 import { Atom, Registry as AtomRegistry, Result } from "@effect-atom/atom";
 import * as RegistryModule from "@effect-atom/atom/Registry";
 export const makeFiberState = () => ({
@@ -13,8 +15,6 @@ export const makeFiberState = () => ({
     wipRoot: Option.none(),
     nextUnitOfWork: Option.none(),
     deletions: [],
-    renderQueue: new Set(),
-    batchScheduled: false,
     listenerStore: new WeakMap(),
 });
 // =============================================================================
@@ -33,6 +33,17 @@ export class FibraeRuntime extends Effect.Service()("FibraeRuntime", {
         const fullContextRef = yield* Ref.make(Context.empty());
         // Each render tree gets its own fiber state
         const fiberState = yield* Ref.make(makeFiberState());
+        // Mailbox for batching re-render requests (replaces manual Set + queueMicrotask)
+        const renderMailbox = yield* Mailbox.make();
+        // Reference-counted SSE connections: shared EventSources keyed by URL.
+        // Automatically closes EventSource when last consumer releases.
+        const sseWithCredentials = yield* Ref.make(false);
+        const sseConnections = yield* RcMap.make({
+            lookup: (url) => Effect.gen(function* () {
+                const withCredentials = yield* Ref.get(sseWithCredentials);
+                return yield* Effect.acquireRelease(Effect.sync(() => new EventSource(url, { withCredentials })), (es) => Effect.sync(() => es.close()));
+            }),
+        });
         const AtomOps = {
             get: (atom) => registry.get(atom),
             set: (atom, value) => registry.set(atom, value),
@@ -49,6 +60,9 @@ export class FibraeRuntime extends Effect.Service()("FibraeRuntime", {
             AtomOps,
             fiberState,
             fullContextRef,
+            renderMailbox,
+            sseConnections,
+            sseWithCredentials,
         };
     }),
 }) {
@@ -67,6 +81,10 @@ export class FibraeRuntime extends Effect.Service()("FibraeRuntime", {
  *
  * IMPORTANT: fullContextRef must be set by render() before this is called.
  */
+// fullContextRef holds the dynamically-assembled context (FibraeRuntime + user layers).
+// Its static type is Context<never> because the full set of services isn't known until
+// render() composes all layers. The casts below are load-bearing — they bridge the gap
+// between the dynamic context and the type system's static requirements.
 export const runForkWithRuntime = (runtime) => (effect) => {
     const withContext = Effect.gen(function* () {
         const fullContext = yield* Ref.get(runtime.fullContextRef);

package/dist/runtime.js.map

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