@fictjs/runtime 0.5.0 → 0.5.2

package/dist/index.dev.js

@@ -22,7 +22,7 @@ var enterRootGuard = () => true;
 var exitRootGuard = () => {
 };
 var defaultOptions = {
-  enabled: true,
+  enabled: isDev,
   maxFlushCyclesPerMicrotask: 1e4,
   maxEffectRunsPerFlush: 2e4,
   windowSize: 5,
@@ -526,6 +526,8 @@ var cycle = 0;
 var batchDepth = 0;
 var activeSub;
 var flushScheduled = false;
+var currentFlushId = 0;
+var activeCleanupFlushId = 0;
 var highPriorityQueue = [];
 var lowPriorityQueue = [];
 var isInTransition = false;
@@ -771,6 +773,8 @@ function updateSignal(s) {
   const current = s.currentValue;
   const pending = s.pendingValue;
   if (valuesDiffer(s, current, pending)) {
+    s.prevValue = current;
+    s.prevFlushId = currentFlushId;
     s.currentValue = pending;
     return true;
   }
@@ -789,6 +793,8 @@ function updateComputed(c) {
     c.flags &= ~Running;
     purgeDeps(c);
     if (valuesDiffer(c, oldValue, newValue)) {
+      c.prevValue = oldValue;
+      c.prevFlushId = currentFlushId;
       c.value = newValue;
       if (isDev4) updateComputedDevtools(c, newValue);
       return true;
@@ -802,15 +808,19 @@ function updateComputed(c) {
 }
 function runEffect(e) {
   const flags = e.flags;
-  if (flags & Dirty) {
-    if (e.runCleanup) {
-      inCleanup = true;
-      try {
-        e.runCleanup();
-      } finally {
-        inCleanup = false;
-      }
+  const runCleanup = () => {
+    if (!e.runCleanup) return;
+    inCleanup = true;
+    activeCleanupFlushId = currentFlushId;
+    try {
+      e.runCleanup();
+    } finally {
+      activeCleanupFlushId = 0;
+      inCleanup = false;
     }
+  };
+  if (flags & Dirty) {
+    runCleanup();
     ++cycle;
     if (isDev4) effectRunDevtools(e);
     e.depsTail = void 0;
@@ -828,14 +838,6 @@ function runEffect(e) {
       throw err;
     }
   } else if (flags & Pending && e.deps) {
-    if (e.runCleanup) {
-      inCleanup = true;
-      try {
-        e.runCleanup();
-      } finally {
-        inCleanup = false;
-      }
-    }
     let isDirty = false;
     try {
       isDirty = checkDirty(e.deps, e);
@@ -855,6 +857,7 @@ function runEffect(e) {
       throw err;
     }
     if (isDirty) {
+      runCleanup();
       ++cycle;
       if (isDev4) effectRunDevtools(e);
       e.depsTail = void 0;
@@ -900,6 +903,7 @@ function flush() {
     endFlushGuard();
     return;
   }
+  currentFlushId++;
   flushScheduled = false;
   let highIndex = 0;
   while (highIndex < highPriorityQueue.length) {
@@ -1004,6 +1008,12 @@ function signalOper(value) {
       if (subs !== void 0) shallowPropagate(subs);
     }
   }
+  if (inCleanup) {
+    if (this.prevFlushId === activeCleanupFlushId) {
+      return this.prevValue;
+    }
+    return this.currentValue;
+  }
   let sub = activeSub;
   while (sub !== void 0) {
     if (sub.flags & 3) {
@@ -1037,7 +1047,12 @@ function computed(getter, options2) {
   return bound;
 }
 function computedOper() {
-  if (inCleanup) return this.value;
+  if (inCleanup) {
+    if (this.prevFlushId === activeCleanupFlushId) {
+      return this.prevValue;
+    }
+    return this.value;
+  }
   const flags = this.flags;
   if (flags & Dirty) {
     if (updateComputed(this)) {
@@ -1834,12 +1849,35 @@ function removeNodes(nodes) {
   }
 }
 
+// src/ssr-stream.ts
+var ssrStreamHooks = null;
+var boundaryStack = [];
+function __fictGetSSRStreamHooks() {
+  return ssrStreamHooks;
+}
+function __fictPushSSRBoundary(id) {
+  boundaryStack.push(id);
+}
+function __fictPopSSRBoundary(expected) {
+  if (boundaryStack.length === 0) return;
+  const top = boundaryStack[boundaryStack.length - 1];
+  if (expected && top !== expected) {
+    boundaryStack.pop();
+    return;
+  }
+  boundaryStack.pop();
+}
+function __fictGetCurrentSSRBoundary() {
+  return boundaryStack.length > 0 ? boundaryStack[boundaryStack.length - 1] : null;
+}
+
 // src/resume.ts
 var ssrEnabled = false;
 var resumableEnabled = false;
 var hydrating = false;
 var scopeCounter = 0;
 var scopeRegistry = /* @__PURE__ */ new Map();
+var boundaryScopes = /* @__PURE__ */ new Map();
 function __fictIsResumable() {
   return ssrEnabled || resumableEnabled;
 }
@@ -1864,6 +1902,16 @@ function __fictRegisterScope(ctx, host, type, props) {
   if (props !== void 0) {
     record.props = props;
   }
+  const boundaryId = __fictGetCurrentSSRBoundary();
+  if (boundaryId) {
+    record.boundaryId = boundaryId;
+    let scopes = boundaryScopes.get(boundaryId);
+    if (!scopes) {
+      scopes = /* @__PURE__ */ new Set();
+      boundaryScopes.set(boundaryId, scopes);
+    }
+    scopes.add(id);
+  }
   scopeRegistry.set(id, record);
   return id;
 }
@@ -3005,6 +3053,7 @@ function createSuspenseToken() {
 }
 var isThenable = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 function Suspense(props) {
+  const streamHooks = __fictGetSSRStreamHooks();
   const pending = signal(0);
   let resolvedOnce = false;
   let epoch = 0;
@@ -3025,7 +3074,12 @@ function Suspense(props) {
     const root = createRootContext(hostRoot);
     const prev = pushRoot(root);
     let nodes = [];
+    let boundaryPushed = false;
     try {
+      if (streamBoundaryId) {
+        __fictPushSSRBoundary(streamBoundaryId);
+        boundaryPushed = true;
+      }
       const output = createElement(view);
       nodes = toNodeArray(output);
       const suspendedAttempt = root.suspended || nodes.length > 0 && nodes.every((node) => node instanceof Comment && node.data === "fict:suspend");
@@ -3034,9 +3088,9 @@ function Suspense(props) {
         destroyRoot(root);
         return;
       }
-      const parentNode = marker.parentNode;
+      const parentNode = endMarker.parentNode;
       if (parentNode) {
-        insertNodesBefore(parentNode, nodes, marker);
+        insertNodesBefore(parentNode, nodes, endMarker);
       }
     } catch (err) {
       popRoot(prev);
@@ -3045,6 +3099,10 @@ function Suspense(props) {
         throw err;
       }
       return;
+    } finally {
+      if (boundaryPushed) {
+        __fictPopSSRBoundary(streamBoundaryId ?? void 0);
+      }
     }
     popRoot(prev);
     flushOnMount(root);
@@ -3055,10 +3113,21 @@ function Suspense(props) {
     activeNodes = nodes;
   };
   const fragment = document.createDocumentFragment();
-  const marker = document.createComment("fict:suspense");
-  fragment.appendChild(marker);
+  const startMarker = document.createComment("fict:suspense-start");
+  const endMarker = document.createComment("fict:suspense-end");
+  fragment.appendChild(startMarker);
+  fragment.appendChild(endMarker);
   let cleanup;
   let activeNodes = [];
+  let streamBoundaryId = null;
+  let streamPending = false;
+  if (streamHooks?.registerBoundary) {
+    streamBoundaryId = streamHooks.registerBoundary(startMarker, endMarker) ?? null;
+    if (streamBoundaryId) {
+      startMarker.data = `fict:suspense-start:${streamBoundaryId}`;
+      endMarker.data = `fict:suspense-end:${streamBoundaryId}`;
+    }
+  }
   const onResolveMaybe = () => {
     if (!resolvedOnce) {
       resolvedOnce = true;
@@ -3067,6 +3136,10 @@ function Suspense(props) {
   };
   registerSuspenseHandler((token) => {
     const tokenEpoch = epoch;
+    if (!streamPending && streamBoundaryId && streamHooks?.boundaryPending) {
+      streamPending = true;
+      streamHooks.boundaryPending(streamBoundaryId);
+    }
     pending(pending() + 1);
     renderView(toFallback());
     const thenable = token.then ? token : isThenable(token) ? token : null;
@@ -3080,6 +3153,10 @@ function Suspense(props) {
           pending(newPending);
           if (newPending === 0) {
             renderView(props.children ?? null);
+            if (streamPending && streamBoundaryId && streamHooks?.boundaryResolved) {
+              streamPending = false;
+              streamHooks.boundaryResolved(streamBoundaryId);
+            }
             onResolveMaybe();
           }
         },
@@ -3089,9 +3166,23 @@ function Suspense(props) {
           }
           const newPending = Math.max(0, pending() - 1);
           pending(newPending);
-          props.onReject?.(err);
-          if (!handleError(err, { source: "render" }, hostRoot)) {
-            throw err;
+          let rejectionError = err;
+          try {
+            props.onReject?.(err);
+          } catch (callbackError) {
+            rejectionError = callbackError;
+          }
+          const handled = handleError(rejectionError, { source: "render" }, hostRoot);
+          if (!handled) {
+            if (streamHooks?.onError) {
+              streamHooks.onError(rejectionError, streamBoundaryId ?? void 0);
+              return;
+            }
+            throw rejectionError;
+          }
+          if (newPending === 0 && streamPending && streamBoundaryId && streamHooks?.boundaryResolved) {
+            streamPending = false;
+            streamHooks.boundaryResolved(streamBoundaryId);
           }
         }
       );
@@ -3111,6 +3202,10 @@ function Suspense(props) {
         epoch++;
         pending(0);
         renderView(props.children ?? null);
+        if (streamPending && streamBoundaryId && streamHooks?.boundaryResolved) {
+          streamPending = false;
+          streamHooks.boundaryResolved(streamBoundaryId);
+        }
       }
     });
   }