@fluixi/reactive 1.0.0-alpha.92 → 1.0.0-alpha.94

package/dist/lib/signal/graph/ssr-hooks.d.ts

@@ -24,4 +24,28 @@ export declare function nextResourceId(): string | undefined;
 export declare function setResourceDataSink(fn: ((id: string, value: any) => void) | null): void;
 /** @internal, a resource reports its resolved value here. */
 export declare function reportResourceData(id: string, value: any): void;
+/** Where cached resources keep their entries and in-flight fetches. */
+export interface ResourceCacheEntry {
+    value: unknown;
+    /** Date.now() when it was fetched. */
+    timestamp: number;
+}
+export interface ResourceCache {
+    get(key: string): ResourceCacheEntry | undefined;
+    set(key: string, entry: ResourceCacheEntry): void;
+    delete(key: string): void;
+    keys(): Iterable<string>;
+    clear(): void;
+    /** Fetches running now, by key, so two readers share one request. Same scope as the entries. */
+    readonly inflight: Map<string, Promise<unknown>>;
+}
+/** A cache held in memory, values kept as they are (Dates, class instances). */
+export declare function createResourceCache(): ResourceCache;
+/**
+ * Inject the cache for the current scope. The server sets one per request, so two visitors
+ * never share an entry or an in-flight fetch.
+ */
+export declare function setResourceCacheScope(fn: (() => ResourceCache | undefined) | null): void;
+/** The cache for where this runs: the injected scope, else the page in a browser, else a private one. */
+export declare function currentResourceCache(): ResourceCache;
 //# sourceMappingURL=ssr-hooks.d.ts.map

package/dist/lib/signal/graph/ssr-hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ssr-hooks.d.ts","sourceRoot":"","sources":["../../../../src/lib/signal/graph/ssr-hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,4FAA4F;AAC5F,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAE/E;AACD,4DAA4D;AAC5D,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAE1D;AAGD,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,KAAK;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,IAAI,CAEjG;AACD,gEAAgE;AAChE,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAEpE;AAGD,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAEnE;AACD,0FAA0F;AAC1F,wBAAgB,cAAc,IAAI,MAAM,GAAG,SAAS,CAEnD;AAGD,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAEvF;AACD,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAE/D"}
+{"version":3,"file":"ssr-hooks.d.ts","sourceRoot":"","sources":["../../../../src/lib/signal/graph/ssr-hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,4FAA4F;AAC5F,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAE/E;AACD,4DAA4D;AAC5D,wBAAgB,oBAAoB,CAAC,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAE1D;AAGD,uFAAuF;AACvF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,KAAK;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,IAAI,CAEjG;AACD,gEAAgE;AAChE,wBAAgB,aAAa,CAAC,EAAE,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,GAAG,CAAA;CAAE,GAAG,SAAS,CAEpE;AAGD,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAEnE;AACD,0FAA0F;AAC1F,wBAAgB,cAAc,IAAI,MAAM,GAAG,SAAS,CAEnD;AAGD,sFAAsF;AACtF,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,IAAI,CAAC,GAAG,IAAI,GAAG,IAAI,CAEvF;AACD,6DAA6D;AAC7D,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI,CAE/D;AAED,uEAAuE;AACvE,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,OAAO,CAAC;IACf,sCAAsC;IACtC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,aAAa;IAC5B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,kBAAkB,GAAG,SAAS,CAAC;IACjD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI,CAAC;IAClD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,IAAI,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;IACzB,KAAK,IAAI,IAAI,CAAC;IACd,gGAAgG;IAChG,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;CAClD;AAED,gFAAgF;AAChF,wBAAgB,mBAAmB,IAAI,aAAa,CAcnD;AAGD;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,EAAE,EAAE,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,GAAG,IAAI,GAAG,IAAI,CAExF;AAKD,yGAAyG;AACzG,wBAAgB,oBAAoB,IAAI,aAAa,CAMpD"}

package/dist/lib/signal/graph/ssr-hooks.js

@@ -42,3 +42,39 @@ export function reportResourceData(id, value) {
     if (_resourceDataSink)
         _resourceDataSink(id, value);
 }
+/** A cache held in memory, values kept as they are (Dates, class instances). */
+export function createResourceCache() {
+    const entries = new Map();
+    const inflight = 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,
+    };
+}
+let _cacheScope = null;
+/**
+ * Inject the cache for the current scope. The server sets one per request, so two visitors
+ * never share an entry or an in-flight fetch.
+ */
+export function setResourceCacheScope(fn) {
+    _cacheScope = fn;
+}
+// The browser serves one user, so the page is the scope there.
+let _pageCache;
+/** The cache for where this runs: the injected scope, else the page in a browser, else a private one. */
+export function currentResourceCache() {
+    const scoped = _cacheScope?.();
+    if (scoped)
+        return scoped;
+    // A server with no scope injected: nothing safe to share, so nothing is shared.
+    if (typeof window === 'undefined')
+        return createResourceCache();
+    return (_pageCache ??= createResourceCache());
+}

package/dist/lib/signal/graph/ssr-hooks.mjs

@@ -27,10 +27,39 @@ function setResourceDataSink(fn) {
 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;
+function setResourceCacheScope(fn) {
+  _cacheScope = fn;
+}
+var _pageCache;
+function currentResourceCache() {
+  const scoped = _cacheScope?.();
+  if (scoped) return scoped;
+  if (typeof window === "undefined") return createResourceCache();
+  return _pageCache ??= createResourceCache();
+}
 export {
+  createResourceCache,
+  currentResourceCache,
   getServerData,
   nextResourceId,
   reportResourceData,
+  setResourceCacheScope,
   setResourceDataSink,
   setResourceIdSource,
   setResourceTracker,

package/dist/lib/signal/graph/state.cjs

@@ -27,7 +27,7 @@ __export(state_exports, {
 module.exports = __toCommonJS(state_exports);
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];

package/dist/lib/signal/graph/state.mjs

@@ -1,5 +1,5 @@
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];

package/dist/lib/signal/graph/suspense.cjs

@@ -27,7 +27,7 @@ __export(suspense_exports, {
 module.exports = __toCommonJS(suspense_exports);
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -77,11 +77,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 }
     );
   }
 }

package/dist/lib/signal/graph/suspense.mjs

@@ -1,5 +1,5 @@
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // 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 }
     );
   }
 }

package/dist/lib/signal/index-legacy.cjs

@@ -1,4 +1,4 @@
-/*! @fluixi/reactive v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/reactive v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 "use strict";
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -27,11 +27,10 @@ __export(index_legacy_exports, {
   $SIGNAL: () => $SIGNAL3,
   __DEV__: () => __DEV__,
   batch: () => batch3,
-  clearAllCachedResources: () => clearAllCachedResources,
-  clearCachedResourceNamespace: () => clearCachedResourceNamespace,
+  cachedResource: () => cachedResource,
+  clearCachedResources: () => clearCachedResources,
   combineSignal: () => combineSignal,
   combineSignals: () => combineSignals,
-  createCachedResource: () => createCachedResource,
   createComputed: () => createComputed,
   createContext: () => createContext,
   createDebounce: () => createDebounce,
@@ -41,6 +40,7 @@ __export(index_legacy_exports, {
   createProvider: () => createProvider,
   createRenderEffect: () => createRenderEffect,
   createResource: () => createResource,
+  createResourceCache: () => createResourceCache,
   createRoot: () => createRoot2,
   createSelector: () => createSelector,
   createSignal: () => createSignal2,
@@ -494,7 +494,7 @@ function makeArrayFlat(values) {
 }
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -544,11 +544,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 }
     );
   }
 }
@@ -863,7 +864,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);
@@ -875,7 +876,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);
@@ -902,8 +903,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();
 }
 
@@ -971,12 +972,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 batch2(fn) {
   return batch(fn);
@@ -1085,6 +1086,29 @@ function setResourceDataSink(fn) {
 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/signal.ts
 var $SIGNAL3 = /* @__PURE__ */ Symbol.for("signal");
@@ -2211,12 +2235,10 @@ function readSignal(signal) {
 }
 
 // src/lib/signal/cached-resource.ts
-var ttlCache = /* @__PURE__ */ new Map();
-var inflight = /* @__PURE__ */ new Map();
 var _autoId = 0;
 var $SIGNAL4 = /* @__PURE__ */ Symbol.for("signal");
 var $RESOURCE3 = /* @__PURE__ */ Symbol.for("resource");
-function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
+function cachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let sourceFn;
   let fetchFn;
   let options;
@@ -2235,7 +2257,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 });
@@ -2248,8 +2276,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);
         },
@@ -2257,12 +2286,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;
       },
@@ -2285,7 +2317,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");
@@ -2303,6 +2336,7 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   }
   createEffect(() => {
     const key = sourceFn();
+    const values = depValues();
     tick();
     if (key === false || key === null || key === void 0) {
       prevKey = UNSET;
@@ -2317,16 +2351,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(() => {
@@ -2387,22 +2423,17 @@ 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);
 }
 
 // src/lib/signal/list.ts

package/dist/lib/signal/index-legacy.mjs

@@ -1,4 +1,4 @@
-/*! @fluixi/reactive v1.0.0-alpha.92 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+/*! @fluixi/reactive v1.0.0-alpha.94 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
 
 // src/lib/predicates.ts
 function isFunction(value) {
@@ -392,7 +392,7 @@ function makeArrayFlat(values) {
 }
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.92";
+var VERSION = "1.0.0-alpha.94";
 
 // src/lib/signal/graph/state.ts
 var MAJOR = VERSION.split(".")[0];
@@ -442,11 +442,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 }
     );
   }
 }
@@ -761,7 +762,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);
@@ -773,7 +774,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);
@@ -800,8 +801,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();
 }
 
@@ -869,12 +870,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 batch2(fn) {
   return batch(fn);
@@ -983,6 +984,29 @@ function setResourceDataSink(fn) {
 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/signal.ts
 var $SIGNAL3 = /* @__PURE__ */ Symbol.for("signal");
@@ -2109,12 +2133,10 @@ function readSignal(signal) {
 }
 
 // src/lib/signal/cached-resource.ts
-var ttlCache = /* @__PURE__ */ new Map();
-var inflight = /* @__PURE__ */ new Map();
 var _autoId = 0;
 var $SIGNAL4 = /* @__PURE__ */ Symbol.for("signal");
 var $RESOURCE3 = /* @__PURE__ */ Symbol.for("resource");
-function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
+function cachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let sourceFn;
   let fetchFn;
   let options;
@@ -2133,7 +2155,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 });
@@ -2146,8 +2174,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);
         },
@@ -2155,12 +2184,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;
       },
@@ -2183,7 +2215,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");
@@ -2201,6 +2234,7 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   }
   createEffect(() => {
     const key = sourceFn();
+    const values = depValues();
     tick();
     if (key === false || key === null || key === void 0) {
       prevKey = UNSET;
@@ -2215,16 +2249,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(() => {
@@ -2285,22 +2321,17 @@ 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);
 }
 
 // src/lib/signal/list.ts
@@ -2443,11 +2474,10 @@ export {
   $SIGNAL3 as $SIGNAL,
   __DEV__,
   batch3 as batch,
-  clearAllCachedResources,
-  clearCachedResourceNamespace,
+  cachedResource,
+  clearCachedResources,
   combineSignal,
   combineSignals,
-  createCachedResource,
   createComputed,
   createContext,
   createDebounce,
@@ -2457,6 +2487,7 @@ export {
   createProvider,
   createRenderEffect,
   createResource,
+  createResourceCache,
   createRoot2 as createRoot,
   createSelector,
   createSignal2 as createSignal,