sibujs 4.8.0 → 4.10.0

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.8.0" : "dev";
+var _runtimeVersion = true ? "4.10.0" : "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]();
@@ -1805,6 +1842,8 @@ function query(key, fetcher, options = {}) {
     structuralSharing = true
   } = options;
   const resolveKey = typeof key === "function" ? key : () => key;
+  const enabledGate = typeof enabled === "function" ? derived(() => Boolean(enabled())) : null;
+  const isEnabled = enabledGate ?? (() => Boolean(enabled));
   const cache = getActiveQueryCache();
   const [data2, setData] = signal(initialData);
   const [isFetching, setIsFetching] = signal(false);
@@ -1823,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(() => {
@@ -1919,7 +1959,7 @@ function query(key, fetcher, options = {}) {
     }
   }
   async function doFetch() {
-    if (disposed || !currentKey || !enabled) return;
+    if (disposed || !currentKey || !untracked2(isEnabled)) return;
     const key2 = currentKey;
     const entry = getOrCreateEntry(cache, key2);
     attachToEntry(entry, key2);
@@ -2021,10 +2061,20 @@ function query(key, fetcher, options = {}) {
   }
   const effectCleanup = effect(() => {
     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) {
       const view = viewOf(entry);
       batch(() => {
@@ -2033,19 +2083,20 @@ 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 (enabled && isDataStale2 && !entry.promise) doFetch();
+      if (on && isDataStale2 && !entry.promise) doFetch();
       return;
     }
     const isDataStale = entry.dataUpdatedAt === 0 || Date.now() - entry.dataUpdatedAt >= staleTime;
-    if (enabled && (entry.data === void 0 || isDataStale)) {
+    if (on && (entry.data === void 0 || isDataStale)) {
       doFetch();
     }
   });
   if (refetchInterval && refetchInterval > 0) {
     intervalTimer = setInterval(() => {
-      if (!disposed && currentKey && enabled) doFetch();
+      if (!disposed && currentKey) doFetch();
     }, refetchInterval);
   }
   let focusHandler = null;
@@ -2053,13 +2104,13 @@ function query(key, fetcher, options = {}) {
   if (typeof globalThis !== "undefined" && typeof globalThis.addEventListener === "function") {
     if (refetchOnWindowFocus) {
       focusHandler = () => {
-        if (!disposed && currentKey && enabled) doFetch();
+        if (!disposed && currentKey) doFetch();
       };
       globalThis.addEventListener("focus", focusHandler);
     }
     if (refetchOnReconnect) {
       onlineHandler = () => {
-        if (!disposed && currentKey && enabled) doFetch();
+        if (!disposed && currentKey) doFetch();
       };
       globalThis.addEventListener("online", onlineHandler);
     }
@@ -2071,6 +2122,7 @@ function query(key, fetcher, options = {}) {
     stopSelect?.();
     loading.dispose();
     isStale.dispose();
+    enabledGate?.dispose();
     if (intervalTimer) clearInterval(intervalTimer);
     detachFromEntry();
     if (focusHandler && typeof globalThis.removeEventListener === "function") {
@@ -2250,6 +2302,8 @@ function infiniteQuery(key, fetcher, options) {
     onError
   } = options;
   const resolveKey = typeof key === "function" ? key : () => key;
+  const enabledGate = typeof enabled === "function" ? derived(() => Boolean(enabled())) : null;
+  const isEnabled = enabledGate ?? (() => enabled);
   const [pages, setPages] = signal([]);
   const [isFetching, setIsFetching] = signal(false);
   const [isFetchingNext, setIsFetchingNext] = signal(false);
@@ -2328,7 +2382,7 @@ function infiniteQuery(key, fetcher, options) {
   }
   const effectCleanup = effect(() => {
     resolveKey();
-    if (enabled) {
+    if (isEnabled()) {
       abortController?.abort();
       batch(() => {
         setPages([]);
@@ -2369,6 +2423,7 @@ function infiniteQuery(key, fetcher, options) {
     loading.dispose();
     hasNextPage.dispose();
     hasPreviousPage.dispose();
+    enabledGate?.dispose();
   }
   return {
     data: data2,
@@ -4843,6 +4898,7 @@ function keyboard(options = {}) {
     };
   }
   const target = options.target ?? window;
+  const view = options.target?.ownerDocument?.defaultView ?? window;
   const filter = options.keys ? new Set(options.keys) : null;
   const onDown = (e) => {
     if (filter && !filter.has(e.key)) return;
@@ -4865,14 +4921,14 @@ function keyboard(options = {}) {
   const onBlur = () => setPressed(/* @__PURE__ */ new Set());
   target.addEventListener("keydown", onDown);
   target.addEventListener("keyup", onUp);
-  window.addEventListener("blur", onBlur);
+  view.addEventListener("blur", onBlur);
   function isPressed(key) {
     return pressed().has(key);
   }
   function dispose2() {
     target.removeEventListener("keydown", onDown);
     target.removeEventListener("keyup", onUp);
-    window.removeEventListener("blur", onBlur);
+    view.removeEventListener("blur", onBlur);
   }
   return { pressed, isPressed, dispose: dispose2 };
 }
@@ -9700,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");
@@ -10042,7 +10102,7 @@ function svgElement(tag, props = {}, ...nodes) {
   for (const child of nodes) {
     if (typeof child === "string") {
       el.appendChild(document.createTextNode(child));
-    } else if (child instanceof Node) {
+    } else if (typeof child?.nodeType === "number") {
       el.appendChild(child);
     }
   }
@@ -11150,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(
@@ -11374,7 +11438,7 @@ function createISR(options) {
   const [data2, 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 = () => {
@@ -11394,10 +11458,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;
@@ -11409,10 +11470,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);
@@ -11947,7 +12031,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
@@ -12092,7 +12176,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-]+";
@@ -12694,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-RGLPEBDE.js";
+} from "./chunk-JCKUWWHU.js";
 import {
   DOMPool,
   Features,
@@ -41,7 +41,7 @@ import {
   transitionState,
   uniqueId,
   yieldToMain
-} from "./chunk-C5PEWEGH.js";
+} from "./chunk-IL5MMSCL.js";
 import {
   MigrationStorageError,
   VERSION,
@@ -63,7 +63,7 @@ import {
   preloadCritical,
   prerenderRoutes,
   satisfies
-} from "./chunk-QGMSESDD.js";
+} from "./chunk-54F4TPHK.js";
 import {
   Head,
   clearWasmCache,
@@ -89,7 +89,7 @@ import {
   wasm,
   worker,
   workerFn
-} from "./chunk-JUTFX2RM.js";
+} from "./chunk-4DCVJ4YA.js";
 import {
   FocusTrap,
   VirtualList,
@@ -130,7 +130,7 @@ import {
   toast,
   withScopedStyle,
   zipMask
-} from "./chunk-ZVLHNEEL.js";
+} from "./chunk-ITEL5KPL.js";
 import {
   RenderProp,
   assertType,
@@ -157,7 +157,7 @@ import {
   select,
   tabs,
   tooltip
-} from "./chunk-GSGNX35Q.js";
+} from "./chunk-IFRIBZ4O.js";
 import {
   __resetSpeechCoordinator,
   animationFrame,
@@ -196,7 +196,7 @@ import {
   visibility,
   wakeLock,
   windowSize
-} from "./chunk-EGUQLBHE.js";
+} from "./chunk-GTS35FLA.js";
 import "./chunk-52XFPGSN.js";
 import {
   __resetQueryCache,
@@ -222,7 +222,7 @@ import {
   throttle,
   withLoader,
   withRetry
-} from "./chunk-UCNP3HVM.js";
+} from "./chunk-GMMDHJJT.js";
 import {
   SibuError,
   checkLeaks,
@@ -260,7 +260,7 @@ import {
   trackCleanup,
   walkDependencyGraph,
   withErrorTracking
-} from "./chunk-44MTL7ED.js";
+} from "./chunk-BMCR7TXG.js";
 import {
   antdAdapter,
   chakraAdapter,
@@ -270,7 +270,7 @@ import {
   mobXAdapter,
   reduxAdapter,
   zustandAdapter
-} from "./chunk-4WMSTZ7J.js";
+} from "./chunk-VWPMWV7O.js";
 import {
   PluginInstallCancelledError,
   createPlugin,
@@ -284,7 +284,7 @@ import {
   triggerPluginMount,
   triggerPluginUnmount
 } from "./chunk-J6FW5TV6.js";
-import "./chunk-Q5J2LVKH.js";
+import "./chunk-N6U4GOIU.js";
 import {
   collectStream,
   deserializeState,
@@ -305,15 +305,15 @@ import {
   suspenseSwapScript,
   trustHTML
 } from "./chunk-FC6KCJSA.js";
-import "./chunk-CZPRSWSS.js";
-import "./chunk-C7AA2CZX.js";
+import "./chunk-EVOK663Z.js";
+import "./chunk-GOL3FU5Q.js";
 import "./chunk-62BDYGAG.js";
-import "./chunk-VWT3VXPL.js";
-import "./chunk-O6TRVMJI.js";
+import "./chunk-EVI4ZQO3.js";
+import "./chunk-XUQUQJYE.js";
 import "./chunk-3ACAAQIN.js";
-import "./chunk-KJ3UKABJ.js";
+import "./chunk-5PC7OTQW.js";
 import "./chunk-7ZHH77QA.js";
-import "./chunk-V3LHZSU5.js";
+import "./chunk-7WIHYHWD.js";
 import "./chunk-EXXSN3BW.js";
 import "./chunk-7XHATCIH.js";
 import {
@@ -338,10 +338,10 @@ import {
   stagger,
   transition,
   viewTransition
-} from "./chunk-LI4W3U6C.js";
+} from "./chunk-TOPRMXFY.js";
 import "./chunk-5HZXGZ6T.js";
-import "./chunk-DSID757X.js";
-import "./chunk-TQQUN4WR.js";
+import "./chunk-FYUEL5IW.js";
+import "./chunk-D6HYFOWR.js";
 import "./chunk-NYNYSPK7.js";
 export {
   DOMPool,