@ivogt/rsc-router 0.0.0-experimental.1

package/src/browser/partial-update.ts

@@ -0,0 +1,545 @@
+import type {
+  NavigationStore,
+  NavigationClient,
+  UpdateSubscriber,
+  ResolvedSegment,
+} from "./types.js";
+import type { ReactNode } from "react";
+import { startTransition } from "react";
+import type { RenderSegmentsOptions } from "../segment-system.js";
+import {
+  mergeSegmentLoaders,
+  needsLoaderMerge,
+  insertMissingDiffSegments,
+} from "./merge-segment-loaders.js";
+import type { BoundTransaction } from "./navigation-bridge.js";
+
+/**
+ * Configuration for creating a partial updater
+ */
+export interface PartialUpdateConfig {
+  store: NavigationStore;
+  client: NavigationClient;
+  onUpdate: UpdateSubscriber;
+  renderSegments: (
+    segments: ResolvedSegment[],
+    options?: RenderSegmentsOptions
+  ) => Promise<ReactNode> | ReactNode;
+  /** RSC version received from server (from initial payload metadata) */
+  version?: string;
+}
+
+/**
+ * Options that can override the pre-configured commit settings
+ */
+export interface CommitOverrides {
+  /** Override scroll behavior (e.g., disable for intercepts) */
+  scroll?: boolean;
+  /** Override replace behavior (e.g., force replace for intercepts) */
+  replace?: boolean;
+  /** Mark this as an intercept route */
+  intercept?: boolean;
+  /** Source URL where intercept was triggered from */
+  interceptSourceUrl?: string;
+}
+
+/**
+ * Commit context passed to partial updater for URL updates
+ * Transaction encapsulates all store mutations for atomic commit
+ */
+
+/**
+ * Type for the fetchPartialUpdate function
+ */
+export type PartialUpdater = (
+  targetUrl: string,
+  segmentIds: string[] | undefined,
+  isRetry: boolean,
+  signal: AbortSignal | undefined,
+  type: BoundTransaction,
+  options?: {
+    isAction?: boolean;
+    staleRevalidation?: boolean;
+    interceptSourceUrl?: string;
+    /** Cached segments for the target URL. When provided, these are used to build
+     * the segment map instead of the current page's segments. This ensures consistency
+     * when we send cached segment IDs to the server - if the server returns empty diff,
+     * we use the same segments we told the server we have. */
+    targetCacheSegments?: ResolvedSegment[];
+  }
+) => Promise<Promise<void>>;
+
+/**
+ * Create a partial updater for fetching and applying RSC partial updates
+ *
+ * This function is shared between navigation-bridge and server-action-bridge
+ * to handle partial RSC updates with HMR resilience.
+ *
+ * @param config - Partial update configuration
+ * @returns fetchPartialUpdate function
+ *
+ * @example
+ * ```typescript
+ * const fetchPartialUpdate = createPartialUpdater({
+ *   store,
+ *   client,
+ *   onUpdate: (update) => store.emit(update),
+ *   renderSegments,
+ * });
+ *
+ * await fetchPartialUpdate('/new-page');
+ * ```
+ */
+export function createPartialUpdater(
+  config: PartialUpdateConfig
+): PartialUpdater {
+  const { store, client, onUpdate, renderSegments, version } = config;
+
+  /**
+   * Build a lookup map from current page's cached segments
+   */
+  function getCurrentSegmentMap(): Map<string, ResolvedSegment> {
+    const currentKey = store.getHistoryKey();
+    const cached = store.getCachedSegments(currentKey);
+    const cachedSegments = cached?.segments || [];
+    const map = new Map<string, ResolvedSegment>();
+    cachedSegments.forEach((s) => map.set(s.id, s));
+    return map;
+  }
+
+  /**
+   * Fetch partial update and trigger UI update
+   * Returns a promise that resolves when the RSC stream is fully consumed
+   *
+   * @param tx - Transaction for committing segment state (required)
+   * @param signal - AbortSignal to check if navigation is stale (not for aborting fetch)
+   */
+  async function fetchPartialUpdate(
+    targetUrl: string,
+    segmentIds: string[] | undefined,
+    isRetry: boolean,
+    signal: AbortSignal | undefined,
+    tx: BoundTransaction,
+    options?: {
+      isAction?: boolean;
+      staleRevalidation?: boolean;
+      interceptSourceUrl?: string;
+      targetCacheSegments?: ResolvedSegment[];
+    }
+  ): Promise<Promise<void>> {
+    const {
+      isAction = false,
+      staleRevalidation = false,
+      interceptSourceUrl,
+      targetCacheSegments,
+    } = options || {};
+    const segmentState = store.getSegmentState();
+    const url = targetUrl || window.location.href;
+
+    // Capture history key at start for stale revalidation consistency check
+    const historyKeyAtStart = store.getHistoryKey();
+    const segments = segmentIds ?? segmentState.currentSegmentIds;
+
+    // For intercept revalidation, use the intercept source URL as previousUrl
+    // This tells the server the route should be treated as an intercept
+    const previousUrl =
+      interceptSourceUrl || tx.currentUrl || segmentState.currentUrl;
+
+    console.log(`\n[Browser] >>> NAVIGATION`);
+    console.log(`[Browser] From: ${previousUrl}`);
+    console.log(`[Browser] To: ${url}`);
+    console.log(`[Browser] Segments to send: ${segments.join(", ")}`);
+    if (interceptSourceUrl) {
+      console.log(`[Browser] Intercept context from: ${interceptSourceUrl}`);
+    }
+
+    // Build segment map for merging with server diff.
+    // When targetCacheSegments is provided (navigating to a cached route), use those
+    // to ensure consistency - we use the same segments we told the server we have.
+    // Otherwise fall back to current page's segments (for same-route revalidation).
+    let currentSegmentMap: Map<string, ResolvedSegment>;
+    if (targetCacheSegments && targetCacheSegments.length > 0) {
+      currentSegmentMap = new Map();
+      targetCacheSegments.forEach((s) => currentSegmentMap.set(s.id, s));
+    } else {
+      currentSegmentMap = getCurrentSegmentMap();
+    }
+    // Mark navigation as streaming (response received, now parsing RSC)
+    // The token is ended when the stream completes
+    const streamingToken = tx.startStreaming();
+    // Fetch partial payload (no abort signal - RSC doesn't support it well)
+    const { payload, streamComplete: rawStreamComplete } =
+      await client.fetchPartial({
+        targetUrl: url,
+        segmentIds: segments,
+        previousUrl,
+        staleRevalidation,
+        version,
+      });
+    console.log("payload.metadata", payload.metadata);
+
+    const streamComplete = rawStreamComplete.then(() => {
+      streamingToken.end();
+    });
+
+    if (payload.metadata?.isPartial) {
+      const { segments: newSegments, matched, diff } = payload.metadata;
+
+      // Check if this navigation is stale (a newer one started)
+      if (signal?.aborted) {
+        console.log(`[Browser] Ignoring stale navigation (aborted)`);
+        return streamComplete;
+      }
+
+      console.log(`[Browser] Partial update - matched: ${matched?.join(", ")}`);
+      console.log(`[Browser] Diff: ${diff?.join(", ")}`);
+
+      // Create lookup for new segments from server
+      const newSegmentMap = new Map<string, ResolvedSegment>();
+      (newSegments || []).forEach((s: ResolvedSegment) =>
+        newSegmentMap.set(s.id, s)
+      );
+
+      // If diff is empty, nothing changed on server side.
+      // However, if we're navigating with targetCacheSegments (to a different route),
+      // we still need to render those segments since the UI is showing the old route.
+      if (!diff || diff.length === 0) {
+        const matchedIds = matched || [];
+        const existingSegments = matchedIds
+          .map((id: string) => currentSegmentMap.get(id))
+          .filter(Boolean) as ResolvedSegment[];
+
+        // When navigating with cached segments to a different route, render them.
+        // targetCacheSegments being provided means we're navigating to a cached route.
+        if (targetCacheSegments && targetCacheSegments.length > 0) {
+          console.log(
+            `[Browser] No diff but navigating with cached segments - rendering target route`
+          );
+
+          const newTree = await renderSegments(existingSegments, {
+            forceAwait: true,
+          });
+
+          tx.commit(matchedIds, existingSegments);
+
+          onUpdate({
+            root: newTree,
+            metadata: payload.metadata!,
+          });
+
+          console.log(`[Browser] Navigation complete (rendered from cache)\n`);
+          return streamComplete;
+        }
+
+        // Same route revalidation with no changes - skip UI update
+        console.log(
+          `[Browser] No changes - all revalidations returned false, keeping existing UI`
+        );
+        tx.commit(matchedIds, existingSegments);
+        console.log(`[Browser] Navigation complete (no re-render)\n`);
+        return streamComplete;
+      }
+
+      // Build full segment list by merging:
+      // - New/changed segments from server response (diff)
+      // - Unchanged segments from current page's cache
+      const matchedIds = matched || [];
+      console.log(`[Browser] matchedIds: ${matchedIds.join(", ")}`);
+      console.log(
+        `[Browser] currentSegmentMap keys: ${[...currentSegmentMap.keys()].join(", ")}`
+      );
+      console.log(
+        `[Browser] newSegmentMap keys: ${[...newSegmentMap.keys()].join(", ")}`,
+        newSegmentMap
+      );
+
+      // First pass: build segments from matched IDs
+      const matchedIdSet = new Set(matchedIds);
+      const allSegments = matchedIds
+        .map((id: string) => {
+          // First check server response (new/updated segments)
+          const fromServer = newSegmentMap.get(id);
+          if (fromServer) {
+            // For partial revalidation (stale or action), merge server's new loader data
+            // with cached loader data when server returns fewer loaders than cached
+            const fromCache = currentSegmentMap.get(id);
+            if (
+              (staleRevalidation || isAction) &&
+              needsLoaderMerge(fromServer, fromCache)
+            ) {
+              return mergeSegmentLoaders(fromServer, fromCache);
+            }
+            // When server returns component: null for a layout segment, it means
+            // "this segment doesn't need re-rendering" - preserve the cached component
+            // to maintain the outlet chain and prevent React tree changes
+            if (
+              fromServer.component === null &&
+              fromServer.type === "layout" &&
+              fromCache?.component != null
+            ) {
+              console.log(
+                `[Browser] Preserving cached component for layout ${id} (server returned null)`
+              );
+              return { ...fromServer, component: fromCache.component };
+            }
+            return fromServer;
+          }
+          // Fall back to current page's cached segments
+          const fromCache = currentSegmentMap.get(id);
+          if (!fromCache) {
+            console.warn(`[Browser] Missing segment: ${id}`);
+            return fromCache;
+          }
+          // Clear loading for cached segments to prevent suspense - server decided
+          // this segment doesn't need re-rendering, so show content as-is
+          if (fromCache.loading !== undefined) {
+            return { ...fromCache, loading: undefined };
+          }
+          return fromCache;
+        })
+        .filter(Boolean) as ResolvedSegment[];
+
+      // Insert diff segments not in matchedIds (e.g., loader segments from consolidation fetch)
+      insertMissingDiffSegments(allSegments, diff, matchedIdSet, newSegmentMap);
+
+      // HMR RESILIENCE: Check if we're missing any matched segments
+      // Note: allSegments may include additional diff segments, so we check matchedIds specifically
+      const allSegmentIdSet = new Set(allSegments.map((s) => s.id));
+      const missingIds = matchedIds.filter(
+        (id: string) => !allSegmentIdSet.has(id)
+      );
+
+      if (missingIds.length > 0) {
+        const missingCount = missingIds.length;
+
+        if (isRetry) {
+          console.warn("Missing ids", { missingIds });
+          throw new Error(
+            `[Browser] Failed to fetch segments after retry. Missing: [${missingIds.join(", ")}]`
+          );
+        }
+        if (signal?.aborted) {
+          console.log(
+            `[Browser] Ignoring stale navigation (aborted during HMR retry)`
+          );
+          return streamComplete;
+        }
+        if (isAction) {
+          return streamComplete;
+        }
+        console.warn(
+          `[Browser] HMR detected: Missing ${missingCount} segments. Refetching all...`
+        );
+
+        // Refetch with empty segments = server sends everything
+        return fetchPartialUpdate(url, [], true, signal, tx, { isAction });
+      }
+
+      // INTERCEPT HANDLING: Separate intercept segments for explicit injection
+      // Intercept segments have namespace starting with "intercept:" or ID containing .@
+      // This makes the flow clearer and easier to debug
+      const isInterceptSegment = (s: ResolvedSegment) =>
+        s.namespace?.startsWith("intercept:") ||
+        (s.type === "parallel" && s.id.includes(".@"));
+
+      const interceptSegments = allSegments.filter(isInterceptSegment);
+      const mainSegments = allSegments.filter((s) => !isInterceptSegment(s));
+
+      if (signal?.aborted) {
+        console.log(
+          `[Browser] Ignoring stale navigation (aborted before render)`
+        );
+        return streamComplete;
+      }
+
+      // Rebuild tree on client (await for loader data resolution)
+      // Race against abort signal to allow cancellation during loader awaiting
+      // Pass intercept segments separately for explicit handling
+      // For stale revalidation, use forceAwait to ensure no loading fallbacks
+      const renderOptions = {
+        isAction,
+        forceAwait: staleRevalidation,
+        interceptSegments:
+          interceptSegments.length > 0 ? interceptSegments : undefined,
+      };
+      const newTree = await (signal
+        ? Promise.race([
+            renderSegments(mainSegments, renderOptions),
+            new Promise<never>((_, reject) => {
+              if (signal.aborted) {
+                reject(new DOMException("Navigation aborted", "AbortError"));
+              }
+              signal.addEventListener("abort", () => {
+                reject(new DOMException("Navigation aborted", "AbortError"));
+              });
+            }),
+          ])
+        : renderSegments(mainSegments, renderOptions));
+
+      // Final abort check before committing - another navigation may have started
+      if (signal?.aborted) {
+        console.log(
+          `[Browser] Ignoring stale navigation (aborted before commit)`
+        );
+        return streamComplete;
+      }
+
+      // Check if this is an intercept response (any slot is active)
+      // If so, disable scroll to keep the current scroll position
+      const hasActiveIntercept = payload.metadata?.slots
+        ? Object.values(payload.metadata.slots).some((slot) => slot.active)
+        : false;
+
+      // BUG FIX: When navigating with cached target segments but receiving an intercept response,
+      // the background segments should come from the SOURCE page (where we navigated from),
+      // not the TARGET cache. This happens when:
+      // 1. User visits /product/xxx (detail page) - cached under key "/product/xxx"
+      // 2. User navigates back to /
+      // 3. User clicks product link → cache hit for "/product/xxx" (detail page)
+      // 4. But server returns intercept response (modal with index background)
+      // 5. Without this fix: background uses detail page segments (wrong!)
+      // 6. With this fix: rebuild currentSegmentMap from source page
+      if (hasActiveIntercept && targetCacheSegments) {
+        console.log(
+          `[Browser] Intercept response with target cache - rebuilding segment map from source page`
+        );
+        currentSegmentMap = getCurrentSegmentMap();
+      }
+
+      // Track intercept context for action revalidation (only on navigation, not actions or stale revalidation)
+      if (!isAction && !staleRevalidation) {
+        if (hasActiveIntercept) {
+          // Save the source URL for action revalidation to maintain intercept context
+          store.setInterceptSourceUrl(segmentState.currentUrl);
+        } else {
+          // Clear intercept context when navigating to a non-intercept route
+          store.setInterceptSourceUrl(null);
+        }
+      }
+
+      // Commit navigation - transaction handles all store mutations atomically
+      // For intercept responses: disable scroll, mark as intercept, include source URL
+      // Use allSegmentIds (derived from allSegments) instead of matchedIds because
+      // we may have added diff segments (like loader segments) not in the matched array
+      const allSegmentIds = allSegments.map((s) => s.id);
+      tx.commit(
+        allSegmentIds,
+        allSegments,
+        hasActiveIntercept
+          ? {
+              scroll: false,
+              intercept: true,
+              interceptSourceUrl: segmentState.currentUrl,
+            }
+          : undefined
+      );
+
+      // For stale revalidation: verify history key hasn't changed before updating UI
+      // If user navigated away, skip UI update to avoid corrupting current view
+      if (staleRevalidation) {
+        const historyKeyNow = store.getHistoryKey();
+        if (historyKeyNow !== historyKeyAtStart) {
+          console.log(
+            `[Browser] Stale revalidation: history key changed (${historyKeyAtStart} -> ${historyKeyNow}), skipping UI update`
+          );
+          return streamComplete;
+        }
+      }
+
+      console.log("[partial-update] updating document");
+
+      // Emit update to trigger React render
+      // For stale revalidation: wait for stream to complete (loaders resolved), then update
+      // For actions: wrap in startTransition to avoid UI flickering
+      if (isAction || staleRevalidation) {
+        startTransition(() => {
+          onUpdate({
+            root: newTree,
+            metadata: payload.metadata!,
+          });
+        });
+      } else {
+        onUpdate({
+          root: newTree,
+          metadata: payload.metadata!,
+        });
+      }
+
+      console.log(`[Browser] Navigation complete\n`);
+      return streamComplete;
+    } else {
+      // Full update (fallback)
+      console.warn(`[Browser] Full update (fallback)`);
+
+      const segments = payload.metadata?.segments || [];
+
+      // Check if this navigation is stale (a newer one started)
+      if (signal?.aborted) {
+        console.log(`[Browser] Ignoring stale navigation (aborted)`);
+        return streamComplete;
+      }
+
+      // Await loader data from segments before committing URL
+      // This ensures URL only updates after loaders resolve
+      const loaderSegments = segments.filter(
+        (s: ResolvedSegment) =>
+          s.type === "loader" && s.loaderData !== undefined
+      );
+      if (loaderSegments.length > 0) {
+        console.log(`[Browser] Awaiting ${loaderSegments.length} loader(s)...`);
+        await Promise.all(
+          loaderSegments.map((s: ResolvedSegment) =>
+            s.loaderData instanceof Promise
+              ? s.loaderData
+              : Promise.resolve(s.loaderData)
+          )
+        );
+        console.log(`[Browser] Loaders resolved`);
+      }
+
+      const segmentIds = segments.map((s: ResolvedSegment) => s.id);
+
+      // Final abort check before committing - another navigation may have started
+      if (signal?.aborted) {
+        console.log(
+          `[Browser] Ignoring stale navigation (aborted before commit)`
+        );
+        return streamComplete;
+      }
+
+      // Commit navigation - transaction handles all store mutations atomically
+      tx.commit(segmentIds, segments);
+
+      // Emit update to trigger React render
+      // For stale revalidation: wait for stream to complete, then update
+      // For actions: wrap in startTransition to avoid UI flickering
+      if (staleRevalidation) {
+        await rawStreamComplete;
+        startTransition(() => {
+          onUpdate({
+            root: payload.root,
+            metadata: payload.metadata!,
+          });
+        });
+      } else if (isAction) {
+        startTransition(async () => {
+          onUpdate({
+            root: payload.root,
+            metadata: payload.metadata!,
+          });
+        });
+      } else {
+        onUpdate({
+          root: payload.root,
+          metadata: payload.metadata!,
+        });
+      }
+
+      return streamComplete;
+    }
+  }
+
+  return fetchPartialUpdate;
+}
+
+export { createPartialUpdater as default };