@rangojs/router 0.33.2 → 0.34.0

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 (46) hide show
  1. package/dist/bin/{chunk-YP4HENIU.js → chunk-4HHFQSDC.js} +6 -1
  2. package/dist/bin/{chunk-3B7CKBRO.js → chunk-MWOHBDPM.js} +9 -9
  3. package/dist/bin/{client-urls-projection-J2BGDKQ4.js → client-urls-projection-4Q5EQDAL.js} +2 -2
  4. package/dist/bin/rango.js +1 -1
  5. package/dist/bin/{runtime-EPUDEHO4.js → runtime-6WLCJCN7.js} +1 -1
  6. package/dist/bin/{runtime-discovery-O6KQ5KO2.js → runtime-discovery-2ZTYRZ3V.js} +2 -2
  7. package/dist/bin/{temp-rsc-server-BOHXBOR7.js → temp-rsc-server-EUNKRFJD.js} +3 -3
  8. package/dist/types/client-urls/server-projection.d.ts +7 -0
  9. package/dist/types/client-urls/types.d.ts +13 -14
  10. package/dist/types/errors.d.ts +5 -0
  11. package/dist/types/prefetch-markers.d.ts +13 -4
  12. package/dist/types/route-definition/helpers-types.d.ts +14 -10
  13. package/dist/types/router/segment-resolution/prefetch-deferral.d.ts +39 -21
  14. package/dist/types/server/context.d.ts +6 -5
  15. package/dist/types/testing/serve-shell-request.d.ts +7 -7
  16. package/dist/types/types/loader-types.d.ts +10 -8
  17. package/dist/types/urls/path-helper-types.d.ts +9 -8
  18. package/dist/vite/index.js +26 -12
  19. package/package.json +1 -1
  20. package/skills/app-structure/large-app.md +3 -0
  21. package/skills/client-urls/SKILL.md +13 -10
  22. package/skills/intercept/SKILL.md +8 -4
  23. package/skills/links/SKILL.md +15 -12
  24. package/skills/loader/SKILL.md +52 -39
  25. package/skills/ppr/SKILL.md +1 -1
  26. package/skills/route/SKILL.md +15 -9
  27. package/skills/testing/serve-shell-request.md +19 -7
  28. package/skills/ux-architecture/SKILL.md +16 -11
  29. package/src/browser/navigation-bridge.ts +6 -0
  30. package/src/browser/partial-update.ts +12 -4
  31. package/src/browser/prefetch/fetch.ts +3 -3
  32. package/src/client-urls/client-urls.ts +11 -7
  33. package/src/client-urls/server-projection.ts +21 -3
  34. package/src/client-urls/types.ts +13 -14
  35. package/src/errors.ts +17 -0
  36. package/src/prefetch-markers.ts +18 -4
  37. package/src/route-definition/dsl-helpers.ts +13 -6
  38. package/src/route-definition/helpers-types.ts +14 -10
  39. package/src/router/loader-resolution.ts +4 -4
  40. package/src/router/match-api.ts +1 -3
  41. package/src/router/segment-resolution/prefetch-deferral.ts +108 -50
  42. package/src/rsc/rsc-rendering.ts +1 -1
  43. package/src/server/context.ts +6 -5
  44. package/src/testing/serve-shell-request.ts +7 -7
  45. package/src/types/loader-types.ts +10 -8
  46. package/src/urls/path-helper-types.ts +9 -8
@@ -3,7 +3,7 @@ import {
3
3
  prefetchDirect,
4
4
  prefetchQueued,
5
5
  schedulePrefetchWhenRouterIdle
6
- } from "./chunk-3B7CKBRO.js";
6
+ } from "./chunk-MWOHBDPM.js";
7
7
  import {
8
8
  findTsFiles,
9
9
  firstCodeMatchIndex,
@@ -1386,8 +1386,13 @@ function serializeLoaderOptions(loaders, owner, options) {
1386
1386
  loaders,
1387
1387
  ({ prefetch }) => prefetch === false
1388
1388
  );
1389
+ const intentLoaderIndices = indicesWhere(
1390
+ loaders,
1391
+ ({ prefetch }) => prefetch === "intent"
1392
+ );
1389
1393
  return {
1390
1394
  ...deferrableLoaderIndices.length > 0 ? { deferrableLoaderIndices: Object.freeze(deferrableLoaderIndices) } : {},
1395
+ ...intentLoaderIndices.length > 0 ? { intentLoaderIndices: Object.freeze(intentLoaderIndices) } : {},
1391
1396
  ...loaderRevalidate.some((keys) => keys.length > 0) ? {
1392
1397
  loaderRevalidate: Object.freeze(
1393
1398
  loaderRevalidate.map((keys) => Object.freeze(keys))
@@ -1,3 +1,8 @@
1
+ // src/prefetch-markers.ts
2
+ var PREFETCH_HEADER = "X-Rango-Prefetch";
3
+ var PREFETCH_INTENT = "intent";
4
+ var PREFETCH_FAILED_ROW = ":H_0\n";
5
+
1
6
  // src/internal-debug.ts
2
7
  var INTERNAL_RANGO_DEBUG = typeof process !== "undefined" && Boolean(process.env?.INTERNAL_RANGO_DEBUG);
3
8
 
@@ -209,7 +214,7 @@ var requestGeneration = 0;
209
214
  function loadRuntime() {
210
215
  if (runtime) return Promise.resolve(runtime);
211
216
  if (!runtimePromise) {
212
- runtimePromise = import("./runtime-EPUDEHO4.js").then(
217
+ runtimePromise = import("./runtime-6WLCJCN7.js").then(
213
218
  (loaded) => {
214
219
  runtime = loaded;
215
220
  if (decoder) loaded.setPrefetchDecoder(decoder);
@@ -423,12 +428,10 @@ function isActionFenceActive() {
423
428
  return fenceCount > 0;
424
429
  }
425
430
 
426
- // src/prefetch-markers.ts
427
- var PREFETCH_HEADER = "X-Rango-Prefetch";
428
- var PREFETCH_INTENT = "intent";
429
- var PREFETCH_FAILED_ROW = ":H_0\n";
430
-
431
431
  export {
432
+ PREFETCH_HEADER,
433
+ PREFETCH_INTENT,
434
+ PREFETCH_FAILED_ROW,
432
435
  IS_BROWSER_DEBUG,
433
436
  debugLog,
434
437
  notifyListeners,
@@ -454,9 +457,6 @@ export {
454
457
  clearPrefetchInflight,
455
458
  isFragmentPassthroughEnabled,
456
459
  isActionFenceActive,
457
- PREFETCH_HEADER,
458
- PREFETCH_INTENT,
459
- PREFETCH_FAILED_ROW,
460
460
  prefetchDirect,
461
461
  prefetchQueued,
462
462
  schedulePrefetchWhenRouterIdle
@@ -10,8 +10,8 @@ import {
10
10
  refreshRecordedClientUrlProjections,
11
11
  resolveClientUrlsSource,
12
12
  scanForClientUrlModules
13
- } from "./chunk-YP4HENIU.js";
14
- import "./chunk-3B7CKBRO.js";
13
+ } from "./chunk-4HHFQSDC.js";
14
+ import "./chunk-MWOHBDPM.js";
15
15
  import "./chunk-LD7UBHT4.js";
16
16
  export {
17
17
  CLIENT_IMPORT_RE,
package/dist/bin/rango.js CHANGED
@@ -229,7 +229,7 @@ ${formatNestedRouterConflictError(nestedRouterConflict, "[rango]")}
229
229
  }
230
230
  let discoverAndWriteRouteTypes;
231
231
  try {
232
- const mod = await import("./runtime-discovery-O6KQ5KO2.js");
232
+ const mod = await import("./runtime-discovery-2ZTYRZ3V.js");
233
233
  discoverAndWriteRouteTypes = mod.discoverAndWriteRouteTypes;
234
234
  } catch (err) {
235
235
  if (err.code === "ERR_MODULE_NOT_FOUND" || err.code === "MODULE_NOT_FOUND") {
@@ -26,7 +26,7 @@ import {
26
26
  setInflightPromiseWithAliases,
27
27
  stateEpoch,
28
28
  storePrefetch
29
- } from "./chunk-3B7CKBRO.js";
29
+ } from "./chunk-MWOHBDPM.js";
30
30
 
31
31
  // src/browser/prefetch/resource-ready.ts
32
32
  function waitForViewportImages() {
@@ -163,9 +163,9 @@ async function discoverAndWriteRouteTypes(opts) {
163
163
  "Runtime discovery requires '@vitejs/plugin-rsc'. Install it with: pnpm add -D @vitejs/plugin-rsc"
164
164
  );
165
165
  }
166
- const { createTempRscServer } = await import("./temp-rsc-server-BOHXBOR7.js");
166
+ const { createTempRscServer } = await import("./temp-rsc-server-EUNKRFJD.js");
167
167
  const { createDiscoveryState } = await import("./state-ACD2MGKJ.js");
168
- const { discoverClientUrlProjections } = await import("./client-urls-projection-J2BGDKQ4.js");
168
+ const { discoverClientUrlProjections } = await import("./client-urls-projection-4Q5EQDAL.js");
169
169
  const {
170
170
  isFrameworkPlugin,
171
171
  pickForwardedRunnerConfig,
@@ -27,8 +27,8 @@ import {
27
27
  propertyKeyIs,
28
28
  recordClientUrlsModule,
29
29
  unwrapExpression
30
- } from "./chunk-YP4HENIU.js";
31
- import "./chunk-3B7CKBRO.js";
30
+ } from "./chunk-4HHFQSDC.js";
31
+ import "./chunk-MWOHBDPM.js";
32
32
  import {
33
33
  codeMatchIndices,
34
34
  isSkippedSourceScanDir
@@ -47,7 +47,7 @@ var DEFAULT_ROUTER_VERSIONS_KEY = "*";
47
47
  // package.json
48
48
  var package_default = {
49
49
  name: "@rangojs/router",
50
- version: "0.33.2",
50
+ version: "0.34.0",
51
51
  description: "Django-inspired RSC router with composable URL patterns",
52
52
  keywords: [
53
53
  "react",
@@ -38,6 +38,11 @@ export interface ClientUrlProjectionRoute {
38
38
  * loader(), so a prefetch of the route defers them. Absent (= none) in
39
39
  * projections serialized before the option existed. */
40
40
  readonly deferrableLoaderIndices?: readonly number[];
41
+ /** Indices into loaderIds of loaders declared loader(Def, { prefetch:
42
+ * "intent" }); materialization passes the option through, so a
43
+ * speculative prefetch defers them and an intent prefetch runs them.
44
+ * Absent (= none) in projections serialized before the option existed. */
45
+ readonly intentLoaderIndices?: readonly number[];
41
46
  /** Per loader (aligned with loaderIds), its revalidate() arguments in
42
47
  * declaration order: a hoisted predicate's key, whose registration
43
48
  * materialization attaches (revalidate-registry.ts), or a boolean
@@ -64,6 +69,8 @@ export interface ClientUrlProjectionIntercept {
64
69
  readonly hasLoading: boolean;
65
70
  /** As on a route (ClientUrlProjectionRoute.deferrableLoaderIndices). */
66
71
  readonly deferrableLoaderIndices?: readonly number[];
72
+ /** As on a route (ClientUrlProjectionRoute.intentLoaderIndices). */
73
+ readonly intentLoaderIndices?: readonly number[];
67
74
  /** As on a route (ClientUrlProjectionRoute.loaderRevalidate). */
68
75
  readonly loaderRevalidate?: readonly (readonly (string | boolean)[])[];
69
76
  }
@@ -2,6 +2,7 @@ import type { ComponentType, ReactNode } from "react";
2
2
  import type { LoaderDefinition, LoaderOptions, ShouldRevalidateFn, TransitionConfig } from "../types.js";
3
3
  import type { DefaultEnv } from "../types/global-namespace.js";
4
4
  import type { HoistedRevalidateRef } from "./hoisted-revalidate.js";
5
+ import type { PrefetchFlag } from "../prefetch-markers.js";
5
6
  import type { TrieMatchResult } from "../router/trie-matching.js";
6
7
  import type { PathOptions } from "../urls/pattern-types.js";
7
8
  import type { SearchSchema } from "../search-params.js";
@@ -48,13 +49,12 @@ export interface ClientUrlLoaderRecord {
48
49
  */
49
50
  readonly ssr?: false;
50
51
  /**
51
- * loader(Def, { prefetch: false }): a viewport or render prefetch of the
52
- * route, or of an intercept's target from its source, defers this loader
53
- * (a hover prefetch runs it) and the click
54
- * that adopts it runs it in its fill request (see {@link LoaderOptions}).
55
- * Projected onto the materialized stub.
52
+ * loader(Def, { prefetch: false | "intent" }): a prefetch of the route, or
53
+ * of an intercept's target from its source, defers this loader and the
54
+ * click that adopts it runs it in its fill request (see
55
+ * {@link LoaderOptions}). Projected onto the materialized stub.
56
56
  */
57
- readonly prefetch?: false;
57
+ readonly prefetch?: PrefetchFlag;
58
58
  }
59
59
  /**
60
60
  * The TransitionConfig subset a clientUrls() route may declare: ViewTransition
@@ -118,14 +118,13 @@ export interface ClientUrlHelpers {
118
118
  * settled return freezes into the shell (nested promises stay live
119
119
  * holes).
120
120
  *
121
- * Pass `{ prefetch: false }` to keep this loader out of the route's
122
- * viewport and render prefetches; a hover prefetch runs it (see
123
- * {@link LoaderOptions}). An in-group click still shows
124
- * the destination at once, commits the adopted prefetch with the other
125
- * loaders' data, and runs only the flagged loaders in its one fill
126
- * request. A `layout()` loader with the flag is flagged on every route
127
- * below it. Inside intercept() it defers the loader in a viewport or
128
- * render prefetch of the intercept from its source, as in urls().
121
+ * Pass `{ prefetch: false | "intent" }` to keep this loader out of the
122
+ * route's prefetches (see {@link LoaderOptions}). An in-group click still
123
+ * shows the destination at once, commits the adopted prefetch with the
124
+ * other loaders' data, and runs only the flagged loaders in its one fill
125
+ * request. A `layout()` loader with the
126
+ * flag is flagged on every route below it. Inside intercept() it defers
127
+ * the loader in a prefetch of the intercept from its source, as in urls().
129
128
  */
130
129
  readonly loader: <TData>(definition: LoaderDefinition<TData>, optionsOrUse?: Pick<LoaderOptions, "ssr" | "prefetch"> | ClientUrlUse, use?: ClientUrlUse) => ClientUrlItem;
131
130
  readonly loading: (component: ReactNode) => ClientUrlItem;
@@ -247,6 +247,11 @@ export declare function invariant(condition: any, message: string): asserts cond
247
247
  * passes), as an invariant.
248
248
  */
249
249
  export declare function assertBooleanOption(value: unknown, option: string, effect: string): void;
250
+ /**
251
+ * Rejects a `prefetch` DSL option that is neither a boolean nor `"intent"`
252
+ * (undefined passes), as an invariant.
253
+ */
254
+ export declare function assertPrefetchOption(value: unknown, option: string, effect: string): void;
250
255
  /**
251
256
  * Sanitize errors for production - prevents leaking sensitive information
252
257
  *
@@ -10,12 +10,21 @@ export declare const PREFETCH_HEADER = "X-Rango-Prefetch";
10
10
  /**
11
11
  * PREFETCH_HEADER's value on an intent prefetch: a hover or an explicit
12
12
  * `prefetch()` call (browser/prefetch/fetch.ts prefetchDirect). The server
13
- * defers nothing in it: `prefetch: false` loaders and the work behind a
14
- * flagged `loading()` run, as in the navigation it starts early. A
15
- * speculative prefetch (viewport, render) sends `1`, and any value other than
16
- * this one reads as speculative.
13
+ * runs the work flagged `prefetch: "intent"` in it and defers the work
14
+ * flagged `prefetch: false`. A speculative prefetch (viewport, render) sends
15
+ * `1` and defers both; any value other than this one reads as speculative.
17
16
  */
18
17
  export declare const PREFETCH_INTENT = "intent";
18
+ /**
19
+ * A recorded `prefetch` flag of loader() or loading(): `false` defers the
20
+ * work in every prefetch, `"intent"` in a speculative one only
21
+ * (router/segment-resolution/prefetch-deferral.ts).
22
+ */
23
+ export type PrefetchFlag = false | typeof PREFETCH_INTENT;
24
+ /** A `prefetch` DSL option as written: a boolean, or `"intent"`. */
25
+ export type PrefetchOption = boolean | PrefetchFlag;
26
+ /** The option asks for deferral: `prefetch: false` or `prefetch: "intent"`. */
27
+ export declare function isPrefetchFlag(value: unknown): value is PrefetchFlag;
19
28
  /**
20
29
  * The last row of a prefetch whose render reported an error
21
30
  * (rsc/prefetch-render-error.ts): a Flight hint with a code React does not
@@ -2,6 +2,7 @@ import type { ReactNode } from "react";
2
2
  import type { ExtractRouteParams, Handler, PartialCacheOptions, ErrorBoundaryHandler, LoaderDefinition, LoaderOptions, MiddlewareFn, NotFoundBoundaryHandler, ResolvedRouteMap, RouteDefinition, ShouldRevalidateFn, TransitionConfig } from "../types.js";
3
3
  import type { AllUseItems, LayoutItem, RouteItem, ParallelItem, InterceptItem, MiddlewareItem, RevalidateItem, LoaderItem, LoadingItem, ErrorBoundaryItem, NotFoundBoundaryItem, LayoutUseItem, RouteUseItem, ParallelUseItem, InterceptUseItem, LoaderUseItem, CacheItem, TransitionItem, UseItems } from "../route-types.js";
4
4
  import type { StaticHandlerRef } from "../static-handler.js";
5
+ import type { PrefetchOption } from "../prefetch-markers.js";
5
6
  export type { AllUseItems, LayoutItem, RouteItem, ParallelItem, InterceptItem, MiddlewareItem, RevalidateItem, LoaderItem, ErrorBoundaryItem, NotFoundBoundaryItem, LayoutUseItem, RouteUseItem, ParallelUseItem, InterceptUseItem, CacheItem, } from "../route-types.js";
6
7
  export type { InterceptConfig, InterceptSelectorContext, InterceptSegmentsState, InterceptWhenFn, } from "../server/context";
7
8
  /**
@@ -231,15 +232,16 @@ export type RouteHelpers<T extends RouteDefinition, TEnv> = {
231
232
  * loader(RecommendationsLoader), // still streams behind loading()
232
233
  * ```
233
234
  *
234
- * Pass `{ prefetch: false }` to keep the loader out of speculative
235
- * prefetches (viewport, render): such a prefetch skips it and the click
236
- * that adopts it fetches it in one follow-up request; a hover prefetch runs
237
- * it (see {@link LoaderOptions}). Only on a segment the
235
+ * Pass `{ prefetch: false }` to keep the loader out of prefetches: a
236
+ * prefetch skips it and the click that adopts it fetches it in one
237
+ * follow-up request. `{ prefetch: "intent" }` defers it in viewport and
238
+ * render prefetches only (see {@link LoaderOptions}). Only on a segment the
238
239
  * client does not have yet: a loader the client already holds runs in the
239
240
  * prefetch when it revalidates.
240
241
  *
241
242
  * ```typescript
242
243
  * loader(ReviewsLoader, { prefetch: false }),
244
+ * loader(RelatedLoader, { prefetch: "intent" }),
243
245
  * ```
244
246
  *
245
247
  * @param loaderDef - Loader created with createLoader()
@@ -256,16 +258,18 @@ export type RouteHelpers<T extends RouteDefinition, TEnv> = {
256
258
  * // Skip loading on SSR, only show on client navigation
257
259
  * loading(<Skeleton />, { ssr: false })
258
260
  *
259
- * // Keep everything behind this fallback out of viewport and render
260
- * // prefetches (a hover prefetch runs it)
261
+ * // Keep everything behind this fallback out of prefetches
261
262
  * loading(<Skeleton />, { prefetch: false })
263
+ *
264
+ * // Deferred in viewport and render prefetches only
265
+ * loading(<Skeleton />, { prefetch: "intent" })
262
266
  * ```
263
267
  * @param component - The loading UI to show during navigation
264
268
  * @param options - Configuration options
265
269
  * @param options.ssr - If false, skip showing loading on document requests (SSR)
266
- * @param options.prefetch - If false, the flag applies when this entry's
267
- * segment is new to the client. A viewport or render prefetch then skips
268
- * the whole unit (a hover prefetch runs it): the
270
+ * @param options.prefetch - `false` or `"intent"` (see
271
+ * {@link LoaderOptions}); the flag applies when this entry's segment is
272
+ * new to the client. A prefetch then skips the whole unit: the
269
273
  * handler, its loaders, its orphan layouts and parallel slots and, for a
270
274
  * layout, every deeper entry; the click that adopts the prefetch shows
271
275
  * this fallback and fetches them in one follow-up request, which reads
@@ -280,7 +284,7 @@ export type RouteHelpers<T extends RouteDefinition, TEnv> = {
280
284
  */
281
285
  loading: (component: ReactNode | (() => ReactNode), options?: {
282
286
  ssr?: boolean;
283
- prefetch?: boolean;
287
+ prefetch?: PrefetchOption;
284
288
  }) => LoadingItem;
285
289
  /**
286
290
  * Attach an error boundary to catch errors in this segment and children
@@ -1,6 +1,9 @@
1
1
  /**
2
- * `prefetch: false`: what a prefetch request defers and what its fill request
3
- * runs (docs/design/prefetch-false.md).
2
+ * `prefetch: false` and `prefetch: "intent"`: what a prefetch request defers
3
+ * and what its fill request runs (docs/design/prefetch-false.md). A
4
+ * speculative prefetch (viewport, render) defers both flags; an intent
5
+ * prefetch (a hover, `prefetch()`) defers `false` only and runs `"intent"`
6
+ * work as if it were unflagged.
4
7
  *
5
8
  * Two layers. The SCOPE is static per matched chain: which loader
6
9
  * registrations are deferrable and which entries can be a handler unit. The
@@ -30,20 +33,15 @@ import type { CacheScope } from "../../cache/cache-scope.js";
30
33
  /**
31
34
  * What a request says it is, read once when its context is created
32
35
  * (RequestContext._requestKind). A fill is marked on the raw URL and wins
33
- * over the prefetch header. `"prefetch"` is a speculative prefetch (viewport,
34
- * render) and `"intent"` a hover or an explicit `prefetch()` call
35
- * (PREFETCH_INTENT): both are prefetches, and only the first defers. Whether
36
- * a prefetch defers anything is decided per match, by partialDeferralMode: a
37
- * shell capture inherits the context of the request that scheduled it and is
38
- * never a prefetch.
36
+ * over the prefetch header; an intent prefetch carries PREFETCH_INTENT.
39
37
  */
40
38
  export declare function requestKind(request: Request, rawUrl: URL): RequestKind | undefined;
41
39
  /** requestKind's answer for a marked request. */
42
40
  export type RequestKind = "prefetch" | "intent" | "fill";
43
41
  /** A prefetch of either kind: speculative or intent. */
44
42
  export declare function isPrefetchKind(kind: RequestKind | undefined): boolean;
45
- /** Static, per matched chain. */
46
- interface DeferralScope {
43
+ /** What one kind of prefetch can defer in a matched chain. */
44
+ interface DeferralSet {
47
45
  /**
48
46
  * Loader registrations a prefetch can defer, each with what makes it so:
49
47
  * `true` for its own flag, else the segment ids of the flagged entries whose
@@ -51,8 +49,6 @@ interface DeferralScope {
51
49
  * segments is new to the client.
52
50
  */
53
51
  readonly loaders: ReadonlyMap<LoaderEntry, true | readonly string[]>;
54
- /** `$$id`s of `loaders`: the loaders that cannot call ctx.rendered(). */
55
- readonly loaderIds: ReadonlySet<string>;
56
52
  /**
57
53
  * Entries whose handler a prefetch can skip (a flagged loading() with a
58
54
  * fallback to show). `index` is the chain index that owns the entry: its
@@ -62,6 +58,23 @@ interface DeferralScope {
62
58
  */
63
59
  readonly units: ReadonlyMap<EntryData, DeferralUnit>;
64
60
  }
61
+ /**
62
+ * Static, per matched chain: what a speculative prefetch defers (every flag,
63
+ * `false` or `"intent"`), and in `intent` what an intent prefetch defers.
64
+ */
65
+ interface DeferralScope extends DeferralSet {
66
+ /**
67
+ * `$$id`s of `loaders`: the loaders that cannot call ctx.rendered(). The
68
+ * speculative set on every request: a loader an intent prefetch runs is
69
+ * still run by a speculative prefetch's fill, where its handler does not.
70
+ */
71
+ readonly loaderIds: ReadonlySet<string>;
72
+ /**
73
+ * What an intent prefetch defers: the scope with every `"intent"` flag
74
+ * read as unflagged. Absent when no flag is `"intent"`: the scope itself.
75
+ */
76
+ readonly intent?: DeferralSet;
77
+ }
65
78
  interface DeferralUnit {
66
79
  readonly index: number;
67
80
  readonly ids: readonly string[];
@@ -69,6 +82,11 @@ interface DeferralUnit {
69
82
  /** Per match: InternalHandlerContext._prefetchDeferral. */
70
83
  export interface PrefetchDeferral {
71
84
  readonly scope: DeferralScope;
85
+ /**
86
+ * What this request defers: `scope`, or `scope.intent` for an intent
87
+ * prefetch. The ctx.rendered() guards read `scope`.
88
+ */
89
+ readonly defers: DeferralSet;
72
90
  /**
73
91
  * "prefetch": deferral replaces execution. "fill": the request that follows
74
92
  * an adopted prefetch; a held segment is skipped outright. Unset on every
@@ -151,7 +169,7 @@ export interface DeferredLoader {
151
169
  /**
152
170
  * The deferral scope of a matched chain, memoized on its leaf entry (entries
153
171
  * are per-isSSR manifest objects, replaced on HMR). EMPTY_SCOPE when nothing
154
- * in the tree declares `prefetch: false`.
172
+ * in the tree declares `prefetch: false` or `prefetch: "intent"`.
155
173
  */
156
174
  export declare function resolveDeferralScope(entries: readonly EntryData[]): DeferralScope;
157
175
  /**
@@ -164,10 +182,8 @@ export declare function resolveDeferralScope(entries: readonly EntryData[]): Def
164
182
  */
165
183
  export declare function resolveInterceptDeferralScope(intercept: InterceptEntry): DeferralScope;
166
184
  /**
167
- * Which half of the feature a partial request is, if either (`fill` and
168
- * `prefetch` are requestKind's answer). `prefetch` is a speculative prefetch
169
- * only: an intent prefetch defers nothing, like the navigation it starts
170
- * early (R16). Both halves are GETs: a request of
185
+ * The kind a partial request plans its deferral as, if any (requestKind's
186
+ * answer, filtered). Both halves of the feature are GETs: a request of
171
187
  * another method that carries either marker is a normal request. A prefetch
172
188
  * defers only on a plain GET navigation: an action re-renders what it
173
189
  * changed, and a shell capture is never a prefetch whatever the request that
@@ -175,20 +191,22 @@ export declare function resolveInterceptDeferralScope(intercept: InterceptEntry)
175
191
  * capture runs the full match): each one states its own reason.
176
192
  */
177
193
  export declare function partialDeferralMode(request: {
178
- fill: boolean;
179
- prefetch: boolean;
194
+ kind: RequestKind | undefined;
180
195
  method: string;
181
196
  isAction: boolean;
182
197
  isShellCapture: boolean;
183
- }): PrefetchDeferral["mode"];
198
+ }): RequestKind | undefined;
184
199
  export declare const NOTHING_HELD: ReadonlySet<string>;
185
200
  /**
186
201
  * The plan for one match, or undefined when the tree declares no flag and the
187
202
  * request is not a fill (the common case: nothing to carry). `held` is the
188
203
  * client's segment ids as the request listed them. `scope` is the chain's
189
204
  * unless the request resolves an intercept (resolveInterceptDeferralScope).
205
+ * An intent prefetch plans as a prefetch over `scope.intent`: a tree whose
206
+ * flags are all `"intent"` defers nothing in it, and its response is the
207
+ * navigation's (no `_payloadDeferred`, so no source scope).
190
208
  */
191
- export declare function planPrefetchDeferral(entries: readonly EntryData[], mode: PrefetchDeferral["mode"], matched: {
209
+ export declare function planPrefetchDeferral(entries: readonly EntryData[], requested: RequestKind | undefined, matched: {
192
210
  pr?: boolean;
193
211
  od?: boolean;
194
212
  }, cacheScope: CacheScope | null | undefined, held?: ReadonlySet<string>, scope?: DeferralScope): PrefetchDeferral | undefined;
@@ -3,6 +3,7 @@ import { AsyncLocalStorage } from "node:async_hooks";
3
3
  import type { ReactNode } from "react";
4
4
  import type { PartialCacheOptions, ErrorBoundaryHandler, Handler, LoaderDefinition, MiddlewareFn, NotFoundBoundaryHandler, ShouldRevalidateFn, TransitionConfig } from "../types";
5
5
  import type { ContextVar } from "../context-var.js";
6
+ import type { PrefetchFlag } from "../prefetch-markers.js";
6
7
  import { type WarmContext } from "../prerender/warm-request.js";
7
8
  /**
8
9
  * Performance metric entry for a single measured operation
@@ -91,13 +92,13 @@ export type EntryPropDatas = {
91
92
  export type EntryPropRender = {
92
93
  loading?: ReactNode | false;
93
94
  /**
94
- * loading(fallback, { prefetch: false }) with a renderable fallback: a
95
- * speculative prefetch defers what the fallback covers while the entry's
95
+ * loading(fallback, { prefetch: false | "intent" }) with a renderable
96
+ * fallback: a prefetch defers what the fallback covers while the entry's
96
97
  * segment is new to the client
97
98
  * (router/segment-resolution/prefetch-deferral.ts). Set on both DSL
98
99
  * evaluations, whatever `ssr` did to `loading`.
99
100
  */
100
- loadingPrefetch?: false;
101
+ loadingPrefetch?: PrefetchFlag;
101
102
  /**
102
103
  * loading(fallback, { ssr: false }), on both DSL evaluations; a document
103
104
  * then sets `loading` to false (applyDocumentModeLoading).
@@ -137,11 +138,11 @@ export type LoaderEntry = {
137
138
  */
138
139
  bake?: true;
139
140
  /**
140
- * loader(Def, { prefetch: false }): a speculative prefetch defers this
141
+ * loader(Def, { prefetch: false | "intent" }): a prefetch defers this
141
142
  * registration while its segment is new to the client
142
143
  * (router/segment-resolution/prefetch-deferral.ts).
143
144
  */
144
- prefetch?: false;
145
+ prefetch?: PrefetchFlag;
145
146
  /**
146
147
  * The declaring layout's / parallel's / cache()'s include scope, for the
147
148
  * loader body's `ctx.reverse(".name")` (its DSL kickoff carries it,
@@ -66,13 +66,13 @@ export interface ServeShellRequestOptions<TEnv = any> {
66
66
  * `result.replayStatus`.
67
67
  *
68
68
  * `prefetch: true` sends the speculative kind a viewport or render
69
- * `<Link>` prefetch sends (`X-Rango-Prefetch: 1`), so `prefetch: false`
70
- * loaders and `loading()` entries are deferred: `result.readDeferred()`
71
- * lists them. A hover's or `prefetch()`'s intent prefetch defers nothing;
72
- * serve it with `prefetch: true` and `headers: { "X-Rango-Prefetch":
73
- * "intent" }`, which `prefetch: true` leaves as given. `fill: true`
74
- * sends the request the browser follows an adopted prefetch with
75
- * (`_rsc_fill`): pass the ids the prefetch delivered, without the deferred
69
+ * `<Link>` prefetch sends (`X-Rango-Prefetch: 1`), so loaders and
70
+ * `loading()` entries flagged `prefetch: false` or `"intent"` are deferred:
71
+ * `result.readDeferred()` lists them. A hover's intent prefetch defers
72
+ * `false` only; serve it with `prefetch: true` and `headers: {
73
+ * "X-Rango-Prefetch": "intent" }`, which `prefetch: true` leaves as given.
74
+ * `fill: true` sends the request the browser follows an adopted prefetch
75
+ * with (`_rsc_fill`): pass the ids the prefetch delivered, without the deferred
76
76
  * ones, as `segments`, and the same URL as `from`. `interceptSource` sends
77
77
  * the intercept source (`X-RSC-Router-Intercept-Source`) the browser sends
78
78
  * from an open modal and with the fill of an intercept, whose `from` is
@@ -7,6 +7,7 @@ import type { SearchSchema, ResolveSearchSchema } from "../search-params.js";
7
7
  import type { UseItems, LoaderUseItem } from "../route-types.js";
8
8
  import type { DefaultEnv, DefaultReverseRouteMap, DefaultVars } from "./global-namespace.js";
9
9
  import type { RequestScope } from "./request-scope.js";
10
+ import type { PrefetchOption } from "../prefetch-markers.js";
10
11
  /**
11
12
  * Context passed to loader functions during execution
12
13
  *
@@ -182,13 +183,14 @@ export type LoaderFn<T, TParams = Record<string, string | undefined>, TEnv = Def
182
183
  export type LoaderOptions = {
183
184
  ssr?: boolean;
184
185
  /**
185
- * `prefetch: false` keeps this loader out of speculative prefetches. A
186
- * viewport or render `<Link>` prefetch (a partial request with
187
- * `X-Rango-Prefetch: 1`) does not execute it; the payload marks it
188
- * deferred. A hover prefetch and `useRouter().prefetch()`
189
- * (`X-Rango-Prefetch: intent`) count as intent to click and run it, so a
190
- * click after a hover needs no follow-up request. A document request and a
191
- * navigation with no prefetch to adopt run it as usual.
186
+ * `prefetch: false` keeps this loader out of every `<Link>` prefetch: a
187
+ * prefetch (a partial request with `X-Rango-Prefetch`) does not execute
188
+ * it; the payload marks it deferred. `prefetch: "intent"` keeps it out of
189
+ * speculative prefetches only: a viewport or render prefetch
190
+ * (`X-Rango-Prefetch: 1`) defers it, and a hover prefetch or
191
+ * `useRouter().prefetch()` (`X-Rango-Prefetch: intent`) runs it, so a click
192
+ * after a hover needs no follow-up request for it. A document request and
193
+ * a navigation with no prefetch to adopt run it as usual.
192
194
  *
193
195
  * A deferred loader never blocks the navigation that adopts the prefetch:
194
196
  * it behaves like a loader that is still streaming. Its own `<Suspense>`
@@ -213,7 +215,7 @@ export type LoaderOptions = {
213
215
  * request only deferred work and middleware run, so values a held handler
214
216
  * would have set with `ctx.set()` are not visible.
215
217
  */
216
- prefetch?: boolean;
218
+ prefetch?: PrefetchOption;
217
219
  };
218
220
  /**
219
221
  * Options for fetchable loaders
@@ -8,6 +8,7 @@ import type { ResponseHandler, ResponseHandlerContext, TextResponseHandler } fro
8
8
  import type { UnnamedRoute, LocalOnlyInclude, PathOptions, UrlPatterns, IncludeOptions } from "./pattern-types.js";
9
9
  import type { ExtractRoutes, ExtractResponses } from "./type-extraction.js";
10
10
  import type { ClientUrlPatterns } from "../client-urls/types.js";
11
+ import type { PrefetchOption } from "../prefetch-markers.js";
11
12
  /**
12
13
  * Base path function signature for defining routes with URL patterns.
13
14
  */
@@ -161,10 +162,10 @@ export type PathHelpers<TEnv> = {
161
162
  * freezes into the shell (nested promises stay live holes) — the pre-flush
162
163
  * promise applied to the prelude.
163
164
  *
164
- * Pass `{ prefetch: false }` to keep the loader out of speculative
165
- * prefetches (viewport, render): such a prefetch skips it and the click
166
- * that adopts it fetches it in one follow-up request; a hover prefetch runs
167
- * it (see {@link LoaderOptions}). Only on a segment the
165
+ * Pass `{ prefetch: false }` to keep the loader out of prefetches: a
166
+ * prefetch skips it and the click that adopts it fetches it in one
167
+ * follow-up request. `{ prefetch: "intent" }` defers it in viewport and
168
+ * render prefetches only (see {@link LoaderOptions}). Only on a segment the
168
169
  * client does not have yet: a loader the client already holds runs in the
169
170
  * prefetch when it revalidates.
170
171
  */
@@ -173,9 +174,9 @@ export type PathHelpers<TEnv> = {
173
174
  * Attach a loading component to the current route/layout.
174
175
  *
175
176
  * `{ ssr: false }` skips the fallback on document requests. `{ prefetch:
176
- * false }` keeps what the fallback covers out of viewport and render
177
- * prefetches (a hover prefetch runs it), when this entry's segment is new
178
- * to the client: the entry's handler, its loaders,
177
+ * false }` keeps what the fallback covers out of prefetches (`"intent"`:
178
+ * viewport and render prefetches only, see {@link LoaderOptions}), when this
179
+ * entry's segment is new to the client: the entry's handler, its loaders,
179
180
  * its orphan layouts and parallel slots and, for a layout, every deeper
180
181
  * entry. The click that adopts the prefetch shows the fallback and fetches
181
182
  * them in one follow-up request, which reads cache() and "use cache" as
@@ -189,7 +190,7 @@ export type PathHelpers<TEnv> = {
189
190
  */
190
191
  loading: (component: ReactNode | (() => ReactNode), options?: {
191
192
  ssr?: boolean;
192
- prefetch?: boolean;
193
+ prefetch?: PrefetchOption;
193
194
  }) => LoadingItem;
194
195
  /**
195
196
  * Attach an error boundary to catch errors in this segment