@rangojs/router 0.0.0-experimental.2 → 0.0.0-experimental.21

package/dist/browser/link-interceptor.js

@@ -0,0 +1,99 @@
+/**
+ * Default link interception predicate
+ *
+ * Returns true if the link should be intercepted for SPA navigation.
+ * Filters out:
+ * - Cross-origin links
+ * - Links with download attribute
+ * - Links with target other than _self
+ * - Links with data-no-intercept attribute
+ *
+ * @param link - The anchor element to check
+ * @returns true if the link should be intercepted
+ */
+export function defaultShouldIntercept(link) {
+    // Only intercept same-origin links
+    if (link.origin !== window.location.origin) {
+        return false;
+    }
+    // Don't intercept if it has download attribute
+    if (link.hasAttribute("download")) {
+        return false;
+    }
+    // Don't intercept if target is set to something other than _self
+    if (link.target && link.target !== "_self") {
+        return false;
+    }
+    // Don't intercept if explicitly disabled
+    if (link.getAttribute("data-no-intercept") === "true") {
+        return false;
+    }
+    // Don't intercept Link component anchors - they handle their own navigation
+    if (link.hasAttribute("data-link-component")) {
+        return false;
+    }
+    // Don't intercept external links
+    if (link.hasAttribute("data-external")) {
+        return false;
+    }
+    return true;
+}
+/**
+ * Set up link interception for SPA navigation
+ *
+ * Attaches a global click handler to intercept clicks on anchor elements
+ * and call the onNavigate callback instead of performing a full page load.
+ *
+ * @param onNavigate - Callback when a link should navigate via SPA
+ * @param options - Configuration options
+ * @returns Cleanup function to remove the event listener
+ *
+ * @example
+ * ```typescript
+ * const cleanup = setupLinkInterception((url) => {
+ *   window.history.pushState({}, "", url);
+ *   fetchPartialUpdate(url);
+ * });
+ *
+ * // Later, to clean up:
+ * cleanup();
+ * ```
+ */
+export function setupLinkInterception(onNavigate, options) {
+    const shouldIntercept = options?.shouldIntercept ?? defaultShouldIntercept;
+    const handleClick = (event) => {
+        // If event was already handled by Link component (or other handler), skip
+        if (event.defaultPrevented) {
+            return;
+        }
+        const target = event.target;
+        const link = target.closest("a");
+        if (!link || !shouldIntercept(link)) {
+            return;
+        }
+        // Don't intercept if modifier keys are pressed (open in new tab, etc.)
+        if (event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+            return;
+        }
+        event.preventDefault();
+        const href = link.href;
+        // Read navigation options from data attributes (set by Link component)
+        const scrollAttr = link.getAttribute("data-scroll");
+        const replaceAttr = link.getAttribute("data-replace");
+        const navigateOptions = {};
+        if (scrollAttr === "false") {
+            navigateOptions.scroll = false;
+        }
+        if (replaceAttr === "true") {
+            navigateOptions.replace = true;
+        }
+        onNavigate(href, navigateOptions);
+    };
+    document.addEventListener("click", handleClick);
+    console.log("[Browser] Link interception enabled");
+    return () => {
+        document.removeEventListener("click", handleClick);
+        console.log("[Browser] Link interception disabled");
+    };
+}
+//# sourceMappingURL=link-interceptor.js.map

package/dist/browser/link-interceptor.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"link-interceptor.js","sourceRoot":"","sources":["../../src/browser/link-interceptor.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAuB;IAC5D,mCAAmC;IACnC,IAAI,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,+CAA+C;IAC/C,IAAI,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iEAAiE;IACjE,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC3C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,yCAAyC;IACzC,IAAI,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAAC,KAAK,MAAM,EAAE,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,4EAA4E;IAC5E,IAAI,IAAI,CAAC,YAAY,CAAC,qBAAqB,CAAC,EAAE,CAAC;QAC7C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,iCAAiC;IACjC,IAAI,IAAI,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,qBAAqB,CACnC,UAA4D,EAC5D,OAAgC;IAEhC,MAAM,eAAe,GAAG,OAAO,EAAE,eAAe,IAAI,sBAAsB,CAAC;IAE3E,MAAM,WAAW,GAAG,CAAC,KAAiB,EAAE,EAAE;QACxC,0EAA0E;QAC1E,IAAI,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAC3B,OAAO;QACT,CAAC;QAED,MAAM,MAAM,GAAG,KAAK,CAAC,MAAqB,CAAC;QAC3C,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAEjC,IAAI,CAAC,IAAI,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,uEAAuE;QACvE,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACrE,OAAO;QACT,CAAC;QAED,KAAK,CAAC,cAAc,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QAEvB,uEAAuE;QACvE,MAAM,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACpD,MAAM,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;QAEtD,MAAM,eAAe,GAAoB,EAAE,CAAC;QAC5C,IAAI,UAAU,KAAK,OAAO,EAAE,CAAC;YAC3B,eAAe,CAAC,MAAM,GAAG,KAAK,CAAC;QACjC,CAAC;QACD,IAAI,WAAW,KAAK,MAAM,EAAE,CAAC;YAC3B,eAAe,CAAC,OAAO,GAAG,IAAI,CAAC;QACjC,CAAC;QAED,UAAU,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACpC,CAAC,CAAC;IAEF,QAAQ,CAAC,gBAAgB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;IAEhD,OAAO,CAAC,GAAG,CAAC,qCAAqC,CAAC,CAAC;IAEnD,OAAO,GAAG,EAAE;QACV,QAAQ,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACnD,OAAO,CAAC,GAAG,CAAC,sCAAsC,CAAC,CAAC;IACtD,CAAC,CAAC;AACJ,CAAC"}

package/dist/browser/logging.d.ts

@@ -0,0 +1,10 @@
+interface BrowserLogContext {
+    requestId: string;
+    txId: string;
+    operation: string;
+}
+export declare function isBrowserDebugEnabled(): boolean;
+export declare function startBrowserTransaction(operation: string): BrowserLogContext;
+export declare function browserDebugLog(ctx: BrowserLogContext, message: string, details?: Record<string, unknown>): void;
+export {};
+//# sourceMappingURL=logging.d.ts.map

package/dist/browser/logging.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.d.ts","sourceRoot":"","sources":["../../src/browser/logging.ts"],"names":[],"mappings":"AAEA,UAAU,iBAAiB;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAKD,wBAAgB,qBAAqB,IAAI,OAAO,CAE/C;AAMD,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,iBAAiB,CAQ5E;AAED,wBAAgB,eAAe,CAC7B,GAAG,EAAE,iBAAiB,EACtB,OAAO,EAAE,MAAM,EACf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAChC,IAAI,CAUN"}

package/dist/browser/logging.js

@@ -0,0 +1,29 @@
+import { INTERNAL_RANGO_DEBUG } from "../internal-debug.js";
+let txCounter = 0;
+let requestCounter = 0;
+export function isBrowserDebugEnabled() {
+    return INTERNAL_RANGO_DEBUG;
+}
+function nextId(prefix, counter) {
+    return `${prefix}${counter.toString(36)}`;
+}
+export function startBrowserTransaction(operation) {
+    txCounter += 1;
+    requestCounter += 1;
+    return {
+        operation,
+        txId: nextId("ctx-", txCounter),
+        requestId: nextId("creq-", requestCounter),
+    };
+}
+export function browserDebugLog(ctx, message, details) {
+    if (!INTERNAL_RANGO_DEBUG)
+        return;
+    const prefix = `[Browser][req:${ctx.requestId}][tx:${ctx.operation}-${ctx.txId}]`;
+    if (details) {
+        console.log(`${prefix} ${message}`, details);
+        return;
+    }
+    console.log(`${prefix} ${message}`);
+}
+//# sourceMappingURL=logging.js.map

package/dist/browser/logging.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../src/browser/logging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAQ5D,IAAI,SAAS,GAAG,CAAC,CAAC;AAClB,IAAI,cAAc,GAAG,CAAC,CAAC;AAEvB,MAAM,UAAU,qBAAqB;IACnC,OAAO,oBAAoB,CAAC;AAC9B,CAAC;AAED,SAAS,MAAM,CAAC,MAAc,EAAE,OAAe;IAC7C,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC5C,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,SAAiB;IACvD,SAAS,IAAI,CAAC,CAAC;IACf,cAAc,IAAI,CAAC,CAAC;IACpB,OAAO;QACL,SAAS;QACT,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC;QAC/B,SAAS,EAAE,MAAM,CAAC,OAAO,EAAE,cAAc,CAAC;KAC3C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,GAAsB,EACtB,OAAe,EACf,OAAiC;IAEjC,IAAI,CAAC,oBAAoB;QAAE,OAAO;IAElC,MAAM,MAAM,GAAG,iBAAiB,GAAG,CAAC,SAAS,QAAQ,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,IAAI,GAAG,CAAC;IAClF,IAAI,OAAO,EAAE,CAAC;QACZ,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,IAAI,OAAO,EAAE,CAAC,CAAC;AACtC,CAAC"}

package/dist/browser/lru-cache.d.ts

@@ -0,0 +1,17 @@
+/**
+ * Simple LRU (Least Recently Used) cache implementation
+ * Used for caching navigation segments to enable instant back/forward
+ */
+export declare class LRUCache<K, V> {
+    private cache;
+    private maxSize;
+    constructor(maxSize: number);
+    get(key: K): V | undefined;
+    set(key: K, value: V): void;
+    has(key: K): boolean;
+    delete(key: K): boolean;
+    clear(): void;
+    keys(): IterableIterator<K>;
+    get size(): number;
+}
+//# sourceMappingURL=lru-cache.d.ts.map

package/dist/browser/lru-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lru-cache.d.ts","sourceRoot":"","sources":["../../src/browser/lru-cache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,qBAAa,QAAQ,CAAC,CAAC,EAAE,CAAC;IACxB,OAAO,CAAC,KAAK,CAAmB;IAChC,OAAO,CAAC,OAAO,CAAS;gBAEZ,OAAO,EAAE,MAAM;IAI3B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,SAAS;IAY1B,GAAG,CAAC,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI;IAiB3B,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIpB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,OAAO;IAIvB,KAAK,IAAI,IAAI;IAIb,IAAI,IAAI,gBAAgB,CAAC,CAAC,CAAC;IAI3B,IAAI,IAAI,IAAI,MAAM,CAEjB;CACF"}

package/dist/browser/lru-cache.js

@@ -0,0 +1,50 @@
+/**
+ * Simple LRU (Least Recently Used) cache implementation
+ * Used for caching navigation segments to enable instant back/forward
+ */
+export class LRUCache {
+    constructor(maxSize) {
+        this.cache = new Map();
+        this.maxSize = maxSize;
+    }
+    get(key) {
+        if (!this.cache.has(key)) {
+            return undefined;
+        }
+        // Move to end (most recently used)
+        const value = this.cache.get(key);
+        this.cache.delete(key);
+        this.cache.set(key, value);
+        return value;
+    }
+    set(key, value) {
+        // If key exists, delete it first to update position
+        if (this.cache.has(key)) {
+            this.cache.delete(key);
+        }
+        this.cache.set(key, value);
+        // Evict oldest entries if over capacity
+        while (this.cache.size > this.maxSize) {
+            const oldestKey = this.cache.keys().next().value;
+            if (oldestKey !== undefined) {
+                this.cache.delete(oldestKey);
+            }
+        }
+    }
+    has(key) {
+        return this.cache.has(key);
+    }
+    delete(key) {
+        return this.cache.delete(key);
+    }
+    clear() {
+        this.cache.clear();
+    }
+    keys() {
+        return this.cache.keys();
+    }
+    get size() {
+        return this.cache.size;
+    }
+}
+//# sourceMappingURL=lru-cache.js.map

package/dist/browser/lru-cache.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"lru-cache.js","sourceRoot":"","sources":["../../src/browser/lru-cache.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,MAAM,OAAO,QAAQ;IAInB,YAAY,OAAe;QAHnB,UAAK,GAAG,IAAI,GAAG,EAAQ,CAAC;QAI9B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,GAAG,CAAC,GAAM;QACR,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,SAAS,CAAC;QACnB,CAAC;QAED,mCAAmC;QACnC,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAE,CAAC;QACnC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAC3B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,GAAG,CAAC,GAAM,EAAE,KAAQ;QAClB,oDAAoD;QACpD,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACzB,CAAC;QAED,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;QAE3B,wCAAwC;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;YACtC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC;YACjD,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAED,GAAG,CAAC,GAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAED,MAAM,CAAC,GAAM;QACX,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAChC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAED,IAAI;QACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;CACF"}

package/dist/browser/merge-segment-loaders.d.ts

@@ -0,0 +1,39 @@
+import type { ResolvedSegment } from "./types.js";
+/**
+ * Merge partial loader data from server with cached loader data.
+ *
+ * During partial revalidation (stale or action), the server may return only
+ * some loaders that pass the revalidation check. The component still needs
+ * all loader data, so we merge fresh data with cached data.
+ *
+ * @param fromServer - Segment returned from server with partial loaders
+ * @param fromCache - Cached segment with full loader data
+ * @returns Merged segment with complete loader data
+ */
+export declare function mergeSegmentLoaders(fromServer: ResolvedSegment, fromCache: ResolvedSegment): ResolvedSegment;
+/**
+ * Check if segments need loader merging during partial revalidation.
+ *
+ * Returns true when:
+ * - Server returned fewer loaders than cached (partial revalidation)
+ * - Both segments have loader data promises
+ */
+export declare function needsLoaderMerge(fromServer: ResolvedSegment, fromCache: ResolvedSegment | undefined): fromCache is ResolvedSegment;
+/**
+ * Insert diff segments that aren't in the matched array into allSegments.
+ *
+ * During consolidation fetch for concurrent actions, loader segments may be
+ * excluded from the request. The server returns them in the diff but not in
+ * the matched array. This function inserts them at the correct position
+ * (after their parent layout segment).
+ *
+ * Loader segment IDs follow the pattern: {parentLayoutId}D{index}.{loaderId}
+ * Example: M9L0L1D0.actionCounter has parent layout M9L0L1
+ *
+ * @param allSegments - Mutable array of segments to insert into
+ * @param diff - Array of segment IDs that changed (from server response)
+ * @param matchedIdSet - Set of segment IDs from matched array
+ * @param newSegmentMap - Map of segment ID to segment data from server
+ */
+export declare function insertMissingDiffSegments(allSegments: ResolvedSegment[], diff: string[] | undefined, matchedIdSet: Set<string>, newSegmentMap: Map<string, ResolvedSegment>): void;
+//# sourceMappingURL=merge-segment-loaders.d.ts.map

package/dist/browser/merge-segment-loaders.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merge-segment-loaders.d.ts","sourceRoot":"","sources":["../../src/browser/merge-segment-loaders.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAElD;;;;;;;;;;GAUG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,eAAe,GACzB,eAAe,CA6BjB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAC9B,UAAU,EAAE,eAAe,EAC3B,SAAS,EAAE,eAAe,GAAG,SAAS,GACrC,SAAS,IAAI,eAAe,CAS9B;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,eAAe,EAAE,EAC9B,IAAI,EAAE,MAAM,EAAE,GAAG,SAAS,EAC1B,YAAY,EAAE,GAAG,CAAC,MAAM,CAAC,EACzB,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,CAAC,GAC1C,IAAI,CAoCN"}

package/dist/browser/merge-segment-loaders.js

@@ -0,0 +1,102 @@
+/**
+ * Merge partial loader data from server with cached loader data.
+ *
+ * During partial revalidation (stale or action), the server may return only
+ * some loaders that pass the revalidation check. The component still needs
+ * all loader data, so we merge fresh data with cached data.
+ *
+ * @param fromServer - Segment returned from server with partial loaders
+ * @param fromCache - Cached segment with full loader data
+ * @returns Merged segment with complete loader data
+ */
+export function mergeSegmentLoaders(fromServer, fromCache) {
+    const serverLoaderIds = fromServer.loaderIds || [];
+    const cachedLoaderIds = fromCache.loaderIds || [];
+    console.log(`[Browser] Merging partial loaders: server has ${serverLoaderIds.join(", ")}, cache has ${cachedLoaderIds.join(", ")}`);
+    return {
+        ...fromCache,
+        // Keep cached component (server's might be a fresh Promise that needs the loaders)
+        component: fromCache.component,
+        // Merge loader data - await both and combine
+        loaderDataPromise: Promise.all([
+            fromServer.loaderDataPromise,
+            fromCache.loaderDataPromise,
+        ]).then(([newData, cachedData]) => {
+            // Build merged array: use new data for updated loaders, cached for rest
+            return cachedLoaderIds.map((id, i) => {
+                const newIndex = serverLoaderIds.indexOf(id);
+                if (newIndex !== -1) {
+                    return newData[newIndex]; // Use fresh data
+                }
+                return cachedData[i]; // Use cached data
+            });
+        }),
+        // Keep all loader IDs from cache
+        loaderIds: fromCache.loaderIds,
+    };
+}
+/**
+ * Check if segments need loader merging during partial revalidation.
+ *
+ * Returns true when:
+ * - Server returned fewer loaders than cached (partial revalidation)
+ * - Both segments have loader data promises
+ */
+export function needsLoaderMerge(fromServer, fromCache) {
+    return !!(fromCache &&
+        fromServer.loaderIds &&
+        fromCache.loaderIds &&
+        fromServer.loaderIds.length < fromCache.loaderIds.length &&
+        fromServer.loaderDataPromise &&
+        fromCache.loaderDataPromise);
+}
+/**
+ * Insert diff segments that aren't in the matched array into allSegments.
+ *
+ * During consolidation fetch for concurrent actions, loader segments may be
+ * excluded from the request. The server returns them in the diff but not in
+ * the matched array. This function inserts them at the correct position
+ * (after their parent layout segment).
+ *
+ * Loader segment IDs follow the pattern: {parentLayoutId}D{index}.{loaderId}
+ * Example: M9L0L1D0.actionCounter has parent layout M9L0L1
+ *
+ * @param allSegments - Mutable array of segments to insert into
+ * @param diff - Array of segment IDs that changed (from server response)
+ * @param matchedIdSet - Set of segment IDs from matched array
+ * @param newSegmentMap - Map of segment ID to segment data from server
+ */
+export function insertMissingDiffSegments(allSegments, diff, matchedIdSet, newSegmentMap) {
+    if (!diff || diff.length === 0)
+        return;
+    diff.forEach((diffId) => {
+        if (!matchedIdSet.has(diffId)) {
+            const fromServer = newSegmentMap.get(diffId);
+            if (fromServer) {
+                // Loader segment IDs have pattern like M9L0L1D0.actionCounter
+                // Parent layout ID is the prefix before D\d+ (e.g., M9L0L1)
+                const loaderMatch = diffId.match(/^(.+?)D\d+\./);
+                if (loaderMatch) {
+                    const parentLayoutId = loaderMatch[1];
+                    const parentIndex = allSegments.findIndex((s) => s.id === parentLayoutId);
+                    if (parentIndex !== -1) {
+                        // Insert loader segment right after its parent layout
+                        allSegments.splice(parentIndex + 1, 0, fromServer);
+                        console.log(`[Browser] Inserted diff segment ${diffId} after ${parentLayoutId}`);
+                    }
+                    else {
+                        // Fallback: append to end if parent not found
+                        allSegments.push(fromServer);
+                        console.warn(`[Browser] Appended diff segment ${diffId} (parent ${parentLayoutId} not found)`);
+                    }
+                }
+                else {
+                    // Non-loader diff segment not in matched - append to end
+                    allSegments.push(fromServer);
+                    console.log(`[Browser] Appended diff segment ${diffId}`);
+                }
+            }
+        }
+    });
+}
+//# sourceMappingURL=merge-segment-loaders.js.map

package/dist/browser/merge-segment-loaders.js.map

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

package/dist/browser/navigation-bridge.d.ts

@@ -0,0 +1,102 @@
+import type { NavigationBridge, NavigationBridgeConfig, NavigateOptions, NavigationStore, ResolvedSegment } from "./types.js";
+import type { EventController, NavigationHandle } from "./event-controller.js";
+/**
+ * Options for committing a navigation transaction
+ */
+interface CommitOptions {
+    url: string;
+    segmentIds: string[];
+    segments: ResolvedSegment[];
+    replace?: boolean;
+    scroll?: boolean;
+    /** User-provided state to store in history.state */
+    state?: unknown;
+    /** If true, only update store without changing URL/history (for server actions) */
+    storeOnly?: boolean;
+    /** If true, this is an intercept route - store in history.state for popstate handling */
+    intercept?: boolean;
+    /** Source URL where the intercept was triggered from (stored in history.state) */
+    interceptSourceUrl?: string;
+    /** If true, only update cache without touching store or history (for background stale revalidation) */
+    cacheOnly?: boolean;
+}
+/**
+ * Options that can override the pre-configured commit settings
+ */
+interface BoundCommitOverrides {
+    /** Override scroll behavior (e.g., disable for intercepts) */
+    scroll?: boolean;
+    /** Override replace behavior (e.g., force replace for intercepts) */
+    replace?: boolean;
+    /** Override user-provided state */
+    state?: unknown;
+    /** Mark this as an intercept route */
+    intercept?: boolean;
+    /** Source URL where intercept was triggered from */
+    interceptSourceUrl?: string;
+    /** If true, only update cache (for stale revalidation) */
+    cacheOnly?: boolean;
+}
+/**
+ * Token for tracking an active stream - call end() when stream completes
+ */
+export interface StreamingToken {
+    end(): void;
+}
+/**
+ * Bound transaction with pre-configured commit options (without segmentIds/segments)
+ */
+export interface BoundTransaction {
+    readonly currentUrl: string;
+    /** Start streaming and get a token to end it when the stream completes */
+    startStreaming(): StreamingToken;
+    commit(segmentIds: string[], segments: ResolvedSegment[], overrides?: BoundCommitOverrides): void;
+}
+/**
+ * Navigation transaction for managing state during navigation
+ * Uses the event controller handle for lifecycle management
+ */
+interface NavigationTransaction extends Disposable {
+    /** Optimistically commit from cache - instant render before revalidation */
+    optimisticCommit(options: CommitOptions): void;
+    /** Final commit with server data (or reconciliation after optimistic) */
+    commit(options: CommitOptions): void;
+    with(options: Omit<CommitOptions, "segmentIds" | "segments">): BoundTransaction;
+    /** The navigation handle from the event controller */
+    handle: NavigationHandle;
+}
+/**
+ * Creates a navigation transaction that coordinates with the event controller.
+ * Handles loading state transitions and cleanup on completion/abort.
+ *
+ * Supports optimistic navigation: render from cache immediately,
+ * then revalidate in background and reconcile if data changed.
+ */
+declare function createNavigationTransaction(store: NavigationStore, eventController: EventController, url: string, options?: NavigateOptions & {
+    skipLoadingState?: boolean;
+}): NavigationTransaction;
+export { createNavigationTransaction };
+/**
+ * Extended configuration for navigation bridge with event controller
+ */
+export interface NavigationBridgeConfigWithController extends NavigationBridgeConfig {
+    eventController: EventController;
+    /** RSC version from initial payload metadata */
+    version?: string;
+}
+/**
+ * Create a navigation bridge for handling client-side navigation
+ *
+ * The bridge coordinates all navigation operations:
+ * - Link click interception
+ * - Browser back/forward (popstate)
+ * - Programmatic navigation
+ *
+ * Uses the event controller for reactive state management.
+ *
+ * @param config - Bridge configuration
+ * @returns NavigationBridge instance
+ */
+export declare function createNavigationBridge(config: NavigationBridgeConfigWithController): NavigationBridge;
+export { createNavigationBridge as default };
+//# sourceMappingURL=navigation-bridge.d.ts.map

package/dist/browser/navigation-bridge.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"navigation-bridge.d.ts","sourceRoot":"","sources":["../../src/browser/navigation-bridge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,sBAAsB,EACtB,eAAe,EACf,eAAe,EACf,eAAe,EAChB,MAAM,YAAY,CAAC;AAwEpB,OAAO,KAAK,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AA8B/E;;GAEG;AACH,UAAU,aAAa;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,eAAe,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,oDAAoD;IACpD,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mFAAmF;IACnF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,yFAAyF;IACzF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kFAAkF;IAClF,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,uGAAuG;IACvG,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,UAAU,oBAAoB;IAC5B,8DAA8D;IAC9D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qEAAqE;IACrE,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,mCAAmC;IACnC,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,sCAAsC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,oDAAoD;IACpD,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,GAAG,IAAI,IAAI,CAAC;CACb;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,0EAA0E;IAC1E,cAAc,IAAI,cAAc,CAAC;IACjC,MAAM,CACJ,UAAU,EAAE,MAAM,EAAE,EACpB,QAAQ,EAAE,eAAe,EAAE,EAC3B,SAAS,CAAC,EAAE,oBAAoB,GAC/B,IAAI,CAAC;CACT;AAED;;;GAGG;AACH,UAAU,qBAAsB,SAAQ,UAAU;IAChD,4EAA4E;IAC5E,gBAAgB,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IAC/C,yEAAyE;IACzE,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,CAAC;IACrC,IAAI,CACF,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,YAAY,GAAG,UAAU,CAAC,GACtD,gBAAgB,CAAC;IACpB,sDAAsD;IACtD,MAAM,EAAE,gBAAgB,CAAC;CAC1B;AAED;;;;;;GAMG;AACH,iBAAS,2BAA2B,CAClC,KAAK,EAAE,eAAe,EACtB,eAAe,EAAE,eAAe,EAChC,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,eAAe,GAAG;IAAE,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAE,GACzD,qBAAqB,CAgPvB;AAGD,OAAO,EAAE,2BAA2B,EAAE,CAAC;AAEvC;;GAEG;AACH,MAAM,WAAW,oCAAqC,SAAQ,sBAAsB;IAClF,eAAe,EAAE,eAAe,CAAC;IACjC,gDAAgD;IAChD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,oCAAoC,GAC3C,gBAAgB,CA8clB;AAED,OAAO,EAAE,sBAAsB,IAAI,OAAO,EAAE,CAAC"}