sibujs 1.4.0 → 1.5.0

package/dist/extras.d.cts

@@ -1,9 +1,9 @@
 export { InfiniteQueryOptions, InfiniteQueryResult, LoaderRoute, MutationOptions, MutationResult, OfflineStore, OfflineStoreOptions, QueryOptions, QueryResult, Resource, ResourceOptions, RetryOptions, RouteLoaderFn, SyncAdapter, SyncChange, SyncResult, calculateDelay, clearQueryCache, debounce, executeLoader, getQueryData, infiniteQuery, invalidateQueries, loaderData, mutation, offlineStore, preloadRoute, previous, query, resource, setQueryData, socket, stream, syncAdapter, throttle, withRetry } from './data.cjs';
 export { AnimationFrameOptions, BoundsRect, GamepadSnapshot, ImageLoaderState, KeyboardOptions, MouseOptions, MutationObserverOptions, SpeakOptions, SwipeDirection, SwipeOptions, TextSelectionState, UrlStateOptions, animationFrame, battery, bounds, broadcast, clipboard, colorScheme, draggable, dropZone, favicon, formatCurrency, formatNumber, fullscreen, gamepad, geo, idle, imageLoader, keyboard, media, mouse, mutationObserver, network, online, permissions, pointerLock, resize, scroll, speech, svgFavicon, swipe, textSelection, title, urlState, vibrate, visibility, wakeLock, windowSize } from './browser.cjs';
-export { GlobalStore, MachineConfig, MachineReturn, Middleware, OptimisticAction, PersistOptions, Selector, TimeTravelReturn, globalStore, machine, optimistic, optimisticList, persisted, timeline } from './patterns.cjs';
-export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-xo5ckdRP.cjs';
+export { GlobalStore, MachineConfig, MachineReturn, Middleware, PersistOptions, Selector, TimeTravelReturn, globalStore, machine, optimistic, optimisticList, persisted, timeline } from './patterns.cjs';
+export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-ey_Qh8ef.cjs';
 export { AnimationPreset, PresetOptions, SlideDirection, SpringOptions, TransitionGroup, TransitionGroupOptions, TransitionOptions, animate, bounceIn, bounceOut, fadeIn, fadeOut, flipIn, pulse, reducedMotion, scaleDown, scaleUp, sequence, shake, slideIn, slideOut, spring, springSignal, stagger, transition, viewTransition } from './motion.cjs';
-export { B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, a as FocusTrap, b as FormConfig, c as FormField, d as FormReturn, I as IntersectionResult, M as MaskOptions, T as Toast, e as ToastInstance, V as ValidatorFn, f as VirtualList, g as VirtualListProps, h as announce, i as aria, j as bindAttrs, k as bindBoolAttr, l as bindData, m as bindField, n as creditCardMask, o as custom, p as dateMask, q as defineElement, r as dialog, s as email, t as eventBus, u as focus, v as form, w as hotkey, x as infiniteScroll, y as inputMask, z as intersection, A as lazyLoad, D as matchesPattern, E as max, G as maxLength, H as min, J as minLength, K as pagination, L as phoneMask, N as removeScopedStyle, O as required, P as scopedStyle, Q as ssnMask, R as svgElement, S as timeMask, U as toast, W as withScopedStyle, X as zipMask } from './customElement-D2DJp_xn.cjs';
+export { B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, a as FocusTrap, b as FormConfig, c as FormField, d as FormReturn, I as IntersectionResult, M as MaskOptions, T as Toast, e as ToastInstance, V as ValidatorFn, f as VirtualList, g as VirtualListProps, h as announce, i as aria, j as bindAttrs, k as bindBoolAttr, l as bindData, m as bindField, n as creditCardMask, o as custom, p as dateMask, q as defineElement, r as dialog, s as email, t as eventBus, u as focus, v as form, w as hotkey, x as infiniteScroll, y as inputMask, z as intersection, A as lazyLoad, D as matchesPattern, E as max, G as maxLength, H as min, J as minLength, K as pagination, L as phoneMask, N as removeScopedStyle, O as required, P as scopedStyle, Q as ssnMask, R as svgElement, S as timeMask, U as toast, W as withScopedStyle, X as zipMask } from './customElement-BL3Uo8dL.cjs';
 export { ChunkConfig, DOMPool, Features, NormalizeResult, NormalizedEntities, NormalizedSchema, NormalizedState, NormalizedStoreActions, Priority, PriorityLevel, block, cloneTemplate, conditional, createChunkRegistry, deferredValue, denormalize, devOnly, domPool, flushScheduler, hoistable, lazyChunk, noSideEffect, normalize, normalizedStore, pendingTasks, precompile, prefetch, preloadImage, preloadModule, preloadModules, preloadResource, processInChunks, pure, resetIdCounter, scheduleUpdate, setIdPrefix, startTransition, staticTemplate, transitionState, uniqueId, yieldToMain } from './performance.cjs';
 export { ActionFn, ActionResult, Head, ISROptions, MicroApp, MicroAppConfig, MiddlewareFn, SSGOptions, SSGResult, ScrollRestorationOptions, ServiceWorkerState, SharedScope, UseWorkerFnReturn, UseWorkerReturn, WasmConfig, WasmModuleState, WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn } from './ssr.cjs';
 export { H as HydrateOptions, a as HydrationMismatch, T as TrustedHTML, c as collectStream, d as deserializeState, e as escapeScriptJson, h as hydrate, b as hydrateIslands, f as hydrateProgressively, i as island, r as renderToDocument, g as renderToReadableStream, j as renderToStream, k as renderToString, l as renderToSuspenseStream, m as resetSSRState, s as serializeState, n as ssrSuspense, o as suspenseSwapScript, t as trustHTML } from './ssr-Do_SiVoL.cjs';

package/dist/extras.d.ts

@@ -1,9 +1,9 @@
 export { InfiniteQueryOptions, InfiniteQueryResult, LoaderRoute, MutationOptions, MutationResult, OfflineStore, OfflineStoreOptions, QueryOptions, QueryResult, Resource, ResourceOptions, RetryOptions, RouteLoaderFn, SyncAdapter, SyncChange, SyncResult, calculateDelay, clearQueryCache, debounce, executeLoader, getQueryData, infiniteQuery, invalidateQueries, loaderData, mutation, offlineStore, preloadRoute, previous, query, resource, setQueryData, socket, stream, syncAdapter, throttle, withRetry } from './data.js';
 export { AnimationFrameOptions, BoundsRect, GamepadSnapshot, ImageLoaderState, KeyboardOptions, MouseOptions, MutationObserverOptions, SpeakOptions, SwipeDirection, SwipeOptions, TextSelectionState, UrlStateOptions, animationFrame, battery, bounds, broadcast, clipboard, colorScheme, draggable, dropZone, favicon, formatCurrency, formatNumber, fullscreen, gamepad, geo, idle, imageLoader, keyboard, media, mouse, mutationObserver, network, online, permissions, pointerLock, resize, scroll, speech, svgFavicon, swipe, textSelection, title, urlState, vibrate, visibility, wakeLock, windowSize } from './browser.js';
-export { GlobalStore, MachineConfig, MachineReturn, Middleware, OptimisticAction, PersistOptions, Selector, TimeTravelReturn, globalStore, machine, optimistic, optimisticList, persisted, timeline } from './patterns.js';
-export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-xo5ckdRP.js';
+export { GlobalStore, MachineConfig, MachineReturn, Middleware, PersistOptions, Selector, TimeTravelReturn, globalStore, machine, optimistic, optimisticList, persisted, timeline } from './patterns.js';
+export { C as ComponentProps, P as PropDef, a as PropSchema, R as RenderProp, V as Validator, b as assertType, c as compose, d as createGuard, e as createSlots, f as defineComponent, g as defineSlottedComponent, h as defineStrictComponent, v as validateProps, i as validators, w as withBoundary, j as withDefaults, k as withProps, l as withWrapper } from './contracts-ey_Qh8ef.js';
 export { AnimationPreset, PresetOptions, SlideDirection, SpringOptions, TransitionGroup, TransitionGroupOptions, TransitionOptions, animate, bounceIn, bounceOut, fadeIn, fadeOut, flipIn, pulse, reducedMotion, scaleDown, scaleUp, sequence, shake, slideIn, slideOut, spring, springSignal, stagger, transition, viewTransition } from './motion.js';
-export { B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, a as FocusTrap, b as FormConfig, c as FormField, d as FormReturn, I as IntersectionResult, M as MaskOptions, T as Toast, e as ToastInstance, V as ValidatorFn, f as VirtualList, g as VirtualListProps, h as announce, i as aria, j as bindAttrs, k as bindBoolAttr, l as bindData, m as bindField, n as creditCardMask, o as custom, p as dateMask, q as defineElement, r as dialog, s as email, t as eventBus, u as focus, v as form, w as hotkey, x as infiniteScroll, y as inputMask, z as intersection, A as lazyLoad, D as matchesPattern, E as max, G as maxLength, H as min, J as minLength, K as pagination, L as phoneMask, N as removeScopedStyle, O as required, P as scopedStyle, Q as ssnMask, R as svgElement, S as timeMask, U as toast, W as withScopedStyle, X as zipMask } from './customElement-D2DJp_xn.js';
+export { B as BoundFieldProps, C as CustomElementOptions, F as FieldConfig, a as FocusTrap, b as FormConfig, c as FormField, d as FormReturn, I as IntersectionResult, M as MaskOptions, T as Toast, e as ToastInstance, V as ValidatorFn, f as VirtualList, g as VirtualListProps, h as announce, i as aria, j as bindAttrs, k as bindBoolAttr, l as bindData, m as bindField, n as creditCardMask, o as custom, p as dateMask, q as defineElement, r as dialog, s as email, t as eventBus, u as focus, v as form, w as hotkey, x as infiniteScroll, y as inputMask, z as intersection, A as lazyLoad, D as matchesPattern, E as max, G as maxLength, H as min, J as minLength, K as pagination, L as phoneMask, N as removeScopedStyle, O as required, P as scopedStyle, Q as ssnMask, R as svgElement, S as timeMask, U as toast, W as withScopedStyle, X as zipMask } from './customElement-BL3Uo8dL.js';
 export { ChunkConfig, DOMPool, Features, NormalizeResult, NormalizedEntities, NormalizedSchema, NormalizedState, NormalizedStoreActions, Priority, PriorityLevel, block, cloneTemplate, conditional, createChunkRegistry, deferredValue, denormalize, devOnly, domPool, flushScheduler, hoistable, lazyChunk, noSideEffect, normalize, normalizedStore, pendingTasks, precompile, prefetch, preloadImage, preloadModule, preloadModules, preloadResource, processInChunks, pure, resetIdCounter, scheduleUpdate, setIdPrefix, startTransition, staticTemplate, transitionState, uniqueId, yieldToMain } from './performance.js';
 export { ActionFn, ActionResult, Head, ISROptions, MicroApp, MicroAppConfig, MiddlewareFn, SSGOptions, SSGResult, ScrollRestorationOptions, ServiceWorkerState, SharedScope, UseWorkerFnReturn, UseWorkerReturn, WasmConfig, WasmModuleState, WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn } from './ssr.js';
 export { H as HydrateOptions, a as HydrationMismatch, T as TrustedHTML, c as collectStream, d as deserializeState, e as escapeScriptJson, h as hydrate, b as hydrateIslands, f as hydrateProgressively, i as island, r as renderToDocument, g as renderToReadableStream, j as renderToStream, k as renderToString, l as renderToSuspenseStream, m as resetSSRState, s as serializeState, n as ssrSuspense, o as suspenseSwapScript, t as trustHTML } from './ssr-Do_SiVoL.js';

package/dist/extras.js

@@ -5,7 +5,7 @@ import {
   optimisticList,
   persisted,
   timeline
-} from "./chunk-ZWKZCBO6.js";
+} from "./chunk-VAPYJN4X.js";
 import {
   DOMPool,
   Features,
@@ -41,7 +41,7 @@ import {
   transitionState,
   uniqueId,
   yieldToMain
-} from "./chunk-TSOKIX5Z.js";
+} from "./chunk-BMPL52BF.js";
 import {
   VERSION,
   bundlerMetadata,
@@ -87,7 +87,7 @@ import {
   wasm,
   worker,
   workerFn
-} from "./chunk-2BYQDGN3.js";
+} from "./chunk-MYRV7VDM.js";
 import {
   FocusTrap,
   VirtualList,
@@ -127,7 +127,7 @@ import {
   toast,
   withScopedStyle,
   zipMask
-} from "./chunk-JCI5M6U6.js";
+} from "./chunk-VQDZK23A.js";
 import {
   RenderProp,
   assertType,
@@ -154,7 +154,7 @@ import {
   select,
   tabs,
   tooltip
-} from "./chunk-EBGIRKQY.js";
+} from "./chunk-PDZQY43A.js";
 import {
   collectStream,
   deserializeState,
@@ -211,7 +211,7 @@ import {
   visibility,
   wakeLock,
   windowSize
-} from "./chunk-3AIRKM3B.js";
+} from "./chunk-RJ46C3CS.js";
 import {
   calculateDelay,
   clearQueryCache,
@@ -233,7 +233,7 @@ import {
   syncAdapter,
   throttle,
   withRetry
-} from "./chunk-JAKHTMQU.js";
+} from "./chunk-BGTHZHJ5.js";
 import {
   SibuError,
   checkLeaks,
@@ -269,7 +269,7 @@ import {
   trackCleanup,
   walkDependencyGraph,
   withErrorTracking
-} from "./chunk-77L6NL3X.js";
+} from "./chunk-7GRNSCFT.js";
 import {
   antdAdapter,
   chakraAdapter,
@@ -279,7 +279,7 @@ import {
   mobXAdapter,
   reduxAdapter,
   zustandAdapter
-} from "./chunk-BTU3TJDS.js";
+} from "./chunk-TDGZL5CU.js";
 import {
   createPlugin,
   inject,
@@ -289,14 +289,14 @@ import {
   triggerPluginMount,
   triggerPluginUnmount
 } from "./chunk-K5ZUMYVS.js";
-import "./chunk-32DY64NT.js";
-import "./chunk-NYVAC6P5.js";
-import "./chunk-BGN5ZMP4.js";
-import "./chunk-F3FA4F32.js";
-import "./chunk-PTQJDMRT.js";
-import "./chunk-NEKUBFPT.js";
+import "./chunk-P3XWXJZU.js";
+import "./chunk-GJPXRJ45.js";
+import "./chunk-6BMPXPUW.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 {
   TransitionGroup,
@@ -319,9 +319,9 @@ import {
   stagger,
   transition,
   viewTransition
-} from "./chunk-KQPDEVVS.js";
-import "./chunk-WZSPOOER.js";
-import "./chunk-ZD6OAMTH.js";
+} from "./chunk-XUEEGU5O.js";
+import "./chunk-NZIIMDWI.js";
+import "./chunk-K4G4ZQNR.js";
 import "./chunk-5X6PP2UK.js";
 export {
   DOMPool,

package/dist/index.cjs

@@ -372,12 +372,21 @@ function queueSignalNotification(signal2) {
     }
   }
 }
+var MAX_DRAIN_ITERATIONS = 1e3;
 function drainNotificationQueue() {
   if (notifyDepth > 0) return;
   notifyDepth++;
   try {
     let i2 = 0;
     while (i2 < pendingQueue.length) {
+      if (i2 >= 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[i2]);
       i2++;
     }
@@ -707,7 +716,15 @@ function dispose(node) {
     const disposers = elementDisposers.get(current);
     if (disposers) {
       if (_isDev5) activeBindingCount -= disposers.length;
-      for (const d of disposers) d();
+      for (const d of disposers) {
+        try {
+          d();
+        } catch (err) {
+          if (_isDev5 && typeof console !== "undefined") {
+            console.warn("[SibuJS] Disposer threw during cleanup:", err);
+          }
+        }
+      }
       elementDisposers.delete(current);
     }
   }
@@ -1641,19 +1658,16 @@ function Portal(nodes, target) {
       portalContent = nodes();
       container.appendChild(portalContent);
     } catch (err) {
-      console.error("[Portal] Render error:", err);
+      if (typeof console !== "undefined") {
+        console.error("[Portal] Render error:", err);
+      }
     }
   });
-  const observer = new MutationObserver(() => {
-    if (!anchor.isConnected && portalContent) {
+  registerDisposer(anchor, () => {
+    if (portalContent) {
+      dispose(portalContent);
       portalContent.remove();
       portalContent = null;
-      observer.disconnect();
-    }
-  });
-  queueMicrotask(() => {
-    if (anchor.parentNode) {
-      observer.observe(anchor.parentNode, { childList: true });
     }
   });
   return anchor;
@@ -2120,21 +2134,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 });
       }
@@ -2462,21 +2492,67 @@ function deepEqual(a2, b2, seen) {
   if (a2 == null || b2 == null) return false;
   if (typeof a2 !== typeof b2) return false;
   if (typeof a2 !== "object") return false;
-  if (a2 instanceof Date && b2 instanceof Date) return a2.getTime() === b2.getTime();
-  if (a2 instanceof RegExp && b2 instanceof RegExp) return a2.toString() === b2.toString();
-  if (!seen) seen = /* @__PURE__ */ new Set();
-  if (seen.has(a2)) return true;
-  seen.add(a2);
+  const objA = a2;
+  const objB = b2;
+  if (objA.constructor !== objB.constructor) return false;
+  if (a2 instanceof Date) return a2.getTime() === b2.getTime();
+  if (a2 instanceof RegExp) {
+    const rb = b2;
+    return a2.source === rb.source && a2.flags === rb.flags;
+  }
+  if (!seen) seen = /* @__PURE__ */ new Map();
+  let peers = seen.get(objA);
+  if (peers?.has(objB)) return true;
+  if (!peers) {
+    peers = /* @__PURE__ */ new Set();
+    seen.set(objA, peers);
+  }
+  peers.add(objB);
+  if (a2 instanceof Map) {
+    const mb = b2;
+    if (a2.size !== mb.size) return false;
+    for (const [k, v] of a2) {
+      if (!mb.has(k)) return false;
+      if (!deepEqual(v, mb.get(k), seen)) return false;
+    }
+    return true;
+  }
+  if (a2 instanceof Set) {
+    const sb = b2;
+    if (a2.size !== sb.size) return false;
+    for (const item of a2) {
+      if (!sb.has(item)) return false;
+    }
+    return true;
+  }
+  if (a2 instanceof ArrayBuffer) {
+    const viewA = new Uint8Array(a2);
+    const viewB = new Uint8Array(b2);
+    if (viewA.length !== viewB.length) return false;
+    for (let i2 = 0; i2 < viewA.length; i2++) {
+      if (viewA[i2] !== viewB[i2]) return false;
+    }
+    return true;
+  }
+  if (ArrayBuffer.isView(a2) && ArrayBuffer.isView(b2)) {
+    const ta = a2;
+    const tb = b2;
+    if (ta.length !== tb.length) return false;
+    for (let i2 = 0; i2 < ta.length; i2++) {
+      if (ta[i2] !== tb[i2]) return false;
+    }
+    return true;
+  }
   if (Array.isArray(a2)) {
     if (!Array.isArray(b2)) return false;
     if (a2.length !== b2.length) return false;
     return a2.every((val, i2) => deepEqual(val, b2[i2], seen));
   }
-  const keysA = Object.keys(a2);
-  const keysB = Object.keys(b2);
+  const keysA = Object.keys(objA);
+  const keysB = Object.keys(objB);
   if (keysA.length !== keysB.length) return false;
   return keysA.every(
-    (key) => deepEqual(a2[key], b2[key], seen)
+    (key) => deepEqual(objA[key], objB[key], seen)
   );
 }
 function deepSignal(initial) {
@@ -2536,29 +2612,35 @@ function asyncDerived(factory, initial) {
 // src/core/rendering/lifecycle.ts
 function safeCall(cb, hookName) {
   try {
-    cb();
+    return cb();
   } catch (err) {
     devWarn(`${hookName}: callback threw: ${err instanceof Error ? err.message : String(err)}`);
+    return void 0;
+  }
+}
+function runMountCallback(callback, hookName, element) {
+  const cleanup2 = safeCall(callback, hookName);
+  if (typeof cleanup2 === "function" && element) {
+    registerDisposer(element, cleanup2);
   }
 }
 function onMount(callback, element) {
   if (typeof document === "undefined") return;
   if (element) {
     if (element.isConnected) {
-      queueMicrotask(() => {
-        safeCall(callback, "onMount");
-      });
+      queueMicrotask(() => runMountCallback(callback, "onMount", element));
       return;
     }
     const observer = new MutationObserver(() => {
       if (element.isConnected) {
         observer.disconnect();
-        safeCall(callback, "onMount");
+        runMountCallback(callback, "onMount", element);
       }
     });
+    registerDisposer(element, () => observer.disconnect());
     queueMicrotask(() => {
       if (element.isConnected) {
-        safeCall(callback, "onMount");
+        runMountCallback(callback, "onMount", element);
       } else {
         observer.observe(document.body, { childList: true, subtree: true });
       }
@@ -2570,6 +2652,7 @@ function onMount(callback, element) {
   }
 }
 function onUnmount(callback, element) {
+  registerDisposer(element, () => safeCall(callback, "onUnmount"));
   const startObserving = () => {
     const observer = new MutationObserver(() => {
       if (!element.isConnected) {
@@ -2578,6 +2661,7 @@ function onUnmount(callback, element) {
       }
     });
     observer.observe(document.body, { childList: true, subtree: true });
+    registerDisposer(element, () => observer.disconnect());
   };
   if (element.isConnected) {
     startObserving();
@@ -2728,26 +2812,24 @@ function lazy(importFn) {
     if (cached) {
       return cached();
     }
-    const [_status, setStatus] = signal("loading");
-    const [_error, setError] = signal(null);
     const container = div({ class: "sibu-lazy" });
+    let disposed = false;
     importFn().then((mod) => {
+      if (disposed) return;
       cached = mod.default;
       const rendered = cached();
       container.replaceChildren(rendered);
-      setStatus("loaded");
     }).catch((err) => {
+      if (disposed) return;
       const errorObj = err instanceof Error ? err : new Error(String(err));
-      setError(errorObj);
-      setStatus("error");
-      container.replaceChildren(
-        div({
-          class: "sibu-lazy-error",
-          nodes: `Failed to load component: ${errorObj.message}`
-        })
-      );
+      container.replaceChildren(div("sibu-lazy-error", `Failed to load component: ${errorObj.message}`));
     });
-    container.appendChild(span({ class: "sibu-lazy-loading", nodes: "Loading..." }));
+    container.appendChild(span("sibu-lazy-loading", "Loading..."));
+    const origRemove = container.remove.bind(container);
+    container.remove = () => {
+      disposed = true;
+      origRemove();
+    };
     return container;
   };
 }