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

package/dist/index.cjs

@@ -39,15 +39,16 @@ __export(index_exports, {
   SuspenseContext: () => SuspenseContext,
   VERSION: () => VERSION,
   __DEV__: () => __DEV__,
+  adoptReactiveScope: () => adoptReactiveScope,
   batch: () => batch2,
+  cachedResource: () => cachedResource,
   childOwner: () => childOwner,
-  clearAllCachedResources: () => clearAllCachedResources,
-  clearCachedResourceNamespace: () => clearCachedResourceNamespace,
+  clearCachedResources: () => clearCachedResources,
+  closeReactiveScope: () => closeReactiveScope,
   combineSignal: () => combineSignal,
   combineSignals: () => combineSignals,
   computed: () => computed,
   context: () => context,
-  createCachedResource: () => createCachedResource,
   createChildOwner: () => createChildOwner,
   createComputed: () => createComputed,
   createComputedStore: () => createComputedStore,
@@ -62,6 +63,7 @@ __export(index_exports, {
   createMutableStore: () => createMutableStore,
   createRenderEffect: () => createRenderEffect,
   createResource: () => createResource,
+  createResourceCache: () => createResourceCache,
   createRoot: () => createRoot,
   createSelector: () => createSelector,
   createSignal: () => createSignal,
@@ -69,6 +71,7 @@ __export(index_exports, {
   createStoreEffect: () => createStoreEffect,
   createStoreMemo: () => createStoreMemo,
   createSuspenseBoundary: () => createSuspenseBoundary,
+  currentResourceCache: () => currentResourceCache,
   debounceSignal: () => debounceSignal,
   disposeScope: () => disposeScope,
   distinctSignal: () => distinctSignal,
@@ -97,6 +100,7 @@ __export(index_exports, {
   makeArrayFlat: () => makeArrayFlat,
   mapArray: () => mapArray,
   mapSignal: () => mapSignal,
+  markReactiveScope: () => markReactiveScope,
   memo: () => memo,
   mergeSignal: () => mergeSignal,
   modifiable: () => modifiable,
@@ -105,12 +109,14 @@ __export(index_exports, {
   omitSignal: () => omitSignal,
   on: () => on,
   onCleanup: () => onCleanup,
+  openReactiveScope: () => openReactiveScope,
   operate: () => operate,
   pickSignal: () => pickSignal,
   produceUtil: () => produce,
   provide: () => provide,
   provideErrorBoundary: () => provideErrorBoundary,
   provideSuspense: () => provideSuspense,
+  reactiveScopeOf: () => reactiveScopeOf,
   readChildren: () => readChildren,
   readSignal: () => readSignal,
   reconcileUtil: () => reconcile,
@@ -127,6 +133,7 @@ __export(index_exports, {
   runWithOwner: () => runWithOwner,
   selectSignal: () => selectSignal,
   setOwner: () => setOwner,
+  setResourceCacheScope: () => setResourceCacheScope,
   setResourceDataSink: () => setResourceDataSink,
   setResourceIdSource: () => setResourceIdSource,
   setResourceTracker: () => setResourceTracker,
@@ -144,13 +151,14 @@ __export(index_exports, {
   useContext: () => useContext,
   useTransition: () => useTransition,
   whenSignal: () => whenSignal,
+  withReactiveScope: () => withReactiveScope,
   wrap: () => wrap,
   zipSignal: () => zipSignal
 });
 module.exports = __toCommonJS(index_exports);
 
 // src/version.generated.ts
-var VERSION = "1.0.0-alpha.91";
+var VERSION = "1.0.0-alpha.93";
 
 // src/lib/predicates.ts
 function isFunction(value) {
@@ -641,11 +649,40 @@ function withReactiveOrigin(owner, fn) {
     origin = previous;
   }
 }
+var currentScope;
+function openReactiveScope(info) {
+  const scope = {};
+  G.observer?.scope?.(scope, info, currentScope);
+  return scope;
+}
+function withReactiveScope(scope, fn) {
+  if (!G.observer) return fn();
+  const previous = currentScope;
+  currentScope = scope;
+  try {
+    return fn();
+  } finally {
+    currentScope = previous;
+  }
+}
+function closeReactiveScope(scope) {
+  G.observer?.scopeEnded?.(scope);
+}
+function adoptReactiveScope(scope, parent) {
+  G.observer?.scopeAdopted?.(scope, parent);
+}
+var SCOPE_OF = /* @__PURE__ */ Symbol.for("fluixi.reactiveScope");
+function markReactiveScope(value, scope) {
+  Object.defineProperty(value, SCOPE_OF, { value: scope, configurable: true, enumerable: false });
+}
+function reactiveScopeOf(value) {
+  return value !== null && (typeof value === "object" || typeof value === "function") ? value[SCOPE_OF] ?? void 0 : void 0;
+}
 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 }
     );
   }
 }
@@ -1065,7 +1102,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);
@@ -1077,7 +1114,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);
@@ -1104,8 +1141,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();
 }
 
@@ -1173,12 +1210,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;
@@ -1424,6 +1461,32 @@ 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();
+}
 
 // src/lib/signal/graph/derived.ts
 function createSelector(source, fn = (k, v) => k === v) {
@@ -1743,8 +1806,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);
@@ -2527,12 +2590,10 @@ function readSignal(signal2) {
 }
 
 // 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 $RESOURCE2 = /* @__PURE__ */ Symbol.for("resource");
-function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
+function cachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let sourceFn;
   let fetchFn;
   let options;
@@ -2551,7 +2612,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 });
@@ -2564,8 +2631,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);
         },
@@ -2573,12 +2641,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;
       },
@@ -2601,7 +2672,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");
@@ -2619,6 +2691,7 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   }
   createEffect(() => {
     const key = sourceFn();
+    const values = depValues();
     tick();
     if (key === false || key === null || key === void 0) {
       prevKey = UNSET2;
@@ -2633,16 +2706,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 === UNSET2 && !cache.get(ck)) cache.set(ck, { value: seed.value, timestamp: Date.now() });
+    if (doInvalidate) cache.delete(ck);
     const keyChanged = prevKey === UNSET2 || 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(() => {
@@ -2703,20 +2778,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 [resource2, { mutate: setValue, refetch, invalidate }];
+  return Object.assign(resource2, { 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/index.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/predicates.ts
 function isFunction(value) {
@@ -490,11 +490,40 @@ function withReactiveOrigin(owner, fn) {
     origin = previous;
   }
 }
+var currentScope;
+function openReactiveScope(info) {
+  const scope = {};
+  G.observer?.scope?.(scope, info, currentScope);
+  return scope;
+}
+function withReactiveScope(scope, fn) {
+  if (!G.observer) return fn();
+  const previous = currentScope;
+  currentScope = scope;
+  try {
+    return fn();
+  } finally {
+    currentScope = previous;
+  }
+}
+function closeReactiveScope(scope) {
+  G.observer?.scopeEnded?.(scope);
+}
+function adoptReactiveScope(scope, parent) {
+  G.observer?.scopeAdopted?.(scope, parent);
+}
+var SCOPE_OF = /* @__PURE__ */ Symbol.for("fluixi.reactiveScope");
+function markReactiveScope(value, scope) {
+  Object.defineProperty(value, SCOPE_OF, { value: scope, configurable: true, enumerable: false });
+}
+function reactiveScopeOf(value) {
+  return value !== null && (typeof value === "object" || typeof value === "function") ? value[SCOPE_OF] ?? void 0 : void 0;
+}
 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 }
     );
   }
 }
@@ -914,7 +943,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);
@@ -926,7 +955,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);
@@ -953,8 +982,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();
 }
 
@@ -1022,12 +1051,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;
@@ -1273,6 +1302,32 @@ 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();
+}
 
 // src/lib/signal/graph/derived.ts
 function createSelector(source, fn = (k, v) => k === v) {
@@ -1592,8 +1647,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);
@@ -2383,12 +2438,10 @@ function readSignal(signal2) {
 }
 
 // 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 $RESOURCE2 = /* @__PURE__ */ Symbol.for("resource");
-function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
+function cachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   let sourceFn;
   let fetchFn;
   let options;
@@ -2407,7 +2460,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 });
@@ -2420,8 +2479,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);
         },
@@ -2429,12 +2489,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;
       },
@@ -2457,7 +2520,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");
@@ -2475,6 +2539,7 @@ function createCachedResource(sourceOrFetcher, fetcherOrOptions, opts = {}) {
   }
   createEffect(() => {
     const key = sourceFn();
+    const values = depValues();
     tick();
     if (key === false || key === null || key === void 0) {
       prevKey = UNSET2;
@@ -2489,16 +2554,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 === UNSET2 && !cache.get(ck)) cache.set(ck, { value: seed.value, timestamp: Date.now() });
+    if (doInvalidate) cache.delete(ck);
     const keyChanged = prevKey === UNSET2 || 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(() => {
@@ -2559,22 +2626,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 [resource2, { mutate: setValue, refetch, invalidate }];
+  return Object.assign(resource2, { 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);
 }
 export {
   $NAME,
@@ -2596,15 +2658,16 @@ export {
   SuspenseContext,
   VERSION,
   __DEV__,
+  adoptReactiveScope,
   batch2 as batch,
+  cachedResource,
   childOwner,
-  clearAllCachedResources,
-  clearCachedResourceNamespace,
+  clearCachedResources,
+  closeReactiveScope,
   combineSignal,
   combineSignals,
   computed,
   context,
-  createCachedResource,
   createChildOwner,
   createComputed,
   createComputedStore,
@@ -2619,6 +2682,7 @@ export {
   createMutableStore,
   createRenderEffect,
   createResource,
+  createResourceCache,
   createRoot,
   createSelector,
   createSignal,
@@ -2626,6 +2690,7 @@ export {
   createStoreEffect,
   createStoreMemo,
   createSuspenseBoundary,
+  currentResourceCache,
   debounceSignal,
   disposeScope,
   distinctSignal,
@@ -2654,6 +2719,7 @@ export {
   makeArrayFlat,
   mapArray,
   mapSignal,
+  markReactiveScope,
   memo,
   mergeSignal,
   modifiable,
@@ -2662,12 +2728,14 @@ export {
   omitSignal,
   on,
   onCleanup,
+  openReactiveScope,
   operate,
   pickSignal,
   produce as produceUtil,
   provide,
   provideErrorBoundary,
   provideSuspense,
+  reactiveScopeOf,
   readChildren,
   readSignal,
   reconcile as reconcileUtil,
@@ -2684,6 +2752,7 @@ export {
   runWithOwner,
   selectSignal,
   setOwner,
+  setResourceCacheScope,
   setResourceDataSink,
   setResourceIdSource,
   setResourceTracker,
@@ -2701,6 +2770,7 @@ export {
   useContext,
   useTransition,
   whenSignal,
+  withReactiveScope,
   wrap,
   zipSignal
 };