sibujs 1.4.0 → 1.5.0

package/dist/data.cjs

@@ -138,12 +138,21 @@ function queueSignalNotification(signal2) {
     }
   }
 }
+var MAX_DRAIN_ITERATIONS = 1e3;
 function drainNotificationQueue() {
   if (notifyDepth > 0) return;
   notifyDepth++;
   try {
     let i = 0;
     while (i < pendingQueue.length) {
+      if (i >= MAX_DRAIN_ITERATIONS) {
+        if (typeof console !== "undefined") {
+          console.error(
+            `[SibuJS] Notification queue exceeded ${MAX_DRAIN_ITERATIONS} iterations \u2014 likely an effect that writes to a signal it reads. Breaking to prevent infinite loop.`
+          );
+        }
+        break;
+      }
       safeInvoke(pendingQueue[i]);
       i++;
     }
@@ -310,21 +319,37 @@ function derived(getter, options) {
     cs._v = getter();
   }, markDirty);
   const hook = globalThis.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  let evaluating = false;
   function computedGetter() {
+    if (evaluating) {
+      throw new Error(
+        `[SibuJS] Circular dependency detected in derived${debugName ? ` "${debugName}"` : ""}. A derived signal cannot read itself (directly or through a chain).`
+      );
+    }
     if (trackingSuspended) {
       if (cs._d) {
-        cs._d = false;
-        cs._v = getter();
+        evaluating = true;
+        try {
+          cs._d = false;
+          cs._v = getter();
+        } finally {
+          evaluating = false;
+        }
       }
       return cs._v;
     }
     recordDependency(cs);
     if (cs._d) {
       const oldValue = cs._v;
-      track(() => {
-        cs._d = false;
-        cs._v = getter();
-      }, markDirty);
+      evaluating = true;
+      try {
+        track(() => {
+          cs._d = false;
+          cs._v = getter();
+        }, markDirty);
+      } finally {
+        evaluating = false;
+      }
       if (hook && oldValue !== cs._v) {
         hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
       }
@@ -480,9 +505,13 @@ async function withRetry(fn, options, onRetry, signal2) {
       const delay = calculateDelay(attempt, strategy, baseDelay, maxDelay, jitter);
       onRetry?.(error, attempt, delay);
       await new Promise((resolve, reject) => {
-        const timer = setTimeout(resolve, delay);
+        let onAbort = null;
+        const timer = setTimeout(() => {
+          if (onAbort && signal2) signal2.removeEventListener("abort", onAbort);
+          resolve();
+        }, delay);
         if (signal2) {
-          const onAbort = () => {
+          onAbort = () => {
             clearTimeout(timer);
             reject(new DOMException("Aborted", "AbortError"));
           };
@@ -633,9 +662,10 @@ function query(key, fetcher, options = {}) {
         }
       }
     }
+    const keyChanged = currentKey !== key2;
     currentKey = key2;
     const entry = getOrCreateEntry(key2, initialData);
-    entry.subscribers++;
+    if (keyChanged || entry.subscribers === 0) entry.subscribers++;
     if (entry.gcTimer !== null) {
       clearTimeout(entry.gcTimer);
       entry.gcTimer = null;
@@ -749,7 +779,9 @@ function mutation(mutationFn, options = {}) {
   const [status, setStatus] = signal("idle");
   const isSuccess = derived(() => status() === "success");
   const isIdle = derived(() => status() === "idle");
+  let runId = 0;
   async function execute(variables) {
+    const myRun = ++runId;
     let context2;
     batch(() => {
       setLoading(true);
@@ -761,6 +793,7 @@ function mutation(mutationFn, options = {}) {
         context2 = await options.onMutate(variables);
       }
       const result = await withRetry(() => mutationFn(variables), options.retry);
+      if (myRun !== runId) return result;
       batch(() => {
         setData(result);
         setLoading(false);
@@ -771,6 +804,7 @@ function mutation(mutationFn, options = {}) {
       return result;
     } catch (err) {
       const errorObj = err instanceof Error ? err : new Error(String(err));
+      if (myRun !== runId) throw errorObj;
       batch(() => {
         setError(errorObj);
         setLoading(false);
@@ -782,6 +816,7 @@ function mutation(mutationFn, options = {}) {
     }
   }
   function reset() {
+    runId++;
     batch(() => {
       setData(void 0);
       setError(void 0);
@@ -1031,7 +1066,10 @@ function resource(sourceOrFetcher, fetcherOrOptions, maybeOptions) {
       options.onSuccess?.(result);
     } catch (err) {
       if (version !== fetchVersion || disposed) return;
-      if (err instanceof DOMException && err.name === "AbortError") return;
+      if (err instanceof DOMException && err.name === "AbortError") {
+        if (version === fetchVersion) setLoading(false);
+        return;
+      }
       const errorObj = err instanceof Error ? err : new Error(String(err));
       batch(() => {
         setError(errorObj);
@@ -1285,6 +1323,7 @@ function socket(url, options) {
   let reconnectTimer = null;
   let heartbeatTimer = null;
   let disposed = false;
+  let manuallyClosed = false;
   function getUrl() {
     return typeof url === "function" ? url() : url;
   }
@@ -1308,12 +1347,13 @@ function socket(url, options) {
     ws.onclose = () => {
       setStatus("closed");
       stopHeartbeat();
-      if (autoReconnect && !disposed && reconnectCount < maxReconnects) {
+      if (autoReconnect && !disposed && !manuallyClosed && reconnectCount < maxReconnects) {
         reconnectCount++;
         reconnectTimer = setTimeout(() => {
           connect();
         }, reconnectDelay);
       }
+      manuallyClosed = false;
     };
     ws.onerror = () => {
     };
@@ -1339,6 +1379,7 @@ function socket(url, options) {
     }
   }
   function close() {
+    manuallyClosed = true;
     if (reconnectTimer !== null) {
       clearTimeout(reconnectTimer);
       reconnectTimer = null;

package/dist/data.js

@@ -19,14 +19,14 @@ import {
   syncAdapter,
   throttle,
   withRetry
-} from "./chunk-JAKHTMQU.js";
-import "./chunk-BGN5ZMP4.js";
-import "./chunk-NEKUBFPT.js";
+} from "./chunk-BGTHZHJ5.js";
+import "./chunk-6BMPXPUW.js";
+import "./chunk-XHK6BDAJ.js";
 import "./chunk-CMBFNA7L.js";
-import "./chunk-CHF5OHIA.js";
+import "./chunk-VQNQZCWJ.js";
 import "./chunk-EUZND3CB.js";
-import "./chunk-WZSPOOER.js";
-import "./chunk-ZD6OAMTH.js";
+import "./chunk-NZIIMDWI.js";
+import "./chunk-K4G4ZQNR.js";
 import "./chunk-5X6PP2UK.js";
 export {
   calculateDelay,

package/dist/devtools.cjs

@@ -1473,55 +1473,53 @@ function createTraceProfiler() {
   }
   const start = typeof performance !== "undefined" ? performance.now() : Date.now();
   let recording = true;
-  const onEffectStart = (payload) => {
+  function now() {
+    return (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
+  }
+  const onEffectCreate = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "effect";
     events.push({
-      name: label,
+      name: payload.name ?? "effect",
       cat: "effect",
-      ph: "B",
-      ts: Math.floor(now * 1e3),
+      ph: "I",
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0
     });
   };
-  const onEffectEnd = (payload) => {
+  const onEffectDestroy = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "effect";
     events.push({
-      name: label,
+      name: payload.name ?? "effect:destroy",
       cat: "effect",
-      ph: "E",
-      ts: Math.floor(now * 1e3),
+      ph: "I",
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0
     });
   };
-  const onSignalSet = (payload) => {
+  const onSignalUpdate = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "signal";
+    const p = payload;
     events.push({
-      name: label,
+      name: p.name ?? "signal",
       cat: "signal",
       ph: "I",
-      ts: Math.floor(now * 1e3),
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0,
-      args: payload.args
+      args: p.oldValue !== void 0 ? { oldValue: String(p.oldValue), newValue: String(p.newValue) } : void 0
     });
   };
-  const offStart = hook.on("effect:start", onEffectStart);
-  const offEnd = hook.on("effect:end", onEffectEnd);
-  const offSet = hook.on("signal:set", onSignalSet);
+  const offCreate = hook.on("effect:create", onEffectCreate);
+  const offDestroy = hook.on("effect:destroy", onEffectDestroy);
+  const offUpdate = hook.on("signal:update", onSignalUpdate);
   function stop() {
     if (!recording) return events;
     recording = false;
-    offStart();
-    offEnd();
-    offSet();
+    offCreate();
+    offDestroy();
+    offUpdate();
     return events;
   }
   function stopTrace() {

package/dist/devtools.js

@@ -33,11 +33,11 @@ import {
   trackCleanup,
   walkDependencyGraph,
   withErrorTracking
-} from "./chunk-77L6NL3X.js";
-import "./chunk-CHF5OHIA.js";
+} from "./chunk-7GRNSCFT.js";
+import "./chunk-VQNQZCWJ.js";
 import "./chunk-EUZND3CB.js";
-import "./chunk-WZSPOOER.js";
-import "./chunk-ZD6OAMTH.js";
+import "./chunk-NZIIMDWI.js";
+import "./chunk-K4G4ZQNR.js";
 import {
   isDev
 } from "./chunk-5X6PP2UK.js";
@@ -100,55 +100,53 @@ function createTraceProfiler() {
   }
   const start = typeof performance !== "undefined" ? performance.now() : Date.now();
   let recording = true;
-  const onEffectStart = (payload) => {
+  function now() {
+    return (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
+  }
+  const onEffectCreate = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "effect";
     events.push({
-      name: label,
+      name: payload.name ?? "effect",
       cat: "effect",
-      ph: "B",
-      ts: Math.floor(now * 1e3),
+      ph: "I",
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0
     });
   };
-  const onEffectEnd = (payload) => {
+  const onEffectDestroy = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "effect";
     events.push({
-      name: label,
+      name: payload.name ?? "effect:destroy",
       cat: "effect",
-      ph: "E",
-      ts: Math.floor(now * 1e3),
+      ph: "I",
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0
     });
   };
-  const onSignalSet = (payload) => {
+  const onSignalUpdate = (payload) => {
     if (!recording) return;
-    const now = (typeof performance !== "undefined" ? performance.now() : Date.now()) - start;
-    const label = payload.name ?? "signal";
+    const p = payload;
     events.push({
-      name: label,
+      name: p.name ?? "signal",
       cat: "signal",
       ph: "I",
-      ts: Math.floor(now * 1e3),
+      ts: Math.floor(now() * 1e3),
       tid: 0,
       pid: 0,
-      args: payload.args
+      args: p.oldValue !== void 0 ? { oldValue: String(p.oldValue), newValue: String(p.newValue) } : void 0
     });
   };
-  const offStart = hook.on("effect:start", onEffectStart);
-  const offEnd = hook.on("effect:end", onEffectEnd);
-  const offSet = hook.on("signal:set", onSignalSet);
+  const offCreate = hook.on("effect:create", onEffectCreate);
+  const offDestroy = hook.on("effect:destroy", onEffectDestroy);
+  const offUpdate = hook.on("signal:update", onSignalUpdate);
   function stop() {
     if (!recording) return events;
     recording = false;
-    offStart();
-    offEnd();
-    offSet();
+    offCreate();
+    offDestroy();
+    offUpdate();
     return events;
   }
   function stopTrace() {

package/dist/ecosystem.cjs

@@ -126,12 +126,21 @@ function queueSignalNotification(signal2) {
     }
   }
 }
+var MAX_DRAIN_ITERATIONS = 1e3;
 function drainNotificationQueue() {
   if (notifyDepth > 0) return;
   notifyDepth++;
   try {
     let i = 0;
     while (i < pendingQueue.length) {
+      if (i >= MAX_DRAIN_ITERATIONS) {
+        if (typeof console !== "undefined") {
+          console.error(
+            `[SibuJS] Notification queue exceeded ${MAX_DRAIN_ITERATIONS} iterations \u2014 likely an effect that writes to a signal it reads. Breaking to prevent infinite loop.`
+          );
+        }
+        break;
+      }
       safeInvoke(pendingQueue[i]);
       i++;
     }
@@ -436,21 +445,37 @@ function derived(getter, options) {
     cs._v = getter();
   }, markDirty);
   const hook = globalThis.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
+  let evaluating = false;
   function computedGetter() {
+    if (evaluating) {
+      throw new Error(
+        `[SibuJS] Circular dependency detected in derived${debugName ? ` "${debugName}"` : ""}. A derived signal cannot read itself (directly or through a chain).`
+      );
+    }
     if (trackingSuspended) {
       if (cs._d) {
-        cs._d = false;
-        cs._v = getter();
+        evaluating = true;
+        try {
+          cs._d = false;
+          cs._v = getter();
+        } finally {
+          evaluating = false;
+        }
       }
       return cs._v;
     }
     recordDependency(cs);
     if (cs._d) {
       const oldValue = cs._v;
-      track(() => {
-        cs._d = false;
-        cs._v = getter();
-      }, markDirty);
+      evaluating = true;
+      try {
+        track(() => {
+          cs._d = false;
+          cs._v = getter();
+        }, markDirty);
+      } finally {
+        evaluating = false;
+      }
       if (hook && oldValue !== cs._v) {
         hook.emit("computed:update", { signal: cs, oldValue, newValue: cs._v });
       }

package/dist/ecosystem.d.cts

@@ -48,7 +48,7 @@ interface MobXAdapterAPI {
  *
  * const mobx = inject<MobXAdapterAPI>("mobx");
  * const todoCount = mobx.fromMobX(() => todoStore.todos.length);
- * div({ nodes: () => `Todos: ${todoCount()}` });
+ * div(() => `Todos: ${todoCount()}`);
  * ```
  */
 declare function mobXAdapter(options: MobXAdapterOptions): SibuPlugin;
@@ -90,7 +90,7 @@ interface ReduxAdapterAPI<S = unknown> {
  *
  * const redux = inject<ReduxAdapterAPI>("redux");
  * const count = redux.useSelector(s => s.counter);
- * div({ nodes: () => `Count: ${count()}` });
+ * div(() => `Count: ${count()}`);
  * ```
  */
 declare function reduxAdapter<S>(options: ReduxAdapterOptions<S>): SibuPlugin;
@@ -133,7 +133,7 @@ interface ZustandAdapterAPI<S> {
  *
  * const zs = inject<ZustandAdapterAPI>("zustand");
  * const bears = zs.useSelector(s => s.bears);
- * div({ nodes: () => `Bears: ${bears()}` });
+ * div(() => `Bears: ${bears()}`);
  * ```
  */
 declare function zustandAdapter<S>(options: ZustandAdapterOptions<S>): SibuPlugin;
@@ -204,7 +204,7 @@ type AdaptedComponent = (props?: AdaptedComponentProps) => Element;
  * });
  *
  * const { Button } = adapter.components;
- * Button({ variant: "raised", nodes: "Click me" });
+ * Button({ variant: "raised" }, "Click me");
  * ```
  */
 declare function componentAdapter(config: AdapterConfig): {

package/dist/ecosystem.d.ts

@@ -48,7 +48,7 @@ interface MobXAdapterAPI {
  *
  * const mobx = inject<MobXAdapterAPI>("mobx");
  * const todoCount = mobx.fromMobX(() => todoStore.todos.length);
- * div({ nodes: () => `Todos: ${todoCount()}` });
+ * div(() => `Todos: ${todoCount()}`);
  * ```
  */
 declare function mobXAdapter(options: MobXAdapterOptions): SibuPlugin;
@@ -90,7 +90,7 @@ interface ReduxAdapterAPI<S = unknown> {
  *
  * const redux = inject<ReduxAdapterAPI>("redux");
  * const count = redux.useSelector(s => s.counter);
- * div({ nodes: () => `Count: ${count()}` });
+ * div(() => `Count: ${count()}`);
  * ```
  */
 declare function reduxAdapter<S>(options: ReduxAdapterOptions<S>): SibuPlugin;
@@ -133,7 +133,7 @@ interface ZustandAdapterAPI<S> {
  *
  * const zs = inject<ZustandAdapterAPI>("zustand");
  * const bears = zs.useSelector(s => s.bears);
- * div({ nodes: () => `Bears: ${bears()}` });
+ * div(() => `Bears: ${bears()}`);
  * ```
  */
 declare function zustandAdapter<S>(options: ZustandAdapterOptions<S>): SibuPlugin;
@@ -204,7 +204,7 @@ type AdaptedComponent = (props?: AdaptedComponentProps) => Element;
  * });
  *
  * const { Button } = adapter.components;
- * Button({ variant: "raised", nodes: "Click me" });
+ * Button({ variant: "raised" }, "Click me");
  * ```
  */
 declare function componentAdapter(config: AdapterConfig): {

package/dist/ecosystem.js

@@ -7,16 +7,16 @@ import {
   mobXAdapter,
   reduxAdapter,
   zustandAdapter
-} from "./chunk-BTU3TJDS.js";
+} from "./chunk-TDGZL5CU.js";
 import "./chunk-K5ZUMYVS.js";
-import "./chunk-F3FA4F32.js";
-import "./chunk-PTQJDMRT.js";
-import "./chunk-NEKUBFPT.js";
+import "./chunk-SFKNRVCU.js";
+import "./chunk-5ZYQ6KDD.js";
+import "./chunk-XHK6BDAJ.js";
 import "./chunk-CMBFNA7L.js";
-import "./chunk-CHF5OHIA.js";
+import "./chunk-VQNQZCWJ.js";
 import "./chunk-EUZND3CB.js";
-import "./chunk-WZSPOOER.js";
-import "./chunk-ZD6OAMTH.js";
+import "./chunk-NZIIMDWI.js";
+import "./chunk-K4G4ZQNR.js";
 import "./chunk-5X6PP2UK.js";
 export {
   antdAdapter,