@rangojs/router 0.1.0 → 0.1.1

package/dist/types/rsc/shell-capture.d.ts

@@ -148,6 +148,8 @@ export interface ShellCaptureDebugEvent {
     snapshotBytes?: number;
     /** True when the snapshot exceeded maxSnapshotBytes and was dropped. */
     snapshotSkipped?: boolean;
+    /** Outcome reported by a store that supports shell-write acknowledgements. */
+    storeWrite?: "stored" | "invalidated";
     /** Consecutive failure count in the key's backoff entry, when one exists. */
     backoffFailures?: number;
     /** Ms remaining in the key's backoff window, when one exists. */
@@ -308,13 +310,7 @@ type CaptureAttemptOutcome = "stored" | "redirect" | "no-shell" | "refused";
  * bag, not a return value: captureAndStoreShell's outcome type stays a string
  * union its existing callers (producer B, tests) consume unchanged.
  */
-interface CaptureAttemptStats {
-    barrierWaitMs?: number;
-    writeSettleMs?: number;
-    preludeBytes?: number;
-    snapshotBytes?: number;
-    snapshotSkipped?: boolean;
-}
+type CaptureAttemptStats = Pick<ShellCaptureDebugEvent, "barrierWaitMs" | "writeSettleMs" | "preludeBytes" | "snapshotBytes" | "snapshotSkipped" | "storeWrite">;
 /**
  * Run the shell capture with a single in-place retry, then store the result.
  *
@@ -369,6 +365,6 @@ export declare function deriveShellCaptureContext(reqCtx: RequestContext<any>, d
  * retryable outcome; a genuine (non-abort) captureShellHTML error propagates so it
  * reaches reportCacheError and is NOT retried.
  */
-declare function captureAndStoreShell(ssrModule: SSRModule, rscStream: ReadableStream<Uint8Array>, handleStore: HandleStore, reqCtx: RequestContext<any>, capture: ShellCaptureDescriptor, stats?: CaptureAttemptStats): Promise<Exclude<CaptureAttemptOutcome, "redirect">>;
+declare function captureAndStoreShell(ssrModule: SSRModule, rscStream: ReadableStream<Uint8Array>, handleStore: HandleStore, reqCtx: RequestContext<any>, capture: ShellCaptureDescriptor, stats?: CaptureAttemptStats, captureStartedAt?: number): Promise<Exclude<CaptureAttemptOutcome, "redirect">>;
 export { runShellCapture, captureAndStoreShell, delay, SHELL_CAPTURE_RETRY_DELAY_MS, };
 export { isCaptureBackedOff, markCaptureBackoff, clearCaptureBackoff, REFUSED_CAPTURE_BASE_MS, REFUSED_CAPTURE_MAX_MS, REFUSED_CAPTURE_DEV_MAX_MS, };

package/dist/types/rsc/types.d.ts

@@ -41,6 +41,8 @@ export interface RscPayload {
         handles?: AsyncGenerator<HandleData, void, unknown>;
         /** RSC version string for cache invalidation */
         version?: string;
+        /** Cloudflare dev worker generation used for stale-document convergence. */
+        devDiscoveryEpoch?: number;
         /** TTL in milliseconds for the client-side in-memory prefetch cache */
         prefetchCacheTTL?: number;
         /** Max entries in the client-side in-memory prefetch cache (FIFO eviction) */

package/dist/types/server/context.d.ts

@@ -248,6 +248,10 @@ interface HelperContext {
     counters: Record<string, number>;
     forRoute?: string;
     mountIndex?: number;
+    /** Owning router id, when known (threaded by generateManifestFull). Scopes
+     *  the search-schema/root-scope registries so same-named routes in
+     *  different routers don't clobber each other (route-map-builder.ts). */
+    routerId?: string;
     metrics?: MetricsStore;
     /** True when rendering for SSR (document requests) */
     isSSR?: boolean;
@@ -337,6 +341,18 @@ export declare function getNamePrefix(): string | undefined;
  * Returns true at root or inside { name: "" } includes, false inside named includes.
  */
 export declare function getRootScoped(): boolean;
+/**
+ * Stamp build-time scope identity onto a Static() definition at mount time.
+ * The bake collector (prerender-collection.ts) renders defs OUTSIDE any
+ * evaluation scope and used to iterate the registry first-non-null, so these
+ * are the ONLY reliable carriers of the def's owning router, root-scope, and
+ * full route name — a name-keyed registry lookup at bake time reproduces the
+ * cross-router collision #757/#762 fixed (and the collector's historical
+ * `$$routePrefix` argument is a name PREFIX, which the root-scope registry
+ * never contains, silently degrading to the dot-heuristic).
+ * A definition mounted more than once is stamped each time; the last mount wins.
+ */
+export declare function stampStaticDefScope(handler: unknown, routeName?: string): void;
 export type { HelperContext };
 /**
  * Return an isolated copy of a lazy include's captured parent entry.

package/dist/types/server/request-context.d.ts

@@ -180,21 +180,28 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
      */
     _shellLoaderSeed?: Map<string, import("../cache/shell-snapshot.js").ShellLoaderSeedEntry>;
     /**
-     * @internal Shell fast-path marker: makes the NEXT full match treat the whole
-     * matched route as an implicit doc-level cache() boundary (see
+     * @internal Shell fast-path marker: makes the next eligible match treat the
+     * whole matched route as an implicit doc-level cache() boundary (see
      * resolveShellImplicitCacheScope in cache/cache-scope.ts). Set ONLY on
      * (a) the capture's derived context — with a record-only store so the
      * capture's cacheRoute write lands in the snapshot, never the real store —
-     * and (b) a HIT tail's seeded context when the entry is eligible
-     * (!handlerLiveHoles), where the SeededShellStore serves the recorded doc
-     * entry and the match skips handler execution entirely. Routes with their
-     * own cache() config (including cache(false)) are never overridden: the
-     * marker only applies when the route tree derived NO cache scope.
+     * (b) a HIT tail's seeded context, and (c) an eligible normal-route partial
+     * replay, where `store` is a request-local segment overlay. Handler-live holes
+     * and conditional transitions decline replay.
+     * Routes with their own cache() config (including cache(false)) are never
+     * overridden: the marker only applies when the route tree derived NO cache
+     * scope.
      */
     _shellImplicitCache?: {
         ttl?: number;
         swr?: number;
         store?: SegmentCacheStore;
+        /**
+         * @internal Override the implicit scope's default cache namespace. Shell
+         * captures and navigation replay both consume the canonical document
+         * segment record even when the triggering request is partial.
+         */
+        keyPrefix?: "doc";
     };
     /**
      * @internal Shell-HIT tail marker: cache/prerender-store hits during THIS
@@ -484,6 +491,9 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
     _tracing?: ResolvedTracing;
     /** @internal Router basename for this request (used by redirect()) */
     _basename?: string;
+    /** @internal Owning router id; scopes the search-schema/root-scope registry
+     *  lookups per router (route-map-builder.ts) */
+    _routerId?: string;
     /**
      * @internal RouteSnapshot from classifyRequest, reused by match/matchPartial
      * to avoid a second resolveRoute call. Cleared on HMR invalidation.
@@ -504,7 +514,7 @@ export interface RequestContext<TEnv = DefaultEnv, TParams = Record<string, stri
  * This is the type exported to library consumers. Internal code should
  * use the full RequestContext interface directly.
  */
-export type PublicRequestContext<TEnv = DefaultEnv, TParams = Record<string, string>> = Omit<RequestContext<TEnv, TParams>, "cookie" | "cookies" | "setCookie" | "deleteCookie" | "_handleStore" | "_transitionWhen" | "_cacheStore" | "_shellCaptureRun" | "_shellFragmentPayload" | "_shellCaptureGuardTrippedLoaderId" | "_explicitTaggedStores" | "_requestTags" | "_cacheProfiles" | "_onResponseCallbacks" | "_themeConfig" | "_locationState" | "_routeName" | "_prevRouteKey" | "_gateCurrentUrl" | "_gateCurrentParams" | "_gateActionId" | "_gateActionUrl" | "_gateActionResult" | "_gateFormData" | "_inActionRevalidation" | "_reportedErrors" | "_renderBarrier" | "_resolveRenderBarrier" | "_renderBarrierSegmentOrder" | "_treeHasStreaming" | "_renderBarrierWaiters" | "_handlerLoaderDeps" | "_renderBarrierHandleSnapshot" | "_renderBarrierGuardClosed" | "_reportBackgroundError" | "_debugPerformance" | "_metricsStore" | "_renderForeground" | "_renderDiagnosticsEnabled" | "_handlerStart" | "_basename" | "_setStatus" | "_rotateStateCookie" | "_setKeepCacheDirective" | "_variables" | "_classifiedRoute" | "_cacheSignal" | "_dynamic" | "res">;
+export type PublicRequestContext<TEnv = DefaultEnv, TParams = Record<string, string>> = Omit<RequestContext<TEnv, TParams>, "cookie" | "cookies" | "setCookie" | "deleteCookie" | "_handleStore" | "_transitionWhen" | "_cacheStore" | "_shellCaptureRun" | "_shellImplicitCache" | "_shellLoaderSeed" | "_shellCaptureLoaderRecords" | "_shellCaptureHandleLiveness" | "_shellCaptureLoaderHandleValues" | "_shellFragmentPayload" | "_shellCaptureGuardTripped" | "_shellCaptureGuardTrippedLoaderId" | "_explicitTaggedStores" | "_requestTags" | "_cacheProfiles" | "_onResponseCallbacks" | "_pendingBackgroundTasks" | "_themeConfig" | "_locationState" | "_routeName" | "_prevRouteKey" | "_gateCurrentUrl" | "_gateCurrentParams" | "_gateActionId" | "_gateActionUrl" | "_gateActionResult" | "_gateFormData" | "_inActionRevalidation" | "_reportedErrors" | "_renderBarrier" | "_resolveRenderBarrier" | "_renderBarrierSegmentOrder" | "_treeHasStreaming" | "_renderBarrierWaiters" | "_handlerLoaderDeps" | "_renderBarrierHandleSnapshot" | "_renderBarrierGuardClosed" | "_reportBackgroundError" | "_debugPerformance" | "_metricsStore" | "_renderForeground" | "_renderDiagnosticsEnabled" | "_handlerStart" | "_tracing" | "_basename" | "_routerId" | "_setStatus" | "_rotateStateCookie" | "_setKeepCacheDirective" | "_variables" | "_classifiedRoute" | "_cacheSignal" | "_dynamic" | "res">;
 /**
  * Marker for a waitUntil-scheduled fn whose task promise must NOT enter
  * _pendingBackgroundTasks. Used by the PPR shell capture for its own task:

package/dist/types/server.d.ts

@@ -9,7 +9,7 @@
  */
 export { RSC_ROUTER_BRAND, RouterRegistry } from "./router.js";
 export { HostRouterRegistry, type HostRouterRegistryEntry, } from "./host/router.js";
-export { registerRouteMap, setCachedManifest, clearCachedManifest, clearAllRouterData, getGlobalRouteMap, getRouterManifest, setPrecomputedEntries, setRouteTrie, setManifestReadyPromise, setRouterManifest, setRouterTrie, setRouterPrecomputedEntries, registerRouterManifestLoader, ensureRouterManifest, } from "./route-map-builder.js";
+export { registerRouteMap, setCachedManifest, clearCachedManifest, clearAllRouterData, getGlobalRouteMap, getRouterManifest, setManifestReadyPromise, setRouterManifest, setRouterTrie, setRouterPrecomputedEntries, registerRouterManifestLoader, ensureRouterManifest, } from "./route-map-builder.js";
 export { registerLoaderById, setLoaderImports, } from "./server/loader-registry.js";
 export { createRequestContext, type CreateRequestContextOptions, } from "./server/request-context.js";
 export { isClientComponent, assertClientComponent } from "./component-utils.js";

package/dist/types/types/route-entry.d.ts

@@ -9,6 +9,9 @@ export interface LazyIncludeContext {
     cacheProfiles?: Record<string, import("../cache/profile-registry.js").CacheProfile>;
     /** Root scope flag for dot-local reverse resolution */
     rootScoped?: boolean;
+    /** Owning router id; scopes search-schema/root-scope registration during
+     *  lazy include evaluation (route-map-builder.ts registries) */
+    routerId?: string;
     /**
      * Positional include scope token composed from the parent scope plus this
      * include's sibling index (`${parentScope}I${idx}`). Applied to direct-

package/dist/types/vite/discovery/state.d.ts

@@ -60,6 +60,7 @@ export interface ChunkInfo {
 export interface PerRouterManifestEntry {
     id: string;
     routeManifest: Record<string, string>;
+    routeTrailingSlash?: Record<string, string>;
     routeSearchSchemas?: Record<string, Record<string, string>>;
     sourceFile?: string;
     factoryOnlyPrefixes?: Set<string>;
@@ -103,8 +104,6 @@ export interface DiscoveryState {
     opts: PluginOptions | undefined;
     mergedRouteManifest: Record<string, string> | null;
     perRouterManifests: PerRouterManifestEntry[];
-    mergedPrecomputedEntries: PrecomputedEntry[] | null;
-    mergedRouteTrie: any;
     perRouterTrieMap: Map<string, any>;
     perRouterPrecomputedMap: Map<string, PrecomputedEntry[]>;
     perRouterManifestDataMap: Map<string, Record<string, string>>;
@@ -137,6 +136,8 @@ export interface DiscoveryState {
     resolvedPrerenderModules: Map<string, string[]> | undefined;
     resolvedStaticModules: Map<string, string[]> | undefined;
     discoveryDone: Promise<void> | null;
+    /** Monotonic Cloudflare-dev generation installed by the routes manifest. */
+    devDiscoveryEpoch?: number;
     devServerOrigin: string | null;
     devServer: any;
     selfWrittenGenFiles: Map<string, {

package/dist/types/vite/utils/manifest-utils.d.ts

@@ -1,4 +1,4 @@
-export { flattenLeafEntries, buildRouteToStaticPrefix, } from "../../build/prefix-tree-utils.js";
+export { flattenLeafEntries } from "../../build/prefix-tree-utils.js";
 /**
  * Wrap a value as `JSON.parse('...')` instead of a JS object literal.
  * V8's JSON parser is significantly faster than its full JS parser for large