sibujs 4.8.0 → 4.10.0

package/dist/{chunk-J3YQ457H.js → chunk-2NWHJ2UJ.js}

@@ -135,44 +135,44 @@ import {
   use,
   var_,
   video
-} from "./chunk-Q5J2LVKH.js";
+} from "./chunk-N6U4GOIU.js";
 import {
   trustHTML
 } from "./chunk-FC6KCJSA.js";
 import {
   watch
-} from "./chunk-CZPRSWSS.js";
+} from "./chunk-EVOK663Z.js";
 import {
   __resetIdCounter,
   createId,
   domBinding
-} from "./chunk-C7AA2CZX.js";
+} from "./chunk-GOL3FU5Q.js";
 import {
   SVG_NS,
   bindChildNode,
   captureFocusWithin,
   restoreFocusWithin,
   tagFactory
-} from "./chunk-VWT3VXPL.js";
+} from "./chunk-EVI4ZQO3.js";
 import {
   bindAttribute,
   bindDynamic,
   setSafeAttribute,
   setTrustedAttribute
-} from "./chunk-O6TRVMJI.js";
+} from "./chunk-XUQUQJYE.js";
 import {
   isCodeTextElement
 } from "./chunk-3ACAAQIN.js";
 import {
   derived
-} from "./chunk-KJ3UKABJ.js";
+} from "./chunk-5PC7OTQW.js";
 import {
   globalSingleton
 } from "./chunk-7ZHH77QA.js";
 import {
   effect,
   on
-} from "./chunk-V3LHZSU5.js";
+} from "./chunk-7WIHYHWD.js";
 import {
   disableSSR,
   enableSSR,
@@ -191,19 +191,22 @@ import {
   external,
   isBatching,
   signal
-} from "./chunk-DSID757X.js";
+} from "./chunk-FYUEL5IW.js";
 import {
+  bindOwnerScope,
   emitDevtools,
+  getOwnerScope,
   notifySubscribers,
   reactiveBinding,
   recordDependency,
   resumeTracking,
   retrack,
+  runWithOwnerScope,
   setMaxDrainIterations,
   suspendTracking,
   track,
   untracked
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   DEV,
   MAX_DRAIN_TEARDOWNS,
@@ -487,12 +490,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.
+      bindOwnerScope((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(
@@ -523,7 +530,7 @@ function Suspense({ nodes, fallback }) {
     }
     if (childEl && !container.contains(childEl)) dispose(childEl);
   });
-  queueMicrotask(() => {
+  const renderContent = bindOwnerScope(() => {
     if (suspenseDisposed) return;
     try {
       const el = nodes();
@@ -551,10 +558,14 @@ function Suspense({ nodes, fallback }) {
       dispatchPropagate(container, errorObj);
     }
   });
+  queueMicrotask(renderContent);
   return container;
 }
 
 // src/core/rendering/lifecycle.ts
+function pinScope(scope, fn) {
+  return () => getOwnerScope() === scope ? fn() : runWithOwnerScope(scope, fn);
+}
 function safeCall(cb, hookName) {
   try {
     return cb();
@@ -564,13 +575,14 @@ function safeCall(cb, hookName) {
     return void 0;
   }
 }
-function runMountCallback(callback, hookName, element, isDisposed) {
-  const cleanup = safeCall(callback, hookName);
-  if (typeof cleanup !== "function") return;
+function runMountCallback(callback, hookName, element, isDisposed, scope) {
+  const returned = safeCall(callback, hookName);
+  if (typeof returned !== "function") return;
+  const cleanup = pinScope(scope, returned);
   if (isDisposed() || !element.isConnected) {
     safeCall(cleanup, "onUnmount");
   } else {
-    onUnmount(cleanup, element);
+    watchUnmount(cleanup, element);
   }
 }
 var mountWatchers = /* @__PURE__ */ new WeakMap();
@@ -730,6 +742,8 @@ function registerUnmountWatcher(element, cb) {
 }
 function onMount(callback, element) {
   if (typeof document === "undefined") return;
+  const scope = getOwnerScope();
+  callback = pinScope(scope, callback);
   if (element) {
     let disposed = false;
     const isDisposed = () => disposed;
@@ -739,19 +753,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);
     });
@@ -763,6 +777,9 @@ function onMount(callback, element) {
 }
 function onUnmount(callback, element) {
   if (typeof document === "undefined") return;
+  watchUnmount(pinScope(getOwnerScope(), callback), element);
+}
+function watchUnmount(callback, element) {
   let fired = false;
   const fireOnce = () => {
     if (fired) return;
@@ -1463,11 +1480,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.
+            bindOwnerScope((e) => {
+              if (asyncDisposed) return;
+              const err = handleError(e);
+              replaceChildrenSafely(asyncContainer, tryRenderFallback(err));
+            })
+          );
           return asyncContainer;
         }
         return result;
@@ -1637,37 +1658,44 @@ function action(element, action2, param2) {
   }
 }
 var clickOutside = (element, callback) => {
+  const doc = element.ownerDocument;
   const handler = (e) => {
-    if (!element.contains(e.target)) {
-      callback();
-    }
+    const target = e.target;
+    if (!(typeof target?.nodeType === "number" && element.contains(target))) callback();
   };
-  document.addEventListener("pointerdown", handler, true);
-  return () => document.removeEventListener("pointerdown", handler, true);
+  doc.addEventListener("pointerdown", handler, true);
+  return () => doc.removeEventListener("pointerdown", handler, true);
 };
+var PRESS_END_EVENTS = ["pointerup", "pointerleave", "pointercancel"];
 var longPress = (element, options) => {
   const duration = options.duration ?? 500;
   let timer = null;
-  const start = () => {
-    timer = setTimeout(() => {
-      options.callback();
-      timer = null;
-    }, duration);
-  };
+  let owner;
   const cancel = () => {
     if (timer !== null) {
       clearTimeout(timer);
       timer = null;
     }
   };
+  const start = (e) => {
+    const id = e.pointerId;
+    if (timer !== null && id !== owner) return;
+    cancel();
+    owner = id;
+    timer = setTimeout(() => {
+      timer = null;
+      options.callback();
+    }, duration);
+  };
+  const end = (e) => {
+    if (timer !== null && e.pointerId === owner) cancel();
+  };
   element.addEventListener("pointerdown", start);
-  element.addEventListener("pointerup", cancel);
-  element.addEventListener("pointerleave", cancel);
+  for (const type of PRESS_END_EVENTS) element.addEventListener(type, end);
   return () => {
     cancel();
     element.removeEventListener("pointerdown", start);
-    element.removeEventListener("pointerup", cancel);
-    element.removeEventListener("pointerleave", cancel);
+    for (const type of PRESS_END_EVENTS) element.removeEventListener(type, end);
   };
 };
 var copyOnClick = (element, getText) => {
@@ -1701,10 +1729,11 @@ var trapFocus = (element) => {
     if (elements.length === 0) return;
     const first = elements[0];
     const last = elements[elements.length - 1];
-    if (e.shiftKey && document.activeElement === first) {
+    const active = element.ownerDocument.activeElement;
+    if (e.shiftKey && active === first) {
       e.preventDefault();
       last.focus();
-    } else if (!e.shiftKey && document.activeElement === last) {
+    } else if (!e.shiftKey && active === last) {
       e.preventDefault();
       first.focus();
     }
@@ -1875,9 +1904,11 @@ function when(condition, thenBranch, elseBranch) {
     currentNode = null;
   });
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!disposed && !initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope(() => {
+        if (!disposed && !initialized && anchor.parentNode) update();
+      })
+    );
   }
   return anchor;
 }
@@ -1916,9 +1947,11 @@ function match(value, cases, fallback) {
     currentNode = null;
   });
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!disposed && !initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope(() => {
+        if (!disposed && !initialized && anchor.parentNode) update();
+      })
+    );
   }
   return anchor;
 }
@@ -2210,11 +2243,13 @@ function each(getArray, render, options) {
   };
   registerDisposer(anchor, disposeRange);
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!initialized && !rangeDisposed && anchor.parentNode) {
-        update();
-      }
-    });
+    queueMicrotask(
+      bindOwnerScope(() => {
+        if (!initialized && !rangeDisposed && anchor.parentNode) {
+          update();
+        }
+      })
+    );
   }
   return anchor;
 }
@@ -2662,7 +2697,7 @@ function KeepAlive(activeKey, cases, options) {
         return;
       }
       node = factory();
-      if (node instanceof DocumentFragment) {
+      if (node.nodeType === 11) {
         const wrapper = document.createElement("div");
         wrapper.style.display = "contents";
         wrapper.appendChild(node);
@@ -2692,9 +2727,11 @@ function KeepAlive(activeKey, cases, options) {
   };
   const untrack = track(update);
   if (!initialized) {
-    queueMicrotask(() => {
-      if (!initialized && anchor.parentNode) update();
-    });
+    queueMicrotask(
+      bindOwnerScope(() => {
+        if (!initialized && anchor.parentNode) update();
+      })
+    );
   }
   registerDisposer(anchor, () => {
     disposed = true;
@@ -2799,7 +2836,7 @@ function Portal(nodes, target) {
   const container = target || document.body;
   let portalContent = null;
   let disposed = false;
-  queueMicrotask(() => {
+  const renderContent = bindOwnerScope(() => {
     if (disposed) return;
     try {
       portalContent = nodes();
@@ -2814,6 +2851,7 @@ function Portal(nodes, target) {
       });
     }
   });
+  queueMicrotask(renderContent);
   registerDisposer(anchor, () => {
     disposed = true;
     if (portalContent) {

package/dist/{chunk-JUTFX2RM.js → chunk-4DCVJ4YA.js}

@@ -6,7 +6,7 @@ import {
 import {
   div,
   span
-} from "./chunk-Q5J2LVKH.js";
+} from "./chunk-N6U4GOIU.js";
 import {
   STATIC_VALUE_RESOLVER,
   planHeadElementEntry,
@@ -17,14 +17,17 @@ import {
 } from "./chunk-7ZHH77QA.js";
 import {
   effect
-} from "./chunk-V3LHZSU5.js";
+} from "./chunk-7WIHYHWD.js";
 import {
   sanitizeUrl
 } from "./chunk-EXXSN3BW.js";
 import {
   batch,
   signal
-} from "./chunk-DSID757X.js";
+} from "./chunk-FYUEL5IW.js";
+import {
+  bindOwnerScope
+} from "./chunk-D6HYFOWR.js";
 import {
   registerDisposer,
   replaceChildrenSafely,
@@ -686,11 +689,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.
+      bindOwnerScope((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(
@@ -910,7 +917,7 @@ function createISR(options) {
   const [data, setData] = signal(initialData);
   const [stale, setStale] = signal(initialData === void 0);
   const controller = new AbortController();
-  let inFlight = false;
+  let inFlight = null;
   let disposed = false;
   let deadline;
   const clearDeadline = () => {
@@ -930,10 +937,7 @@ function createISR(options) {
       });
     }, revalidateAfter);
   };
-  const revalidate = async () => {
-    if (disposed || inFlight) return;
-    if (controller.signal.aborted) return;
-    inFlight = true;
+  const run = async () => {
     try {
       const result = await fetcher({ signal: controller.signal });
       if (disposed || controller.signal.aborted) return;
@@ -945,10 +949,33 @@ function createISR(options) {
     } catch (err) {
       if (!disposed && !controller.signal.aborted) armDeadline();
       throw err;
-    } finally {
-      inFlight = false;
     }
   };
+  const revalidate = () => {
+    if (disposed || controller.signal.aborted) return Promise.resolve();
+    if (inFlight) return inFlight;
+    let resolve;
+    let reject;
+    const current = new Promise((res, rej) => {
+      resolve = res;
+      reject = rej;
+    });
+    inFlight = current;
+    const release = () => {
+      if (inFlight === current) inFlight = null;
+    };
+    run().then(
+      () => {
+        release();
+        resolve();
+      },
+      (err) => {
+        release();
+        reject(err);
+      }
+    );
+    return current;
+  };
   if (initialData === void 0) {
     revalidate().catch((err) => {
       if (typeof console !== "undefined") console.warn("[SibuJS ISR] initial fetch failed", err);

package/dist/{chunk-QGMSESDD.js → chunk-54F4TPHK.js}

@@ -170,7 +170,7 @@ var CDN_ENTRY_POINTS = {
 };
 var packageInfo = {
   name: "sibujs",
-  version: true ? "4.8.0" : "dev",
+  version: true ? "4.10.0" : "dev",
   entryPoints: MODULE_ENTRY_POINTS,
   /**
    * Generate the package.json `exports` map. Module entries resolve to the
@@ -315,7 +315,7 @@ var env = {
 };
 
 // src/plugins/versioning.ts
-var VERSION = true ? "4.8.0" : "dev";
+var VERSION = true ? "4.10.0" : "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-]+";

package/dist/{chunk-KJ3UKABJ.js → chunk-5PC7OTQW.js}

@@ -5,7 +5,7 @@ import {
   recordDependency,
   retrack,
   track
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   devAssert
 } from "./chunk-NYNYSPK7.js";

package/dist/{chunk-V3LHZSU5.js → chunk-7WIHYHWD.js}

@@ -4,9 +4,11 @@ import {
 import {
   cleanup,
   emitDevtools,
+  getOwnerScope,
   retrack,
+  runWithOwnerScope,
   untracked
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   devAssert,
   reportError
@@ -35,6 +37,11 @@ function flushUserCleanups(ctx) {
   const list = ctx.userCleanups;
   if (list.length === 0) return;
   ctx.userCleanups = [];
+  const scope = ctx.subscriber._scope ?? null;
+  if (scope === getOwnerScope()) runCleanups(list);
+  else runWithOwnerScope(scope, () => runCleanups(list));
+}
+function runCleanups(list) {
   for (let i = list.length - 1; i >= 0; i--) {
     try {
       list[i]();

package/dist/{chunk-44MTL7ED.js → chunk-BMCR7TXG.js}

@@ -3,18 +3,18 @@ import {
 } from "./chunk-7ZHH77QA.js";
 import {
   effect
-} from "./chunk-V3LHZSU5.js";
+} from "./chunk-7WIHYHWD.js";
 import {
   stripHtml
 } from "./chunk-EXXSN3BW.js";
 import {
   signal
-} from "./chunk-DSID757X.js";
+} from "./chunk-FYUEL5IW.js";
 import {
   forEachSubscriber,
   getSubscriberCount,
   getSubscriberDeps
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   dispose,
   isDev

package/dist/{chunk-TQQUN4WR.js → chunk-D6HYFOWR.js}

@@ -151,6 +151,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;
@@ -166,6 +184,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;
@@ -178,6 +200,7 @@ function retrack(effectFn, subscriber) {
     effectFn();
   } finally {
     currentSubscriber = prev;
+    currentOwnerScope = prevScope;
     if (savedDepth !== 0) {
       suspendDepth = savedDepth;
       suspendSavedSub = savedSuspendSub;
@@ -212,23 +235,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) {
@@ -498,7 +524,7 @@ function forEachSubscriber(signal, visit) {
 }
 
 // src/reactivity/track.ts
-var _runtimeVersion = true ? "4.8.0" : "dev";
+var _runtimeVersion = true ? "4.10.0" : "dev";
 var REGISTRY_KEY = /* @__PURE__ */ Symbol.for("sibujs.reactive.v1");
 function resolveReactiveApi() {
   const g = globalThis;
@@ -530,6 +556,9 @@ function resolveReactiveApi() {
     getSubscriberCount,
     getSubscriberDeps,
     forEachSubscriber,
+    getOwnerScope,
+    runWithOwnerScope,
+    bindOwnerScope,
     version: _runtimeVersion
   };
   g[REGISTRY_KEY] = local;
@@ -553,6 +582,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) {
@@ -579,5 +611,8 @@ export {
   getSubscriberCount2 as getSubscriberCount,
   getSubscriberDeps2 as getSubscriberDeps,
   forEachSubscriber2 as forEachSubscriber,
+  getOwnerScope2 as getOwnerScope,
+  runWithOwnerScope2 as runWithOwnerScope,
+  bindOwnerScope2 as bindOwnerScope,
   emitDevtools
 };

package/dist/{chunk-VWT3VXPL.js → chunk-EVI4ZQO3.js}

@@ -1,7 +1,7 @@
 import {
   bindAttribute,
   setSafeAttribute
-} from "./chunk-O6TRVMJI.js";
+} from "./chunk-XUQUQJYE.js";
 import {
   isBlockedElement
 } from "./chunk-3ACAAQIN.js";
@@ -12,7 +12,7 @@ import {
 } from "./chunk-EXXSN3BW.js";
 import {
   reactiveBinding
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   DEV,
   devWarn,

package/dist/{chunk-CZPRSWSS.js → chunk-EVOK663Z.js}

@@ -5,7 +5,7 @@ import {
   resumeTracking,
   suspendTracking,
   track
-} from "./chunk-TQQUN4WR.js";
+} from "./chunk-D6HYFOWR.js";
 import {
   devAssert
 } from "./chunk-NYNYSPK7.js";