@rangojs/router 0.0.0-experimental.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (172) hide show
  1. package/CLAUDE.md +43 -0
  2. package/README.md +19 -0
  3. package/dist/bin/rango.js +227 -0
  4. package/dist/vite/index.js +3039 -0
  5. package/package.json +171 -0
  6. package/skills/caching/SKILL.md +191 -0
  7. package/skills/debug-manifest/SKILL.md +108 -0
  8. package/skills/document-cache/SKILL.md +180 -0
  9. package/skills/fonts/SKILL.md +165 -0
  10. package/skills/hooks/SKILL.md +442 -0
  11. package/skills/intercept/SKILL.md +190 -0
  12. package/skills/layout/SKILL.md +213 -0
  13. package/skills/links/SKILL.md +180 -0
  14. package/skills/loader/SKILL.md +246 -0
  15. package/skills/middleware/SKILL.md +202 -0
  16. package/skills/mime-routes/SKILL.md +124 -0
  17. package/skills/parallel/SKILL.md +228 -0
  18. package/skills/prerender/SKILL.md +283 -0
  19. package/skills/rango/SKILL.md +54 -0
  20. package/skills/response-routes/SKILL.md +358 -0
  21. package/skills/route/SKILL.md +173 -0
  22. package/skills/router-setup/SKILL.md +346 -0
  23. package/skills/tailwind/SKILL.md +129 -0
  24. package/skills/theme/SKILL.md +78 -0
  25. package/skills/typesafety/SKILL.md +394 -0
  26. package/src/__internal.ts +175 -0
  27. package/src/bin/rango.ts +24 -0
  28. package/src/browser/event-controller.ts +876 -0
  29. package/src/browser/index.ts +18 -0
  30. package/src/browser/link-interceptor.ts +121 -0
  31. package/src/browser/lru-cache.ts +69 -0
  32. package/src/browser/merge-segment-loaders.ts +126 -0
  33. package/src/browser/navigation-bridge.ts +913 -0
  34. package/src/browser/navigation-client.ts +165 -0
  35. package/src/browser/navigation-store.ts +823 -0
  36. package/src/browser/partial-update.ts +600 -0
  37. package/src/browser/react/Link.tsx +248 -0
  38. package/src/browser/react/NavigationProvider.tsx +346 -0
  39. package/src/browser/react/ScrollRestoration.tsx +94 -0
  40. package/src/browser/react/context.ts +53 -0
  41. package/src/browser/react/index.ts +52 -0
  42. package/src/browser/react/location-state-shared.ts +120 -0
  43. package/src/browser/react/location-state.ts +62 -0
  44. package/src/browser/react/mount-context.ts +32 -0
  45. package/src/browser/react/use-action.ts +240 -0
  46. package/src/browser/react/use-client-cache.ts +56 -0
  47. package/src/browser/react/use-handle.ts +203 -0
  48. package/src/browser/react/use-href.tsx +40 -0
  49. package/src/browser/react/use-link-status.ts +134 -0
  50. package/src/browser/react/use-mount.ts +31 -0
  51. package/src/browser/react/use-navigation.ts +140 -0
  52. package/src/browser/react/use-segments.ts +188 -0
  53. package/src/browser/request-controller.ts +164 -0
  54. package/src/browser/rsc-router.tsx +352 -0
  55. package/src/browser/scroll-restoration.ts +324 -0
  56. package/src/browser/segment-structure-assert.ts +67 -0
  57. package/src/browser/server-action-bridge.ts +762 -0
  58. package/src/browser/shallow.ts +35 -0
  59. package/src/browser/types.ts +478 -0
  60. package/src/build/generate-manifest.ts +377 -0
  61. package/src/build/generate-route-types.ts +828 -0
  62. package/src/build/index.ts +36 -0
  63. package/src/build/route-trie.ts +239 -0
  64. package/src/cache/cache-scope.ts +563 -0
  65. package/src/cache/cf/cf-cache-store.ts +428 -0
  66. package/src/cache/cf/index.ts +19 -0
  67. package/src/cache/document-cache.ts +340 -0
  68. package/src/cache/index.ts +58 -0
  69. package/src/cache/memory-segment-store.ts +150 -0
  70. package/src/cache/memory-store.ts +253 -0
  71. package/src/cache/types.ts +392 -0
  72. package/src/client.rsc.tsx +83 -0
  73. package/src/client.tsx +643 -0
  74. package/src/component-utils.ts +76 -0
  75. package/src/components/DefaultDocument.tsx +23 -0
  76. package/src/debug.ts +233 -0
  77. package/src/default-error-boundary.tsx +88 -0
  78. package/src/deps/browser.ts +8 -0
  79. package/src/deps/html-stream-client.ts +2 -0
  80. package/src/deps/html-stream-server.ts +2 -0
  81. package/src/deps/rsc.ts +10 -0
  82. package/src/deps/ssr.ts +2 -0
  83. package/src/errors.ts +295 -0
  84. package/src/handle.ts +130 -0
  85. package/src/handles/MetaTags.tsx +193 -0
  86. package/src/handles/index.ts +6 -0
  87. package/src/handles/meta.ts +247 -0
  88. package/src/host/cookie-handler.ts +159 -0
  89. package/src/host/errors.ts +97 -0
  90. package/src/host/index.ts +56 -0
  91. package/src/host/pattern-matcher.ts +214 -0
  92. package/src/host/router.ts +330 -0
  93. package/src/host/testing.ts +79 -0
  94. package/src/host/types.ts +138 -0
  95. package/src/host/utils.ts +25 -0
  96. package/src/href-client.ts +202 -0
  97. package/src/href-context.ts +33 -0
  98. package/src/index.rsc.ts +121 -0
  99. package/src/index.ts +165 -0
  100. package/src/loader.rsc.ts +207 -0
  101. package/src/loader.ts +47 -0
  102. package/src/network-error-thrower.tsx +21 -0
  103. package/src/outlet-context.ts +15 -0
  104. package/src/prerender/param-hash.ts +35 -0
  105. package/src/prerender/store.ts +40 -0
  106. package/src/prerender.ts +156 -0
  107. package/src/reverse.ts +267 -0
  108. package/src/root-error-boundary.tsx +277 -0
  109. package/src/route-content-wrapper.tsx +193 -0
  110. package/src/route-definition.ts +1431 -0
  111. package/src/route-map-builder.ts +242 -0
  112. package/src/route-types.ts +220 -0
  113. package/src/router/error-handling.ts +287 -0
  114. package/src/router/handler-context.ts +158 -0
  115. package/src/router/intercept-resolution.ts +387 -0
  116. package/src/router/loader-resolution.ts +327 -0
  117. package/src/router/manifest.ts +216 -0
  118. package/src/router/match-api.ts +621 -0
  119. package/src/router/match-context.ts +264 -0
  120. package/src/router/match-middleware/background-revalidation.ts +236 -0
  121. package/src/router/match-middleware/cache-lookup.ts +382 -0
  122. package/src/router/match-middleware/cache-store.ts +276 -0
  123. package/src/router/match-middleware/index.ts +81 -0
  124. package/src/router/match-middleware/intercept-resolution.ts +281 -0
  125. package/src/router/match-middleware/segment-resolution.ts +184 -0
  126. package/src/router/match-pipelines.ts +214 -0
  127. package/src/router/match-result.ts +213 -0
  128. package/src/router/metrics.ts +62 -0
  129. package/src/router/middleware.ts +791 -0
  130. package/src/router/pattern-matching.ts +407 -0
  131. package/src/router/revalidation.ts +190 -0
  132. package/src/router/router-context.ts +301 -0
  133. package/src/router/segment-resolution.ts +1315 -0
  134. package/src/router/trie-matching.ts +172 -0
  135. package/src/router/types.ts +163 -0
  136. package/src/router.gen.ts +6 -0
  137. package/src/router.ts +2423 -0
  138. package/src/rsc/handler.ts +1443 -0
  139. package/src/rsc/helpers.ts +64 -0
  140. package/src/rsc/index.ts +56 -0
  141. package/src/rsc/nonce.ts +18 -0
  142. package/src/rsc/types.ts +236 -0
  143. package/src/segment-system.tsx +442 -0
  144. package/src/server/context.ts +466 -0
  145. package/src/server/handle-store.ts +229 -0
  146. package/src/server/loader-registry.ts +174 -0
  147. package/src/server/request-context.ts +554 -0
  148. package/src/server/root-layout.tsx +10 -0
  149. package/src/server/tsconfig.json +14 -0
  150. package/src/server.ts +171 -0
  151. package/src/ssr/index.tsx +296 -0
  152. package/src/theme/ThemeProvider.tsx +291 -0
  153. package/src/theme/ThemeScript.tsx +61 -0
  154. package/src/theme/constants.ts +59 -0
  155. package/src/theme/index.ts +58 -0
  156. package/src/theme/theme-context.ts +70 -0
  157. package/src/theme/theme-script.ts +152 -0
  158. package/src/theme/types.ts +182 -0
  159. package/src/theme/use-theme.ts +44 -0
  160. package/src/types.ts +1757 -0
  161. package/src/urls.gen.ts +8 -0
  162. package/src/urls.ts +1282 -0
  163. package/src/use-loader.tsx +346 -0
  164. package/src/vite/expose-action-id.ts +344 -0
  165. package/src/vite/expose-handle-id.ts +209 -0
  166. package/src/vite/expose-loader-id.ts +426 -0
  167. package/src/vite/expose-location-state-id.ts +177 -0
  168. package/src/vite/expose-prerender-handler-id.ts +429 -0
  169. package/src/vite/index.ts +2068 -0
  170. package/src/vite/package-resolution.ts +125 -0
  171. package/src/vite/version.d.ts +12 -0
  172. package/src/vite/virtual-entries.ts +114 -0
@@ -0,0 +1,762 @@
1
+ import type {
2
+ ServerActionBridge,
3
+ ServerActionBridgeConfig,
4
+ RscPayload,
5
+ ResolvedSegment,
6
+ NavigationStore,
7
+ } from "./types.js";
8
+ import { createPartialUpdater } from "./partial-update.js";
9
+ import { createNavigationTransaction } from "./navigation-bridge.js";
10
+ import {
11
+ mergeSegmentLoaders,
12
+ needsLoaderMerge,
13
+ } from "./merge-segment-loaders.js";
14
+ import { assertSegmentStructure } from "./segment-structure-assert.js";
15
+ import { startTransition, createElement } from "react";
16
+ import type { EventController, ActionHandle } from "./event-controller.js";
17
+ import { NetworkError, isNetworkError } from "../errors.js";
18
+ import { NetworkErrorThrower } from "../network-error-thrower.js";
19
+
20
+ // Polyfill Symbol.dispose/asyncDispose for Safari and older browsers
21
+ if (typeof Symbol.dispose === "undefined") {
22
+ (Symbol as any).dispose = Symbol("Symbol.dispose");
23
+ }
24
+ if (typeof Symbol.asyncDispose === "undefined") {
25
+ (Symbol as any).asyncDispose = Symbol("Symbol.asyncDispose");
26
+ }
27
+
28
+ /**
29
+ * Normalize action ID - returns the ID as-is
30
+ *
31
+ * Server actions have IDs like "hash#actionName" or "src/actions.ts#actionName".
32
+ * The full ID is used for tracking in the event controller. When subscribing
33
+ * via useAction, both exact matching (full ID) and suffix matching (action name
34
+ * only) are supported by the event controller.
35
+ */
36
+ function normalizeActionId(actionId: string): string {
37
+ return actionId;
38
+ }
39
+
40
+ /**
41
+ * Extended configuration for server action bridge with event controller
42
+ */
43
+ export interface ServerActionBridgeConfigWithController
44
+ extends ServerActionBridgeConfig {
45
+ eventController: EventController;
46
+ /** RSC version from initial payload metadata */
47
+ version?: string;
48
+ }
49
+
50
+ /**
51
+ * Create a server action bridge for handling RSC server actions
52
+ *
53
+ * The bridge registers a callback with the RSC runtime that handles:
54
+ * - Encoding action arguments
55
+ * - Sending action requests to the server
56
+ * - Processing responses and updating UI
57
+ * - Managing concurrent action requests via event controller
58
+ * - HMR resilience (refetching if segments are missing)
59
+ *
60
+ * @param config - Bridge configuration
61
+ * @returns ServerActionBridge instance
62
+ */
63
+ export function createServerActionBridge(
64
+ config: ServerActionBridgeConfigWithController
65
+ ): ServerActionBridge {
66
+ const { store, client, eventController, deps, onUpdate, renderSegments, version } =
67
+ config;
68
+
69
+ let isRegistered = false;
70
+
71
+ const fetchPartialUpdate = createPartialUpdater({
72
+ store,
73
+ client,
74
+ onUpdate,
75
+ renderSegments,
76
+ version,
77
+ });
78
+
79
+ /**
80
+ * Server action callback handler
81
+ */
82
+ async function handleServerAction(id: string, args: any[]): Promise<unknown> {
83
+ // Normalize action ID to just the function name for store tracking
84
+ const locationKey = window.history.state?.key;
85
+ const actionId = normalizeActionId(id);
86
+ console.log("ID", { id, actionId, args });
87
+
88
+ // Start action in event controller - handles lifecycle tracking
89
+ using handle = eventController.startAction(actionId, args);
90
+
91
+ const segmentState = store.getSegmentState();
92
+ console.log(`[Browser] Args:`, args);
93
+
94
+ // Mark cache as stale immediately when action starts
95
+ // This ensures SWR pattern kicks in if user navigates away during action
96
+ store.markCacheAsStaleAndBroadcast();
97
+
98
+ // Create temporary references for serialization
99
+ const temporaryReferences = deps.createTemporaryReferenceSet();
100
+
101
+ // Capture URL pathname at action start to detect navigation during action
102
+ // Must use window.location (not store.path) because intercepts change URL
103
+ // without changing store.path (e.g., /kanban -> /kanban/card/1)
104
+ const actionStartPathname = window.location.pathname;
105
+
106
+ // Build action request URL with current segments
107
+ const url = new URL(window.location.href);
108
+ url.searchParams.set("_rsc_action", id);
109
+ url.searchParams.set(
110
+ "_rsc_segments",
111
+ segmentState.currentSegmentIds.join(",")
112
+ );
113
+ // Add version param for version mismatch detection
114
+ if (version) {
115
+ url.searchParams.set("_rsc_v", version);
116
+ }
117
+
118
+ // Encode arguments
119
+ const encodedBody = await deps.encodeReply(args, { temporaryReferences });
120
+
121
+ console.log(
122
+ `[Browser] Encoded body type:`,
123
+ typeof encodedBody,
124
+ encodedBody instanceof FormData
125
+ );
126
+ console.log(`[Browser] Sending action request to: ${url.href}`);
127
+ console.log(
128
+ `[Browser] Current segments: ${segmentState.currentSegmentIds.join(", ")}`
129
+ );
130
+
131
+ // Track when the stream completes
132
+ let resolveStreamComplete: () => void;
133
+ const streamComplete = new Promise<void>((resolve) => {
134
+ resolveStreamComplete = resolve;
135
+ });
136
+
137
+ // Get intercept source URL if in intercept context
138
+ const interceptSourceUrl = store.getInterceptSourceUrl();
139
+
140
+ // Track streaming token - will be set when response arrives
141
+ let streamingToken: { end(): void } | null = null;
142
+
143
+ // Send action request with stream tracking
144
+ const responsePromise = fetch(url, {
145
+ method: "POST",
146
+ headers: {
147
+ "rsc-action": id,
148
+ "X-RSC-Router-Client-Path": segmentState.currentUrl,
149
+ // Send intercept source URL so server can maintain intercept context
150
+ ...(interceptSourceUrl && {
151
+ "X-RSC-Router-Intercept-Source": interceptSourceUrl,
152
+ }),
153
+ },
154
+ body: encodedBody,
155
+ }).then(async (response) => {
156
+ // Check for version mismatch - server wants us to reload
157
+ const reloadUrl = response.headers.get("X-RSC-Reload");
158
+ if (reloadUrl) {
159
+ console.log(`[Browser] Version mismatch on action - reloading: ${reloadUrl}`);
160
+ window.location.href = reloadUrl;
161
+ // Return a never-resolving promise to prevent further processing
162
+ return new Promise<Response>(() => {});
163
+ }
164
+
165
+ // Start streaming immediately when response arrives
166
+ if (!handle.signal.aborted) {
167
+ streamingToken = handle.startStreaming();
168
+ }
169
+
170
+ if (!response.body) {
171
+ // No body means stream is already complete
172
+ streamingToken?.end();
173
+ resolveStreamComplete();
174
+ return response;
175
+ }
176
+
177
+ // Tee the stream: one for RSC runtime, one for tracking completion
178
+ const [rscStream, trackingStream] = response.body.tee();
179
+
180
+ // Consume the tracking stream to detect when it closes
181
+ (async () => {
182
+ const reader = trackingStream.getReader();
183
+ try {
184
+ while (true) {
185
+ const { done } = await reader.read();
186
+ if (done) break;
187
+ }
188
+ } finally {
189
+ reader.releaseLock();
190
+ console.log("[STREAMING] RSC stream complete");
191
+ streamingToken?.end();
192
+ resolveStreamComplete();
193
+ }
194
+ })().catch((error) => {
195
+ console.error("[STREAMING] Error reading tracking stream:", error);
196
+ streamingToken?.end();
197
+ });
198
+
199
+ // Return response with the RSC stream
200
+ return new Response(rscStream, {
201
+ headers: response.headers,
202
+ status: response.status,
203
+ statusText: response.statusText,
204
+ });
205
+ });
206
+
207
+ // Deserialize response (MUST use same temporaryReferences)
208
+ let payload: RscPayload;
209
+ try {
210
+ payload = await deps.createFromFetch<RscPayload>(responsePromise, {
211
+ temporaryReferences,
212
+ });
213
+ } catch (error) {
214
+ // Clean up streaming token on error (may be null if fetch failed before .then() ran)
215
+ // The token is assigned in .then() callback which runs before this catch block,
216
+ // but TypeScript doesn't track cross-async assignments, so use type assertion
217
+ (streamingToken as { end(): void } | null)?.end();
218
+ // resolveStreamComplete is assigned in the Promise constructor so it's safe to call
219
+ resolveStreamComplete!();
220
+
221
+ // Convert network-level errors to NetworkError for proper handling
222
+ if (isNetworkError(error)) {
223
+ const networkError = new NetworkError(
224
+ "Unable to connect to server. Please check your connection.",
225
+ {
226
+ cause: error,
227
+ url: url.toString(),
228
+ operation: "action",
229
+ }
230
+ );
231
+
232
+ // Mark action as failed
233
+ handle.fail(networkError);
234
+
235
+ // Emit the network error so the root error boundary can catch it
236
+ // NetworkErrorThrower throws during render to trigger the error boundary
237
+ startTransition(() => {
238
+ onUpdate({
239
+ root: createElement(NetworkErrorThrower, { error: networkError }),
240
+ metadata: {
241
+ pathname: segmentState.currentUrl,
242
+ segments: [],
243
+ isError: true,
244
+ },
245
+ });
246
+ });
247
+
248
+ throw networkError;
249
+ }
250
+ throw error;
251
+ }
252
+
253
+ console.log(`[Browser] Action response received:`, payload.metadata);
254
+
255
+ // Process response
256
+ const { metadata, returnValue } = payload;
257
+ const { matched, diff, segments, isPartial, isError } = metadata || {};
258
+
259
+ // Log action result
260
+ if (returnValue) {
261
+ console.log(`[Browser] Action result:`, returnValue);
262
+ if (!returnValue.ok) {
263
+ console.error(`[Browser] Action failed:`, returnValue.data);
264
+ }
265
+ }
266
+
267
+ // Handle error responses with error boundary UI
268
+ if (isError && isPartial && segments && diff) {
269
+ console.log(`[Browser] Processing error boundary response`);
270
+
271
+ // Abort all other pending action requests - error takes precedence
272
+ // This prevents other actions from completing and overwriting the error UI
273
+ eventController.abortAllActions();
274
+
275
+ // Clear concurrent action tracking - no consolidation needed when showing error
276
+ handle.clearConsolidation();
277
+
278
+ // Get current page's cached segments
279
+ const currentKey = store.getHistoryKey();
280
+ const cached = store.getCachedSegments(currentKey);
281
+ const cachedSegments = cached?.segments || [];
282
+
283
+ // Create lookup for error segment from server
284
+ const errorSegmentMap = new Map<string, ResolvedSegment>();
285
+ segments.forEach((s: ResolvedSegment) => errorSegmentMap.set(s.id, s));
286
+
287
+ // For error responses, use ALL cached segments but replace the errored one
288
+ // This preserves sibling layouts that aren't in the parent chain
289
+ const fullSegments = cachedSegments.map((cached) => {
290
+ // Replace the error segment with the one from server
291
+ const fromServer = errorSegmentMap.get(cached.id);
292
+ if (fromServer) return fromServer;
293
+ return cached;
294
+ });
295
+
296
+ // INTERCEPT HANDLING: Separate intercept segments for explicit injection
297
+ const isInterceptSegment = (s: ResolvedSegment) =>
298
+ s.namespace?.startsWith("intercept:") ||
299
+ (s.type === "parallel" && s.id.includes(".@"));
300
+
301
+ const interceptSegments = fullSegments.filter(isInterceptSegment);
302
+ const mainSegments = fullSegments.filter((s) => !isInterceptSegment(s));
303
+
304
+ // Render the full tree with error segment merged with parent layouts
305
+ const errorRenderOptions = {
306
+ isAction: true,
307
+ interceptSegments:
308
+ interceptSegments.length > 0 ? interceptSegments : undefined,
309
+ };
310
+ const errorTree = await renderSegments(mainSegments, errorRenderOptions);
311
+
312
+ // Update UI with error boundary
313
+ startTransition(() => {
314
+ onUpdate({ root: errorTree, metadata: metadata! });
315
+ });
316
+
317
+ console.log(`[Browser] Error boundary UI rendered`);
318
+
319
+ // Update segment tracking to exclude error segment IDs
320
+ const errorSegmentIds = new Set(diff);
321
+ const segmentIdsAfterError = segmentState.currentSegmentIds.filter(
322
+ (id) => !errorSegmentIds.has(id)
323
+ );
324
+
325
+ // Update store state
326
+ store.setSegmentIds(segmentIdsAfterError);
327
+ const currentHandleData = eventController.getHandleState().data;
328
+ store.cacheSegmentsForHistory(currentKey, fullSegments, currentHandleData);
329
+
330
+ console.log(
331
+ `[Browser] Segment IDs updated (excluding error segments):`,
332
+ segmentIdsAfterError
333
+ );
334
+
335
+ // Throw the error so the action promise rejects
336
+ if (returnValue && !returnValue.ok) {
337
+ handle.fail(returnValue.data);
338
+ throw returnValue.data;
339
+ }
340
+
341
+ // No error in returnValue (shouldn't happen with isError: true)
342
+ handle.complete(undefined);
343
+ return undefined;
344
+ }
345
+
346
+ if (isPartial) {
347
+ console.log(`[Browser] Processing partial update`);
348
+ console.log(
349
+ `[Browser] Server sent ${segments?.length || 0} segments in diff:`,
350
+ diff
351
+ );
352
+ console.log(`[Browser] Server expects client to have:`, matched);
353
+
354
+ // Record revalidated segments for concurrent action tracking
355
+ if (diff) {
356
+ handle.recordRevalidatedSegments(diff);
357
+ }
358
+
359
+ // Get current page's cached segments for merging
360
+ const currentKey = store.getHistoryKey();
361
+ const cached = store.getCachedSegments(currentKey);
362
+ const cachedSegments = cached?.segments || [];
363
+ const currentSegmentMap = new Map<string, ResolvedSegment>();
364
+ cachedSegments.forEach((s) => currentSegmentMap.set(s.id, s));
365
+
366
+ console.log(
367
+ `[Browser] Client cache has ${currentSegmentMap.size} entries:`,
368
+ Array.from(currentSegmentMap.keys())
369
+ );
370
+
371
+ // Create lookup for new segments from server
372
+ const newSegmentMap = new Map<string, ResolvedSegment>();
373
+ (segments || []).forEach((s: ResolvedSegment) =>
374
+ newSegmentMap.set(s.id, s)
375
+ );
376
+
377
+ if (!matched) {
378
+ console.log(`[Browser] Matched segments: ${matched}`);
379
+ throw new Error("No matched segments in response");
380
+ }
381
+
382
+ // Rebuild from matched: merge server segments with cached, or use cached as fallback
383
+ const fullSegments = matched
384
+ .map((segId: string) => {
385
+ const fromServer = newSegmentMap.get(segId);
386
+ const fromCache = currentSegmentMap.get(segId);
387
+
388
+ if (fromServer) {
389
+ // Server returned this segment - check if we need to merge partial loaders
390
+ if (needsLoaderMerge(fromServer, fromCache)) {
391
+ return mergeSegmentLoaders(fromServer, fromCache);
392
+ }
393
+ // When server returns component: null for a layout segment, it means
394
+ // "this segment doesn't need re-rendering" - preserve the cached component
395
+ // to maintain the outlet chain and prevent React tree changes
396
+ const cached = currentSegmentMap.get(segId); // Re-fetch to avoid type narrowing issues
397
+ if (
398
+ fromServer.component === null &&
399
+ fromServer.type === "layout" &&
400
+ cached?.component != null
401
+ ) {
402
+ console.log(
403
+ `[Browser] Preserving cached component for layout ${segId} (server returned null)`
404
+ );
405
+ return { ...fromServer, component: cached.component };
406
+ }
407
+ // Dev-mode assertion: warn if tree structure would change
408
+ if (cached) {
409
+ assertSegmentStructure(cached, fromServer, "action-bridge");
410
+ }
411
+ // Preserve cached loading value to maintain consistent tree structure.
412
+ // SSR may set loading=false for skipSSR routes, but actions set
413
+ // loading=<skeleton> (isSSR=false). Changing loading between renders
414
+ // alters the React tree (with/without RouteContentWrapper), causing
415
+ // remounts that destroy useActionState.
416
+ if (
417
+ cached &&
418
+ cached.loading !== undefined &&
419
+ fromServer.loading !== cached.loading
420
+ ) {
421
+ return { ...fromServer, loading: cached.loading };
422
+ }
423
+ return fromServer;
424
+ }
425
+
426
+ // Fall back to current page's cached segments
427
+ if (!fromCache) {
428
+ console.error(`[Browser] MISSING SEGMENT: ${segId} not in cache!`);
429
+ }
430
+ return fromCache;
431
+ })
432
+ .filter(Boolean) as ResolvedSegment[];
433
+
434
+ console.log(
435
+ `[Browser] Rebuilt ${fullSegments.length} segments from matched array`
436
+ );
437
+
438
+ const returnData = returnValue?.data;
439
+
440
+ console.log(
441
+ `[Browser] Action complete - UI updated (after action state committed)`
442
+ );
443
+
444
+ if (returnValue && !returnValue.ok) {
445
+ handle.fail(returnValue.data);
446
+ throw returnValue.data;
447
+ }
448
+
449
+ // Check if user navigated away during the action
450
+ const currentPathname = window.location.pathname;
451
+ const currentLocationKey = window.history.state?.key;
452
+ const userNavigatedAway =
453
+ currentPathname !== actionStartPathname ||
454
+ currentLocationKey !== locationKey;
455
+
456
+ if (userNavigatedAway) {
457
+ console.log(
458
+ `[Browser] User navigated away during action (${actionStartPathname} -> ${currentPathname})`
459
+ );
460
+ // Clear concurrent action tracking - don't consolidate for old route's segments
461
+ handle.clearConsolidation();
462
+
463
+ // Check if the history key changed (different cache entry)
464
+ // This happens when navigating between intercept and non-intercept routes
465
+ if (currentLocationKey !== locationKey) {
466
+ console.log(
467
+ `[Browser] History key changed (${locationKey} -> ${currentLocationKey}), triggering background revalidation`
468
+ );
469
+
470
+ // The action completed on the server, but the user navigated to a different route.
471
+ // The navigation fetch may have gotten stale data (before action committed).
472
+ // Trigger a background revalidation of the CURRENT route to get fresh data.
473
+ // User navigated to a different history entry.
474
+ // Check if we should do background revalidation:
475
+ // - YES if user is on a non-intercept route (safe to revalidate)
476
+ // - NO if user is on an intercept route (would lose background segments)
477
+ const currentInterceptSource = store.getInterceptSourceUrl();
478
+ if (currentInterceptSource) {
479
+ // User is on an intercept route - skip revalidation to preserve background
480
+ console.log(
481
+ `[Browser] Skipping background revalidation - user on intercept route`
482
+ );
483
+ } else {
484
+ // User is on a non-intercept route - safe to revalidate
485
+ console.log(
486
+ `[Browser] History key changed, triggering background revalidation`
487
+ );
488
+ store.markCacheAsStaleAndBroadcast();
489
+ using navTx = createNavigationTransaction(
490
+ store,
491
+ eventController,
492
+ window.location.href,
493
+ { replace: true, skipLoadingState: true }
494
+ );
495
+ fetchPartialUpdate(
496
+ window.location.href,
497
+ [],
498
+ false,
499
+ navTx.handle.signal,
500
+ navTx.with({
501
+ url: window.location.href,
502
+ storeOnly: true,
503
+ }),
504
+ {
505
+ isAction: true,
506
+ }
507
+ ).then(() => {
508
+ console.log(`[Browser] Background revalidation complete`);
509
+ });
510
+ }
511
+
512
+ handle.complete(returnData);
513
+ return returnData;
514
+ }
515
+
516
+ // Same history key but different pathname (e.g., same-page navigation)
517
+ // Safe to refetch current route
518
+ console.log(`[Browser] Same history key, refetching current route`);
519
+ store.markCacheAsStaleAndBroadcast();
520
+ using navTx = createNavigationTransaction(
521
+ store,
522
+ eventController,
523
+ window.location.href,
524
+ { replace: true, skipLoadingState: true }
525
+ );
526
+ // Preserve intercept context
527
+ const currentInterceptSource = store.getInterceptSourceUrl();
528
+ await fetchPartialUpdate(
529
+ window.location.href,
530
+ [], // Empty array = refetch all segments for current route
531
+ false,
532
+ navTx.handle.signal,
533
+ navTx.with({
534
+ url: window.location.href,
535
+ storeOnly: true,
536
+ intercept: !!currentInterceptSource,
537
+ interceptSourceUrl: currentInterceptSource ?? undefined,
538
+ }),
539
+ {
540
+ isAction: true,
541
+ interceptSourceUrl: currentInterceptSource ?? undefined,
542
+ }
543
+ );
544
+ console.log(`[Browser] Refetch after navigation complete`);
545
+ handle.complete(returnData);
546
+ return returnData;
547
+ }
548
+
549
+ // HMR resilience check - only runs if user DIDN'T navigate away
550
+ if (fullSegments.length < matched.length) {
551
+ console.warn(
552
+ `[Browser] Missing segments after action (HMR detected), refetching...`
553
+ );
554
+
555
+ using navTx = createNavigationTransaction(
556
+ store,
557
+ eventController,
558
+ window.location.href,
559
+ { replace: true, skipLoadingState: true }
560
+ );
561
+ await fetchPartialUpdate(
562
+ window.location.href,
563
+ [],
564
+ false,
565
+ navTx.handle.signal,
566
+ navTx.with({
567
+ url: window.location.href,
568
+ storeOnly: true,
569
+ intercept: !!interceptSourceUrl,
570
+ interceptSourceUrl: interceptSourceUrl ?? undefined,
571
+ }),
572
+ {
573
+ isAction: true,
574
+ interceptSourceUrl: interceptSourceUrl ?? undefined,
575
+ }
576
+ );
577
+ console.log(
578
+ `[Browser] Refetch complete (HMR), now returning action result`
579
+ );
580
+
581
+ // Broadcast to other tabs
582
+ store.broadcastCacheInvalidation();
583
+ handle.complete(returnData);
584
+ return returnData;
585
+ }
586
+
587
+ // Check if we need a consolidation fetch due to concurrent actions
588
+ const consolidationSegments = handle.getConsolidationSegments();
589
+
590
+ if (consolidationSegments && consolidationSegments.length > 0) {
591
+ // This is the last concurrent action - do consolidation fetch
592
+ console.log(
593
+ `[Browser] Concurrent actions detected - consolidation fetch needed for:`,
594
+ consolidationSegments
595
+ );
596
+ // Calculate segments to send (exclude the ones we want fresh)
597
+ const currentSegmentIds = store.getSegmentState().currentSegmentIds;
598
+ const segmentsToSend = currentSegmentIds.filter(
599
+ (id) => !consolidationSegments.includes(id)
600
+ );
601
+
602
+ console.log(
603
+ `[Browser] Sending segments (excluding revalidated):`,
604
+ segmentsToSend
605
+ );
606
+
607
+ // Clear consolidation tracking before fetch
608
+ handle.clearConsolidation();
609
+
610
+ using navTx = createNavigationTransaction(
611
+ store,
612
+ eventController,
613
+ window.location.href,
614
+ { replace: true, skipLoadingState: true }
615
+ );
616
+
617
+ console.warn("Fetch partial", id);
618
+ await fetchPartialUpdate(
619
+ window.location.href,
620
+ segmentsToSend,
621
+ false,
622
+ navTx.handle.signal,
623
+ navTx.with({
624
+ url: window.location.href,
625
+ storeOnly: true,
626
+ intercept: !!interceptSourceUrl,
627
+ interceptSourceUrl: interceptSourceUrl ?? undefined,
628
+ }),
629
+ {
630
+ isAction: true,
631
+ interceptSourceUrl: interceptSourceUrl ?? undefined,
632
+ }
633
+ );
634
+
635
+ console.log(`[Browser] Consolidation fetch complete`);
636
+ // Broadcast to other tabs
637
+ store.broadcastCacheInvalidation();
638
+ console.log(
639
+ `[Browser] Consolidate/Reconcile - Returning to React:`,
640
+ returnData
641
+ );
642
+
643
+ handle.complete(returnData);
644
+ return returnData;
645
+ }
646
+
647
+ // Check if there are OTHER actions still fetching (waiting for server response)
648
+ // Exclude the current action since we already have our response
649
+ // We don't need to wait for streaming to complete - just for the response to arrive
650
+ const otherFetchingActions = [...eventController.getInflightActions().values()].filter(
651
+ (a) => a.phase === "fetching" && a.id !== handle.id
652
+ );
653
+ if (otherFetchingActions.length > 0) {
654
+ console.log(
655
+ `[Browser] Skipping UI update - ${otherFetchingActions.length} other action(s) still fetching`
656
+ );
657
+ console.log(
658
+ `[Browser] Multi actions - Returning to React (no cache clear):`,
659
+ returnData
660
+ );
661
+ // Only update store if history key hasn't changed (user didn't navigate away)
662
+ const currentKeyNow = store.getHistoryKey();
663
+ if (currentKeyNow === currentKey) {
664
+ store.setSegmentIds(matched);
665
+ const currentHandleData = eventController.getHandleState().data;
666
+ store.cacheSegmentsForHistory(currentKey, fullSegments, currentHandleData);
667
+ } else {
668
+ console.log(
669
+ `[Browser] History key changed during multi-action (${currentKey} -> ${currentKeyNow}), skipping cache update`
670
+ );
671
+ }
672
+ handle.complete(returnData);
673
+ return returnData;
674
+ }
675
+
676
+ // No concurrent actions - normal flow with single action
677
+ // INTERCEPT HANDLING: Separate intercept segments for explicit injection
678
+ const isInterceptSegment = (s: ResolvedSegment) =>
679
+ s.namespace?.startsWith("intercept:") ||
680
+ (s.type === "parallel" && s.id.includes(".@"));
681
+
682
+ const interceptSegments = fullSegments.filter(isInterceptSegment);
683
+ const mainSegments = fullSegments.filter((s) => !isInterceptSegment(s));
684
+
685
+ // Prepare new tree (await loader data resolution)
686
+ const renderOptions = {
687
+ isAction: true,
688
+ interceptSegments:
689
+ interceptSegments.length > 0 ? interceptSegments : undefined,
690
+ };
691
+ const newTree = await renderSegments(mainSegments, renderOptions);
692
+
693
+ // Re-check if user navigated away (could happen during async wait)
694
+ const currentPathnameNow = window.location.pathname;
695
+ if (currentPathnameNow !== actionStartPathname) {
696
+ console.log(
697
+ `[Browser] User navigated during UI update scheduling, skipping`
698
+ );
699
+ handle.complete(returnData);
700
+ return returnData;
701
+ }
702
+
703
+ // Verify the store's current key still matches what we captured at action start
704
+ // If they differ, user navigated away and we should NOT cache under the old key
705
+ const currentKeyNow = store.getHistoryKey();
706
+ if (currentKeyNow !== currentKey) {
707
+ console.log(
708
+ `[Browser] History key changed during action (${currentKey} -> ${currentKeyNow}), skipping cache update`
709
+ );
710
+ handle.complete(returnData);
711
+ return returnData;
712
+ }
713
+
714
+ startTransition(() => {
715
+ onUpdate({ root: newTree, metadata: metadata! });
716
+ });
717
+
718
+ // Update store state
719
+ store.setSegmentIds(matched);
720
+ const currentHandleData = eventController.getHandleState().data;
721
+ store.cacheSegmentsForHistory(currentKey, fullSegments, currentHandleData);
722
+ store.markCacheAsStaleAndBroadcast();
723
+
724
+ console.log(`[Browser] Normal - Returning to React:`, returnData);
725
+ handle.complete(returnData);
726
+ return returnData;
727
+ } else {
728
+ // Full update not supported for actions
729
+ throw new Error(
730
+ `[Browser] Full update after action is not supported yet`
731
+ );
732
+ }
733
+ }
734
+
735
+ return {
736
+ /**
737
+ * Register the server action callback with the RSC runtime
738
+ */
739
+ register(): void {
740
+ if (isRegistered) {
741
+ console.warn("[Browser] Server action bridge already registered");
742
+ return;
743
+ }
744
+ deps.setServerCallback(handleServerAction);
745
+ isRegistered = true;
746
+ console.log("[Browser] Server action callback registered");
747
+ },
748
+
749
+ /**
750
+ * Unregister the server action callback
751
+ */
752
+ unregister(): void {
753
+ if (!isRegistered) {
754
+ return;
755
+ }
756
+ isRegistered = false;
757
+ console.log("[Browser] Server action bridge unregistered");
758
+ },
759
+ };
760
+ }
761
+
762
+ export { createServerActionBridge as default };