waku 1.0.0-beta.3 → 1.0.0-beta.4

package/README.md

@@ -17,7 +17,7 @@ visit [waku.gg](https://waku.gg) or `npm create waku@latest`
 
 ## Getting started
 
-Start a new Waku project with the `create` command for your preferred package manager. It will scaffold a new project with our default [Waku starter](https://github.com/wakujs/waku/tree/main/examples/01_template).
+Start a new Waku project with the `create` command for your preferred package manager. It will scaffold a new project with our default [Waku starter](https://github.com/wakujs/waku-examples/tree/main/fs-router/basic).
 
 ```sh
 npm create waku@latest
@@ -804,11 +804,11 @@ export const Component = () => {
 
 The `router` object also contains several methods for programmatic navigation:
 
-- `router.push(to: string)` - navigate to the provided route
+- `router.push(to)` - navigate to the provided route. `to` is a route string, or a structured `{ to, params, search, hash }` target for typed navigation to dynamic routes (see [Typed Routes](https://github.com/wakujs/waku/blob/main/docs/guides/typed-routes.mdx))
 
 - `router.prefetch(to: string)` - prefetch the provided route
 
-- `router.replace(to: string)` - replace the current history entry
+- `router.replace(to)` - replace the current history entry (same argument as `push`)
 
 - `router.reload()` - reload the current route
 

package/dist/lib/utils/prefetch-cache.d.ts

@@ -5,16 +5,11 @@ export declare const PREFETCH_LIMIT = 100;
 export type PrefetchEntry = {
     rscPath: string;
     rscParams: unknown;
-    getElements: (store: never) => unknown;
+    elements: unknown;
     expireAt: number;
 };
-/**
- * Decode and cache a prefetch. `getStore` returns the entry's currently bound
- * store: the prefetch's now, the navigation's after `consumePrefetchEntry`.
- */
-export declare const addPrefetchEntry: <Store, Elements>(rscPath: string, rscParams: unknown, store: Store, decode: (getStore: () => Store) => Elements) => void;
+/** Decode and cache a prefetch so a later navigation can reuse the tree. */
+export declare const addPrefetchEntry: <Elements>(rscPath: string, rscParams: unknown, elements: Elements) => void;
 export declare const hasPrefetchEntry: (rscPath: string, rscParams: unknown) => boolean;
-/**
- * Consume a fresh prefetch, rebinding its decoded tree to the consumer's store.
- */
-export declare const consumePrefetchEntry: <Store, Elements>(rscPath: string, rscParams: unknown, store: Store) => Elements | undefined;
+/** Consume a fresh prefetch, returning its eagerly decoded tree. */
+export declare const consumePrefetchEntry: <Elements>(rscPath: string, rscParams: unknown) => Elements | undefined;

package/dist/lib/utils/prefetch-cache.js

@@ -1,30 +1,20 @@
 // Client-side cache of prefetched navigations: a prefetch decodes the route
-// eagerly so a later navigation reuses it without re-fetching. Each entry keeps
-// a mutable store so the decoded tree's server actions bind to the consuming
-// navigation's store, not the prefetch's. Bounded by a ttl and a max size.
+// eagerly so a later navigation reuses the decoded tree without re-fetching.
+// Bounded by a ttl and a max size.
 /** How long (ms) a prefetched entry stays usable before it is discarded. */ export const PREFETCH_TTL = 1000 * 60;
 /** Maximum number of prefetched entries kept at once. */ export const PREFETCH_LIMIT = 100;
 const getCache = ()=>globalThis.__WAKU_PREFETCHED__ ||= [];
 const findFreshIndex = (cache, rscPath, rscParams, now)=>cache.findIndex((entry)=>entry.expireAt > now && entry.rscPath === rscPath && // rscParams is intentionally compared by reference.
         entry.rscParams === rscParams);
-/**
- * Decode and cache a prefetch. `getStore` returns the entry's currently bound
- * store: the prefetch's now, the navigation's after `consumePrefetchEntry`.
- */ export const addPrefetchEntry = (rscPath, rscParams, store, decode)=>{
+/** Decode and cache a prefetch so a later navigation can reuse the tree. */ export const addPrefetchEntry = (rscPath, rscParams, elements)=>{
     const cache = getCache();
     const now = Date.now();
-    let currentStore = store;
-    const elements = decode(()=>currentStore);
     // Mark as handled so a prefetch that is never consumed stays quiet.
     Promise.resolve(elements).catch(()=>{});
-    const getElements = (nextStore)=>{
-        currentStore = nextStore;
-        return elements;
-    };
     cache.push({
         rscPath,
         rscParams,
-        getElements,
+        elements,
         expireAt: now + PREFETCH_TTL
     });
     while(cache.length > 0 && (cache.length > PREFETCH_LIMIT || cache[0].expireAt <= now)){
@@ -35,16 +25,13 @@ export const hasPrefetchEntry = (rscPath, rscParams)=>{
     const cache = getCache();
     return findFreshIndex(cache, rscPath, rscParams, Date.now()) >= 0;
 };
-/**
- * Consume a fresh prefetch, rebinding its decoded tree to the consumer's store.
- */ export const consumePrefetchEntry = (rscPath, rscParams, store)=>{
+/** Consume a fresh prefetch, returning its eagerly decoded tree. */ export const consumePrefetchEntry = (rscPath, rscParams)=>{
     const cache = getCache();
     const index = findFreshIndex(cache, rscPath, rscParams, Date.now());
     if (index < 0) {
         return undefined;
     }
-    const { getElements } = cache.splice(index, 1)[0];
-    return getElements(store);
+    return cache.splice(index, 1)[0].elements;
 };
 
 //# sourceMappingURL=prefetch-cache.js.map

package/dist/lib/utils/prefetch-cache.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/prefetch-cache.ts"],"sourcesContent":["// Client-side cache of prefetched navigations: a prefetch decodes the route\n// eagerly so a later navigation reuses it without re-fetching. Each entry keeps\n// a mutable store so the decoded tree's server actions bind to the consuming\n// navigation's store, not the prefetch's. Bounded by a ttl and a max size.\n\n/** How long (ms) a prefetched entry stays usable before it is discarded. */\nexport const PREFETCH_TTL = 1000 * 60;\n\n/** Maximum number of prefetched entries kept at once. */\nexport const PREFETCH_LIMIT = 100;\n\n// This is exported only for global-types.ts. It is not a public API.\nexport type PrefetchEntry = {\n  rscPath: string;\n  rscParams: unknown;\n  getElements: (store: never) => unknown;\n  expireAt: number;\n};\n\nconst getCache = (): PrefetchEntry[] => (globalThis.__WAKU_PREFETCHED__ ||= []);\n\nconst findFreshIndex = (\n  cache: PrefetchEntry[],\n  rscPath: string,\n  rscParams: unknown,\n  now: number,\n) =>\n  cache.findIndex(\n    (entry) =>\n      entry.expireAt > now &&\n      entry.rscPath === rscPath &&\n      // rscParams is intentionally compared by reference.\n      entry.rscParams === rscParams,\n  );\n\n/**\n * Decode and cache a prefetch. `getStore` returns the entry's currently bound\n * store: the prefetch's now, the navigation's after `consumePrefetchEntry`.\n */\nexport const addPrefetchEntry = <Store, Elements>(\n  rscPath: string,\n  rscParams: unknown,\n  store: Store,\n  decode: (getStore: () => Store) => Elements,\n): void => {\n  const cache = getCache();\n  const now = Date.now();\n  let currentStore = store;\n  const elements = decode(() => currentStore);\n  // Mark as handled so a prefetch that is never consumed stays quiet.\n  Promise.resolve(elements).catch(() => {});\n  const getElements = (nextStore: Store): Elements => {\n    currentStore = nextStore;\n    return elements;\n  };\n  cache.push({ rscPath, rscParams, getElements, expireAt: now + PREFETCH_TTL });\n  while (\n    cache.length > 0 &&\n    (cache.length > PREFETCH_LIMIT || cache[0]!.expireAt <= now)\n  ) {\n    cache.shift();\n  }\n};\n\nexport const hasPrefetchEntry = (\n  rscPath: string,\n  rscParams: unknown,\n): boolean => {\n  const cache = getCache();\n  return findFreshIndex(cache, rscPath, rscParams, Date.now()) >= 0;\n};\n\n/**\n * Consume a fresh prefetch, rebinding its decoded tree to the consumer's store.\n */\nexport const consumePrefetchEntry = <Store, Elements>(\n  rscPath: string,\n  rscParams: unknown,\n  store: Store,\n): Elements | undefined => {\n  const cache = getCache();\n  const index = findFreshIndex(cache, rscPath, rscParams, Date.now());\n  if (index < 0) {\n    return undefined;\n  }\n  const { getElements } = cache.splice(index, 1)[0]!;\n  return (getElements as (s: Store) => Elements)(store);\n};\n"],"names":["PREFETCH_TTL","PREFETCH_LIMIT","getCache","globalThis","__WAKU_PREFETCHED__","findFreshIndex","cache","rscPath","rscParams","now","findIndex","entry","expireAt","addPrefetchEntry","store","decode","Date","currentStore","elements","Promise","resolve","catch","getElements","nextStore","push","length","shift","hasPrefetchEntry","consumePrefetchEntry","index","undefined","splice"],"mappings":"AAAA,4EAA4E;AAC5E,gFAAgF;AAChF,6EAA6E;AAC7E,2EAA2E;AAE3E,0EAA0E,GAC1E,OAAO,MAAMA,eAAe,OAAO,GAAG;AAEtC,uDAAuD,GACvD,OAAO,MAAMC,iBAAiB,IAAI;AAUlC,MAAMC,WAAW,IAAwBC,WAAWC,mBAAmB,KAAK,EAAE;AAE9E,MAAMC,iBAAiB,CACrBC,OACAC,SACAC,WACAC,MAEAH,MAAMI,SAAS,CACb,CAACC,QACCA,MAAMC,QAAQ,GAAGH,OACjBE,MAAMJ,OAAO,KAAKA,WAClB,oDAAoD;QACpDI,MAAMH,SAAS,KAAKA;AAG1B;;;CAGC,GACD,OAAO,MAAMK,mBAAmB,CAC9BN,SACAC,WACAM,OACAC;IAEA,MAAMT,QAAQJ;IACd,MAAMO,MAAMO,KAAKP,GAAG;IACpB,IAAIQ,eAAeH;IACnB,MAAMI,WAAWH,OAAO,IAAME;IAC9B,oEAAoE;IACpEE,QAAQC,OAAO,CAACF,UAAUG,KAAK,CAAC,KAAO;IACvC,MAAMC,cAAc,CAACC;QACnBN,eAAeM;QACf,OAAOL;IACT;IACAZ,MAAMkB,IAAI,CAAC;QAAEjB;QAASC;QAAWc;QAAaV,UAAUH,MAAMT;IAAa;IAC3E,MACEM,MAAMmB,MAAM,GAAG,KACdnB,CAAAA,MAAMmB,MAAM,GAAGxB,kBAAkBK,KAAK,CAAC,EAAE,CAAEM,QAAQ,IAAIH,GAAE,EAC1D;QACAH,MAAMoB,KAAK;IACb;AACF,EAAE;AAEF,OAAO,MAAMC,mBAAmB,CAC9BpB,SACAC;IAEA,MAAMF,QAAQJ;IACd,OAAOG,eAAeC,OAAOC,SAASC,WAAWQ,KAAKP,GAAG,OAAO;AAClE,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMmB,uBAAuB,CAClCrB,SACAC,WACAM;IAEA,MAAMR,QAAQJ;IACd,MAAM2B,QAAQxB,eAAeC,OAAOC,SAASC,WAAWQ,KAAKP,GAAG;IAChE,IAAIoB,QAAQ,GAAG;QACb,OAAOC;IACT;IACA,MAAM,EAAER,WAAW,EAAE,GAAGhB,MAAMyB,MAAM,CAACF,OAAO,EAAE,CAAC,EAAE;IACjD,OAAO,AAACP,YAAuCR;AACjD,EAAE"}
+{"version":3,"sources":["../../../src/lib/utils/prefetch-cache.ts"],"sourcesContent":["// Client-side cache of prefetched navigations: a prefetch decodes the route\n// eagerly so a later navigation reuses the decoded tree without re-fetching.\n// Bounded by a ttl and a max size.\n\n/** How long (ms) a prefetched entry stays usable before it is discarded. */\nexport const PREFETCH_TTL = 1000 * 60;\n\n/** Maximum number of prefetched entries kept at once. */\nexport const PREFETCH_LIMIT = 100;\n\n// This is exported only for global-types.ts. It is not a public API.\nexport type PrefetchEntry = {\n  rscPath: string;\n  rscParams: unknown;\n  elements: unknown;\n  expireAt: number;\n};\n\nconst getCache = (): PrefetchEntry[] => (globalThis.__WAKU_PREFETCHED__ ||= []);\n\nconst findFreshIndex = (\n  cache: PrefetchEntry[],\n  rscPath: string,\n  rscParams: unknown,\n  now: number,\n) =>\n  cache.findIndex(\n    (entry) =>\n      entry.expireAt > now &&\n      entry.rscPath === rscPath &&\n      // rscParams is intentionally compared by reference.\n      entry.rscParams === rscParams,\n  );\n\n/** Decode and cache a prefetch so a later navigation can reuse the tree. */\nexport const addPrefetchEntry = <Elements>(\n  rscPath: string,\n  rscParams: unknown,\n  elements: Elements,\n): void => {\n  const cache = getCache();\n  const now = Date.now();\n  // Mark as handled so a prefetch that is never consumed stays quiet.\n  Promise.resolve(elements).catch(() => {});\n  cache.push({ rscPath, rscParams, elements, expireAt: now + PREFETCH_TTL });\n  while (\n    cache.length > 0 &&\n    (cache.length > PREFETCH_LIMIT || cache[0]!.expireAt <= now)\n  ) {\n    cache.shift();\n  }\n};\n\nexport const hasPrefetchEntry = (\n  rscPath: string,\n  rscParams: unknown,\n): boolean => {\n  const cache = getCache();\n  return findFreshIndex(cache, rscPath, rscParams, Date.now()) >= 0;\n};\n\n/** Consume a fresh prefetch, returning its eagerly decoded tree. */\nexport const consumePrefetchEntry = <Elements>(\n  rscPath: string,\n  rscParams: unknown,\n): Elements | undefined => {\n  const cache = getCache();\n  const index = findFreshIndex(cache, rscPath, rscParams, Date.now());\n  if (index < 0) {\n    return undefined;\n  }\n  return cache.splice(index, 1)[0]!.elements as Elements;\n};\n"],"names":["PREFETCH_TTL","PREFETCH_LIMIT","getCache","globalThis","__WAKU_PREFETCHED__","findFreshIndex","cache","rscPath","rscParams","now","findIndex","entry","expireAt","addPrefetchEntry","elements","Date","Promise","resolve","catch","push","length","shift","hasPrefetchEntry","consumePrefetchEntry","index","undefined","splice"],"mappings":"AAAA,4EAA4E;AAC5E,6EAA6E;AAC7E,mCAAmC;AAEnC,0EAA0E,GAC1E,OAAO,MAAMA,eAAe,OAAO,GAAG;AAEtC,uDAAuD,GACvD,OAAO,MAAMC,iBAAiB,IAAI;AAUlC,MAAMC,WAAW,IAAwBC,WAAWC,mBAAmB,KAAK,EAAE;AAE9E,MAAMC,iBAAiB,CACrBC,OACAC,SACAC,WACAC,MAEAH,MAAMI,SAAS,CACb,CAACC,QACCA,MAAMC,QAAQ,GAAGH,OACjBE,MAAMJ,OAAO,KAAKA,WAClB,oDAAoD;QACpDI,MAAMH,SAAS,KAAKA;AAG1B,0EAA0E,GAC1E,OAAO,MAAMK,mBAAmB,CAC9BN,SACAC,WACAM;IAEA,MAAMR,QAAQJ;IACd,MAAMO,MAAMM,KAAKN,GAAG;IACpB,oEAAoE;IACpEO,QAAQC,OAAO,CAACH,UAAUI,KAAK,CAAC,KAAO;IACvCZ,MAAMa,IAAI,CAAC;QAAEZ;QAASC;QAAWM;QAAUF,UAAUH,MAAMT;IAAa;IACxE,MACEM,MAAMc,MAAM,GAAG,KACdd,CAAAA,MAAMc,MAAM,GAAGnB,kBAAkBK,KAAK,CAAC,EAAE,CAAEM,QAAQ,IAAIH,GAAE,EAC1D;QACAH,MAAMe,KAAK;IACb;AACF,EAAE;AAEF,OAAO,MAAMC,mBAAmB,CAC9Bf,SACAC;IAEA,MAAMF,QAAQJ;IACd,OAAOG,eAAeC,OAAOC,SAASC,WAAWO,KAAKN,GAAG,OAAO;AAClE,EAAE;AAEF,kEAAkE,GAClE,OAAO,MAAMc,uBAAuB,CAClChB,SACAC;IAEA,MAAMF,QAAQJ;IACd,MAAMsB,QAAQnB,eAAeC,OAAOC,SAASC,WAAWO,KAAKN,GAAG;IAChE,IAAIe,QAAQ,GAAG;QACb,OAAOC;IACT;IACA,OAAOnB,MAAMoB,MAAM,CAACF,OAAO,EAAE,CAAC,EAAE,CAAEV,QAAQ;AAC5C,EAAE"}

package/dist/lib/utils/rsc-stream.js

@@ -73,7 +73,7 @@ const collectFlightChunks = (root)=>{
 };
 export async function waitForRootPrerequisites(root) {
     while(true){
-        const unresolvedChunks = collectFlightChunks(root).filter((chunk)=>isPendingStatus(chunk.status));
+        const unresolvedChunks = collectFlightChunks(root).filter((chunk)=>isPendingStatus(chunk.status) && typeof chunk.then === 'function');
         if (unresolvedChunks.length === 0) {
             return;
         }

package/dist/lib/utils/rsc-stream.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/lib/utils/rsc-stream.ts"],"sourcesContent":["type AnyFunction = (...args: unknown[]) => unknown;\n\ntype FlightChunk = {\n  _children?: unknown;\n  reason?: unknown;\n  status: string;\n  then?: AnyFunction;\n  value?: unknown;\n};\n\ntype FlightRecordLike = {\n  _children?: unknown;\n  _payload?: unknown;\n  handler?: { chunk?: unknown };\n  props?: unknown;\n  value?: unknown;\n};\n\nconst isObjectOrFunction = (value: unknown): value is object | AnyFunction =>\n  value !== null && (typeof value === 'object' || typeof value === 'function');\n\nconst isFlightChunk = (value: unknown): value is FlightChunk =>\n  isObjectOrFunction(value) &&\n  'status' in value &&\n  typeof value.status === 'string' &&\n  (!('then' in value) || typeof value.then === 'function');\n\nconst isFlightRecordLike = (value: unknown): value is FlightRecordLike =>\n  isObjectOrFunction(value) &&\n  (!('handler' in value) ||\n    (isObjectOrFunction(value.handler) && 'chunk' in value.handler)) &&\n  ('_payload' in value ||\n    'handler' in value ||\n    '_children' in value ||\n    'value' in value ||\n    'props' in value);\n\nconst isPendingStatus = (value: string) =>\n  value === 'pending' || value === 'blocked';\n\nconst pushInspectable = (stack: object[], value: unknown) => {\n  if (isObjectOrFunction(value)) {\n    stack.push(value);\n  }\n};\n\nconst pushInspectableValues = (stack: object[], values: Iterable<unknown>) => {\n  for (const value of values) {\n    pushInspectable(stack, value);\n  }\n};\n\nconst pushChunkEdges = (stack: object[], chunk: FlightChunk) => {\n  if (Array.isArray(chunk._children)) {\n    pushInspectableValues(stack, chunk._children);\n  }\n  pushInspectable(stack, chunk.value);\n  pushInspectable(stack, chunk.reason);\n};\n\nconst pushRecordEdges = (stack: object[], record: FlightRecordLike) => {\n  pushInspectable(stack, record._payload);\n  if (record.handler) {\n    pushInspectable(stack, record.handler.chunk);\n  }\n  if (Array.isArray(record._children)) {\n    pushInspectableValues(stack, record._children);\n  }\n  pushInspectable(stack, record.value);\n  pushInspectable(stack, record.props);\n};\n\nconst pushObjectValues = (stack: object[], value: object) => {\n  pushInspectableValues(stack, Object.values(value));\n};\n\nconst collectFlightChunks = (root: unknown): FlightChunk[] => {\n  const seen = new Set<object>();\n  const chunks: FlightChunk[] = [];\n  const stack: object[] = [];\n\n  if (isObjectOrFunction(root)) {\n    stack.push(root);\n  }\n\n  while (stack.length) {\n    const value = stack.pop();\n    if (!value || seen.has(value)) {\n      continue;\n    }\n    seen.add(value);\n\n    if (Array.isArray(value)) {\n      pushInspectableValues(stack, value);\n      continue;\n    }\n    if (value instanceof Map) {\n      pushInspectableValues(stack, value.keys());\n      pushInspectableValues(stack, value.values());\n      continue;\n    }\n    if (value instanceof Set) {\n      pushInspectableValues(stack, value.values());\n      continue;\n    }\n    if (isFlightChunk(value)) {\n      chunks.push(value);\n      pushChunkEdges(stack, value);\n      continue;\n    }\n    if (isFlightRecordLike(value)) {\n      pushRecordEdges(stack, value);\n    }\n    pushObjectValues(stack, value);\n  }\n  return chunks;\n};\n\nexport async function waitForRootPrerequisites(root: unknown): Promise<void> {\n  while (true) {\n    const unresolvedChunks = collectFlightChunks(root).filter((chunk) =>\n      isPendingStatus(chunk.status),\n    );\n    if (unresolvedChunks.length === 0) {\n      return;\n    }\n    await Promise.allSettled(unresolvedChunks);\n  }\n}\n"],"names":["isObjectOrFunction","value","isFlightChunk","status","then","isFlightRecordLike","handler","isPendingStatus","pushInspectable","stack","push","pushInspectableValues","values","pushChunkEdges","chunk","Array","isArray","_children","reason","pushRecordEdges","record","_payload","props","pushObjectValues","Object","collectFlightChunks","root","seen","Set","chunks","length","pop","has","add","Map","keys","waitForRootPrerequisites","unresolvedChunks","filter","Promise","allSettled"],"mappings":"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"}
+{"version":3,"sources":["../../../src/lib/utils/rsc-stream.ts"],"sourcesContent":["type AnyFunction = (...args: unknown[]) => unknown;\n\ntype FlightChunk = {\n  _children?: unknown;\n  reason?: unknown;\n  status: string;\n  then?: AnyFunction;\n  value?: unknown;\n};\n\ntype FlightRecordLike = {\n  _children?: unknown;\n  _payload?: unknown;\n  handler?: { chunk?: unknown };\n  props?: unknown;\n  value?: unknown;\n};\n\nconst isObjectOrFunction = (value: unknown): value is object | AnyFunction =>\n  value !== null && (typeof value === 'object' || typeof value === 'function');\n\nconst isFlightChunk = (value: unknown): value is FlightChunk =>\n  isObjectOrFunction(value) &&\n  'status' in value &&\n  typeof value.status === 'string' &&\n  (!('then' in value) || typeof value.then === 'function');\n\nconst isFlightRecordLike = (value: unknown): value is FlightRecordLike =>\n  isObjectOrFunction(value) &&\n  (!('handler' in value) ||\n    (isObjectOrFunction(value.handler) && 'chunk' in value.handler)) &&\n  ('_payload' in value ||\n    'handler' in value ||\n    '_children' in value ||\n    'value' in value ||\n    'props' in value);\n\nconst isPendingStatus = (value: string) =>\n  value === 'pending' || value === 'blocked';\n\nconst pushInspectable = (stack: object[], value: unknown) => {\n  if (isObjectOrFunction(value)) {\n    stack.push(value);\n  }\n};\n\nconst pushInspectableValues = (stack: object[], values: Iterable<unknown>) => {\n  for (const value of values) {\n    pushInspectable(stack, value);\n  }\n};\n\nconst pushChunkEdges = (stack: object[], chunk: FlightChunk) => {\n  if (Array.isArray(chunk._children)) {\n    pushInspectableValues(stack, chunk._children);\n  }\n  pushInspectable(stack, chunk.value);\n  pushInspectable(stack, chunk.reason);\n};\n\nconst pushRecordEdges = (stack: object[], record: FlightRecordLike) => {\n  pushInspectable(stack, record._payload);\n  if (record.handler) {\n    pushInspectable(stack, record.handler.chunk);\n  }\n  if (Array.isArray(record._children)) {\n    pushInspectableValues(stack, record._children);\n  }\n  pushInspectable(stack, record.value);\n  pushInspectable(stack, record.props);\n};\n\nconst pushObjectValues = (stack: object[], value: object) => {\n  pushInspectableValues(stack, Object.values(value));\n};\n\nconst collectFlightChunks = (root: unknown): FlightChunk[] => {\n  const seen = new Set<object>();\n  const chunks: FlightChunk[] = [];\n  const stack: object[] = [];\n\n  if (isObjectOrFunction(root)) {\n    stack.push(root);\n  }\n\n  while (stack.length) {\n    const value = stack.pop();\n    if (!value || seen.has(value)) {\n      continue;\n    }\n    seen.add(value);\n\n    if (Array.isArray(value)) {\n      pushInspectableValues(stack, value);\n      continue;\n    }\n    if (value instanceof Map) {\n      pushInspectableValues(stack, value.keys());\n      pushInspectableValues(stack, value.values());\n      continue;\n    }\n    if (value instanceof Set) {\n      pushInspectableValues(stack, value.values());\n      continue;\n    }\n    if (isFlightChunk(value)) {\n      chunks.push(value);\n      pushChunkEdges(stack, value);\n      continue;\n    }\n    if (isFlightRecordLike(value)) {\n      pushRecordEdges(stack, value);\n    }\n    pushObjectValues(stack, value);\n  }\n  return chunks;\n};\n\nexport async function waitForRootPrerequisites(root: unknown): Promise<void> {\n  while (true) {\n    const unresolvedChunks = collectFlightChunks(root).filter(\n      (chunk) =>\n        isPendingStatus(chunk.status) && typeof chunk.then === 'function',\n    );\n    if (unresolvedChunks.length === 0) {\n      return;\n    }\n    await Promise.allSettled(unresolvedChunks);\n  }\n}\n"],"names":["isObjectOrFunction","value","isFlightChunk","status","then","isFlightRecordLike","handler","isPendingStatus","pushInspectable","stack","push","pushInspectableValues","values","pushChunkEdges","chunk","Array","isArray","_children","reason","pushRecordEdges","record","_payload","props","pushObjectValues","Object","collectFlightChunks","root","seen","Set","chunks","length","pop","has","add","Map","keys","waitForRootPrerequisites","unresolvedChunks","filter","Promise","allSettled"],"mappings":"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"}

package/dist/minimal/client.d.ts

@@ -1,49 +1,82 @@
 import type { ReactNode } from 'react';
 type Elements = Record<string, unknown>;
-type SetElements = (updater: (prev: Promise<Elements>) => Promise<Elements>) => void;
 declare const ENTRY = "e";
 declare const SET_ELEMENTS = "s";
-declare const FETCH_FN = "f";
+declare const FETCH_ENHANCERS = "f";
 declare const FETCH_RSC_INPUT_TRANSFORMERS = "t";
 declare const CALL_SERVER_ELEMENTS_LISTENERS = "l";
-declare const ON_BUILD_ID_MISMATCH = "b";
-type TransformFetchRscInput = (rscPath: string, rscParams: unknown, prefetchOnly: boolean) => readonly [rscPath: string, rscParams: unknown, prefetchOnly: boolean];
-type FetchRscInputTransformers = Set<TransformFetchRscInput>;
+type SetElements = (updater: (prev: Promise<Elements>) => Promise<Elements>) => void;
+type FetchEnhancer = (fetchFn: typeof fetch) => typeof fetch;
+type FetchEnhancers = Set<FetchEnhancer>;
+type FetchRscInputTransformer = (rscPath: string, rscParams: unknown, prefetchOnly: boolean) => readonly [rscPath: string, rscParams: unknown, prefetchOnly: boolean];
+type FetchRscInputTransformers = Set<FetchRscInputTransformer>;
 type CallServerElementsListeners = Set<(elements: Elements) => void>;
-type Unstable_FetchRscStore = {
+type FetchRscStore = {
     [ENTRY]?: [
         rscPath: string,
         rscParams: unknown,
         elementsPromise: Promise<Elements>
     ];
     [SET_ELEMENTS]?: SetElements;
-    [FETCH_FN]?: typeof fetch;
+    [FETCH_ENHANCERS]?: FetchEnhancers;
     [FETCH_RSC_INPUT_TRANSFORMERS]?: FetchRscInputTransformers;
     [CALL_SERVER_ELEMENTS_LISTENERS]?: CallServerElementsListeners;
-    [ON_BUILD_ID_MISMATCH]?: () => void;
 };
+type FetchRscOptions = {
+    signal?: AbortSignal;
+    onBuildIdMismatch?: () => void;
+};
+type Refetch = (rscPath: string, rscParams?: unknown, options?: FetchRscOptions) => Promise<Elements>;
 /**
  * callServer callback
  * This is not a public API.
  */
-export declare const unstable_callServerRsc: (funcId: string, args: unknown[], unstable_enhanceFetchRscStore?: (s: Unstable_FetchRscStore) => Unstable_FetchRscStore) => Promise<unknown>;
+export declare const unstable_callServerRsc: (funcId: string, args: unknown[]) => Promise<unknown>;
 type Unregister = () => void;
-export declare const unstable_registerCallServerElementsListener: (fetchRscStore: Unstable_FetchRscStore, listener: (elements: Elements) => void) => Unregister;
-export declare const unstable_registerFetchRscInputTransformer: (fetchRscStore: Unstable_FetchRscStore, transformFetchRscInput: TransformFetchRscInput) => Unregister;
-export declare const unstable_fetchRsc: (rscPath: string, rscParams?: unknown, unstable_enhanceFetchRscStore?: (s: Unstable_FetchRscStore) => Unstable_FetchRscStore) => Promise<Elements>;
-export declare const unstable_prefetchRsc: (rscPath: string, rscParams?: unknown, unstable_enhanceFetchRscStore?: (s: Unstable_FetchRscStore) => Unstable_FetchRscStore) => void;
-export declare const unstable_withEnhanceFetchFn: (enhanceFetchFn: (fn: typeof fetch) => typeof fetch) => (fetchRscStore: Unstable_FetchRscStore) => Unstable_FetchRscStore;
-export declare const unstable_withBuildIdMismatchHandler: (handler: () => void) => (fetchRscStore: Unstable_FetchRscStore) => Unstable_FetchRscStore;
-export declare const useFetchRscStore_UNSTABLE: () => Unstable_FetchRscStore;
-export declare const Root: ({ initialRscPath, initialRscParams, unstable_fetchRscStore, children, }: {
+/**
+ * Register a listener that runs when a server action returns new elements.
+ * Returns a function that unregisters the listener.
+ */
+export declare const unstable_registerCallServerElementsListener: (listener: (elements: Elements) => void) => Unregister;
+/**
+ * Register a fetch enhancer applied to every RSC request (e.g. to add headers).
+ * Enhancers are composed in registration order. Returns a function that
+ * unregisters the enhancer.
+ */
+export declare const unstable_registerFetchEnhancer: (enhance: FetchEnhancer) => Unregister;
+/**
+ * Register a transformer that rewrites the RSC fetch input
+ * (`rscPath`, `rscParams`, `prefetchOnly`) before each request. Returns a
+ * function that unregisters the transformer.
+ */
+export declare function unstable_registerFetchRscInputTransformer(transformFetchRscInput: FetchRscInputTransformer): Unregister;
+/**
+ * @deprecated Pass only the transformer. The store argument is ignored and this
+ * overload will be removed in a future release.
+ */
+export declare function unstable_registerFetchRscInputTransformer(store: FetchRscStore, transformFetchRscInput: FetchRscInputTransformer): Unregister;
+/** Fetch elements for an RSC path, reusing a cached or prefetched result. */
+export declare const unstable_fetchRsc: (rscPath: string, rscParams?: unknown, options?: FetchRscOptions) => Promise<Elements>;
+/** Eagerly fetch and cache elements so a later fetch reuses them. */
+export declare const unstable_prefetchRsc: (rscPath: string, rscParams?: unknown) => void;
+/**
+ * Client root. Seeds the initial elements, bridges the store to React state,
+ * and provides the elements to `Slot` descendants.
+ */
+export declare const Root: ({ initialRscPath, initialRscParams, children, }: {
     initialRscPath?: string;
     initialRscParams?: unknown;
-    unstable_fetchRscStore?: Unstable_FetchRscStore | undefined;
     children: ReactNode;
 }) => import("react").JSX.Element;
-export declare const useRefetch: () => (rscPath: string, rscParams?: unknown, unstable_enhanceFetchRscStore?: (c: Unstable_FetchRscStore) => Unstable_FetchRscStore) => Promise<Elements>;
+export declare const useRefetch: () => Refetch;
 export declare const Children: () => ReactNode;
 export declare const useElementsPromise_UNSTABLE: () => Promise<Elements>;
+/**
+ * @deprecated The store is an internal singleton; you no longer need to pass it
+ * to `unstable_registerFetchRscInputTransformer`. This will be removed in a
+ * future release.
+ */
+export declare const useFetchRscStore_UNSTABLE: () => FetchRscStore;
 /**
  * Slot component
  * This is used under the Root component.

package/dist/minimal/client.js

@@ -57,70 +57,88 @@ const mergeElementsPromise = (a, b)=>{
 };
 const ENTRY = 'e';
 const SET_ELEMENTS = 's';
-const FETCH_FN = 'f';
+const FETCH_ENHANCERS = 'f';
 const FETCH_RSC_INPUT_TRANSFORMERS = 't';
 const CALL_SERVER_ELEMENTS_LISTENERS = 'l';
-const ON_BUILD_ID_MISMATCH = 'b';
-const defaultFetchRscStore = {};
-const requestRsc = (fetchFn, rscPath, rscParams, temporaryReferences)=>{
+const fetchRscStore = {};
+const getFetchFn = ()=>{
+    let fetchFn = fetch;
+    const enhancers = fetchRscStore[FETCH_ENHANCERS];
+    if (enhancers) {
+        for (const enhance of enhancers){
+            fetchFn = enhance(fetchFn);
+        }
+    }
+    return fetchFn;
+};
+const getSetElements = ()=>{
+    const setElements = fetchRscStore[SET_ELEMENTS];
+    if (!setElements) {
+        throw new Error('Missing Root component');
+    }
+    return setElements;
+};
+const requestRsc = (fetchFn, rscPath, rscParams, temporaryReferences, signal)=>{
     const url = BASE_RSC_PATH + encodeRscPath(rscPath);
+    const init = {};
+    if (signal) {
+        init.signal = signal;
+    }
     if (rscParams === undefined) {
-        return fetchFn(url);
+        return fetchFn(url, init);
     }
     if (rscParams instanceof URLSearchParams) {
-        return fetchFn(url + '?' + rscParams);
+        return fetchFn(url + '?' + rscParams, init);
     }
     return encodeReply(rscParams, {
         temporaryReferences
     }).then((body)=>fetchFn(url, {
+            ...init,
             method: 'POST',
             body
         }));
 };
-// `getStore` is read lazily when a server action fires: a prefetched tree is
-// decoded early but must act against the consuming navigation's store.
-const decodeRsc = (getStore, responsePromise, temporaryReferences, debugChannel)=>createFromFetch(checkStatus(responsePromise), {
-        callServer: (funcId, args)=>unstable_callServerRsc(funcId, args, getStore),
+const decodeRsc = (responsePromise, temporaryReferences, debugChannel)=>createFromFetch(checkStatus(responsePromise), {
+        callServer: (funcId, args)=>unstable_callServerRsc(funcId, args),
         debugChannel,
         temporaryReferences
     });
-const reloadOnBuildIdMismatch = (fetchRscStore, elements)=>{
+const reloadOnBuildIdMismatch = (elements, onBuildIdMismatch)=>{
     if (!import.meta.env?.WAKU_BUILD_ID) {
         return;
     }
     Promise.resolve(elements).then((data)=>{
         if (data._buildId !== import.meta.env.WAKU_BUILD_ID) {
-            (fetchRscStore[ON_BUILD_ID_MISMATCH] ?? (()=>window.location.reload()))();
+            (onBuildIdMismatch ?? (()=>window.location.reload()))();
         }
     }, ()=>{});
 };
-const prefetchRscInternal = (fetchRscStore, rscPath, rscParams)=>{
-    const fetchFn = fetchRscStore[FETCH_FN] || fetch;
+const prefetchRscInternal = (rscPath, rscParams)=>{
     const temporaryReferences = createTemporaryReferenceSet();
-    const responsePromise = requestRsc(fetchFn, rscPath, rscParams, temporaryReferences);
-    addPrefetchEntry(rscPath, rscParams, fetchRscStore, (getStore)=>decodeRsc(getStore, responsePromise, temporaryReferences, undefined));
+    const responsePromise = requestRsc(getFetchFn(), rscPath, rscParams, temporaryReferences, undefined);
+    addPrefetchEntry(rscPath, rscParams, decodeRsc(responsePromise, temporaryReferences, undefined));
 };
-const fetchRscElements = (fetchRscStore, rscPath, rscParams)=>{
-    const prefetched = consumePrefetchEntry(rscPath, rscParams, fetchRscStore);
+const fetchRscElements = (rscPath, rscParams, options)=>{
+    const prefetched = consumePrefetchEntry(rscPath, rscParams);
     if (prefetched) {
-        reloadOnBuildIdMismatch(fetchRscStore, prefetched);
+        reloadOnBuildIdMismatch(prefetched, options?.onBuildIdMismatch);
         return prefetched;
     }
     const initial = consumeInitialRscEntry();
-    const baseFetchFn = fetchRscStore[FETCH_FN] || fetch;
+    const baseFetchFn = getFetchFn();
     const debug = import.meta.hot ? setupDebugChannel(baseFetchFn, !!initial, initial?.debugId) : undefined;
     const fetchFn = debug?.fetchFn || baseFetchFn;
     const temporaryReferences = createTemporaryReferenceSet();
-    const responsePromise = initial ? initial.response : requestRsc(fetchFn, rscPath, rscParams, temporaryReferences);
-    const elements = decodeRsc(()=>fetchRscStore, responsePromise, temporaryReferences, debug?.debugChannel);
-    reloadOnBuildIdMismatch(fetchRscStore, elements);
+    const responsePromise = initial ? initial.response : requestRsc(fetchFn, rscPath, rscParams, temporaryReferences, options?.signal);
+    const elements = decodeRsc(responsePromise, temporaryReferences, debug?.debugChannel);
+    reloadOnBuildIdMismatch(elements, options?.onBuildIdMismatch);
     if (initial) {
         const { close } = initial;
         waitForRootPrerequisites(elements).then(close, close);
     }
     return elements;
 };
-const applyInputTransformers = (fetchRscStore, rscPath, rscParams, prefetchOnly)=>{
+const applyInputTransformers = (rscPath, rscParams, prefetchOnly)=>{
     const fetchRscInputTransformers = fetchRscStore[FETCH_RSC_INPUT_TRANSFORMERS];
     if (fetchRscInputTransformers) {
         for (const transformFetchRscInput of fetchRscInputTransformers){
@@ -133,27 +151,26 @@ const applyInputTransformers = (fetchRscStore, rscPath, rscParams, prefetchOnly)
         prefetchOnly
     ];
 };
-const fetchRscInternal = (fetchRscStore, rscPath, rscParams, prefetchOnly)=>{
-    [rscPath, rscParams, prefetchOnly] = applyInputTransformers(fetchRscStore, rscPath, rscParams, prefetchOnly);
+const fetchRscInternal = (rscPath, rscParams, prefetchOnly, options)=>{
+    [rscPath, rscParams, prefetchOnly] = applyInputTransformers(rscPath, rscParams, prefetchOnly);
     if (prefetchOnly) {
         if (!hasPrefetchEntry(rscPath, rscParams)) {
-            prefetchRscInternal(fetchRscStore, rscPath, rscParams);
+            prefetchRscInternal(rscPath, rscParams);
         }
         return undefined;
     }
-    return fetchRscElements(fetchRscStore, rscPath, rscParams);
+    return fetchRscElements(rscPath, rscParams, options);
 };
 /**
  * callServer callback
  * This is not a public API.
- */ export const unstable_callServerRsc = async (funcId, args, unstable_enhanceFetchRscStore = (s)=>s)=>{
-    const fetchRscStore = unstable_enhanceFetchRscStore(defaultFetchRscStore);
-    const setElements = fetchRscStore[SET_ELEMENTS];
-    const callServerElementsListeners = fetchRscStore[CALL_SERVER_ELEMENTS_LISTENERS];
+ */ export const unstable_callServerRsc = async (funcId, args)=>{
     const rscPath = encodeFuncId(funcId);
     const rscParams = args.length === 1 && args[0] instanceof URLSearchParams ? args[0] : args;
-    const { _value: value, ...data } = await fetchRscInternal(fetchRscStore, rscPath, rscParams, false);
+    const { _value: value, ...data } = await fetchRscInternal(rscPath, rscParams, false, undefined);
     if (Object.keys(data).length) {
+        const setElements = getSetElements();
+        const callServerElementsListeners = fetchRscStore[CALL_SERVER_ELEMENTS_LISTENERS];
         startTransition(()=>{
             callServerElementsListeners?.forEach((listener)=>{
                 listener(data);
@@ -163,42 +180,68 @@ const fetchRscInternal = (fetchRscStore, rscPath, rscParams, prefetchOnly)=>{
     }
     return value;
 };
-export const unstable_registerCallServerElementsListener = (fetchRscStore, listener)=>{
+/**
+ * Register a listener that runs when a server action returns new elements.
+ * Returns a function that unregisters the listener.
+ */ export const unstable_registerCallServerElementsListener = (listener)=>{
     const callServerElementsListeners = fetchRscStore[CALL_SERVER_ELEMENTS_LISTENERS] ||= new Set();
     callServerElementsListeners.add(listener);
     return ()=>{
         callServerElementsListeners.delete(listener);
     };
 };
-export const unstable_registerFetchRscInputTransformer = (fetchRscStore, transformFetchRscInput)=>{
-    const fetchRscInputTransformers = fetchRscStore[FETCH_RSC_INPUT_TRANSFORMERS] || (fetchRscStore[FETCH_RSC_INPUT_TRANSFORMERS] = new Set());
+/**
+ * Register a fetch enhancer applied to every RSC request (e.g. to add headers).
+ * Enhancers are composed in registration order. Returns a function that
+ * unregisters the enhancer.
+ */ export const unstable_registerFetchEnhancer = (enhance)=>{
+    const fetchEnhancers = fetchRscStore[FETCH_ENHANCERS] ||= new Set();
+    fetchEnhancers.add(enhance);
+    return ()=>{
+        fetchEnhancers.delete(enhance);
+    };
+};
+let registerTransformerStoreArgWarned = false;
+export function unstable_registerFetchRscInputTransformer(storeOrTransform, maybeTransform) {
+    let transformFetchRscInput;
+    if (typeof storeOrTransform === 'function') {
+        transformFetchRscInput = storeOrTransform;
+    } else {
+        transformFetchRscInput = maybeTransform;
+        if (!registerTransformerStoreArgWarned) {
+            registerTransformerStoreArgWarned = true;
+            console.warn('[waku] Passing a store to `unstable_registerFetchRscInputTransformer` is deprecated. Pass only the transformer.');
+        }
+    }
+    const fetchRscInputTransformers = fetchRscStore[FETCH_RSC_INPUT_TRANSFORMERS] ||= new Set();
     fetchRscInputTransformers.add(transformFetchRscInput);
     return ()=>{
         fetchRscInputTransformers.delete(transformFetchRscInput);
     };
+}
+const registerHmrRefetch = (refetch)=>{
+    globalThis.__WAKU_RSC_RELOAD_LISTENERS__ ||= [];
+    const index = globalThis.__WAKU_RSC_RELOAD_LISTENERS__.indexOf(globalThis.__WAKU_REFETCH_RSC__);
+    if (index !== -1) {
+        globalThis.__WAKU_RSC_RELOAD_LISTENERS__.splice(index, 1, refetch);
+    } else {
+        globalThis.__WAKU_RSC_RELOAD_LISTENERS__.push(refetch);
+    }
+    globalThis.__WAKU_REFETCH_RSC__ = refetch;
 };
-export const unstable_fetchRsc = (rscPath, rscParams, unstable_enhanceFetchRscStore = (s)=>s)=>{
-    const fetchRscStore = unstable_enhanceFetchRscStore(defaultFetchRscStore);
+/** Fetch elements for an RSC path, reusing a cached or prefetched result. */ export const unstable_fetchRsc = (rscPath, rscParams, options)=>{
     if (import.meta.hot) {
-        const refetchRsc = ()=>{
+        registerHmrRefetch(()=>{
             delete fetchRscStore[ENTRY];
-            const data = unstable_fetchRsc(rscPath, rscParams, unstable_enhanceFetchRscStore);
-            fetchRscStore[SET_ELEMENTS](()=>data);
-        };
-        globalThis.__WAKU_RSC_RELOAD_LISTENERS__ ||= [];
-        const index = globalThis.__WAKU_RSC_RELOAD_LISTENERS__.indexOf(globalThis.__WAKU_REFETCH_RSC__);
-        if (index !== -1) {
-            globalThis.__WAKU_RSC_RELOAD_LISTENERS__.splice(index, 1, refetchRsc);
-        } else {
-            globalThis.__WAKU_RSC_RELOAD_LISTENERS__.push(refetchRsc);
-        }
-        globalThis.__WAKU_REFETCH_RSC__ = refetchRsc;
+            const data = unstable_fetchRsc(rscPath, rscParams, options);
+            getSetElements()(()=>data);
+        });
     }
     const entry = fetchRscStore[ENTRY];
     if (entry && entry[0] === rscPath && entry[1] === rscParams) {
         return entry[2];
     }
-    const data = fetchRscInternal(fetchRscStore, rscPath, rscParams, false);
+    const data = fetchRscInternal(rscPath, rscParams, false, options);
     fetchRscStore[ENTRY] = [
         rscPath,
         rscParams,
@@ -206,60 +249,36 @@ export const unstable_fetchRsc = (rscPath, rscParams, unstable_enhanceFetchRscSt
     ];
     return data;
 };
-export const unstable_prefetchRsc = (rscPath, rscParams, unstable_enhanceFetchRscStore = (s)=>s)=>{
-    const fetchRscStore = unstable_enhanceFetchRscStore(defaultFetchRscStore);
-    fetchRscInternal(fetchRscStore, rscPath, rscParams, true);
+/** Eagerly fetch and cache elements so a later fetch reuses them. */ export const unstable_prefetchRsc = (rscPath, rscParams)=>{
+    fetchRscInternal(rscPath, rscParams, true, undefined);
 };
-export const unstable_withEnhanceFetchFn = (enhanceFetchFn)=>(fetchRscStore)=>({
-            ...fetchRscStore,
-            [FETCH_FN]: enhanceFetchFn(fetchRscStore[FETCH_FN] || fetch)
-        });
-export const unstable_withBuildIdMismatchHandler = (handler)=>(fetchRscStore)=>({
-            ...fetchRscStore,
-            [ON_BUILD_ID_MISMATCH]: handler
-        });
 const RefetchContext = /*#__PURE__*/ createContext(()=>{
     throw new Error('Missing Root component');
 });
 const ElementsContext = /*#__PURE__*/ createContext(null);
-const FetchRscStoreContext = /*#__PURE__*/ createContext(null);
-export const useFetchRscStore_UNSTABLE = ()=>{
-    const fetchRscStore = use(FetchRscStoreContext);
-    if (!fetchRscStore) {
-        throw new Error('Missing Root component');
-    }
-    return fetchRscStore;
-};
-export const Root = ({ initialRscPath, initialRscParams, unstable_fetchRscStore = defaultFetchRscStore, children })=>{
-    const [elements, setElements] = useState(()=>unstable_fetchRsc(initialRscPath || '', initialRscParams, ()=>unstable_fetchRscStore));
+/**
+ * Client root. Seeds the initial elements, bridges the store to React state,
+ * and provides the elements to `Slot` descendants.
+ */ export const Root = ({ initialRscPath, initialRscParams, children })=>{
+    const [elements, setElements] = useState(()=>unstable_fetchRsc(initialRscPath || '', initialRscParams));
     useEffect(()=>{
-        // eslint-disable-next-line react-hooks/immutability
-        unstable_fetchRscStore[SET_ELEMENTS] = setElements;
-    }, [
-        unstable_fetchRscStore
-    ]);
-    const refetch = useCallback(async (rscPath, rscParams, unstable_enhanceFetchRscStore = (s)=>s)=>{
-        // clear cache entry before fetching
-        // eslint-disable-next-line react-hooks/immutability
-        delete unstable_fetchRscStore[ENTRY]; // use non-enhanced store
-        const data = unstable_fetchRsc(rscPath, rscParams, ()=>unstable_enhanceFetchRscStore(unstable_fetchRscStore));
+        fetchRscStore[SET_ELEMENTS] = setElements;
+    }, []);
+    const refetch = useCallback(async (rscPath, rscParams, options)=>{
+        delete fetchRscStore[ENTRY];
+        const data = unstable_fetchRsc(rscPath, rscParams, options);
         const dataWithoutErrors = Promise.resolve(data).catch(()=>({}));
         setElements((prev)=>mergeElementsPromise(prev, dataWithoutErrors));
         return data;
-    }, [
-        unstable_fetchRscStore
-    ]);
-    return /*#__PURE__*/ _jsx(FetchRscStoreContext, {
-        value: unstable_fetchRscStore,
-        children: /*#__PURE__*/ _jsx(RefetchContext, {
-            value: refetch,
-            children: /*#__PURE__*/ _jsxs(ElementsContext, {
-                value: elements,
-                children: [
-                    DEFAULT_HTML_HEAD,
-                    children
-                ]
-            })
+    }, []);
+    return /*#__PURE__*/ _jsx(RefetchContext, {
+        value: refetch,
+        children: /*#__PURE__*/ _jsxs(ElementsContext, {
+            value: elements,
+            children: [
+                DEFAULT_HTML_HEAD,
+                children
+            ]
         })
     });
 };
@@ -274,6 +293,18 @@ export const useElementsPromise_UNSTABLE = ()=>{
     }
     return elementsPromise;
 };
+let useFetchRscStoreDeprecationWarned = false;
+/**
+ * @deprecated The store is an internal singleton; you no longer need to pass it
+ * to `unstable_registerFetchRscInputTransformer`. This will be removed in a
+ * future release.
+ */ export const useFetchRscStore_UNSTABLE = ()=>{
+    if (!useFetchRscStoreDeprecationWarned) {
+        useFetchRscStoreDeprecationWarned = true;
+        console.warn('[waku] `useFetchRscStore_UNSTABLE` is deprecated and will be removed.');
+    }
+    return fetchRscStore;
+};
 /**
  * Slot component
  * This is used under the Root component.
@@ -306,17 +337,14 @@ export const useElementsPromise_UNSTABLE = ()=>{
 /**
  * ServerRoot for SSR
  * This is not a public API.
- */ export const INTERNAL_ServerRoot = ({ elementsPromise, children })=>/*#__PURE__*/ _jsx(FetchRscStoreContext, {
-        value: {},
-        children: /*#__PURE__*/ _jsx(RefetchContext, {
-            value: async ()=>({}),
-            children: /*#__PURE__*/ _jsxs(ElementsContext, {
-                value: elementsPromise,
-                children: [
-                    DEFAULT_HTML_HEAD,
-                    children
-                ]
-            })
+ */ export const INTERNAL_ServerRoot = ({ elementsPromise, children })=>/*#__PURE__*/ _jsx(RefetchContext, {
+        value: async ()=>({}),
+        children: /*#__PURE__*/ _jsxs(ElementsContext, {
+            value: elementsPromise,
+            children: [
+                DEFAULT_HTML_HEAD,
+                children
+            ]
         })
     });