@fictjs/runtime 0.1.0 → 0.2.1

package/dist/index.d.cts

@@ -1,7 +1,7 @@
-export { F as Fragment, J as JSX, M as Memo, e as createElement, c as createMemo, d as createRoot, m as mergeProps, b as onCleanup, a as onDestroy, o as onMount, p as prop, r as render } from './props-BfmSLuyp.cjs';
-import { R as RefObject, B as BaseProps, F as FictNode, S as SuspenseToken } from './effect-Auji1rz9.cjs';
-export { p as ClassProp, C as Cleanup, l as Component, D as DOMElement, E as Effect, r as ErrorInfo, q as EventHandler, k as FictVNode, P as PropsWithChildren, m as Ref, n as RefCallback, o as StyleProp, h as createEffect, j as createPortal } from './effect-Auji1rz9.cjs';
-export { C as Context, P as ProviderProps, c as createContext, h as hasContext, u as useContext } from './context-UXySaqI_.cjs';
+export { F as Fragment, J as JSX, M as Memo, e as createElement, c as createMemo, d as createRoot, m as mergeProps, b as onCleanup, a as onDestroy, o as onMount, p as prop, r as render } from './props-CBwuh35e.cjs';
+import { R as RefObject, B as BaseProps, F as FictNode, S as SuspenseToken } from './effect-ClARNUCc.cjs';
+export { p as ClassProp, C as Cleanup, l as Component, D as DOMElement, E as Effect, r as ErrorInfo, q as EventHandler, k as FictVNode, P as PropsWithChildren, m as Ref, n as RefCallback, o as StyleProp, h as createEffect, j as createPortal } from './effect-ClARNUCc.cjs';
+export { C as Context, P as ProviderProps, c as createContext, h as hasContext, u as useContext } from './context-9gFXOdJl.cjs';
 
 /**
  * Create a ref object for DOM element references.
@@ -101,7 +101,7 @@ declare function batch<T>(fn: () => T): T;
 declare function untrack<T>(fn: () => T): T;
 
 interface ErrorBoundaryProps extends BaseProps {
-    fallback: FictNode | ((err: unknown) => FictNode);
+    fallback: FictNode | ((err: unknown, reset?: () => void) => FictNode);
     onError?: (err: unknown) => void;
     resetKeys?: unknown | (() => unknown);
 }

package/dist/index.d.ts

@@ -1,7 +1,7 @@
-export { F as Fragment, J as JSX, M as Memo, e as createElement, c as createMemo, d as createRoot, m as mergeProps, b as onCleanup, a as onDestroy, o as onMount, p as prop, r as render } from './props-BBi8Tkks.js';
-import { R as RefObject, B as BaseProps, F as FictNode, S as SuspenseToken } from './effect-Auji1rz9.js';
-export { p as ClassProp, C as Cleanup, l as Component, D as DOMElement, E as Effect, r as ErrorInfo, q as EventHandler, k as FictVNode, P as PropsWithChildren, m as Ref, n as RefCallback, o as StyleProp, h as createEffect, j as createPortal } from './effect-Auji1rz9.js';
-export { C as Context, P as ProviderProps, c as createContext, h as hasContext, u as useContext } from './context-B7UYnfzM.js';
+export { F as Fragment, J as JSX, M as Memo, e as createElement, c as createMemo, d as createRoot, m as mergeProps, b as onCleanup, a as onDestroy, o as onMount, p as prop, r as render } from './props-DAyeRPwH.js';
+import { R as RefObject, B as BaseProps, F as FictNode, S as SuspenseToken } from './effect-ClARNUCc.js';
+export { p as ClassProp, C as Cleanup, l as Component, D as DOMElement, E as Effect, r as ErrorInfo, q as EventHandler, k as FictVNode, P as PropsWithChildren, m as Ref, n as RefCallback, o as StyleProp, h as createEffect, j as createPortal } from './effect-ClARNUCc.js';
+export { C as Context, P as ProviderProps, c as createContext, h as hasContext, u as useContext } from './context-4woHo7-L.js';
 
 /**
  * Create a ref object for DOM element references.
@@ -101,7 +101,7 @@ declare function batch<T>(fn: () => T): T;
 declare function untrack<T>(fn: () => T): T;
 
 interface ErrorBoundaryProps extends BaseProps {
-    fallback: FictNode | ((err: unknown) => FictNode);
+    fallback: FictNode | ((err: unknown, reset?: () => void) => FictNode);
     onError?: (err: unknown) => void;
     resetKeys?: unknown | (() => unknown);
 }

package/dist/index.dev.js

@@ -133,7 +133,7 @@ var currentEffectCleanups;
 var globalErrorHandlers = /* @__PURE__ */ new WeakMap();
 var globalSuspenseHandlers = /* @__PURE__ */ new WeakMap();
 function createRootContext(parent) {
-  return { parent, cleanups: [], destroyCallbacks: [] };
+  return { parent, cleanups: [], destroyCallbacks: [], suspended: false };
 }
 function pushRoot(root) {
   if (!enterRootGuard(root)) {
@@ -335,13 +335,17 @@ function handleError(err, info, startRoot) {
 }
 function handleSuspend(token, startRoot) {
   let root = startRoot ?? currentRoot;
+  const originRoot = root;
   while (root) {
     const handlers = root.suspenseHandlers;
     if (handlers && handlers.length) {
       for (let i = handlers.length - 1; i >= 0; i--) {
         const handler = handlers[i];
         const handled = handler(token);
-        if (handled !== false) return true;
+        if (handled !== false) {
+          if (originRoot) originRoot.suspended = true;
+          return true;
+        }
       }
     }
     root = root.parent;
@@ -351,7 +355,10 @@ function handleSuspend(token, startRoot) {
     for (let i = globalForRoot.length - 1; i >= 0; i--) {
       const handler = globalForRoot[i];
       const handled = handler(token);
-      if (handled !== false) return true;
+      if (handled !== false) {
+        if (originRoot) originRoot.suspended = true;
+        return true;
+      }
     }
   }
   return false;
@@ -675,7 +682,25 @@ function runEffect(e) {
         inCleanup = false;
       }
     }
-    if (checkDirty(e.deps, e)) {
+    let isDirty = false;
+    try {
+      isDirty = checkDirty(e.deps, e);
+    } catch (err) {
+      if (handleSuspend(err, e.root)) {
+        if (e.flags !== 0) {
+          e.flags = Watching;
+        }
+        return;
+      }
+      if (handleError(err, { source: "effect" }, e.root)) {
+        if (e.flags !== 0) {
+          e.flags = Watching;
+        }
+        return;
+      }
+      throw err;
+    }
+    if (isDirty) {
       ++cycle;
       effectRunDevtools(e);
       e.depsTail = void 0;
@@ -852,7 +877,7 @@ function computedOper() {
   if (activeSub !== void 0) link(this, activeSub, cycle);
   return this.value;
 }
-function effectWithCleanup(fn, cleanupRunner) {
+function effectWithCleanup(fn, cleanupRunner, root) {
   const e = {
     fn,
     subs: void 0,
@@ -863,6 +888,10 @@ function effectWithCleanup(fn, cleanupRunner) {
     runCleanup: cleanupRunner,
     __id: void 0
   };
+  const resolvedRoot = root ?? getCurrentRoot();
+  if (resolvedRoot) {
+    e.root = resolvedRoot;
+  }
   registerEffectDevtools(e);
   const prevSub = activeSub;
   if (prevSub !== void 0) link(e, prevSub, 0);
@@ -920,6 +949,18 @@ function untrack(fn) {
     activeSub = prev;
   }
 }
+function isSignal(fn) {
+  return typeof fn === "function" && fn[SIGNAL_MARKER] === true;
+}
+function isComputed(fn) {
+  return typeof fn === "function" && fn[COMPUTED_MARKER] === true;
+}
+function isEffect(fn) {
+  return typeof fn === "function" && fn[EFFECT_MARKER] === true;
+}
+function isEffectScope(fn) {
+  return typeof fn === "function" && fn[EFFECT_SCOPE_MARKER] === true;
+}
 function setTransitionContext(value) {
   const prev = isInTransition;
   isInTransition = value;
@@ -986,6 +1027,9 @@ function createEffect(fn) {
           bucket.push(maybeCleanup);
         }
       } catch (err) {
+        if (handleSuspend(err, rootForError)) {
+          return;
+        }
         if (handleError(err, { source: "effect" }, rootForError)) {
           return;
         }
@@ -994,7 +1038,7 @@ function createEffect(fn) {
     });
     cleanups = bucket;
   };
-  const disposeEffect = effectWithCleanup(run, doCleanup);
+  const disposeEffect = effectWithCleanup(run, doCleanup, rootForError);
   const teardown = () => {
     runCleanupList(cleanups);
     disposeEffect();
@@ -1018,6 +1062,9 @@ function createRenderEffect(fn) {
         cleanup = maybeCleanup;
       }
     } catch (err) {
+      if (handleSuspend(err, rootForError)) {
+        return;
+      }
       const handled = handleError(err, { source: "effect" }, rootForError);
       if (handled) {
         return;
@@ -1025,7 +1072,7 @@ function createRenderEffect(fn) {
       throw err;
     }
   };
-  const disposeEffect = effectWithCleanup(run, doCleanup);
+  const disposeEffect = effectWithCleanup(run, doCleanup, rootForError);
   const teardown = () => {
     if (cleanup) {
       cleanup();
@@ -1612,7 +1659,10 @@ function removeNodes(nodes) {
 // src/binding.ts
 var isDev5 = true ? true : typeof process === "undefined" || process.env?.NODE_ENV !== "production";
 function isReactive(value) {
-  return typeof value === "function" && value.length === 0;
+  if (typeof value !== "function") return false;
+  if (isSignal(value) || isComputed(value)) return true;
+  if (isEffect(value) || isEffectScope(value)) return false;
+  return value.length === 0;
 }
 function callEventHandler(handler, event, node, data) {
   if (!handler) return;
@@ -2580,14 +2630,15 @@ function ErrorBoundary(props) {
   const fragment = document.createDocumentFragment();
   const marker = document.createComment("fict:error-boundary");
   fragment.appendChild(marker);
-  const currentView = signal(props.children ?? null);
   const hostRoot = getCurrentRoot();
   let cleanup;
   let activeNodes = [];
   let renderingFallback = false;
+  let reset = () => {
+  };
   const toView = (err) => {
     if (err != null) {
-      return typeof props.fallback === "function" ? props.fallback(err) : props.fallback;
+      return typeof props.fallback === "function" ? props.fallback(err, reset) : props.fallback;
     }
     return props.children ?? null;
   };
@@ -2615,7 +2666,6 @@ function ErrorBoundary(props) {
       }
     } catch (err) {
       popRoot(prev);
-      flushOnMount(root);
       destroyRoot(root);
       if (renderingFallback) {
         throw err;
@@ -2639,10 +2689,11 @@ function ErrorBoundary(props) {
     };
     activeNodes = nodes;
   };
-  createEffect(() => {
-    const value = currentView();
-    renderValue(value);
-  });
+  reset = () => {
+    renderingFallback = false;
+    renderValue(toView(null));
+  };
+  renderValue(props.children ?? null);
   registerErrorHandler((err) => {
     renderValue(toView(err));
     props.onError?.(err);
@@ -2681,16 +2732,11 @@ function createSuspenseToken() {
 }
 var isThenable = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 function Suspense(props) {
-  const currentView = signal(props.children ?? null);
   const pending = signal(0);
   let resolvedOnce = false;
   let epoch = 0;
   const hostRoot = getCurrentRoot();
   const toFallback = (err) => typeof props.fallback === "function" ? props.fallback(err) : props.fallback;
-  const switchView = (view) => {
-    currentView(view);
-    renderView(view);
-  };
   const renderView = (view) => {
     if (cleanup) {
       cleanup();
@@ -2709,7 +2755,7 @@ function Suspense(props) {
     try {
       const output = createElement(view);
       nodes = toNodeArray(output);
-      const suspendedAttempt = nodes.length > 0 && nodes.every((node) => node instanceof Comment && node.data === "fict:suspend");
+      const suspendedAttempt = root.suspended || nodes.length > 0 && nodes.every((node) => node instanceof Comment && node.data === "fict:suspend");
       if (suspendedAttempt) {
         popRoot(prev);
         destroyRoot(root);
@@ -2721,7 +2767,6 @@ function Suspense(props) {
       }
     } catch (err) {
       popRoot(prev);
-      flushOnMount(root);
       destroyRoot(root);
       if (!handleError(err, { source: "render" }, hostRoot)) {
         throw err;
@@ -2750,7 +2795,7 @@ function Suspense(props) {
   registerSuspenseHandler((token) => {
     const tokenEpoch = epoch;
     pending(pending() + 1);
-    switchView(toFallback());
+    renderView(toFallback());
     const thenable = token.then ? token : isThenable(token) ? token : null;
     if (thenable) {
       thenable.then(
@@ -2761,7 +2806,7 @@ function Suspense(props) {
           const newPending = Math.max(0, pending() - 1);
           pending(newPending);
           if (newPending === 0) {
-            switchView(props.children ?? null);
+            renderView(props.children ?? null);
             onResolveMaybe();
           }
         },
@@ -2781,9 +2826,7 @@ function Suspense(props) {
     }
     return false;
   });
-  createEffect(() => {
-    renderView(currentView());
-  });
+  renderView(props.children ?? null);
   if (props.resetKeys !== void 0) {
     const isGetter = typeof props.resetKeys === "function" && props.resetKeys.length === 0;
     const getter = isGetter ? props.resetKeys : void 0;
@@ -2794,7 +2837,7 @@ function Suspense(props) {
         prev = next;
         epoch++;
         pending(0);
-        switchView(props.children ?? null);
+        renderView(props.children ?? null);
       }
     });
   }