@fictjs/runtime 0.17.0 → 0.17.1

package/dist/{chunk-CFAWL76V.js → chunk-OKPQWORE.js}

@@ -179,8 +179,6 @@ var reportCycle = (reason, detail = void 0) => {
 var isDev2 = typeof __DEV__ !== "undefined" ? __DEV__ : typeof process !== "undefined" && process.env?.NODE_ENV !== "production";
 var currentRoot;
 var currentEffectCleanups;
-var globalErrorHandlers = /* @__PURE__ */ new WeakMap();
-var globalSuspenseHandlers = /* @__PURE__ */ new WeakMap();
 var rootDevtoolsIds = /* @__PURE__ */ new WeakMap();
 var nextRootDevtoolsId = 0;
 function registerRootDevtools(root) {
@@ -255,18 +253,27 @@ function onCleanup(fn) {
 function flushOnMount(root) {
   const cbs = root.onMountCallbacks;
   if (!cbs || cbs.length === 0) return;
+  try {
+    withRootContext(root, () => {
+      for (let i = 0; i < cbs.length; i++) {
+        const cleanup = cbs[i]();
+        if (typeof cleanup === "function") {
+          root.cleanups.push(cleanup);
+        }
+      }
+    });
+  } finally {
+    cbs.length = 0;
+  }
+}
+function withRootContext(root, fn) {
+  if (!root) return fn();
   const prevRoot = currentRoot;
   currentRoot = root;
   try {
-    for (let i = 0; i < cbs.length; i++) {
-      const cleanup = cbs[i]();
-      if (typeof cleanup === "function") {
-        root.cleanups.push(cleanup);
-      }
-    }
+    return fn();
   } finally {
     currentRoot = prevRoot;
-    cbs.length = 0;
   }
 }
 function registerRootCleanup(fn) {
@@ -275,26 +282,20 @@ function registerRootCleanup(fn) {
   }
 }
 function clearRoot(root) {
-  runCleanupList(root.cleanups);
+  runCleanupList(root.cleanups, root);
   if (root.onMountCallbacks) {
     root.onMountCallbacks.length = 0;
   }
 }
 function destroyRoot(root) {
   clearRoot(root);
-  runCleanupList(root.destroyCallbacks);
+  runCleanupList(root.destroyCallbacks, root);
   if (root.errorHandlers) {
     root.errorHandlers.length = 0;
   }
-  if (globalErrorHandlers.has(root)) {
-    globalErrorHandlers.delete(root);
-  }
   if (root.suspenseHandlers) {
     root.suspenseHandlers.length = 0;
   }
-  if (globalSuspenseHandlers.has(root)) {
-    globalSuspenseHandlers.delete(root);
-  }
   disposeRootDevtools(root);
 }
 function createRoot(fn, options2) {
@@ -329,21 +330,23 @@ function registerEffectCleanup(fn) {
     registerRootCleanup(fn);
   }
 }
-function runCleanupList(list) {
+function runCleanupList(list, root) {
   let error;
-  for (let i = list.length - 1; i >= 0; i--) {
-    try {
-      const cleanup = list[i];
-      if (cleanup) cleanup();
-    } catch (err) {
-      if (error === void 0) {
-        error = err;
+  withRootContext(root, () => {
+    for (let i = list.length - 1; i >= 0; i--) {
+      try {
+        const cleanup = list[i];
+        if (cleanup) cleanup();
+      } catch (err) {
+        if (error === void 0) {
+          error = err;
+        }
       }
     }
-  }
+  });
   list.length = 0;
   if (error !== void 0) {
-    if (!handleError(error, { source: "cleanup" })) {
+    if (!handleError(error, { source: "cleanup" }, root)) {
       throw error;
     }
   }
@@ -363,12 +366,6 @@ function registerErrorHandler(fn) {
     currentRoot.errorHandlers = [];
   }
   currentRoot.errorHandlers.push(fn);
-  const existing = globalErrorHandlers.get(currentRoot);
-  if (existing) {
-    existing.push(fn);
-  } else {
-    globalErrorHandlers.set(currentRoot, [fn]);
-  }
 }
 function registerSuspenseHandler(fn) {
   if (!currentRoot) {
@@ -379,12 +376,6 @@ function registerSuspenseHandler(fn) {
     currentRoot.suspenseHandlers = [];
   }
   currentRoot.suspenseHandlers.push(fn);
-  const existing = globalSuspenseHandlers.get(currentRoot);
-  if (existing) {
-    existing.push(fn);
-  } else {
-    globalSuspenseHandlers.set(currentRoot, [fn]);
-  }
 }
 function handleError(err, info, startRoot) {
   let root = startRoot ?? currentRoot;
@@ -406,20 +397,6 @@ function handleError(err, info, startRoot) {
     }
     root = root.parent;
   }
-  const globalForRoot = startRoot ? globalErrorHandlers.get(startRoot) : currentRoot ? globalErrorHandlers.get(currentRoot) : void 0;
-  if (globalForRoot && globalForRoot.length) {
-    for (let i = globalForRoot.length - 1; i >= 0; i--) {
-      const handler = globalForRoot[i];
-      try {
-        const handled = handler(error, info);
-        if (handled !== false) {
-          return true;
-        }
-      } catch (nextErr) {
-        error = nextErr;
-      }
-    }
-  }
   return false;
 }
 function handleSuspend(token, startRoot) {
@@ -442,20 +419,6 @@ function handleSuspend(token, startRoot) {
     }
     root = root.parent;
   }
-  const globalForRoot = startRoot && globalSuspenseHandlers.get(startRoot) ? globalSuspenseHandlers.get(startRoot) : currentRoot ? globalSuspenseHandlers.get(currentRoot) : void 0;
-  if (globalForRoot && globalForRoot.length) {
-    for (let i = globalForRoot.length - 1; i >= 0; i--) {
-      const handler = globalForRoot[i];
-      const handled = handler(token);
-      if (handled !== false) {
-        if (originRoot) {
-          originRoot.suspended = true;
-          setRootSuspendDevtools(originRoot, true);
-        }
-        return true;
-      }
-    }
-  }
   return false;
 }
 
@@ -871,7 +834,9 @@ function runEffect(e) {
     inCleanup = true;
     activeCleanupFlushId = currentFlushId;
     try {
-      e.runCleanup();
+      withRootContext(e.root, () => {
+        e.runCleanup();
+      });
     } finally {
       activeCleanupFlushId = 0;
       inCleanup = false;
@@ -1564,7 +1529,7 @@ function createEffect(fn, options2) {
   let cleanups = [];
   const rootForError = getCurrentRoot();
   const doCleanup = () => {
-    runCleanupList(cleanups);
+    runCleanupList(cleanups, rootForError);
     cleanups = [];
   };
   const run = () => {
@@ -1589,26 +1554,26 @@ function createEffect(fn, options2) {
   };
   const disposeEffect = effectWithCleanup(run, doCleanup, rootForError, options2);
   const teardown = () => {
-    runCleanupList(cleanups);
+    runCleanupList(cleanups, rootForError);
     disposeEffect();
   };
   registerRootCleanup(teardown);
   return teardown;
 }
 function createRenderEffect(fn, options2) {
-  let cleanup;
+  let cleanups = [];
   const rootForError = getCurrentRoot();
   const doCleanup = () => {
-    if (cleanup) {
-      cleanup();
-      cleanup = void 0;
-    }
+    runCleanupList(cleanups, rootForError);
+    cleanups = [];
   };
   const run = () => {
     try {
       const maybeCleanup = fn();
       if (typeof maybeCleanup === "function") {
-        cleanup = maybeCleanup;
+        cleanups = [maybeCleanup];
+      } else {
+        cleanups = [];
       }
     } catch (err) {
       if (handleSuspend(err, rootForError)) {
@@ -1623,10 +1588,7 @@ function createRenderEffect(fn, options2) {
   };
   const disposeEffect = effectWithCleanup(run, doCleanup, rootForError, options2);
   const teardown = () => {
-    if (cleanup) {
-      cleanup();
-      cleanup = void 0;
-    }
+    runCleanupList(cleanups, rootForError);
     disposeEffect();
   };
   registerRootCleanup(teardown);
@@ -2734,4 +2696,4 @@ export {
   serializeValue,
   deserializeValue
 };
-//# sourceMappingURL=chunk-CFAWL76V.js.map
+//# sourceMappingURL=chunk-OKPQWORE.js.map