@rangojs/router 0.6.0 → 0.8.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.
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@rangojs/router",
3
- "version": "0.6.0",
3
+ "version": "0.8.0",
4
4
  "description": "Django-inspired RSC router with composable URL patterns",
5
5
  "keywords": [
6
6
  "react",
@@ -176,22 +176,9 @@
176
176
  "access": "public",
177
177
  "tag": "latest"
178
178
  },
179
- "scripts": {
180
- "build": "pnpm run build:types && pnpm exec esbuild src/vite/index.ts --bundle --format=esm --outfile=dist/vite/index.js --platform=node --packages=external && mkdir -p dist/vite/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/vite/plugins/cloudflare-protocol-loader-hook.mjs && pnpm exec esbuild src/testing/vitest.ts --bundle --format=esm --outfile=dist/testing/vitest.js --platform=node --packages=external && pnpm exec esbuild src/bin/rango.ts --bundle --format=esm --outfile=dist/bin/rango.js --platform=node --packages=external --banner:js='#!/usr/bin/env node' && chmod +x dist/bin/rango.js",
181
- "build:types": "rm -rf dist/types && pnpm exec tsc -p tsconfig.types.json",
182
- "prepublishOnly": "pnpm build",
183
- "typecheck": "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit && tsc -p tsconfig.augment-check.json --noEmit",
184
- "test": "playwright test",
185
- "test:ui": "playwright test --ui",
186
- "test:hmr-local": "playwright test --project=dev-warmup --project=hmr-basename --project=hmr-prerender --no-deps --workers=1 && RANGO_E2E_ROUTE_HMR_ONLY=1 playwright test --project=hmr-routes --no-deps --workers=1",
187
- "test:hmr-routes-local": "RANGO_E2E_ROUTE_HMR_ONLY=1 playwright test --project=hmr-routes --no-deps --workers=1",
188
- "test:unit": "pnpm run build:types && vitest run",
189
- "test:unit:watch": "vitest",
190
- "test:unit:rsc": "vitest run --config vitest.rsc.config.ts"
191
- },
192
179
  "dependencies": {
193
180
  "@types/debug": "^4.1.12",
194
- "@vitejs/plugin-rsc": "^0.5.30",
181
+ "@vitejs/plugin-rsc": "^0.5.31",
195
182
  "debug": "^4.4.1",
196
183
  "magic-string": "^0.30.17",
197
184
  "picomatch": "^4.0.4",
@@ -205,18 +192,18 @@
205
192
  "@opentelemetry/context-async-hooks": "^2.9.0",
206
193
  "@opentelemetry/sdk-trace-base": "^2.9.0",
207
194
  "@playwright/test": "^1.49.1",
208
- "@shared/e2e": "workspace:*",
209
195
  "@testing-library/dom": "^10.4.1",
210
196
  "@testing-library/react": "^16.3.2",
211
197
  "@types/node": "^24.10.1",
212
- "@types/react": "catalog:",
213
- "@types/react-dom": "catalog:",
198
+ "@types/react": "^19.2.7",
199
+ "@types/react-dom": "^19.2.3",
214
200
  "esbuild": "^0.28.1",
215
201
  "happy-dom": "^20.10.1",
216
202
  "jiti": "^2.7.0",
217
- "react": "catalog:",
218
- "react-dom": "catalog:",
219
- "vitest": "^4.1.9"
203
+ "react": "^19.2.8",
204
+ "react-dom": "^19.2.8",
205
+ "vitest": "^4.1.9",
206
+ "@shared/e2e": "0.0.1"
220
207
  },
221
208
  "peerDependencies": {
222
209
  "@cloudflare/vite-plugin": "^1.42.1",
@@ -224,9 +211,9 @@
224
211
  "@playwright/test": "^1.49.1",
225
212
  "@testing-library/react": ">=16",
226
213
  "@vercel/functions": "^3.0.0",
227
- "@vitejs/plugin-rsc": "^0.5.30",
228
- "react": ">=19.2.6 <20",
229
- "react-dom": ">=19.2.6 <20",
214
+ "@vitejs/plugin-rsc": "^0.5.31",
215
+ "react": ">=19.2.8 <20",
216
+ "react-dom": ">=19.2.8 <20",
230
217
  "vite": "^8.0.16",
231
218
  "vitest": ">=3"
232
219
  },
@@ -255,5 +242,18 @@
255
242
  },
256
243
  "engines": {
257
244
  "node": ">=24.0.0"
245
+ },
246
+ "scripts": {
247
+ "build": "pnpm run build:types && pnpm exec esbuild src/vite/index.ts --bundle --format=esm --outfile=dist/vite/index.js --platform=node --packages=external && mkdir -p dist/vite/plugins && cp src/vite/plugins/cloudflare-protocol-loader-hook.mjs dist/vite/plugins/cloudflare-protocol-loader-hook.mjs && pnpm exec esbuild src/testing/vitest.ts --bundle --format=esm --outfile=dist/testing/vitest.js --platform=node --packages=external && pnpm exec esbuild src/bin/rango.ts --bundle --format=esm --outfile=dist/bin/rango.js --platform=node --packages=external --banner:js='#!/usr/bin/env node' && chmod +x dist/bin/rango.js",
248
+ "build:types": "rm -rf dist/types && pnpm exec tsc -p tsconfig.types.json",
249
+ "typecheck": "tsc --noEmit && tsc -p tsconfig.strict-check.json --noEmit && tsc -p tsconfig.augment-check.json --noEmit",
250
+ "test": "playwright test",
251
+ "test:preload": "playwright test --config=playwright.preload.config.ts",
252
+ "test:ui": "playwright test --ui",
253
+ "test:hmr-local": "playwright test --project=dev-warmup --project=hmr-basename --project=hmr-prerender --no-deps --workers=1 && RANGO_E2E_ROUTE_HMR_ONLY=1 playwright test --project=hmr-routes --no-deps --workers=1",
254
+ "test:hmr-routes-local": "RANGO_E2E_ROUTE_HMR_ONLY=1 playwright test --project=hmr-routes --no-deps --workers=1",
255
+ "test:unit": "pnpm run build:types && vitest run",
256
+ "test:unit:watch": "vitest",
257
+ "test:unit:rsc": "vitest run --config vitest.rsc.config.ts"
258
258
  }
259
- }
259
+ }
@@ -118,15 +118,15 @@ typing work exactly as for server routes (`/typesafety`).
118
118
 
119
119
  ## Helpers: what exists inside clientUrls()
120
120
 
121
- | Helper | Notes |
122
- | -------------- | ------------------------------------------------------------------------------------- |
123
- | `path()` | Options are `name`, `search`, `trailingSlash` only (no `ppr`, no response variants) |
124
- | `layout()` | Must contain at least one `path()` |
125
- | `loader()` | `loader(Def, use?)` or `loader(Def, { stream: "navigation" }, use?)` — see below |
126
- | `loading()` | Route/layout-level pending UI; inline `<Suspense>` at read sites is usually better |
127
- | `revalidate()` | Valid **inside a loader() use callback only**; runs in the browser |
128
- | `transition()` | Data-only ViewTransition config — no `when` (that is a server-executed predicate) |
129
- | `intercept()` | Dot-local named target in the SAME definition; use may contain `loader()`/`loading()` |
121
+ | Helper | Notes |
122
+ | -------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------- |
123
+ | `path()` | Options are `name`, `search`, `trailingSlash`, `ppr` (shell caching — see /ppr skill; loader routes need `loading()` or capture refuses); no response variants |
124
+ | `layout()` | Must contain at least one `path()` |
125
+ | `loader()` | `loader(Def, use?)` or `loader(Def, { stream: "navigation" }, use?)` — see below |
126
+ | `loading()` | Route/layout-level pending UI; inline `<Suspense>` at read sites is usually better |
127
+ | `revalidate()` | Valid **inside a loader() use callback only**; runs in the browser |
128
+ | `transition()` | Data-only ViewTransition config — no `when` (that is a server-executed predicate) |
129
+ | `intercept()` | Dot-local named target in the SAME definition; use may contain `loader()`/`loading()` |
130
130
 
131
131
  `include`, `parallel`, `cache`, `middleware`, `errorBoundary`,
132
132
  `notFoundBoundary` **throw** — and that is a design position, not a gap.
@@ -130,9 +130,11 @@ export const router = createRouter<AppBindings>({
130
130
  ```
131
131
 
132
132
  PPR shells use Cache API as the per-colo L1 and KV as the durable cross-colo
133
- L2; a KV hit promotes the coupled shell envelope back into L1. KV remains
134
- required for this family. `CFCacheStore` without `kv` can still cache
135
- segment/response entries in Cache API, but its shell family is inert.
133
+ L2; a KV hit promotes the coupled shell envelope back into L1. KV is optional:
134
+ `CFCacheStore` without `kv` runs the shell family L1-only (edge-only ppr —
135
+ each colo captures and serves its own shell). Tag eviction then needs purge
136
+ mode (`tagPurge`); a tagged shell without either warns once and expires by
137
+ ttl+swr only.
136
138
 
137
139
  ## Commands
138
140
 
@@ -356,13 +356,17 @@ curl -s -D - -o /dev/null https://app.example.com/products/1 | grep -i x-rango-s
356
356
  key — no header + a declared `ppr` means look for that warning.
357
357
  - On Cloudflare, `CFCacheStore` reads PPR shells from the per-colo Cache API,
358
358
  falls through to KV on a miss, and promotes the KV hit back into that colo.
359
- WITHOUT a KV namespace its shell family remains inert: every ppr route stays
360
- `MISS` forever. The store warns once per isolate bind KV
361
- (`new CFCacheStore({ ctx, kv: env.CACHE_KV })`) or use another store. An
362
- inert store also stops captures at the gate: the store declares
363
- `shellFamilyInert` and the scheduler skips the background render entirely
364
- (`skip-inert-store` on the debug event) instead of burning a full capture per
365
- MISS whose write could only no-op.
359
+ WITHOUT a KV namespace the family runs L1-only (edge-only ppr): every colo
360
+ captures and serves its own shell from the Cache API. What changes KV-less
361
+ is tag eviction with `tagPurge` the purge-by-tag evicts shell L1 entries;
362
+ without it a TAGGED shell warns once that `updateTag()` cannot reach it
363
+ (ttl/swr-only freshness). Untagged edge-only ppr is warning-free. Tagged
364
+ BUILD-manifest shells decline on a KV-less store (`tagHistoryInert` the
365
+ immutable asset could never be evicted), and an over-limit tag set is
366
+ acknowledged `"uncacheable"` so the capture backs off instead of
367
+ re-rendering per MISS. A custom store can still declare `shellFamilyInert`
368
+ to stop captures at the gate (`skip-inert-store` on the debug event); the
369
+ built-in stores never do.
366
370
  - Structured capture diagnostics: `createRouter({ debugShellCapture: true })`
367
371
  logs one line per capture attempt/skip (outcome, durations, prelude and
368
372
  snapshot bytes, backoff state); pass a function to receive each
@@ -145,11 +145,12 @@ const warnedNoKvReadInvalidation = new Set<string>();
145
145
  const warnedTagInvalidationTtlFloor = new Set<string>();
146
146
 
147
147
  /**
148
- * Stores (by namespace) already warned about the shell family being inert
149
- * (getShell/putShell no-op without a KV namespace), so a ppr route hitting the
150
- * silent fail-open warns once per isolate instead of on every request.
148
+ * Stores (by namespace) already warned that a TAGGED shell was written on a
149
+ * KV-less store without tagPurge: no markers and no purge means updateTag()
150
+ * cannot reach the shell (freshness is ttl/swr only). Once per isolate, not
151
+ * per capture (CFCacheStore is constructed per request).
151
152
  */
152
- const warnedShellFamilyInert = new Set<string>();
153
+ const warnedShellTagsNoEviction = new Set<string>();
153
154
 
154
155
  /**
155
156
  * Stores (by namespace) already warned that tag invalidation is writing KV
@@ -412,8 +413,6 @@ interface KVResponseEnvelope {
412
413
 
413
414
  export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
414
415
  readonly supportsPassiveShellReads: true = true;
415
- /** True when constructed without KV: the shell family no-ops (see ctor). */
416
- readonly shellFamilyInert?: boolean;
417
416
  readonly defaults?: CacheDefaults;
418
417
  readonly keyGenerator?: (
419
418
  ctx: RequestContext<TEnv>,
@@ -429,6 +428,8 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
429
428
  private readonly kvReadTimeoutMs: number;
430
429
  private readonly debug?: (event: CFCacheReadDebugEvent) => void;
431
430
  private readonly kv?: KVNamespace;
431
+ /** True when constructed without KV: no durable tag history (see ctor). */
432
+ readonly tagHistoryInert?: boolean;
432
433
  private readonly onRevalidateTag?: (tags: string[]) => Promise<void>;
433
434
  private readonly tagPurge?: (cacheTags: string[]) => Promise<void>;
434
435
  private readonly tagInvalidationTtl?: number;
@@ -485,11 +486,13 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
485
486
  this.keyGenerator = options.keyGenerator;
486
487
  this.waitUntil = (fn) => options.ctx.waitUntil(fn());
487
488
  this.kv = options.kv;
488
- // The shell family requires KV (getShell/putShell no-op without it — see
489
- // warnShellFamilyInertOnce). Declaring it lets scheduleShellCapture skip
490
- // captures whose write could only no-op instead of burning a background
491
- // render per MISS that still occupies the serialized capture queue.
492
- this.shellFamilyInert = options.kv ? undefined : true;
489
+ // Without KV, isTagsInvalidatedSince has no durable history it answers
490
+ // from the per-request memo at best. Runtime shells tolerate that (purge
491
+ // eviction + ttl/swr bound the staleness), but an immutable TAGGED
492
+ // build-manifest shell must not serve on such a store: nothing could ever
493
+ // evict it (purge cannot delete a build asset), so the manifest gate
494
+ // declines on this flag (shell-build-manifest.ts).
495
+ this.tagHistoryInert = options.kv ? undefined : true;
493
496
  this.onRevalidateTag = options.onRevalidateTag;
494
497
  // tagPurge accepts a ready purge function or a credentials object; the
495
498
  // object form is normalized through the built-in zone purge client, which
@@ -506,9 +509,12 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
506
509
  // marker write throw and break ALL invalidation. Floor it (and warn once);
507
510
  // a non-finite/non-positive value falls back to the no-expiry default
508
511
  // (markers persist) rather than silently sailing a NaN into expirationTtl.
509
- this.tagInvalidationTtl = this.sanitizeTagInvalidationTtl(
510
- options.tagInvalidationTtl,
511
- );
512
+ // KV-less the option is dead config — no markers to expire, and the
513
+ // retention cap it used to imply is KV-conditional (putShell) — so it is
514
+ // dropped without the KV-floor validation/warning, which would misdirect.
515
+ this.tagInvalidationTtl = options.kv
516
+ ? this.sanitizeTagInvalidationTtl(options.tagInvalidationTtl)
517
+ : undefined;
512
518
  // tagCacheTtl gates the L1 marker cache via `> 0`. A non-finite value (NaN
513
519
  // from `Number(env.UNSET)`) is not null/undefined, so `?? 0` would let it
514
520
  // through and silently disable the cache while reading as "configured".
@@ -1876,40 +1882,75 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
1876
1882
  }
1877
1883
 
1878
1884
  // ============================================================================
1879
- // Shell Cache Methods (PPR shell resume) — Cache API L1 + KV L2
1885
+ // Shell Cache Methods (PPR shell resume) — Cache API L1 + optional KV L2
1880
1886
  // ============================================================================
1881
1887
  //
1882
- // KV remains the durable, cross-colo shell tier. Cache API is a per-colo
1883
- // read-through accelerator: writes populate both tiers, and a valid KV hit
1884
- // promotes the same coupled envelope into L1. The family still requires KV;
1885
- // without it, getShell/putShell no-op and PPR fails open to a full HTML render.
1888
+ // With KV it is the durable, cross-colo shell tier: writes populate both
1889
+ // tiers, a valid KV hit promotes the same coupled envelope into L1, and
1890
+ // shell L1 hits deliberately keep the KV generation-marker check even in
1891
+ // purge mode. A shell's taggedAt is its CAPTURE START, not its write time:
1892
+ // an invalidation can purge while an older capture is still running, then
1893
+ // that capture can land after the purge. The marker check rejects that
1894
+ // resurrection.
1886
1895
  //
1887
- // Shell L1 hits deliberately keep the KV generation-marker check even in
1888
- // purge mode. A shell's taggedAt is its CAPTURE START, not its write time: an
1889
- // invalidation can purge while an older capture is still running, then that
1890
- // capture can land after the purge. The marker check rejects that resurrection.
1896
+ // Without KV the family is L1-only (edge-only ppr): every colo captures and
1897
+ // serves its own shell from the Cache API. Tag eviction then needs purge
1898
+ // mode (tagPurge) shell L1 entries carry the same namespaced Cache-Tag
1899
+ // tokens as the data families, read-your-own-writes comes from the
1900
+ // per-request marker memo, and the capture resurrection race narrows to
1901
+ // cross-request timing bounded by ttl+swr (the data families' documented
1902
+ // purge-mode stance). KV-less WITHOUT tagPurge still caches: freshness is
1903
+ // ttl/swr only, and a tagged write warns once that invalidation cannot
1904
+ // reach it (see warnShellTagsNoEvictionOnce).
1891
1905
 
1892
1906
  /**
1893
- * Warn once per isolate that the shell family is inert: getShell/putShell
1894
- * are ONLY called for routes that declared the `ppr` path option, so firing
1895
- * here (not in the constructor) scopes the warning to apps that actually
1896
- * use PPR a KV-less CFCacheStore is a perfectly fine config otherwise.
1897
- * Without it, the correctness-first fail-open (issue #651) is invisible:
1898
- * every ppr route is a permanent MISS with zero diagnostics.
1907
+ * Warn once per isolate that a TAGGED shell landed on a store with no
1908
+ * eviction path for it: no KV (markers) and no tagPurge (purge-by-tag).
1909
+ * The shell still caches and expires by ttl+swr, but updateTag()/
1910
+ * revalidateTag() cannot reach it silent staleness a consumer who tagged
1911
+ * the route clearly did not intend. Fired from putShell (not the
1912
+ * constructor) so an untagged edge-only ppr config stays warning-free.
1899
1913
  * @internal
1900
1914
  */
1901
- private warnShellFamilyInertOnce(): void {
1915
+ private warnShellTagsNoEvictionOnce(): void {
1902
1916
  this.warnOncePerNamespace(
1903
- warnedShellFamilyInert,
1904
- `[CFCacheStore] a ppr route resolved to this store, but no KV namespace ` +
1905
- `is configured, so the shell family (getShell/putShell) is a no-op: ` +
1906
- `every ppr route stays a permanent shell MISS (the page still serves ` +
1907
- `via a full render). Bind a KV namespace and pass it ` +
1908
- `new CFCacheStore({ ctx, kv: env.CACHE_KV }) or use a shell-capable ` +
1909
- `store via createRouter({ cache }).`,
1917
+ warnedShellTagsNoEviction,
1918
+ `[CFCacheStore] a ppr shell with tags was stored on a KV-less store ` +
1919
+ `without tagPurge: tag invalidation cannot evict it (no KV markers, ` +
1920
+ `no purge-by-tag), so updateTag()/revalidateTag() will not reach ` +
1921
+ `this shell it serves until ttl+swr expiry. Configure { kv } for ` +
1922
+ `marker invalidation or { tagPurge } for purge-by-tag eviction; ` +
1923
+ `untagged ppr routes (ttl/swr freshness) are unaffected.`,
1910
1924
  );
1911
1925
  }
1912
1926
 
1927
+ /**
1928
+ * Generation gate for shell writes and the capture scheduler
1929
+ * (isTagsInvalidatedSince). With KV it is the durable marker cascade.
1930
+ * Without KV there are no markers: in purge mode the per-request memo is
1931
+ * the only signal — a capture racing THIS request's updateTag() is still
1932
+ * rejected (read-your-own-writes), while cross-request races are bounded
1933
+ * by ttl+swr exactly like the data families' purge-mode writes. Without
1934
+ * either, fail open (ttl/swr-only semantics, warned at putShell).
1935
+ * @internal
1936
+ */
1937
+ private async isShellGenerationInvalidated(
1938
+ tags: string[] | undefined,
1939
+ since: number | undefined,
1940
+ ): Promise<boolean> {
1941
+ if (this.kv) return this.isGloballyInvalidated(tags, since);
1942
+ if (!this.tagPurge || !Array.isArray(tags) || tags.length === 0 || !since)
1943
+ return false;
1944
+ const ctx = _getRequestContext();
1945
+ if (!ctx) return false;
1946
+ const memo = getTagMarkerMemo(ctx, this);
1947
+ for (const tag of tags) {
1948
+ const marker = memo.get(tag);
1949
+ if (marker != null && marker >= since) return true;
1950
+ }
1951
+ return false;
1952
+ }
1953
+
1913
1954
  /**
1914
1955
  * Get a cached PPR shell entry from Cache API, falling through to KV and
1915
1956
  * promoting a valid KV hit. Both tiers store one envelope so the prelude,
@@ -1920,10 +1961,6 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
1920
1961
  async getShell(
1921
1962
  key: string,
1922
1963
  ): Promise<{ entry: ShellCacheEntry; shouldRevalidate?: boolean } | null> {
1923
- if (!this.kv) {
1924
- this.warnShellFamilyInertOnce();
1925
- return null;
1926
- }
1927
1964
  try {
1928
1965
  const cache = await this.getCache();
1929
1966
  const request = this.keyToRequest(`shell:${key}`);
@@ -2005,10 +2042,17 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
2005
2042
  return this.kvGetShell(key);
2006
2043
  }
2007
2044
 
2008
- // Unlike other L1 families, shells always check the durable generation
2009
- // marker. See the capture-start/purge race documented above.
2045
+ // Unlike other L1 families, shells with KV always check the durable
2046
+ // generation marker see the capture-start/purge race documented
2047
+ // above. Without KV there are no markers: L1-only shells adopt the
2048
+ // data families' purge-mode read semantics (a hit that survived the
2049
+ // purge is trusted; the per-request memo masks this request's own
2050
+ // updateTag() writes; entries a purge cannot reach fall back to the
2051
+ // marker check, which fails open KV-less).
2010
2052
  const markerStartedAt = INTERNAL_RANGO_DEBUG ? Date.now() : 0;
2011
- const invalidated = await this.isGloballyInvalidated(value.t, value.ta);
2053
+ const invalidated = this.kv
2054
+ ? await this.isGloballyInvalidated(value.t, value.ta)
2055
+ : await this.isL1Invalidated(value.t, value.ta, response.headers);
2012
2056
  const markerMs = INTERNAL_RANGO_DEBUG
2013
2057
  ? Date.now() - markerStartedAt
2014
2058
  : undefined;
@@ -2042,11 +2086,12 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
2042
2086
  }
2043
2087
 
2044
2088
  /**
2045
- * Store a PPR shell envelope in Cache API and, when its retention meets KV's
2046
- * 60-second floor, KV. The shared write is registered with waitUntil and
2047
- * awaited so invalidation rejection can be acknowledged to the capture
2048
- * scheduler. Short-lived shells remain useful in L1 even though KV rejects
2049
- * them.
2089
+ * Store a PPR shell envelope in Cache API and, when KV is configured and
2090
+ * the retention meets its 60-second floor, KV. The shared write is
2091
+ * registered with waitUntil and awaited so invalidation rejection can be
2092
+ * acknowledged to the capture scheduler. Short-lived shells remain useful
2093
+ * in L1 even though KV rejects them; a KV-less store is L1-only by design
2094
+ * (edge-only ppr — see the section comment).
2050
2095
  */
2051
2096
  async putShell(
2052
2097
  key: string,
@@ -2054,20 +2099,29 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
2054
2099
  ttlSeconds?: number,
2055
2100
  swrSeconds?: number,
2056
2101
  tags?: string[],
2057
- ): Promise<"stored" | "invalidated" | void> {
2058
- // KV remains required for durable generation markers and cross-colo reads.
2059
- if (!this.kv) {
2060
- this.warnShellFamilyInertOnce();
2061
- return;
2062
- }
2102
+ ): Promise<"stored" | "invalidated" | "uncacheable" | void> {
2063
2103
  if (!this.waitUntil) return;
2104
+ // Same write gate as the data families: in KV-less purge mode an
2105
+ // over-limit tag set has NO eviction path (no tokens, no markers), so the
2106
+ // shell is not cached rather than becoming un-invalidatable. Unlike the
2107
+ // void-returning data puts, this is ACKNOWLEDGED — the capture scheduler
2108
+ // must back the key off (every write would refuse identically), not
2109
+ // treat the capture as stored and re-render on every MISS.
2110
+ if (this.skipUncacheableTagSet(tags)) return "uncacheable";
2111
+ if (!this.kv && !this.tagPurge && Array.isArray(tags) && tags.length > 0) {
2112
+ this.warnShellTagsNoEvictionOnce();
2113
+ }
2064
2114
  try {
2065
2115
  const ttl = resolveTtl(ttlSeconds, this.defaults, DEFAULT_FUNCTION_TTL);
2066
2116
  const swrWindow = resolveSwrWindow(swrSeconds, this.defaults);
2067
2117
  const totalTtl = ttl + swrWindow;
2068
2118
 
2119
+ // The tagInvalidationTtl cap exists so a tagged entry can never outlive
2120
+ // its KV markers (an expired marker would resurrect it). Without KV
2121
+ // there are no markers to outlive — capping would just hard-expire the
2122
+ // shell below its declared ttl+swr — so the cap is KV-conditional.
2069
2123
  const retentionTtl =
2070
- tags && tags.length > 0 && this.tagInvalidationTtl
2124
+ tags && tags.length > 0 && this.kv && this.tagInvalidationTtl
2071
2125
  ? Math.min(totalTtl, this.tagInvalidationTtl)
2072
2126
  : totalTtl;
2073
2127
  const now = Date.now();
@@ -2076,14 +2130,14 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
2076
2130
  const taggedAt =
2077
2131
  Array.isArray(tags) && tags.length > 0 ? entry.createdAt : undefined;
2078
2132
 
2079
- const kvKey = await this.toKVKey(`shell:${key}`);
2080
- const writeKv = retentionTtl >= KV_MIN_EXPIRATION_TTL;
2133
+ const writeKv = !!this.kv && retentionTtl >= KV_MIN_EXPIRATION_TTL;
2134
+ const kvKey = writeKv ? await this.toKVKey(`shell:${key}`) : null;
2081
2135
 
2082
2136
  const write = (async (): Promise<"stored" | "invalidated" | void> => {
2083
2137
  if (
2084
2138
  tags &&
2085
2139
  tags.length > 0 &&
2086
- (await this.isGloballyInvalidated(tags, entry.createdAt))
2140
+ (await this.isShellGenerationInvalidated(tags, entry.createdAt))
2087
2141
  ) {
2088
2142
  this.debugShell(key, "write-invalidated");
2089
2143
  return "invalidated";
@@ -2132,7 +2186,7 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
2132
2186
  }
2133
2187
  })(),
2134
2188
  ];
2135
- if (writeKv) {
2189
+ if (writeKv && kvKey !== null) {
2136
2190
  writes.push(
2137
2191
  (async () => {
2138
2192
  try {
@@ -3029,13 +3083,15 @@ export class CFCacheStore<TEnv = unknown> implements SegmentCacheStore<TEnv> {
3029
3083
  * Shell tag-generation gate (SegmentCacheStore.isTagsInvalidatedSince): the
3030
3084
  * SAME KV markers used by runtime envelopes also evict immutable build shells
3031
3085
  * and captures whose write races updateTag(). Thin public wrapper over the
3032
- * private envelope check (marker >= since, fail open).
3086
+ * shell generation check (marker >= since, fail open); KV-less it degrades
3087
+ * to the per-request memo in purge mode and to false otherwise — see
3088
+ * isShellGenerationInvalidated.
3033
3089
  */
3034
3090
  async isTagsInvalidatedSince(
3035
3091
  tags: string[],
3036
3092
  sinceMs: number,
3037
3093
  ): Promise<boolean> {
3038
- return this.isGloballyInvalidated(tags, sinceMs);
3094
+ return this.isShellGenerationInvalidated(tags, sinceMs);
3039
3095
  }
3040
3096
 
3041
3097
  async invalidateTags(tags: string[]): Promise<void> {
@@ -250,7 +250,7 @@ export class RecordingShellStore<
250
250
  ttlSeconds?: number,
251
251
  swrSeconds?: number,
252
252
  tags?: string[],
253
- ): Promise<"stored" | "invalidated" | void> {
253
+ ): Promise<"stored" | "invalidated" | "uncacheable" | void> {
254
254
  return this.inner.putShell?.(key, entry, ttlSeconds, swrSeconds, tags);
255
255
  }
256
256
 
@@ -506,7 +506,7 @@ export class SeededShellStore<
506
506
  ttlSeconds?: number,
507
507
  swrSeconds?: number,
508
508
  tags?: string[],
509
- ): Promise<"stored" | "invalidated" | void> {
509
+ ): Promise<"stored" | "invalidated" | "uncacheable" | void> {
510
510
  return this.inner.putShell?.(key, entry, ttlSeconds, swrSeconds, tags);
511
511
  }
512
512
 
@@ -188,7 +188,12 @@ export interface SegmentCacheStore<TEnv = unknown> {
188
188
  * @param tags - Optional cache tags for invalidation (participates in
189
189
  * invalidateTags via the same tag machinery as the item family)
190
190
  * @returns `invalidated` when a generation marker rejected the write,
191
- * `stored` when acknowledged, or void for stores without acknowledgements.
191
+ * `stored` when acknowledged, `uncacheable` when the entry can NEVER be
192
+ * stored under the current configuration (every retry would refuse
193
+ * identically — the capture scheduler backs the key off instead of
194
+ * recapturing per MISS; CFCacheStore returns it for a tag set whose
195
+ * Cache-Tag header overflows in KV-less purge mode), or void for stores
196
+ * without acknowledgements.
192
197
  */
193
198
  putShell?(
194
199
  key: string,
@@ -196,18 +201,33 @@ export interface SegmentCacheStore<TEnv = unknown> {
196
201
  ttlSeconds?: number,
197
202
  swrSeconds?: number,
198
203
  tags?: string[],
199
- ): Promise<"stored" | "invalidated" | void>;
204
+ ): Promise<"stored" | "invalidated" | "uncacheable" | void>;
200
205
 
201
206
  /**
202
207
  * Declares the shell family present-but-inert: getShell/putShell exist but
203
- * no-op (CFCacheStore without a KV namespace). scheduleShellCapture skips
204
- * captures whose only write target is inert — the background render would be
205
- * dead work that still occupies the per-isolate serialized capture queue
206
- * (a promise-heavy route bakes for seconds per MISS with nothing stored).
207
- * Absent/false means the family, when present, actually stores.
208
+ * no-op (a custom store whose backing tier is conditionally unavailable).
209
+ * scheduleShellCapture skips captures whose only write target is inert —
210
+ * the background render would be dead work that still occupies the
211
+ * per-isolate serialized capture queue (a promise-heavy route bakes for
212
+ * seconds per MISS with nothing stored). Absent/false means the family,
213
+ * when present, actually stores. The built-in stores never declare it:
214
+ * CFCacheStore is L1-only without KV (edge-only ppr), not inert.
208
215
  */
209
216
  shellFamilyInert?: boolean;
210
217
 
218
+ /**
219
+ * Declares isTagsInvalidatedSince present-but-inert: the store implements
220
+ * the method but has no DURABLE invalidation history behind it (a KV-less
221
+ * CFCacheStore answers from the per-request memo at best). Runtime shells
222
+ * tolerate that — purge eviction plus ttl/swr bound their staleness — but
223
+ * a TAGGED build-manifest shell is immutable with no ttl of its own, so
224
+ * serving it on such a store would make updateTag() a permanent no-op for
225
+ * it. The build-shell read-through declines tagged entries on this flag
226
+ * (same declared-intent-cannot-be-honored doctrine as a store missing the
227
+ * method entirely). Absent/false means answers are durably backed.
228
+ */
229
+ tagHistoryInert?: boolean;
230
+
211
231
  /**
212
232
  * Get a cached function result by key.
213
233
  * Returns the serialized value, optional handle data, and staleness flag.
@@ -31,6 +31,56 @@ const TRANSITION_CONFIG_KEYS = new Set<PropertyKey>([
31
31
  "viewTransition",
32
32
  ]);
33
33
 
34
+ const PPR_NUMBER_KEYS = new Set<PropertyKey>([
35
+ "ttl",
36
+ "swr",
37
+ "captureTimeout",
38
+ "maxSnapshotBytes",
39
+ ]);
40
+
41
+ /**
42
+ * DSL-time shape check for the projected `ppr` path option. Mirrors
43
+ * PartialPrerenderProps but validates by hand: the value must survive the
44
+ * JSON projection to the server, so only `true` or a plain object of finite
45
+ * numbers plus a string[] `tags` is legal. The projection serializer
46
+ * (server-projection.ts) re-validates independently — this copy exists so a
47
+ * bad value fails in the authoring module with a DSL-shaped message.
48
+ */
49
+ function validateClientPpr(value: unknown): void {
50
+ if (value === true) return;
51
+ if (typeof value !== "object" || value === null || Array.isArray(value)) {
52
+ throw new Error(
53
+ "clientUrls() path() ppr must be true or a PartialPrerenderProps object",
54
+ );
55
+ }
56
+ for (const key of Reflect.ownKeys(value)) {
57
+ if (PPR_NUMBER_KEYS.has(key)) {
58
+ const n = (value as Record<PropertyKey, unknown>)[key];
59
+ if (typeof n !== "number" || !Number.isFinite(n)) {
60
+ throw new Error(
61
+ `clientUrls() path() ppr.${String(key)} must be a finite number`,
62
+ );
63
+ }
64
+ continue;
65
+ }
66
+ if (key === "tags") {
67
+ const tags = (value as { tags: unknown }).tags;
68
+ if (
69
+ !Array.isArray(tags) ||
70
+ tags.some((tag) => typeof tag !== "string" || tag === "")
71
+ ) {
72
+ throw new Error(
73
+ "clientUrls() path() ppr.tags must be an array of non-empty strings",
74
+ );
75
+ }
76
+ continue;
77
+ }
78
+ throw new Error(
79
+ `clientUrls() path() ppr received unsupported key ${JSON.stringify(String(key))}`,
80
+ );
81
+ }
82
+ }
83
+
34
84
  const UNSUPPORTED_HELPERS = new Set([
35
85
  "include",
36
86
  "parallel",
@@ -173,6 +223,31 @@ function assertNamedComponent(
173
223
  component: unknown,
174
224
  helper: "path" | "layout" | "intercept",
175
225
  ): asserts component is ComponentType {
226
+ // Build-time handler wrappers get a TARGETED rejection ahead of the generic
227
+ // shape check: their handler code cannot live in a "use client" bundle and
228
+ // their render runs at build, so accepting one could only fail later and
229
+ // further from the mistake. Brand strings checked directly — importing
230
+ // static-handler.ts/prerender.ts here would pull server modules into the
231
+ // client graph for an error message.
232
+ const brand =
233
+ component !== null &&
234
+ (typeof component === "object" || typeof component === "function")
235
+ ? (component as { __brand?: unknown }).__brand
236
+ : undefined;
237
+ if (
238
+ brand === "staticHandler" ||
239
+ brand === "prerenderHandler" ||
240
+ brand === "prerenderPassthrough"
241
+ ) {
242
+ const wrapper = brand === "staticHandler" ? "Static()" : "Prerender()";
243
+ throw new Error(
244
+ `clientUrls() ${helper}() received a ${wrapper} handler. Build-time ` +
245
+ "handlers are server-DSL surface and cannot mount inside a client " +
246
+ "group — routes in a group render client components. For shell " +
247
+ "caching of a group route use the `ppr` path option; build-time " +
248
+ "prerendering belongs to the server tree around the include.",
249
+ );
250
+ }
176
251
  if (typeof component !== "function" || component.name.trim() === "") {
177
252
  throw new Error(
178
253
  `clientUrls() ${helper}() expects a named client component value`,
@@ -249,6 +324,9 @@ function createHelpers(): ClientUrlHelpers {
249
324
  'clientUrls() path() trailingSlash must be "always", "never", or "ignore"',
250
325
  );
251
326
  }
327
+ if (options?.ppr !== undefined) {
328
+ validateClientPpr(options.ppr);
329
+ }
252
330
 
253
331
  const items = use ? runUse(use, "path use") : [];
254
332
  rejectItems(items, new Set(["loader", "loading", "transition"]), "path");