@fluixi/reactive 1.0.0-alpha.91 → 1.0.0-alpha.93

package/dist/lib/signal/api.cjs

@@ -32,7 +32,7 @@ __export(api_exports, {
 module.exports = __toCommonJS(api_exports);
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.91";
+var VERSION = "1.0.0-alpha.93";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -82,11 +82,12 @@ function observeReactiveNodes(next) {
 }
 var running = [];
 var origin;
+var currentScope;
 function reportReactiveNode(report) {
   const observer = G.observer;
   if (observer) {
     observer.created(
-      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin } : report
+      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin, scope: report.scope ?? currentScope } : { ...report, scope: report.scope ?? currentScope }
     );
   }
 }
@@ -415,7 +416,7 @@ function afterWrite() {
   if (G.batchDepth === 0) flushSync();
 }
 var EffectNode = class {
-  constructor(fn, report = false) {
+  constructor(fn, report = false, name) {
     this.queued = false;
     this.disposed = false;
     this.owner = makeOwner(G.owner);
@@ -427,7 +428,7 @@ var EffectNode = class {
         if (typeof r === "function") (this.owner.cleanups ??= []).push(r);
       });
     });
-    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report });
+    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report, ...name ? { name } : {} });
     this.watcher = new Watcher(() => enqueue(this));
     this.run();
     this.watcher.watch(this.computed);
@@ -454,8 +455,8 @@ var EffectNode = class {
     disposeOwner(this.owner);
   }
 };
-function effect(fn, report = false) {
-  const node = new EffectNode(fn, report);
+function effect(fn, report = false, name) {
+  const node = new EffectNode(fn, report, name);
   return () => node.dispose();
 }
 
@@ -523,12 +524,12 @@ function createMemo(fn, value, options) {
   if (isObserved()) onCleanup(() => reportReactiveDispose(c));
   return read;
 }
-function createEffect(fn, value) {
+function createEffect(fn, value, options) {
   let prev = value;
   return effect(() => {
     const r = fn(prev);
     prev = r;
-  }, true);
+  }, true, options?.name);
 }
 function createComputed(fn, value) {
   let prev = value;
@@ -551,8 +552,8 @@ function signal(value, options) {
 function memo(fn, value, options) {
   return createMemo(fn, value, options);
 }
-function effect2(fn, value) {
-  return createEffect(fn, value);
+function effect2(fn, value, options) {
+  return createEffect(fn, value, options);
 }
 function root(fn) {
   return createRoot(fn);

package/dist/lib/signal/api.d.ts

@@ -102,7 +102,11 @@ export declare function memo<T>(fn: (prev?: T) => T, value?: T, options?: Signal
  *
  * @returns Its disposer, for an effect created outside a root.
  */
-export declare function effect<T>(fn: (prev?: T) => T | (() => void), value?: T): () => void;
+export declare function effect<T>(fn: (prev?: T) => T | (() => void), value?: T, 
+/** `name` is what a devtools graph calls it, as for `signal` and `memo`. */
+options?: {
+    name?: string;
+}): () => void;
 /**
  * The rest of the `create` prefix, dropped.
  *

package/dist/lib/signal/api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/lib/signal/api.ts"],"names":[],"mappings":"AAiCA,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,KAAK,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEnE,qEAAqE;AACrE,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;AAE/D,8DAA8D;AAC9D,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;AACjF,wBAAgB,MAAM,CAAC,CAAC,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAMrE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEjG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAEnF;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAEzD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAEzF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAEhE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAEtE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,CAEtD"}
+{"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../../src/lib/signal/api.ts"],"names":[],"mappings":"AAiCA,OAAO,EAIL,KAAK,OAAO,EACZ,KAAK,KAAK,EACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEnE,qEAAqE;AACrE,MAAM,MAAM,YAAY,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAA;CAAE,CAAC;AAE/D,8DAA8D;AAC9D,MAAM,MAAM,UAAU,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC;AACjF,wBAAgB,MAAM,CAAC,CAAC,GAAG,SAAS,KAAK,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;AAMrE;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAEjG;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,wBAAgB,MAAM,CAAC,CAAC,EACtB,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAClC,KAAK,CAAC,EAAE,CAAC;AACT,4EAA4E;AAC5E,OAAO,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GAC1B,MAAM,IAAI,CAEZ;AAED;;;;;;;;;GASG;AAEH;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,CAAC,GAAG,CAAC,CAEzD;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,MAAM,IAAI,CAEzF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAEhE;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,OAAO,CAAC,CAAC,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAEtE;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,UAAU,CAAC,MAAM,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,CAEtD"}

package/dist/lib/signal/api.js

@@ -94,8 +94,10 @@ export function memo(fn, value, options) {
  *
  * @returns Its disposer, for an effect created outside a root.
  */
-export function effect(fn, value) {
-    return createEffect(fn, value);
+export function effect(fn, value, 
+/** `name` is what a devtools graph calls it, as for `signal` and `memo`. */
+options) {
+    return createEffect(fn, value, options);
 }
 /**
  * The rest of the `create` prefix, dropped.

package/dist/lib/signal/api.mjs

@@ -1,5 +1,5 @@
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.91";
+var VERSION = "1.0.0-alpha.93";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -49,11 +49,12 @@ function observeReactiveNodes(next) {
 }
 var running = [];
 var origin;
+var currentScope;
 function reportReactiveNode(report) {
   const observer = G.observer;
   if (observer) {
     observer.created(
-      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin } : report
+      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin, scope: report.scope ?? currentScope } : { ...report, scope: report.scope ?? currentScope }
     );
   }
 }
@@ -382,7 +383,7 @@ function afterWrite() {
   if (G.batchDepth === 0) flushSync();
 }
 var EffectNode = class {
-  constructor(fn, report = false) {
+  constructor(fn, report = false, name) {
     this.queued = false;
     this.disposed = false;
     this.owner = makeOwner(G.owner);
@@ -394,7 +395,7 @@ var EffectNode = class {
         if (typeof r === "function") (this.owner.cleanups ??= []).push(r);
       });
     });
-    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report });
+    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report, ...name ? { name } : {} });
     this.watcher = new Watcher(() => enqueue(this));
     this.run();
     this.watcher.watch(this.computed);
@@ -421,8 +422,8 @@ var EffectNode = class {
     disposeOwner(this.owner);
   }
 };
-function effect(fn, report = false) {
-  const node = new EffectNode(fn, report);
+function effect(fn, report = false, name) {
+  const node = new EffectNode(fn, report, name);
   return () => node.dispose();
 }
 
@@ -490,12 +491,12 @@ function createMemo(fn, value, options) {
   if (isObserved()) onCleanup(() => reportReactiveDispose(c));
   return read;
 }
-function createEffect(fn, value) {
+function createEffect(fn, value, options) {
   let prev = value;
   return effect(() => {
     const r = fn(prev);
     prev = r;
-  }, true);
+  }, true, options?.name);
 }
 function createComputed(fn, value) {
   let prev = value;
@@ -518,8 +519,8 @@ function signal(value, options) {
 function memo(fn, value, options) {
   return createMemo(fn, value, options);
 }
-function effect2(fn, value) {
-  return createEffect(fn, value);
+function effect2(fn, value, options) {
+  return createEffect(fn, value, options);
 }
 function root(fn) {
   return createRoot(fn);

package/dist/lib/signal/cached-resource.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/reactive v1.0.0-alpha.91 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/reactive v1.0.0-alpha.93 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -21,14 +21,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/lib/signal/cached-resource.ts
 var cached_resource_exports = {};
 __export(cached_resource_exports, {
-  clearAllCachedResources: () => clearAllCachedResources,
-  clearCachedResourceNamespace: () => clearCachedResourceNamespace,
-  createCachedResource: () => createCachedResource
+  cachedResource: () => cachedResource,
+  clearCachedResources: () => clearCachedResources,
+  createResourceCache: () => createResourceCache
 });
 module.exports = __toCommonJS(cached_resource_exports);
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.91";
+var VERSION = "1.0.0-alpha.93";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -78,11 +78,12 @@ function observeReactiveNodes(next) {
 }
 var running = [];
 var origin;
+var currentScope;
 function reportReactiveNode(report) {
   const observer = G.observer;
   if (observer) {
     observer.created(
-      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin } : report
+      report.parents === void 0 ? { ...report, parents: running, origin: report.origin ?? origin, scope: report.scope ?? currentScope } : { ...report, scope: report.scope ?? currentScope }
     );
   }
 }
@@ -376,7 +377,7 @@ function batch(fn) {
   }
 }
 var EffectNode = class {
-  constructor(fn, report = false) {
+  constructor(fn, report = false, name) {
     this.queued = false;
     this.disposed = false;
     this.owner = makeOwner(G.owner);
@@ -388,7 +389,7 @@ var EffectNode = class {
         if (typeof r === "function") (this.owner.cleanups ??= []).push(r);
       });
     });
-    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report });
+    reportReactiveNode({ kind: "effect", node: this.computed, handle: this, internal: !report, ...name ? { name } : {} });
     this.watcher = new Watcher(() => enqueue(this));
     this.run();
     this.watcher.watch(this.computed);
@@ -415,8 +416,8 @@ var EffectNode = class {
     disposeOwner(this.owner);
   }
 };
-function effect(fn, report = false) {
-  const node = new EffectNode(fn, report);
+function effect(fn, report = false, name) {
+  const node = new EffectNode(fn, report, name);
   return () => node.dispose();
 }
 
@@ -456,12 +457,12 @@ function createSignal(value, options) {
   if (isObserved()) onCleanup(() => reportReactiveDispose(state));
   return [read, write];
 }
-function createEffect(fn, value) {
+function createEffect(fn, value, options) {
   let prev = value;
   return effect(() => {
     const r = fn(prev);
     prev = r;
-  }, true);
+  }, true, options?.name);
 }
 function batch2(fn) {
   return batch(fn);
@@ -475,14 +476,47 @@ var _resourceTracker = null;
 function trackResourcePromise(p) {
   if (_resourceTracker) _resourceTracker(p);
 }
+var _serverDataGetter = null;
+function getServerData(id) {
+  return _serverDataGetter ? _serverDataGetter(id) : void 0;
+}
+var _resourceIdSource = null;
+function nextResourceId() {
+  return _resourceIdSource ? _resourceIdSource() : void 0;
+}
+var _resourceDataSink = null;
+function reportResourceData(id, value) {
+  if (_resourceDataSink) _resourceDataSink(id, value);
+}
+function createResourceCache() {
+  const entries = /* @__PURE__ */ new Map();
+  const inflight = /* @__PURE__ */ new Map();
+  return {
+    get: (key) => entries.get(key),
+    set: (key, entry) => void entries.set(key, entry),
+    delete: (key) => void entries.delete(key),
+    keys: () => entries.keys(),
+    clear: () => {
+      entries.clear();
+      inflight.clear();
+    },
+    inflight
+  };
+}
+var _cacheScope = null;
+var _pageCache;
+function currentResourceCache() {
+  const scoped = _cacheScope?.();
+  if (scoped) return scoped;
+  if (typeof window === "undefined") return createResourceCache();
+  return _pageCache ??= createResourceCache();
+}
 
 // src/lib/signal/cached-resource.ts
-var ttlCache = /* @__PURE__ */ new Map();
-var inflight = /* @__PURE__ */ new Map();
 var _autoId = 0;
 var $SIGNAL2 = /* @__PURE__ */ Symbol.for("signal");
 var $RESOURCE = /* @__PURE__ */ Symbol.for("resource");
-function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
+function cachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let sourceFn;
   let fetchFn;
   let options;
@@ -501,7 +535,13 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
     staleWhileRevalidate = true
   } = options;
   const ns = name;
-  const buildKey = (key) => `${ns}:${JSON.stringify(key)}`;
+  const cache = options.cache ?? currentResourceCache();
+  const inflight = cache.inflight;
+  const ssrId = options.transport === false ? void 0 : nextResourceId();
+  const seed = ssrId !== void 0 ? getServerData(ssrId) : void 0;
+  const deps = options.deps ?? [];
+  const depValues = () => deps.map((dep) => dep());
+  const buildKey = (key, values = untrack2(depValues)) => `${ns}:${JSON.stringify(key)}` + (deps.length ? `:${JSON.stringify(values)}` : "");
   const isFresh = (entry) => ttl === Infinity || Date.now() - entry.timestamp <= ttl;
   const [value, setValue] = createSignal(void 0, { equals: false });
   const [resourceState, setResourceState] = createSignal("unresolved", { equals: false });
@@ -514,8 +554,9 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let flagRefetch = false;
   let flagInvalidate = false;
   function doFetch(key, ck, background, isCancelled) {
-    if (inflight.has(ck)) {
-      inflight.get(ck).then(
+    const running2 = inflight.get(ck);
+    if (running2) {
+      running2.then(
         (v) => {
           if (!isCancelled()) settle(v, background);
         },
@@ -523,12 +564,15 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
           if (!isCancelled() && !background) fail(e);
         }
       );
-      if (!background) setPendingP(inflight.get(ck));
+      if (!background) {
+        trackResourcePromise(running2);
+        setPendingP(running2);
+      }
       return;
     }
     const promise = Promise.resolve(fetchFn(key)).then(
       (v) => {
-        ttlCache.set(ck, { value: v, timestamp: Date.now() });
+        cache.set(ck, { value: v, timestamp: Date.now() });
         inflight.delete(ck);
         return v;
       },
@@ -551,7 +595,8 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
       }
     );
   }
-  function settle(v, background) {
+  function settle(v, _background) {
+    if (ssrId !== void 0) reportResourceData(ssrId, v);
     batch2(() => {
       setValue(() => v);
       setResourceState("ready");
@@ -569,6 +614,7 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   }
   createEffect(() => {
     const key = sourceFn();
+    const values = depValues();
     tick();
     if (key === false || key === null || key === void 0) {
       prevKey = UNSET;
@@ -583,16 +629,18 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
     const doInvalidate = flagInvalidate;
     flagRefetch = false;
     flagInvalidate = false;
-    const ck = buildKey(key);
-    if (doInvalidate) ttlCache.delete(ck);
+    const ck = buildKey(key, values);
+    if (seed && prevKey === UNSET && !cache.get(ck)) cache.set(ck, { value: seed.value, timestamp: Date.now() });
+    if (doInvalidate) cache.delete(ck);
     const keyChanged = prevKey === UNSET || key !== prevKey;
     prevKey = key;
     let cancelled = false;
     onCleanup(() => {
       cancelled = true;
     });
-    const cached = ttlCache.get(ck);
+    const cached = cache.get(ck);
     if (cached && isFresh(cached) && !doRefetch && !doInvalidate) {
+      if (ssrId !== void 0) reportResourceData(ssrId, cached.value);
       const cur2 = untrack2(resourceState);
       if (cur2 !== "ready" || untrack2(value) !== cached.value) {
         batch2(() => {
@@ -653,20 +701,15 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   const invalidate = () => {
     const key = untrack2(sourceFn);
     if (key !== null && key !== void 0 && key !== false) {
-      ttlCache.delete(buildKey(key));
+      cache.delete(buildKey(key));
     }
     flagInvalidate = true;
     setTick((v) => v + 1);
   };
-  return [resource, { mutate: setValue, refetch, invalidate }];
+  return Object.assign(resource, { mutate: setValue, refetch, invalidate });
 }
-function clearCachedResourceNamespace(name) {
+function clearCachedResources(name, cache = currentResourceCache()) {
+  if (name === void 0) return cache.clear();
   const prefix = `${name}:`;
-  for (const key of ttlCache.keys()) {
-    if (key.startsWith(prefix)) ttlCache.delete(key);
-  }
-}
-function clearAllCachedResources() {
-  ttlCache.clear();
-  inflight.clear();
+  for (const key of [...cache.keys()]) if (key.startsWith(prefix)) cache.delete(key);
 }

package/dist/lib/signal/cached-resource.d.ts

@@ -1,53 +1,29 @@
 /**
- * createCachedResource: a reactive resource with TTL-based caching.
+ * `cachedResource`: a resource whose results are kept, by key, for a TTL.
  *
- * Fetches once and returns the cached result for subsequent reads within the
- * TTL window. After the TTL expires the next read triggers a re-fetch.
+ * Fetches once and serves the cached result to later reads within the TTL; after it, the
+ * next read fetches again, showing the stale value meanwhile unless `staleWhileRevalidate`
+ * is off. Readers of the same key share one request in flight.
  *
- * It runs on the live graph, as of this change. It used to build on `./signal.js`,
- * which tracks its current consumer in a module-level `Listener` while everything on
- * the default entry tracks through `G.consumer`. The two never saw each other, so
- * `createEffect(() => data())` subscribed to nothing and a binding kept whatever it
- * first rendered, which on an initial load is the loading state. `cross-graph.spec.ts`
- * holds the general shape of that hazard; this file is no longer an instance of it.
+ *   const workspace = cachedResource(workspaceId, (id) => api.get(`/workspaces/${id}`), {
+ *     name: 'workspace',
+ *     ttl: 5 * 60_000,
+ *   });
+ *   workspace();            // the value; suspends under <Suspense> on the first load
+ *   workspace.stale;        // true while a background refetch runs
+ *   workspace.invalidate(); // drop the entry and fetch again
  *
- * Suspense needs no bookkeeping here. The accessor throws the pending promise and the
- * runtime's suspend handler finds the nearest boundary from the effect that was
- * reading, which is what `graph/resource.ts` relies on too. The manual increment and
- * decrement against a lazily-resolved context went with the port.
+ * Where entries live is the cache's business (`ResourceCache`). By default: one cache per
+ * request on the server, so visitors never share an entry or an in-flight fetch; the page in
+ * a browser. Pass `cache` to keep them elsewhere, for instance a storage that survives a reload.
  *
- * Two forms (mirrors createResource):
+ * A value fetched during the server render travels to the browser with the page, like a
+ * plain resource's, and seeds the first read there instead of a second fetch.
  *
- *   // 1. no reactive source
- *   const [data, { refetch, invalidate }] = createCachedResource(
- *     () => apiClient.get('/data'),
- *     { ttl: 5 * 60_000, name: 'my-data' }
- *   );
- *
- *   // 2. reactive source (re-fetches when source value changes)
- *   const [data, { refetch, invalidate }] = createCachedResource(
- *     () => workspaceId(),
- *     (id) => apiClient.get(`/workspaces/${id}`),
- *     { ttl: 5 * 60_000, name: 'workspace' }
- *   );
- *
- * Options:
- *   ttl: cache lifetime in ms. Default: Infinity (manual invalidate only)
- *   name: cache namespace. If omitted, each call-site gets its own isolated cache.
- *   staleWhileRevalidate, when true (default), show stale data while background-fetching.
- *                          When false, show a loading state during revalidation.
- *
- * Resource shape (same as createResource):
- *   data(): current value (throws pending promise during initial load for Suspense)
- *   data.loading: true during initial load
- *   data.latest: value without throwing
- *   data.error: last error
- *   data.stale: true when showing stale data during background revalidation
- *
- * Actions:
- *   refetch(): force re-fetch regardless of TTL, keeps showing current value while loading
- *   invalidate(): delete cache entry and re-fetch (shows loading on next read)
+ * It runs on the live graph. Suspense needs no bookkeeping here: the accessor throws the
+ * pending promise and the runtime finds the nearest boundary from the reading effect.
  */
+import { type ResourceCache } from './graph/ssr-hooks.js';
 import type { Setter, Resource } from './signal.js';
 export interface CachedResourceOptions {
     /**
@@ -57,7 +33,7 @@ export interface CachedResourceOptions {
     ttl?: number;
     /**
      * Cache namespace. Two calls that share the same `name` share their cache
-     * entries. When omitted, each `createCachedResource` call-site gets a
+     * entries. When omitted, each `cachedResource` call gets a
      * private cache isolated from all others.
      */
     name?: string;
@@ -70,37 +46,41 @@ export interface CachedResourceOptions {
      * `state='refreshing'` (data is still visible but `loading=true`).
      */
     staleWhileRevalidate?: boolean;
+    /** Where entries live. Defaults to the request's cache on the server and the page's in a browser. */
+    cache?: ResourceCache;
+    /** Carry the server-fetched value to the browser with the page. Default true. */
+    transport?: boolean;
+    /**
+     * Other values the data depends on: the signed-in user, the active organisation. Each
+     * combination is cached apart and a change reads (or fetches) its own entry. The fetcher
+     * still receives only the source's key.
+     */
+    deps?: ReadonlyArray<() => unknown>;
 }
 export type CachedResource<T> = Resource<T> & {
     /** `true` while serving stale data during a background re-fetch. */
     stale: boolean;
 };
-export type CachedResourceReturn<T> = [
-    CachedResource<T>,
-    {
-        mutate: Setter<T | undefined>;
-        /** Force re-fetch, bypassing TTL. Current value stays visible. */
-        refetch: () => void;
-        /** Delete the cache entry for the current key and trigger a fresh fetch. */
-        invalidate: () => void;
-    }
-];
-/**
- * No-source overload: fetch is not keyed by any reactive value.
- */
-export declare function createCachedResource<T>(fetcher: () => Promise<T> | T, options?: CachedResourceOptions): CachedResourceReturn<T>;
-/**
- * With-source overload: fetch re-runs whenever the source accessor returns a
- * new value (falsy source suspends the fetch, same as `createResource`).
- */
-export declare function createCachedResource<T, S>(source: () => S | false | null | undefined, fetcher: (key: S) => Promise<T> | T, options?: CachedResourceOptions): CachedResourceReturn<T>;
+export interface CachedResourceActions<T> {
+    mutate: Setter<T | undefined>;
+    /** Fetch again now, whatever the TTL. The current value stays visible. */
+    refetch: () => void;
+    /** Drop the entry for the current key and fetch again. */
+    invalidate: () => void;
+}
+/** One binding: the accessor, with the actions on it. */
+export type CachedResourceHandle<T> = CachedResource<T> & CachedResourceActions<T>;
+/** Not keyed by a reactive value. */
+export declare function cachedResource<T>(fetcher: () => Promise<T> | T, options?: CachedResourceOptions): CachedResourceHandle<T>;
 /**
- * Clear all TTL cache entries for a given namespace (name).
- * Useful to invalidate a whole category of data at once.
+ * Keyed by `source`: a new key reads its own entry, or fetches. A falsy source holds the
+ * fetch, as for `resource`.
  */
-export declare function clearCachedResourceNamespace(name: string): void;
+export declare function cachedResource<T, S>(source: () => S | false | null | undefined, fetcher: (key: S) => Promise<T> | T, options?: CachedResourceOptions): CachedResourceHandle<T>;
 /**
- * Clear the entire TTL cache. Useful on logout / workspace switch.
+ * Drops cached entries in the current scope: those of one `name`, or all of them. On a
+ * logout or a workspace switch, so nothing fetched for the previous one is served.
  */
-export declare function clearAllCachedResources(): void;
+export declare function clearCachedResources(name?: string, cache?: ResourceCache): void;
+export { createResourceCache, type ResourceCache, type ResourceCacheEntry } from './graph/ssr-hooks.js';
 //# sourceMappingURL=cached-resource.d.ts.map

package/dist/lib/signal/cached-resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cached-resource.d.ts","sourceRoot":"","sources":["../../../src/lib/signal/cached-resource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiDG;AAYH,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAgBnE,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;CAChC;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAC5C,oEAAoE;IACpE,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI;IACpC,cAAc,CAAC,CAAC,CAAC;IACjB;QACE,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;QAC9B,kEAAkE;QAClE,OAAO,EAAE,MAAM,IAAI,CAAC;QACpB,4EAA4E;QAC5E,UAAU,EAAE,MAAM,IAAI,CAAC;KACxB;CACF,CAAC;AAUF;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EACpC,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAC7B,OAAO,CAAC,EAAE,qBAAqB,GAC9B,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAE3B;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,CAAC,EACvC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS,EAC1C,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACnC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAwO3B;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAK/D;AAED;;GAEG;AACH,wBAAgB,uBAAuB,IAAI,IAAI,CAG9C"}
+{"version":3,"file":"cached-resource.d.ts","sourceRoot":"","sources":["../../../src/lib/signal/cached-resource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAUH,OAAO,EAML,KAAK,aAAa,EACnB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAiB,MAAM,aAAa,CAAC;AAMnE,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;OAOG;IACH,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,qGAAqG;IACrG,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,iFAAiF;IACjF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB;;;;OAIG;IACH,IAAI,CAAC,EAAE,aAAa,CAAC,MAAM,OAAO,CAAC,CAAC;CACrC;AAED,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG;IAC5C,oEAAoE;IACpE,KAAK,EAAE,OAAO,CAAC;CAChB,CAAC;AAEF,MAAM,WAAW,qBAAqB,CAAC,CAAC;IACtC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC;IAC9B,0EAA0E;IAC1E,OAAO,EAAE,MAAM,IAAI,CAAC;IACpB,0DAA0D;IAC1D,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB;AAED,yDAAyD;AACzD,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;AAUnF,qCAAqC;AACrC,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EAC7B,OAAO,CAAC,EAAE,qBAAqB,GAC9B,oBAAoB,CAAC,CAAC,CAAC,CAAC;AAE3B;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,GAAG,KAAK,GAAG,IAAI,GAAG,SAAS,EAC1C,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,EACnC,OAAO,CAAC,EAAE,qBAAqB,GAC9B,oBAAoB,CAAC,CAAC,CAAC,CAAC;AA2P3B;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,GAAE,aAAsC,GAAG,IAAI,CAIvG;AAED,OAAO,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC"}