sibujs 4.9.0 → 4.10.0

package/dist/browser.cjs

@@ -327,6 +327,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;
@@ -342,6 +360,10 @@ function retrack(effectFn, subscriber) {
   currentSubscriber = subscriber;
   const sub = subscriber;
   if (sub._cap === void 0) sub._cap = currentDisposerCapture();
+  const prevScope = currentOwnerScope;
+  if (prevScope !== null && !sub._epoch && sub._scope === void 0) sub._scope = prevScope;
+  const scope = sub._scope === void 0 ? null : sub._scope;
+  if (scope !== prevScope) currentOwnerScope = scope;
   const epoch = ++subscriberEpochCounter;
   sub._epoch = epoch;
   sub._structDirty = false;
@@ -354,6 +376,7 @@ function retrack(effectFn, subscriber) {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
@@ -388,23 +411,26 @@ function track(effectFn, subscriber) {
     trackingSuspended = false;
   }
   currentSubscriber = subscriber;
+  const sub = subscriber;
+  if (sub._scope === void 0) sub._scope = currentOwnerScope;
+  const prevScope = currentOwnerScope;
+  currentOwnerScope = sub._scope;
   try {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
       trackingSuspended = true;
     }
-    const sub2 = subscriber;
-    for (let n = sub2.depsHead ?? null; n !== null; n = n.subNext) {
+    for (let n = sub.depsHead ?? null; n !== null; n = n.subNext) {
       const sig = n.sig;
       sig.__activeNode = n.prevActive;
       n.prevActive = null;
     }
   }
-  const sub = subscriber;
   return sub._dispose ?? (sub._dispose = () => cleanup(subscriber));
 }
 function reactiveBinding(commit, ownerNode) {
@@ -674,7 +700,7 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.9.0" : "dev";
+var _runtimeVersion = true ? "4.10.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g = globalThis;
@@ -706,6 +732,9 @@ function resolveReactiveApi() {
     getSubscriberCount,
     getSubscriberDeps,
     forEachSubscriber,
+    getOwnerScope,
+    runWithOwnerScope,
+    bindOwnerScope,
     version: _runtimeVersion
   };
   g[REGISTRY_KEY] = local;
@@ -729,6 +758,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/batch.ts
 var batchDepth = 0;
@@ -924,6 +956,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 i = list.length - 1; i >= 0; i--) {
     try {
       list[i]();

package/dist/browser.js

@@ -36,15 +36,15 @@ import {
   visibility,
   wakeLock,
   windowSize
-} from "./chunk-YW6HQKGO.js";
+} from "./chunk-GTS35FLA.js";
 import "./chunk-52XFPGSN.js";
 import "./chunk-62BDYGAG.js";
 import "./chunk-7ZHH77QA.js";
-import "./chunk-SBTZEYNI.js";
+import "./chunk-7WIHYHWD.js";
 import "./chunk-EXXSN3BW.js";
 import "./chunk-7XHATCIH.js";
-import "./chunk-SYHGGDNW.js";
-import "./chunk-G2WHYEL7.js";
+import "./chunk-FYUEL5IW.js";
+import "./chunk-D6HYFOWR.js";
 import "./chunk-NYNYSPK7.js";
 export {
   __resetSpeechCoordinator,

package/dist/build.cjs

@@ -3201,6 +3201,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;
@@ -3216,6 +3234,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;
@@ -3228,6 +3250,7 @@ function retrack(effectFn, subscriber) {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
@@ -3262,23 +3285,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) {
@@ -3548,7 +3574,7 @@ function forEachSubscriber(signal2, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.9.0" : "dev";
+var _runtimeVersion = true ? "4.10.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g2 = globalThis;
@@ -3580,6 +3606,9 @@ function resolveReactiveApi() {
     getSubscriberCount,
     getSubscriberDeps,
     forEachSubscriber,
+    getOwnerScope,
+    runWithOwnerScope,
+    bindOwnerScope,
     version: _runtimeVersion
   };
   g2[REGISTRY_KEY] = local;
@@ -3603,6 +3632,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) {
@@ -4276,12 +4308,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(
@@ -4312,7 +4348,7 @@ function Suspense({ nodes, fallback }) {
     }
     if (childEl && !container.contains(childEl)) dispose(childEl);
   });
-  queueMicrotask(() => {
+  const renderContent = bindOwnerScope2(() => {
     if (suspenseDisposed) return;
     try {
       const el = nodes();
@@ -4340,10 +4376,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();
@@ -4353,13 +4393,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();
@@ -4519,6 +4560,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;
@@ -4528,19 +4571,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);
     });
@@ -4552,6 +4595,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;
@@ -4714,6 +4760,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]();
@@ -5643,11 +5694,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;
@@ -6100,9 +6155,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;
 }
@@ -6141,9 +6198,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;
 }
@@ -6441,11 +6500,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;
 }
@@ -6923,9 +6984,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;
@@ -7030,7 +7093,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();
@@ -7045,6 +7108,7 @@ function Portal(nodes, target) {
       });
     }
   });
+  queueMicrotask(renderContent);
   registerDisposer(anchor, () => {
     disposed = true;
     if (portalContent) {

package/dist/build.js

@@ -1,17 +1,17 @@
 import {
   index_exports
-} from "./chunk-FNOK662L.js";
-import "./chunk-QBKCK6MJ.js";
+} from "./chunk-2NWHJ2UJ.js";
+import "./chunk-N6U4GOIU.js";
 import "./chunk-FC6KCJSA.js";
-import "./chunk-CDBKFGXN.js";
-import "./chunk-FHCZMHHE.js";
+import "./chunk-EVOK663Z.js";
+import "./chunk-GOL3FU5Q.js";
 import "./chunk-62BDYGAG.js";
-import "./chunk-5MLWTIQE.js";
-import "./chunk-MPWDSTYK.js";
+import "./chunk-EVI4ZQO3.js";
+import "./chunk-XUQUQJYE.js";
 import "./chunk-3ACAAQIN.js";
-import "./chunk-X7NRHFZR.js";
+import "./chunk-5PC7OTQW.js";
 import "./chunk-7ZHH77QA.js";
-import "./chunk-SBTZEYNI.js";
+import "./chunk-7WIHYHWD.js";
 import {
   isEventHandlerAttr,
   isHtmlContentAttribute,
@@ -19,8 +19,8 @@ import {
 } from "./chunk-EXXSN3BW.js";
 import "./chunk-7XHATCIH.js";
 import "./chunk-5HZXGZ6T.js";
-import "./chunk-SYHGGDNW.js";
-import "./chunk-G2WHYEL7.js";
+import "./chunk-FYUEL5IW.js";
+import "./chunk-D6HYFOWR.js";
 import "./chunk-NYNYSPK7.js";
 
 // src/build/sourceEdit.ts