sibujs 4.9.0 → 4.10.1

package/dist/extras.cjs

@@ -245,7 +245,7 @@ __export(extras_exports, {
   resetSSRState: () => resetSSRState,
   resize: () => resize,
   resource: () => resource,
-  runCleanups: () => runCleanups,
+  runCleanups: () => runCleanups2,
   satisfies: () => satisfies,
   scaleDown: () => scaleDown,
   scaleUp: () => scaleUp,
@@ -730,6 +730,24 @@ function untracked(fn) {
     resumeTracking();
   }
 }
+var currentOwnerScope = null;
+function getOwnerScope() {
+  return currentOwnerScope;
+}
+function runWithOwnerScope(scope, fn) {
+  const prev = currentOwnerScope;
+  currentOwnerScope = scope;
+  try {
+    return fn();
+  } finally {
+    currentOwnerScope = prev;
+  }
+}
+function bindOwnerScope(fn) {
+  const scope = currentOwnerScope;
+  if (scope === null) return fn;
+  return (...args) => runWithOwnerScope(scope, () => fn(...args));
+}
 var subscriberEpochCounter = 0;
 function retrack(effectFn, subscriber) {
   const prev = currentSubscriber;
@@ -745,6 +763,10 @@ function retrack(effectFn, subscriber) {
   currentSubscriber = subscriber;
   const sub2 = subscriber;
   if (sub2._cap === void 0) sub2._cap = currentDisposerCapture();
+  const prevScope = currentOwnerScope;
+  if (prevScope !== null && !sub2._epoch && sub2._scope === void 0) sub2._scope = prevScope;
+  const scope = sub2._scope === void 0 ? null : sub2._scope;
+  if (scope !== prevScope) currentOwnerScope = scope;
   const epoch = ++subscriberEpochCounter;
   sub2._epoch = epoch;
   sub2._structDirty = false;
@@ -757,6 +779,7 @@ function retrack(effectFn, subscriber) {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
@@ -791,23 +814,26 @@ function track(effectFn, subscriber) {
     trackingSuspended = false;
   }
   currentSubscriber = subscriber;
+  const sub2 = subscriber;
+  if (sub2._scope === void 0) sub2._scope = currentOwnerScope;
+  const prevScope = currentOwnerScope;
+  currentOwnerScope = sub2._scope;
   try {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
       trackingSuspended = true;
     }
-    const sub3 = subscriber;
-    for (let n = sub3.depsHead ?? null; n !== null; n = n.subNext) {
+    for (let n = sub2.depsHead ?? null; n !== null; n = n.subNext) {
       const sig = n.sig;
       sig.__activeNode = n.prevActive;
       n.prevActive = null;
     }
   }
-  const sub2 = subscriber;
   return sub2._dispose ?? (sub2._dispose = () => cleanup(subscriber));
 }
 function reactiveBinding(commit, ownerNode) {
@@ -1077,7 +1103,7 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.9.0" : "dev";
+var _runtimeVersion = true ? "4.10.1" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g2 = globalThis;
@@ -1109,6 +1135,9 @@ function resolveReactiveApi() {
     getSubscriberCount,
     getSubscriberDeps,
     forEachSubscriber,
+    getOwnerScope,
+    runWithOwnerScope,
+    bindOwnerScope,
     version: _runtimeVersion
   };
   g2[REGISTRY_KEY] = local;
@@ -1132,6 +1161,9 @@ var notifySubscribers2 = API.notifySubscribers;
 var getSubscriberCount2 = API.getSubscriberCount;
 var getSubscriberDeps2 = API.getSubscriberDeps;
 var forEachSubscriber2 = API.forEachSubscriber;
+var getOwnerScope2 = API.getOwnerScope ?? getOwnerScope;
+var runWithOwnerScope2 = API.runWithOwnerScope ?? runWithOwnerScope;
+var bindOwnerScope2 = API.bindOwnerScope ?? bindOwnerScope;
 
 // src/core/devtoolsHook.ts
 function emitDevtools(hook, event, payload) {
@@ -1312,6 +1344,11 @@ function flushUserCleanups(ctx) {
   const list = ctx.userCleanups;
   if (list.length === 0) return;
   ctx.userCleanups = [];
+  const scope = ctx.subscriber._scope ?? null;
+  if (scope === getOwnerScope2()) runCleanups(list);
+  else runWithOwnerScope2(scope, () => runCleanups(list));
+}
+function runCleanups(list) {
   for (let i2 = list.length - 1; i2 >= 0; i2--) {
     try {
       list[i2]();
@@ -1806,7 +1843,7 @@ function query(key, fetcher, options = {}) {
   } = options;
   const resolveKey = typeof key === "function" ? key : () => key;
   const enabledGate = typeof enabled === "function" ? derived(() => Boolean(enabled())) : null;
-  const isEnabled = enabledGate ?? (() => enabled);
+  const isEnabled = enabledGate ?? (() => Boolean(enabled));
   const cache = getActiveQueryCache();
   const [data2, setData] = signal(initialData);
   const [isFetching, setIsFetching] = signal(false);
@@ -1825,6 +1862,7 @@ function query(key, fetcher, options = {}) {
   let currentKey = null;
   let attachedEntry = null;
   let attachedKey = null;
+  let lastEnabled = null;
   let intervalTimer = null;
   const loading = derived(() => isFetching() && data2() === void 0);
   const isStale = derived(() => {
@@ -2025,13 +2063,16 @@ function query(key, fetcher, options = {}) {
     const key2 = resolveKey();
     const on = isEnabled();
     const keyChanged = currentKey !== key2;
+    const enabledRose = on && lastEnabled === false;
     currentKey = key2;
+    lastEnabled = on;
     if (key2 === "") {
       detachFromEntry();
       setIsFetching(false);
       return;
     }
     const entry = getOrCreateEntry(cache, key2, initialData);
+    const reattached = attachedEntry !== entry;
     attachToEntry(entry, key2);
     if (keyChanged) setIsFetching(entry.promise !== null);
     if (entry.data !== void 0) {
@@ -2042,7 +2083,8 @@ function query(key, fetcher, options = {}) {
         setUpdatedAt(entry.dataUpdatedAt);
       });
     }
-    if (!keyChanged && currentKey === key2 && entry.data !== void 0) {
+    if (!keyChanged && !reattached && !enabledRose) return;
+    if (!keyChanged && entry.data !== void 0) {
       const isDataStale2 = entry.dataUpdatedAt === 0 || Date.now() - entry.dataUpdatedAt >= staleTime;
       if (on && isDataStale2 && !entry.promise) doFetch();
       return;
@@ -9714,16 +9756,20 @@ function lazyChunk(id, loader, registry, fallback) {
     registry.load(id, async () => {
       const mod = await loader();
       return typeof mod === "function" ? mod : mod.default;
-    }).then((component) => {
-      if (disposed) return;
-      const node = component();
-      if (disposed) {
-        dispose(node);
-        return;
-      }
-      clearChildren(container);
-      container.appendChild(node);
-    }).catch((err) => {
+    }).then(
+      // Instantiated after the chunk resolves, in the owner scope of the
+      // render that asked for it — as `lazy()` does.
+      bindOwnerScope2((component) => {
+        if (disposed) return;
+        const node = component();
+        if (disposed) {
+          dispose(node);
+          return;
+        }
+        clearChildren(container);
+        container.appendChild(node);
+      })
+    ).catch((err) => {
       if (disposed) return;
       clearChildren(container);
       const errorEl = document.createElement("div");
@@ -11164,11 +11210,15 @@ function defineRemoteComponent(name, loader) {
     registerDisposer(container, () => {
       disposed = true;
     });
-    loader().then((mod) => {
-      cached = mod.default;
-      if (disposed) return;
-      replaceChildrenSafely(container, cached());
-    }).catch((err) => {
+    loader().then(
+      // Instantiated after the module resolves, in the owner scope of the
+      // render that asked for it — as `lazy()` does.
+      bindOwnerScope2((mod) => {
+        cached = mod.default;
+        if (disposed) return;
+        replaceChildrenSafely(container, cached());
+      })
+    ).catch((err) => {
       if (disposed) return;
       const message = err instanceof Error ? err.message : String(err);
       replaceChildrenSafely(
@@ -11981,7 +12031,7 @@ var CDN_ENTRY_POINTS = {
 };
 var packageInfo = {
   name: "sibujs",
-  version: true ? "4.9.0" : "dev",
+  version: true ? "4.10.1" : "dev",
   entryPoints: MODULE_ENTRY_POINTS,
   /**
    * Generate the package.json `exports` map. Module entries resolve to the
@@ -12126,7 +12176,7 @@ var env = {
 };
 
 // src/plugins/versioning.ts
-var VERSION = true ? "4.9.0" : "dev";
+var VERSION = true ? "4.10.1" : "dev";
 var NUM = "(?:0|[1-9]\\d*)";
 var PRE_ID = `(?:${NUM}|\\d*[a-zA-Z-][0-9a-zA-Z-]*)`;
 var BUILD_ID = "[0-9a-zA-Z-]+";
@@ -12728,7 +12778,7 @@ function trackCleanup(component, cleanup3) {
   }
   trackedCleanups.get(component)?.push(cleanup3);
 }
-function runCleanups(component) {
+function runCleanups2(component) {
   const cleanups = trackedCleanups.get(component);
   if (cleanups) {
     for (const cleanup3 of cleanups) {

package/dist/extras.js

@@ -5,7 +5,7 @@ import {
   optimisticList,
   persisted,
   timeline
-} from "./chunk-TV464N2M.js";
+} from "./chunk-CYUU3XXG.js";
 import {
   DOMPool,
   Features,
@@ -41,7 +41,7 @@ import {
   transitionState,
   uniqueId,
   yieldToMain
-} from "./chunk-DRMLIF6M.js";
+} from "./chunk-WHZKRSHQ.js";
 import {
   MigrationStorageError,
   VERSION,
@@ -63,7 +63,7 @@ import {
   preloadCritical,
   prerenderRoutes,
   satisfies
-} from "./chunk-CF2KCWRE.js";
+} from "./chunk-JZMLRF2G.js";
 import {
   Head,
   clearWasmCache,
@@ -89,7 +89,7 @@ import {
   wasm,
   worker,
   workerFn
-} from "./chunk-KG25XMGP.js";
+} from "./chunk-MJZUXQHR.js";
 import {
   FocusTrap,
   VirtualList,
@@ -130,7 +130,7 @@ import {
   toast,
   withScopedStyle,
   zipMask
-} from "./chunk-XJVTQUIV.js";
+} from "./chunk-GEQNWNYS.js";
 import {
   RenderProp,
   assertType,
@@ -157,7 +157,7 @@ import {
   select,
   tabs,
   tooltip
-} from "./chunk-2K3Z3XO4.js";
+} from "./chunk-LYM6TT2R.js";
 import {
   __resetSpeechCoordinator,
   animationFrame,
@@ -196,7 +196,7 @@ import {
   visibility,
   wakeLock,
   windowSize
-} from "./chunk-YW6HQKGO.js";
+} from "./chunk-42REZXE4.js";
 import "./chunk-52XFPGSN.js";
 import {
   __resetQueryCache,
@@ -222,7 +222,7 @@ import {
   throttle,
   withLoader,
   withRetry
-} from "./chunk-562UVHMM.js";
+} from "./chunk-ADJEMTRC.js";
 import {
   SibuError,
   checkLeaks,
@@ -260,7 +260,7 @@ import {
   trackCleanup,
   walkDependencyGraph,
   withErrorTracking
-} from "./chunk-K6K5ACO6.js";
+} from "./chunk-CID4BYBF.js";
 import {
   antdAdapter,
   chakraAdapter,
@@ -270,7 +270,7 @@ import {
   mobXAdapter,
   reduxAdapter,
   zustandAdapter
-} from "./chunk-7OV5Q2UU.js";
+} from "./chunk-2D47RVVK.js";
 import {
   PluginInstallCancelledError,
   createPlugin,
@@ -284,7 +284,7 @@ import {
   triggerPluginMount,
   triggerPluginUnmount
 } from "./chunk-J6FW5TV6.js";
-import "./chunk-QBKCK6MJ.js";
+import "./chunk-YNE4FSVX.js";
 import {
   collectStream,
   deserializeState,
@@ -305,15 +305,15 @@ import {
   suspenseSwapScript,
   trustHTML
 } from "./chunk-FC6KCJSA.js";
-import "./chunk-CDBKFGXN.js";
-import "./chunk-FHCZMHHE.js";
+import "./chunk-DA2LJXK3.js";
+import "./chunk-GVVZPMA5.js";
 import "./chunk-62BDYGAG.js";
-import "./chunk-5MLWTIQE.js";
-import "./chunk-MPWDSTYK.js";
+import "./chunk-2T73SWKF.js";
+import "./chunk-DS6PFIZK.js";
 import "./chunk-3ACAAQIN.js";
-import "./chunk-X7NRHFZR.js";
+import "./chunk-LK3VK47W.js";
 import "./chunk-7ZHH77QA.js";
-import "./chunk-SBTZEYNI.js";
+import "./chunk-6DYRY2NF.js";
 import "./chunk-EXXSN3BW.js";
 import "./chunk-7XHATCIH.js";
 import {
@@ -338,10 +338,10 @@ import {
   stagger,
   transition,
   viewTransition
-} from "./chunk-NQMKWBKU.js";
+} from "./chunk-HZQEL575.js";
 import "./chunk-5HZXGZ6T.js";
-import "./chunk-SYHGGDNW.js";
-import "./chunk-G2WHYEL7.js";
+import "./chunk-BNZDDNBR.js";
+import "./chunk-NROLUUCO.js";
 import "./chunk-NYNYSPK7.js";
 export {
   DOMPool,

package/dist/index.cjs

@@ -1350,6 +1350,24 @@ function untracked(fn) {
     resumeTracking();
   }
 }
+var currentOwnerScope = null;
+function getOwnerScope() {
+  return currentOwnerScope;
+}
+function runWithOwnerScope(scope, fn) {
+  const prev = currentOwnerScope;
+  currentOwnerScope = scope;
+  try {
+    return fn();
+  } finally {
+    currentOwnerScope = prev;
+  }
+}
+function bindOwnerScope(fn) {
+  const scope = currentOwnerScope;
+  if (scope === null) return fn;
+  return (...args) => runWithOwnerScope(scope, () => fn(...args));
+}
 var subscriberEpochCounter = 0;
 function retrack(effectFn, subscriber) {
   const prev = currentSubscriber;
@@ -1365,6 +1383,10 @@ function retrack(effectFn, subscriber) {
   currentSubscriber = subscriber;
   const sub2 = subscriber;
   if (sub2._cap === void 0) sub2._cap = currentDisposerCapture();
+  const prevScope = currentOwnerScope;
+  if (prevScope !== null && !sub2._epoch && sub2._scope === void 0) sub2._scope = prevScope;
+  const scope = sub2._scope === void 0 ? null : sub2._scope;
+  if (scope !== prevScope) currentOwnerScope = scope;
   const epoch = ++subscriberEpochCounter;
   sub2._epoch = epoch;
   sub2._structDirty = false;
@@ -1377,6 +1399,7 @@ function retrack(effectFn, subscriber) {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
@@ -1411,23 +1434,26 @@ function track(effectFn, subscriber) {
     trackingSuspended = false;
   }
   currentSubscriber = subscriber;
+  const sub2 = subscriber;
+  if (sub2._scope === void 0) sub2._scope = currentOwnerScope;
+  const prevScope = currentOwnerScope;
+  currentOwnerScope = sub2._scope;
   try {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
       trackingSuspended = true;
     }
-    const sub3 = subscriber;
-    for (let n = sub3.depsHead ?? null; n !== null; n = n.subNext) {
+    for (let n = sub2.depsHead ?? null; n !== null; n = n.subNext) {
       const sig = n.sig;
       sig.__activeNode = n.prevActive;
       n.prevActive = null;
     }
   }
-  const sub2 = subscriber;
   return sub2._dispose ?? (sub2._dispose = () => cleanup(subscriber));
 }
 function reactiveBinding(commit, ownerNode) {
@@ -1697,7 +1723,7 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.9.0" : "dev";
+var _runtimeVersion = true ? "4.10.1" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g2 = globalThis;
@@ -1729,6 +1755,9 @@ function resolveReactiveApi() {
     getSubscriberCount,
     getSubscriberDeps,
     forEachSubscriber,
+    getOwnerScope,
+    runWithOwnerScope,
+    bindOwnerScope,
     version: _runtimeVersion
   };
   g2[REGISTRY_KEY] = local;
@@ -1752,6 +1781,9 @@ var notifySubscribers2 = API.notifySubscribers;
 var getSubscriberCount2 = API.getSubscriberCount;
 var getSubscriberDeps2 = API.getSubscriberDeps;
 var forEachSubscriber2 = API.forEachSubscriber;
+var getOwnerScope2 = API.getOwnerScope ?? getOwnerScope;
+var runWithOwnerScope2 = API.runWithOwnerScope ?? runWithOwnerScope;
+var bindOwnerScope2 = API.bindOwnerScope ?? bindOwnerScope;
 
 // src/reactivity/bindAttribute.ts
 function bindAttribute(el, attr, getter) {
@@ -2425,12 +2457,16 @@ function lazy(importFn) {
     }
     const container = div({ class: "sibu-lazy" });
     let disposed = false;
-    importFn().then((mod) => {
-      if (disposed) return;
-      cached = mod.default;
-      const rendered = cached();
-      replaceChildrenSafely(container, rendered);
-    }).catch((err) => {
+    importFn().then(
+      // The component renders after the import resolves, in the owner scope
+      // of whoever rendered the placeholder.
+      bindOwnerScope2((mod) => {
+        if (disposed) return;
+        cached = mod.default;
+        const rendered = cached();
+        replaceChildrenSafely(container, rendered);
+      })
+    ).catch((err) => {
       if (disposed) return;
       const errorObj = err instanceof Error ? err : new Error(String(err));
       replaceChildrenSafely(
@@ -2461,7 +2497,7 @@ function Suspense({ nodes, fallback }) {
     }
     if (childEl && !container.contains(childEl)) dispose(childEl);
   });
-  queueMicrotask(() => {
+  const renderContent = bindOwnerScope2(() => {
     if (suspenseDisposed) return;
     try {
       const el = nodes();
@@ -2489,10 +2525,14 @@ function Suspense({ nodes, fallback }) {
       dispatchPropagate(container, errorObj);
     }
   });
+  queueMicrotask(renderContent);
   return container;
 }
 
 // src/core/rendering/lifecycle.ts
+function pinScope(scope, fn) {
+  return () => getOwnerScope2() === scope ? fn() : runWithOwnerScope2(scope, fn);
+}
 function safeCall(cb, hookName) {
   try {
     return cb();
@@ -2502,13 +2542,14 @@ function safeCall(cb, hookName) {
     return void 0;
   }
 }
-function runMountCallback(callback, hookName, element, isDisposed) {
-  const cleanup3 = safeCall(callback, hookName);
-  if (typeof cleanup3 !== "function") return;
+function runMountCallback(callback, hookName, element, isDisposed, scope) {
+  const returned = safeCall(callback, hookName);
+  if (typeof returned !== "function") return;
+  const cleanup3 = pinScope(scope, returned);
   if (isDisposed() || !element.isConnected) {
     safeCall(cleanup3, "onUnmount");
   } else {
-    onUnmount(cleanup3, element);
+    watchUnmount(cleanup3, element);
   }
 }
 var mountWatchers = /* @__PURE__ */ new WeakMap();
@@ -2668,6 +2709,8 @@ function registerUnmountWatcher(element, cb) {
 }
 function onMount(callback, element) {
   if (typeof document === "undefined") return;
+  const scope = getOwnerScope2();
+  callback = pinScope(scope, callback);
   if (element) {
     let disposed = false;
     const isDisposed = () => disposed;
@@ -2677,19 +2720,19 @@ function onMount(callback, element) {
     if (element.isConnected) {
       queueMicrotask(() => {
         if (disposed) return;
-        runMountCallback(callback, "onMount", element, isDisposed);
+        runMountCallback(callback, "onMount", element, isDisposed, scope);
       });
       return;
     }
     queueMicrotask(() => {
       if (disposed) return;
       if (element.isConnected) {
-        runMountCallback(callback, "onMount", element, isDisposed);
+        runMountCallback(callback, "onMount", element, isDisposed, scope);
         return;
       }
       const unregister = registerMountWatcher(element, () => {
         if (disposed) return;
-        runMountCallback(callback, "onMount", element, isDisposed);
+        runMountCallback(callback, "onMount", element, isDisposed, scope);
       });
       registerDisposer(element, unregister);
     });
@@ -2701,6 +2744,9 @@ function onMount(callback, element) {
 }
 function onUnmount(callback, element) {
   if (typeof document === "undefined") return;
+  watchUnmount(pinScope(getOwnerScope2(), callback), element);
+}
+function watchUnmount(callback, element) {
   let fired = false;
   const fireOnce = () => {
     if (fired) return;
@@ -2863,6 +2909,11 @@ function flushUserCleanups(ctx) {
   const list = ctx.userCleanups;
   if (list.length === 0) return;
   ctx.userCleanups = [];
+  const scope = ctx.subscriber._scope ?? null;
+  if (scope === getOwnerScope2()) runCleanups(list);
+  else runWithOwnerScope2(scope, () => runCleanups(list));
+}
+function runCleanups(list) {
   for (let i2 = list.length - 1; i2 >= 0; i2--) {
     try {
       list[i2]();
@@ -3792,11 +3843,15 @@ function ErrorBoundary(optionsOrChildren, maybeChildren) {
               return;
             }
             replaceChildrenSafely(asyncContainer, el);
-          }).catch((e) => {
-            if (asyncDisposed) return;
-            const err = handleError(e);
-            replaceChildrenSafely(asyncContainer, tryRenderFallback(err));
-          });
+          }).catch(
+            // The fallback is rendered later, in the owner scope of the
+            // render that produced the async child.
+            bindOwnerScope2((e) => {
+              if (asyncDisposed) return;
+              const err = handleError(e);
+              replaceChildrenSafely(asyncContainer, tryRenderFallback(err));
+            })
+          );
           return asyncContainer;
         }
         return result;
@@ -4249,9 +4304,11 @@ function when(condition, thenBranch, elseBranch) {
     currentNode = null;
   });
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!disposed && !initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope2(() => {
+        if (!disposed && !initialized && anchor.parentNode) update();
+      })
+    );
   }
   return anchor;
 }
@@ -4290,9 +4347,11 @@ function match(value, cases, fallback) {
     currentNode = null;
   });
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!disposed && !initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope2(() => {
+        if (!disposed && !initialized && anchor.parentNode) update();
+      })
+    );
   }
   return anchor;
 }
@@ -4590,11 +4649,13 @@ function each(getArray, render, options) {
   };
   registerDisposer(anchor, disposeRange);
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!initialized && !rangeDisposed && anchor.parentNode) {
-        update();
-      }
-    });
+    queueMicrotask(
+      bindOwnerScope2(() => {
+        if (!initialized && !rangeDisposed && anchor.parentNode) {
+          update();
+        }
+      })
+    );
   }
   return anchor;
 }
@@ -5072,9 +5133,11 @@ function KeepAlive(activeKey, cases, options) {
   };
   const untrack = track2(update);
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope2(() => {
+        if (!initialized && anchor.parentNode) update();
+      })
+    );
   }
   registerDisposer(anchor, () => {
     disposed = true;
@@ -5179,7 +5242,7 @@ function Portal(nodes, target) {
   const container = target || document.body;
   let portalContent = null;
   let disposed = false;
-  queueMicrotask(() => {
+  const renderContent = bindOwnerScope2(() => {
     if (disposed) return;
     try {
       portalContent = nodes();
@@ -5194,6 +5257,7 @@ function Portal(nodes, target) {
       });
     }
   });
+  queueMicrotask(renderContent);
   registerDisposer(anchor, () => {
     disposed = true;
     if (portalContent) {