sibujs 1.5.0 → 2.0.0

package/dist/ssr.d.cts

@@ -1,4 +1,4 @@
-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';
+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-CrVNy6Pa.cjs';
 
 interface HeadProps {
     title?: string | (() => string);
@@ -140,12 +140,24 @@ declare function wasm<T extends Record<string, unknown> = Record<string, unknown
  * Supports loading from URL, ArrayBuffer, or Uint8Array.
  * Caches compiled modules for reuse.
  */
-declare function loadWasmModule(source: string | ArrayBuffer | Uint8Array, imports?: WebAssembly.Imports, cacheKey?: string): Promise<WebAssembly.Instance>;
+interface LoadWasmOptions {
+    imports?: WebAssembly.Imports;
+    cacheKey?: string;
+    allowedOrigins?: string[];
+    /** Required when source is a URL and allowedOrigins is empty. WASM is
+     *  compiled code with imports into JS memory — fetching from any URL is
+     *  a supply-chain risk equivalent to remote module import (CWE-829). */
+    unsafelyAllowAnyOrigin?: boolean;
+}
+declare function loadWasmModule(source: string | ArrayBuffer | Uint8Array, imports?: WebAssembly.Imports | LoadWasmOptions, cacheKey?: string): Promise<WebAssembly.Instance>;
 /**
  * Preload and compile a WASM module without instantiating it.
  * The compiled module is cached for instant instantiation later.
  */
-declare function preloadWasm(url: string): Promise<void>;
+declare function preloadWasm(url: string, options?: {
+    allowedOrigins?: string[];
+    unsafelyAllowAnyOrigin?: boolean;
+}): Promise<void>;
 /**
  * Create a type-safe bridge to a WASM module with automatic memory management.
  * Provides helpers for passing strings and arrays between JS and WASM.
@@ -236,7 +248,13 @@ declare function createMicroApp(config: MicroAppConfig): MicroApp;
  * const el = charts.BarChart({ data: [1, 2, 3] });
  * ```
  */
-declare function loadRemoteModule(url: string): Promise<unknown>;
+interface LoadRemoteModuleOptions {
+    allowedOrigins?: string[];
+    /** Required when allowedOrigins is empty. Forces a deliberate decision
+     *  to import code from any URL — equivalent to remote eval (CWE-829). */
+    unsafelyAllowAnyOrigin?: boolean;
+}
+declare function loadRemoteModule(url: string, optionsOrAllowedOrigins?: string[] | LoadRemoteModuleOptions): Promise<unknown>;
 type Component = () => HTMLElement;
 type RemoteLoader = () => Promise<{
     default: Component;
@@ -322,7 +340,9 @@ declare function generateStaticSite(options: SSGOptions): Promise<SSGResult>;
 
 interface ISROptions<T> {
     revalidateAfter: number;
-    fetcher: () => Promise<T>;
+    fetcher: (ctx?: {
+        signal: AbortSignal;
+    }) => Promise<T>;
     initialData?: T;
 }
 /**
@@ -389,4 +409,4 @@ declare function createMiddlewareChain(): {
     }) => Promise<void>;
 };
 
-export { type ActionFn, type ActionResult, Head, type ISROptions, type MicroApp, type MicroAppConfig, type MiddlewareFn, type SSGOptions, type SSGResult, type ScrollRestorationOptions, type ServiceWorkerState, type SharedScope, type UseWorkerFnReturn, type UseWorkerReturn, type WasmConfig, type WasmModuleState, type WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn };
+export { type ActionFn, type ActionResult, Head, type ISROptions, type LoadRemoteModuleOptions, type LoadWasmOptions, type MicroApp, type MicroAppConfig, type MiddlewareFn, type SSGOptions, type SSGResult, type ScrollRestorationOptions, type ServiceWorkerState, type SharedScope, type UseWorkerFnReturn, type UseWorkerReturn, type WasmConfig, type WasmModuleState, type WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn };

package/dist/ssr.d.ts

@@ -1,4 +1,4 @@
-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';
+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-CrVNy6Pa.js';
 
 interface HeadProps {
     title?: string | (() => string);
@@ -140,12 +140,24 @@ declare function wasm<T extends Record<string, unknown> = Record<string, unknown
  * Supports loading from URL, ArrayBuffer, or Uint8Array.
  * Caches compiled modules for reuse.
  */
-declare function loadWasmModule(source: string | ArrayBuffer | Uint8Array, imports?: WebAssembly.Imports, cacheKey?: string): Promise<WebAssembly.Instance>;
+interface LoadWasmOptions {
+    imports?: WebAssembly.Imports;
+    cacheKey?: string;
+    allowedOrigins?: string[];
+    /** Required when source is a URL and allowedOrigins is empty. WASM is
+     *  compiled code with imports into JS memory — fetching from any URL is
+     *  a supply-chain risk equivalent to remote module import (CWE-829). */
+    unsafelyAllowAnyOrigin?: boolean;
+}
+declare function loadWasmModule(source: string | ArrayBuffer | Uint8Array, imports?: WebAssembly.Imports | LoadWasmOptions, cacheKey?: string): Promise<WebAssembly.Instance>;
 /**
  * Preload and compile a WASM module without instantiating it.
  * The compiled module is cached for instant instantiation later.
  */
-declare function preloadWasm(url: string): Promise<void>;
+declare function preloadWasm(url: string, options?: {
+    allowedOrigins?: string[];
+    unsafelyAllowAnyOrigin?: boolean;
+}): Promise<void>;
 /**
  * Create a type-safe bridge to a WASM module with automatic memory management.
  * Provides helpers for passing strings and arrays between JS and WASM.
@@ -236,7 +248,13 @@ declare function createMicroApp(config: MicroAppConfig): MicroApp;
  * const el = charts.BarChart({ data: [1, 2, 3] });
  * ```
  */
-declare function loadRemoteModule(url: string): Promise<unknown>;
+interface LoadRemoteModuleOptions {
+    allowedOrigins?: string[];
+    /** Required when allowedOrigins is empty. Forces a deliberate decision
+     *  to import code from any URL — equivalent to remote eval (CWE-829). */
+    unsafelyAllowAnyOrigin?: boolean;
+}
+declare function loadRemoteModule(url: string, optionsOrAllowedOrigins?: string[] | LoadRemoteModuleOptions): Promise<unknown>;
 type Component = () => HTMLElement;
 type RemoteLoader = () => Promise<{
     default: Component;
@@ -322,7 +340,9 @@ declare function generateStaticSite(options: SSGOptions): Promise<SSGResult>;
 
 interface ISROptions<T> {
     revalidateAfter: number;
-    fetcher: () => Promise<T>;
+    fetcher: (ctx?: {
+        signal: AbortSignal;
+    }) => Promise<T>;
     initialData?: T;
 }
 /**
@@ -389,4 +409,4 @@ declare function createMiddlewareChain(): {
     }) => Promise<void>;
 };
 
-export { type ActionFn, type ActionResult, Head, type ISROptions, type MicroApp, type MicroAppConfig, type MiddlewareFn, type SSGOptions, type SSGResult, type ScrollRestorationOptions, type ServiceWorkerState, type SharedScope, type UseWorkerFnReturn, type UseWorkerReturn, type WasmConfig, type WasmModuleState, type WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn };
+export { type ActionFn, type ActionResult, Head, type ISROptions, type LoadRemoteModuleOptions, type LoadWasmOptions, type MicroApp, type MicroAppConfig, type MiddlewareFn, type SSGOptions, type SSGResult, type ScrollRestorationOptions, type ServiceWorkerState, type SharedScope, type UseWorkerFnReturn, type UseWorkerReturn, type WasmConfig, type WasmModuleState, type WorkerPool, clearWasmCache, composeMiddleware, createAction, createISR, createMicroApp, createMiddlewareChain, createSharedScope, createWasmBridge, createWorkerPool, defineRemoteComponent, generateStaticSite, isWasmCached, loadRemoteModule, loadWasmModule, preloadWasm, scrollRestoration, serviceWorker, setCanonical, setStructuredData, wasm, worker, workerFn };

package/dist/ssr.js

@@ -22,7 +22,8 @@ import {
   wasm,
   worker,
   workerFn
-} from "./chunk-MYRV7VDM.js";
+} from "./chunk-SAHNHTFC.js";
+import "./chunk-R73P76YZ.js";
 import {
   collectStream,
   deserializeState,
@@ -41,16 +42,16 @@ import {
   ssrSuspense,
   suspenseSwapScript,
   trustHTML
-} from "./chunk-3X2YG6YM.js";
-import "./chunk-P3XWXJZU.js";
-import "./chunk-SFKNRVCU.js";
-import "./chunk-5ZYQ6KDD.js";
-import "./chunk-CMBFNA7L.js";
-import "./chunk-VQNQZCWJ.js";
-import "./chunk-EUZND3CB.js";
-import "./chunk-NZIIMDWI.js";
-import "./chunk-K4G4ZQNR.js";
-import "./chunk-5X6PP2UK.js";
+} from "./chunk-JYD2PWXH.js";
+import "./chunk-KLRMB5ZS.js";
+import "./chunk-DFPFITST.js";
+import "./chunk-2UPRY23K.js";
+import "./chunk-UCS6AMJ7.js";
+import "./chunk-HB24TBAF.js";
+import "./chunk-2RA7SHDA.js";
+import "./chunk-CC65Y57T.js";
+import "./chunk-VLPPXTYG.js";
+import "./chunk-LMLD24FC.js";
 export {
   Head,
   clearWasmCache,

package/dist/{tagFactory-DaJ0YWX6.d.cts → tagFactory-S17H2qxu.d.cts}

@@ -1,3 +1,11 @@
+/**
+ * Canonical disposer/teardown signature used across the framework.
+ *
+ * Returned by `effect()`, `track()`, widget `bind()` methods, and other
+ * subscription/lifecycle helpers. All disposers MUST be idempotent — calling
+ * twice should be a no-op rather than an error.
+ */
+type Dispose = () => void;
 type NodeChild = Node | Element | Text | Comment | string | number | boolean | (() => NodeChild) | null | undefined;
 type NodeChildren = NodeChild | NodeChild[] | NodeChild[][] | (() => NodeChild | NodeChild[]);
 
@@ -44,4 +52,4 @@ interface TagProps {
  */
 declare const tagFactory: (tag: string, ns?: string) => (first?: TagProps | NodeChildren, second?: NodeChildren) => Element;
 
-export { type NodeChildren as N, SVG_NS as S, type TagProps as T, type NodeChild as a, tagFactory as t };
+export { type Dispose as D, type NodeChildren as N, SVG_NS as S, type TagProps as T, type NodeChild as a, tagFactory as t };

package/dist/{tagFactory-DaJ0YWX6.d.ts → tagFactory-S17H2qxu.d.ts}

@@ -1,3 +1,11 @@
+/**
+ * Canonical disposer/teardown signature used across the framework.
+ *
+ * Returned by `effect()`, `track()`, widget `bind()` methods, and other
+ * subscription/lifecycle helpers. All disposers MUST be idempotent — calling
+ * twice should be a no-op rather than an error.
+ */
+type Dispose = () => void;
 type NodeChild = Node | Element | Text | Comment | string | number | boolean | (() => NodeChild) | null | undefined;
 type NodeChildren = NodeChild | NodeChild[] | NodeChild[][] | (() => NodeChild | NodeChild[]);
 
@@ -44,4 +52,4 @@ interface TagProps {
  */
 declare const tagFactory: (tag: string, ns?: string) => (first?: TagProps | NodeChildren, second?: NodeChildren) => Element;
 
-export { type NodeChildren as N, SVG_NS as S, type TagProps as T, type NodeChild as a, tagFactory as t };
+export { type Dispose as D, type NodeChildren as N, SVG_NS as S, type TagProps as T, type NodeChild as a, tagFactory as t };

package/dist/testing.cjs

@@ -60,11 +60,75 @@ __export(testing_exports, {
   snapshotComponent: () => snapshotComponent,
   testComponent: () => testComponent,
   type: () => type,
+  unmountAll: () => unmountAll,
   waitFor: () => waitFor,
   waitForSignal: () => waitForSignal
 });
 module.exports = __toCommonJS(testing_exports);
 
+// src/core/dev.ts
+function isDev() {
+  return typeof globalThis.__SIBU_DEV__ !== "undefined" ? !!globalThis.__SIBU_DEV__ : typeof __SIBU_DEV__ !== "undefined" ? __SIBU_DEV__ : typeof process !== "undefined" && process.env?.NODE_ENV !== "production";
+}
+var _isDev = isDev();
+function devAssert(condition, message) {
+  if (_isDev && !condition) {
+    throw new Error(`[SibuJS] ${message}`);
+  }
+}
+
+// src/core/rendering/dispose.ts
+var elementDisposers = /* @__PURE__ */ new WeakMap();
+var _isDev2 = isDev();
+var activeBindingCount = 0;
+function dispose(node) {
+  const stack = [node];
+  const order = [];
+  while (stack.length > 0) {
+    const current = stack.pop();
+    order.push(current);
+    const children = Array.from(current.childNodes);
+    for (let i = 0; i < children.length; i++) {
+      stack.push(children[i]);
+    }
+  }
+  for (let i = order.length - 1; i >= 0; i--) {
+    const current = order[i];
+    const disposers = elementDisposers.get(current);
+    if (disposers) {
+      const snapshot = disposers.slice();
+      elementDisposers.delete(current);
+      if (_isDev2) activeBindingCount -= snapshot.length;
+      for (const d of snapshot) {
+        try {
+          d();
+        } catch (err) {
+          if (_isDev2 && typeof console !== "undefined") {
+            console.warn("[SibuJS] Disposer threw during cleanup:", err);
+          }
+        }
+      }
+      let extraPasses = 0;
+      while (extraPasses++ < 8) {
+        const added = elementDisposers.get(current);
+        if (!added || added.length === 0) break;
+        const moreSnapshot = added.slice();
+        elementDisposers.delete(current);
+        if (_isDev2) activeBindingCount -= moreSnapshot.length;
+        for (const d of moreSnapshot) {
+          try {
+            d();
+          } catch (err) {
+            if (_isDev2 && typeof console !== "undefined") {
+              console.warn("[SibuJS] Disposer threw during cleanup:", err);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 // src/testing/a11y.ts
 var VALID_ARIA_ROLES = /* @__PURE__ */ new Set([
   "alert",
@@ -1200,8 +1264,9 @@ function createUniversalAdapter() {
 }
 
 // src/testing/e2e.ts
-function createHttpMock(routes = []) {
+function createHttpMock(routes = [], options = {}) {
   const originalFetch = globalThis.fetch;
+  const hadOriginalFetch = Object.hasOwn(globalThis, "fetch");
   const requestLog = [];
   const mockRoutes = [...routes];
   function matchRoute(url, method) {
@@ -1222,29 +1287,41 @@ function createHttpMock(routes = []) {
       return new Response(JSON.stringify({ error: "Not mocked" }), { status: 404 });
     }
     let mockResponse;
-    if (typeof route.response === "function") {
-      mockResponse = await route.response({ url, method, body, headers: new Headers(init?.headers) });
-    } else {
-      mockResponse = route.response;
+    try {
+      if (typeof route.response === "function") {
+        mockResponse = await route.response({ url, method, body, headers: new Headers(init?.headers) });
+      } else {
+        mockResponse = route.response;
+      }
+      if (mockResponse.delay) {
+        await new Promise((r) => setTimeout(r, mockResponse.delay));
+      }
+      return new Response(
+        typeof mockResponse.body === "string" ? mockResponse.body : JSON.stringify(mockResponse.body),
+        {
+          status: mockResponse.status || 200,
+          statusText: mockResponse.statusText || "OK",
+          headers: mockResponse.headers
+        }
+      );
+    } catch (err) {
+      return new Response(JSON.stringify({ error: String(err) }), { status: 500 });
     }
-    if (mockResponse.delay) {
-      await new Promise((r) => setTimeout(r, mockResponse.delay));
+  };
+  const restore = () => {
+    if (hadOriginalFetch) {
+      globalThis.fetch = originalFetch;
+    } else {
+      delete globalThis.fetch;
     }
-    return new Response(typeof mockResponse.body === "string" ? mockResponse.body : JSON.stringify(mockResponse.body), {
-      status: mockResponse.status || 200,
-      statusText: mockResponse.statusText || "OK",
-      headers: mockResponse.headers
-    });
   };
-  return {
+  const api = {
     /** Install the mock (replace global fetch) */
     install() {
       globalThis.fetch = mockFetch;
     },
     /** Restore original fetch */
-    restore() {
-      globalThis.fetch = originalFetch;
-    },
+    restore,
     /** Add a mock route */
     addRoute(route) {
       mockRoutes.push(route);
@@ -1276,18 +1353,29 @@ function createHttpMock(routes = []) {
       return requestLog.filter((r) => r.url.includes(url) && r.method.toUpperCase() === method.toUpperCase()).length;
     }
   };
+  if (typeof options.afterEach === "function") {
+    options.afterEach(() => api.restore());
+  }
+  return api;
 }
-function createTimerMock() {
-  const originalSetTimeout = globalThis.setTimeout;
-  const originalSetInterval = globalThis.setInterval;
-  const originalClearTimeout = globalThis.clearTimeout;
-  const originalClearInterval = globalThis.clearInterval;
-  const originalRAF = typeof requestAnimationFrame !== "undefined" ? requestAnimationFrame : void 0;
-  const originalCAF = typeof cancelAnimationFrame !== "undefined" ? cancelAnimationFrame : void 0;
+function createTimerMock(options = {}) {
+  const g = globalThis;
+  const snapshot = (key) => ({
+    had: Object.hasOwn(globalThis, key),
+    value: g[key]
+  });
+  const saved = {
+    setTimeout: snapshot("setTimeout"),
+    setInterval: snapshot("setInterval"),
+    clearTimeout: snapshot("clearTimeout"),
+    clearInterval: snapshot("clearInterval"),
+    requestAnimationFrame: snapshot("requestAnimationFrame"),
+    cancelAnimationFrame: snapshot("cancelAnimationFrame")
+  };
   let currentTime = 0;
   let nextId = 1;
   const timers = [];
-  return {
+  const api = {
     install() {
       currentTime = 0;
       globalThis.setTimeout = (cb, delay = 0) => {
@@ -1319,12 +1407,13 @@ function createTimerMock() {
       };
     },
     restore() {
-      globalThis.setTimeout = originalSetTimeout;
-      globalThis.setInterval = originalSetInterval;
-      globalThis.clearTimeout = originalClearTimeout;
-      globalThis.clearInterval = originalClearInterval;
-      if (originalRAF) globalThis.requestAnimationFrame = originalRAF;
-      if (originalCAF) globalThis.cancelAnimationFrame = originalCAF;
+      for (const [key, snap] of Object.entries(saved)) {
+        if (snap.had) {
+          g[key] = snap.value;
+        } else {
+          delete g[key];
+        }
+      }
       timers.length = 0;
     },
     /** Advance time by a given number of ms, running any timers that fire */
@@ -1370,6 +1459,10 @@ function createTimerMock() {
       return timers.length;
     }
   };
+  if (typeof options.afterEach === "function") {
+    options.afterEach(() => api.restore());
+  }
+  return api;
 }
 function createDOMSnapshot(element) {
   return serializeElement(element, 0);
@@ -1454,19 +1547,8 @@ function testComponent(component, options = {}) {
   };
 }
 
-// src/core/dev.ts
-function isDev() {
-  return typeof globalThis.__SIBU_DEV__ !== "undefined" ? !!globalThis.__SIBU_DEV__ : typeof __SIBU_DEV__ !== "undefined" ? __SIBU_DEV__ : typeof process !== "undefined" && process.env?.NODE_ENV !== "production";
-}
-var _isDev = isDev();
-function devAssert(condition, message) {
-  if (_isDev && !condition) {
-    throw new Error(`[Sibu] ${message}`);
-  }
-}
-
 // src/reactivity/track.ts
-var _isDev2 = isDev();
+var _isDev3 = isDev();
 var subscriberStack = new Array(32);
 var stackCapacity = 32;
 var stackTop = -1;
@@ -1498,7 +1580,9 @@ function cleanup(subscriber) {
     if (subs) {
       subs.delete(subscriber);
       if (singleDep.__f === subscriber) {
-        singleDep.__f = void 0;
+        singleDep.__f = subs.size === 1 ? subs.values().next().value : void 0;
+      } else if (subs.size === 1 && singleDep.__f === void 0) {
+        singleDep.__f = subs.values().next().value;
       }
     }
     sub._dep = void 0;
@@ -1511,7 +1595,9 @@ function cleanup(subscriber) {
     if (subs) {
       subs.delete(subscriber);
       if (signal.__f === subscriber) {
-        signal.__f = void 0;
+        signal.__f = subs.size === 1 ? subs.values().next().value : void 0;
+      } else if (subs.size === 1 && signal.__f === void 0) {
+        signal.__f = subs.values().next().value;
       }
     }
   }
@@ -1519,9 +1605,28 @@ function cleanup(subscriber) {
 }
 
 // src/core/ssr-context.ts
-var ssrMode = false;
+var als = null;
+try {
+  if (typeof process !== "undefined" && process.versions && process.versions.node) {
+    const req = Function("return typeof require==='function'?require:null")();
+    if (req) {
+      const mod = req("node:async_hooks");
+      als = new mod.AsyncLocalStorage();
+    }
+  }
+} catch {
+  als = null;
+}
+var fallbackStore = { ssr: false, suspenseIdCounter: 0 };
+function getSSRStore() {
+  if (als) {
+    const s = als.getStore();
+    if (s) return s;
+  }
+  return fallbackStore;
+}
 function isSSR() {
-  return ssrMode;
+  return getSSRStore().ssr;
 }
 
 // src/core/signals/effect.ts
@@ -1531,26 +1636,86 @@ function effect(effectFn, options) {
   if (isSSR()) return () => {
   };
   const onError = options?.onError;
+  let userCleanups = [];
+  const onCleanup = (fn) => {
+    userCleanups.push(fn);
+  };
+  const runUserCleanups = () => {
+    if (userCleanups.length === 0) return;
+    const list = userCleanups;
+    userCleanups = [];
+    for (let i = list.length - 1; i >= 0; i--) {
+      try {
+        list[i]();
+      } catch (err) {
+        if (typeof console !== "undefined") {
+          console.warn("[SibuJS effect] onCleanup threw:", err);
+        }
+      }
+    }
+  };
+  const invokeBody = () => effectFn(onCleanup);
   const wrappedFn = onError ? () => {
     try {
-      effectFn();
+      invokeBody();
     } catch (err) {
       onError(err);
     }
-  } : effectFn;
+  } : invokeBody;
   let cleanupHandle = () => {
   };
+  let running = false;
   const subscriber = () => {
-    cleanupHandle();
-    cleanupHandle = track(wrappedFn, subscriber);
+    if (running) {
+      if (_g.__SIBU_DEV_WARN__ !== false && typeof console !== "undefined") {
+        console.warn(
+          "[SibuJS] effect re-entered itself while running \u2014 the triggering update will be ignored. Wrap mutual writes in `batch()` or split the effect to avoid this."
+        );
+      }
+      return;
+    }
+    running = true;
+    try {
+      runUserCleanups();
+      cleanupHandle();
+      cleanupHandle = track(wrappedFn, subscriber);
+    } finally {
+      running = false;
+    }
   };
-  cleanupHandle = track(wrappedFn, subscriber);
+  running = true;
+  try {
+    cleanupHandle = track(wrappedFn, subscriber);
+  } finally {
+    running = false;
+  }
   const hook = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
   if (hook) hook.emit("effect:create", { effectFn });
+  let disposed = false;
   return () => {
+    if (disposed) return;
+    disposed = true;
     const h = _g.__SIBU_DEVTOOLS_GLOBAL_HOOK__;
-    if (h) h.emit("effect:destroy", { effectFn });
-    cleanupHandle();
+    if (h) {
+      try {
+        h.emit("effect:destroy", { effectFn });
+      } catch {
+      }
+    }
+    try {
+      runUserCleanups();
+    } catch (err) {
+      if (typeof console !== "undefined") {
+        console.warn("[SibuJS effect] onCleanup threw during dispose:", err);
+      }
+    }
+    try {
+      cleanupHandle();
+    } catch (err) {
+      if (typeof console !== "undefined") {
+        console.warn("[SibuJS effect] dispose threw:", err);
+      }
+    }
   };
 }
 
@@ -1640,21 +1805,27 @@ function waitForSignal(getter, predicate, options = {}) {
   const timeoutMs = options.timeout ?? 1e3;
   return new Promise((resolve, reject) => {
     let resolved = false;
-    const timer = setTimeout(() => {
-      if (!resolved) {
-        resolved = true;
+    let timer;
+    const finish = (fn) => {
+      if (resolved) return;
+      resolved = true;
+      if (timer !== void 0) clearTimeout(timer);
+      fn();
+    };
+    timer = setTimeout(() => {
+      finish(() => {
         teardown();
         reject(new Error(`waitForSignal: predicate did not match within ${timeoutMs}ms`));
-      }
+      });
     }, timeoutMs);
     const teardown = effect(() => {
       if (resolved) return;
       const value = getter();
       if (predicate(value)) {
-        resolved = true;
-        clearTimeout(timer);
-        queueMicrotask(() => teardown());
-        resolve(value);
+        finish(() => {
+          queueMicrotask(() => teardown());
+          resolve(value);
+        });
       }
     });
   });
@@ -2005,9 +2176,24 @@ function truncate(str, maxLen) {
 }
 
 // src/testing/index.ts
+function escapeSelector(value) {
+  const g = globalThis;
+  if (g.CSS && typeof g.CSS.escape === "function") return g.CSS.escape(value);
+  return value.replace(/[^\w-]/g, (m) => `\\${m.charCodeAt(0).toString(16)} `);
+}
+var _renderedContainers = /* @__PURE__ */ new Set();
+function unmountAll() {
+  for (const container of _renderedContainers) {
+    for (const child of Array.from(container.childNodes)) dispose(child);
+    container.replaceChildren();
+    if (container.parentNode) container.parentNode.removeChild(container);
+  }
+  _renderedContainers.clear();
+}
 function render(component) {
   const container = document.createElement("div");
   document.body.appendChild(container);
+  _renderedContainers.add(container);
   const element = component();
   container.appendChild(element);
   function getByText(text) {
@@ -2024,7 +2210,7 @@ function render(component) {
     return walk(container);
   }
   function getByTestId(testId) {
-    return container.querySelector(`[data-testid="${testId}"]`);
+    return container.querySelector(`[data-testid="${escapeSelector(testId)}"]`);
   }
   function getByRole(role) {
     return container.querySelector(`[role="${role}"]`);
@@ -2033,8 +2219,10 @@ function render(component) {
     return Array.from(container.querySelectorAll(selector));
   }
   function unmount() {
-    container.innerHTML = "";
+    for (const child of Array.from(container.childNodes)) dispose(child);
+    container.replaceChildren();
     if (container.parentNode) container.parentNode.removeChild(container);
+    _renderedContainers.delete(container);
   }
   return { container, element, getByText, getByTestId, getByRole, queryAll, unmount };
 }
@@ -2145,6 +2333,7 @@ function mockStore(initialState) {
   snapshotComponent,
   testComponent,
   type,
+  unmountAll,
   waitFor,
   waitForSignal
 });