@fictjs/runtime 0.0.15 → 0.2.0

package/dist/index.dev.js

@@ -132,8 +132,8 @@ var currentRoot;
 var currentEffectCleanups;
 var globalErrorHandlers = /* @__PURE__ */ new WeakMap();
 var globalSuspenseHandlers = /* @__PURE__ */ new WeakMap();
-function createRootContext(parent = currentRoot) {
-  return { parent, cleanups: [], destroyCallbacks: [] };
+function createRootContext(parent) {
+  return { parent, cleanups: [], destroyCallbacks: [], suspended: false };
 }
 function pushRoot(root) {
   if (!enterRootGuard(root)) {
@@ -208,8 +208,9 @@ function destroyRoot(root) {
     globalSuspenseHandlers.delete(root);
   }
 }
-function createRoot(fn) {
-  const root = createRootContext();
+function createRoot(fn, options) {
+  const parent = options?.inherit ? currentRoot : void 0;
+  const root = createRootContext(parent);
   const prev = pushRoot(root);
   let value;
   try {
@@ -334,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;
@@ -350,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;
@@ -674,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;
@@ -851,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,
@@ -862,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);
@@ -919,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;
@@ -985,6 +1027,9 @@ function createEffect(fn) {
           bucket.push(maybeCleanup);
         }
       } catch (err) {
+        if (handleSuspend(err, rootForError)) {
+          return;
+        }
         if (handleError(err, { source: "effect" }, rootForError)) {
           return;
         }
@@ -993,7 +1038,7 @@ function createEffect(fn) {
     });
     cleanups = bucket;
   };
-  const disposeEffect = effectWithCleanup(run, doCleanup);
+  const disposeEffect = effectWithCleanup(run, doCleanup, rootForError);
   const teardown = () => {
     runCleanupList(cleanups);
     disposeEffect();
@@ -1017,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;
@@ -1024,7 +1072,7 @@ function createRenderEffect(fn) {
       throw err;
     }
   };
-  const disposeEffect = effectWithCleanup(run, doCleanup);
+  const disposeEffect = effectWithCleanup(run, doCleanup, rootForError);
   const teardown = () => {
     if (cleanup) {
       cleanup();
@@ -1301,8 +1349,7 @@ function getPropAlias(prop2, tagName) {
   return a;
 }
 var $$EVENTS = "_$FICT_DELEGATE";
-var delegatedEvents = isDev4 ? DelegatedEventNames : [];
-var DelegatedEvents = new Set(delegatedEvents);
+var DelegatedEvents = new Set(DelegatedEventNames);
 var svgElements = isDev4 ? [
   "altGlyph",
   "altGlyphDef",
@@ -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;
@@ -1907,7 +1957,8 @@ function bindEvent(el, eventName, handler, options) {
   if (handler == null) return () => {
   };
   const rootRef = getCurrentRoot();
-  if (isDev5 && DelegatedEvents.has(eventName) && !options) {
+  const shouldDelegate = options == null && DelegatedEvents.has(eventName);
+  if (shouldDelegate) {
     const key = `$$${eventName}`;
     delegateEvents([eventName]);
     const resolveHandler = isReactive(handler) ? handler : () => handler;
@@ -2026,17 +2077,27 @@ function __fictPopContext() {
 }
 
 // src/props.ts
+var PROP_GETTER_MARKER = Symbol.for("fict:prop-getter");
 var propGetters = /* @__PURE__ */ new WeakSet();
 var rawToProxy = /* @__PURE__ */ new WeakMap();
 var proxyToRaw = /* @__PURE__ */ new WeakMap();
 function __fictProp(getter) {
   if (typeof getter === "function" && getter.length === 0) {
     propGetters.add(getter);
+    if (Object.isExtensible(getter)) {
+      try {
+        ;
+        getter[PROP_GETTER_MARKER] = true;
+      } catch {
+      }
+    }
   }
   return getter;
 }
 function isPropGetter(value) {
-  return typeof value === "function" && propGetters.has(value);
+  if (typeof value !== "function") return false;
+  const fn = value;
+  return propGetters.has(fn) || fn[PROP_GETTER_MARKER] === true;
 }
 function createPropsProxy(props) {
   if (!props || typeof props !== "object") {
@@ -2150,11 +2211,21 @@ function mergeProps(...sources) {
     }
   });
 }
-function prop(getter) {
+function prop(getter, options) {
   if (isPropGetter(getter)) {
     return getter;
   }
-  return __fictProp(createMemo(getter));
+  const fn = getter;
+  const unwrap = options?.unwrap !== false;
+  return __fictProp(
+    createMemo(() => {
+      const value = fn();
+      if (unwrap && isPropGetter(value)) {
+        return value();
+      }
+      return value;
+    })
+  );
 }
 
 // src/dom.ts
@@ -2666,10 +2737,6 @@ function Suspense(props) {
   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();
@@ -2688,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);
@@ -2729,7 +2796,8 @@ function Suspense(props) {
   registerSuspenseHandler((token) => {
     const tokenEpoch = epoch;
     pending(pending() + 1);
-    switchView(toFallback());
+    currentView(toFallback());
+    renderView(toFallback());
     const thenable = token.then ? token : isThenable(token) ? token : null;
     if (thenable) {
       thenable.then(
@@ -2740,7 +2808,8 @@ function Suspense(props) {
           const newPending = Math.max(0, pending() - 1);
           pending(newPending);
           if (newPending === 0) {
-            switchView(props.children ?? null);
+            currentView(props.children ?? null);
+            renderView(props.children ?? null);
             onResolveMaybe();
           }
         },
@@ -2760,9 +2829,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;
@@ -2773,7 +2840,8 @@ function Suspense(props) {
         prev = next;
         epoch++;
         pending(0);
-        switchView(props.children ?? null);
+        currentView(props.children ?? null);
+        renderView(props.children ?? null);
       }
     });
   }