@fictjs/runtime 0.5.0 → 0.5.1

package/dist/index.cjs

@@ -2,7 +2,7 @@
 
 
 
-var _chunkKYLNC4CDcjs = require('./chunk-KYLNC4CD.cjs');
+var _chunkLFMXNQZCcjs = require('./chunk-LFMXNQZC.cjs');
 
 
 
@@ -19,7 +19,7 @@ var _chunkKYLNC4CDcjs = require('./chunk-KYLNC4CD.cjs');
 
 
 
-var _chunkTKWN42TAcjs = require('./chunk-TKWN42TA.cjs');
+var _chunkWJHXPF7Mcjs = require('./chunk-WJHXPF7M.cjs');
 
 
 
@@ -37,7 +37,7 @@ var _chunkTKWN42TAcjs = require('./chunk-TKWN42TA.cjs');
 
 
 
-var _chunk6SOPF5LZcjs = require('./chunk-6SOPF5LZ.cjs');
+var _chunk6RCEIWZLcjs = require('./chunk-6RCEIWZL.cjs');
 
 // src/ref.ts
 function createRef() {
@@ -49,7 +49,7 @@ function ErrorBoundary(props) {
   const fragment = document.createDocumentFragment();
   const marker = document.createComment("fict:error-boundary");
   fragment.appendChild(marker);
-  const hostRoot = _chunk6SOPF5LZcjs.getCurrentRoot.call(void 0, );
+  const hostRoot = _chunk6RCEIWZLcjs.getCurrentRoot.call(void 0, );
   let cleanup;
   let activeNodes = [];
   let renderingFallback = false;
@@ -67,25 +67,25 @@ function ErrorBoundary(props) {
       cleanup = void 0;
     }
     if (activeNodes.length) {
-      _chunkTKWN42TAcjs.removeNodes.call(void 0, activeNodes);
+      _chunkWJHXPF7Mcjs.removeNodes.call(void 0, activeNodes);
       activeNodes = [];
     }
     if (value == null || value === false) {
       return;
     }
-    const root = _chunk6SOPF5LZcjs.createRootContext.call(void 0, hostRoot);
-    const prev = _chunk6SOPF5LZcjs.pushRoot.call(void 0, root);
+    const root = _chunk6RCEIWZLcjs.createRootContext.call(void 0, hostRoot);
+    const prev = _chunk6RCEIWZLcjs.pushRoot.call(void 0, root);
     let nodes = [];
     try {
-      const output = _chunkTKWN42TAcjs.createElement.call(void 0, value);
-      nodes = _chunkTKWN42TAcjs.toNodeArray.call(void 0, output);
+      const output = _chunkWJHXPF7Mcjs.createElement.call(void 0, value);
+      nodes = _chunkWJHXPF7Mcjs.toNodeArray.call(void 0, output);
       const parentNode = marker.parentNode;
       if (parentNode) {
-        _chunkTKWN42TAcjs.insertNodesBefore.call(void 0, parentNode, nodes, marker);
+        _chunkWJHXPF7Mcjs.insertNodesBefore.call(void 0, parentNode, nodes, marker);
       }
     } catch (err) {
-      _chunk6SOPF5LZcjs.popRoot.call(void 0, prev);
-      _chunk6SOPF5LZcjs.destroyRoot.call(void 0, root);
+      _chunk6RCEIWZLcjs.popRoot.call(void 0, prev);
+      _chunk6RCEIWZLcjs.destroyRoot.call(void 0, root);
       if (renderingFallback) {
         throw err;
       }
@@ -100,11 +100,11 @@ function ErrorBoundary(props) {
       }
       return;
     }
-    _chunk6SOPF5LZcjs.popRoot.call(void 0, prev);
-    _chunk6SOPF5LZcjs.flushOnMount.call(void 0, root);
+    _chunk6RCEIWZLcjs.popRoot.call(void 0, prev);
+    _chunk6RCEIWZLcjs.flushOnMount.call(void 0, root);
     cleanup = () => {
-      _chunk6SOPF5LZcjs.destroyRoot.call(void 0, root);
-      _chunkTKWN42TAcjs.removeNodes.call(void 0, nodes);
+      _chunk6RCEIWZLcjs.destroyRoot.call(void 0, root);
+      _chunkWJHXPF7Mcjs.removeNodes.call(void 0, nodes);
     };
     activeNodes = nodes;
   };
@@ -113,7 +113,7 @@ function ErrorBoundary(props) {
     renderValue(toView(null));
   };
   renderValue(_nullishCoalesce(props.children, () => ( null)));
-  _chunk6SOPF5LZcjs.registerErrorHandler.call(void 0, (err) => {
+  _chunk6RCEIWZLcjs.registerErrorHandler.call(void 0, (err) => {
     renderValue(toView(err));
     _optionalChain([props, 'access', _5 => _5.onError, 'optionalCall', _6 => _6(err)]);
     return true;
@@ -122,7 +122,7 @@ function ErrorBoundary(props) {
     const isGetter = typeof props.resetKeys === "function" && props.resetKeys.length === 0;
     const getter = isGetter ? props.resetKeys : void 0;
     let prev = isGetter ? getter() : props.resetKeys;
-    _chunk6SOPF5LZcjs.createEffect.call(void 0, () => {
+    _chunk6RCEIWZLcjs.createEffect.call(void 0, () => {
       const next = getter ? getter() : props.resetKeys;
       if (prev !== next) {
         prev = next;
@@ -151,10 +151,10 @@ function createSuspenseToken() {
 }
 var isThenable = (value) => typeof value === "object" && value !== null && typeof value.then === "function";
 function Suspense(props) {
-  const pending = _chunk6SOPF5LZcjs.signal.call(void 0, 0);
+  const pending = _chunk6RCEIWZLcjs.signal.call(void 0, 0);
   let resolvedOnce = false;
   let epoch = 0;
-  const hostRoot = _chunk6SOPF5LZcjs.getCurrentRoot.call(void 0, );
+  const hostRoot = _chunk6RCEIWZLcjs.getCurrentRoot.call(void 0, );
   const toFallback = (err) => typeof props.fallback === "function" ? props.fallback(err) : props.fallback;
   const renderView = (view) => {
     if (cleanup) {
@@ -162,41 +162,41 @@ function Suspense(props) {
       cleanup = void 0;
     }
     if (activeNodes.length) {
-      _chunkTKWN42TAcjs.removeNodes.call(void 0, activeNodes);
+      _chunkWJHXPF7Mcjs.removeNodes.call(void 0, activeNodes);
       activeNodes = [];
     }
     if (view == null || view === false) {
       return;
     }
-    const root = _chunk6SOPF5LZcjs.createRootContext.call(void 0, hostRoot);
-    const prev = _chunk6SOPF5LZcjs.pushRoot.call(void 0, root);
+    const root = _chunk6RCEIWZLcjs.createRootContext.call(void 0, hostRoot);
+    const prev = _chunk6RCEIWZLcjs.pushRoot.call(void 0, root);
     let nodes = [];
     try {
-      const output = _chunkTKWN42TAcjs.createElement.call(void 0, view);
-      nodes = _chunkTKWN42TAcjs.toNodeArray.call(void 0, output);
+      const output = _chunkWJHXPF7Mcjs.createElement.call(void 0, view);
+      nodes = _chunkWJHXPF7Mcjs.toNodeArray.call(void 0, output);
       const suspendedAttempt = root.suspended || nodes.length > 0 && nodes.every((node) => node instanceof Comment && node.data === "fict:suspend");
       if (suspendedAttempt) {
-        _chunk6SOPF5LZcjs.popRoot.call(void 0, prev);
-        _chunk6SOPF5LZcjs.destroyRoot.call(void 0, root);
+        _chunk6RCEIWZLcjs.popRoot.call(void 0, prev);
+        _chunk6RCEIWZLcjs.destroyRoot.call(void 0, root);
         return;
       }
       const parentNode = marker.parentNode;
       if (parentNode) {
-        _chunkTKWN42TAcjs.insertNodesBefore.call(void 0, parentNode, nodes, marker);
+        _chunkWJHXPF7Mcjs.insertNodesBefore.call(void 0, parentNode, nodes, marker);
       }
     } catch (err) {
-      _chunk6SOPF5LZcjs.popRoot.call(void 0, prev);
-      _chunk6SOPF5LZcjs.destroyRoot.call(void 0, root);
-      if (!_chunk6SOPF5LZcjs.handleError.call(void 0, err, { source: "render" }, hostRoot)) {
+      _chunk6RCEIWZLcjs.popRoot.call(void 0, prev);
+      _chunk6RCEIWZLcjs.destroyRoot.call(void 0, root);
+      if (!_chunk6RCEIWZLcjs.handleError.call(void 0, err, { source: "render" }, hostRoot)) {
         throw err;
       }
       return;
     }
-    _chunk6SOPF5LZcjs.popRoot.call(void 0, prev);
-    _chunk6SOPF5LZcjs.flushOnMount.call(void 0, root);
+    _chunk6RCEIWZLcjs.popRoot.call(void 0, prev);
+    _chunk6RCEIWZLcjs.flushOnMount.call(void 0, root);
     cleanup = () => {
-      _chunk6SOPF5LZcjs.destroyRoot.call(void 0, root);
-      _chunkTKWN42TAcjs.removeNodes.call(void 0, nodes);
+      _chunk6RCEIWZLcjs.destroyRoot.call(void 0, root);
+      _chunkWJHXPF7Mcjs.removeNodes.call(void 0, nodes);
     };
     activeNodes = nodes;
   };
@@ -211,7 +211,7 @@ function Suspense(props) {
       _optionalChain([props, 'access', _7 => _7.onResolve, 'optionalCall', _8 => _8()]);
     }
   };
-  _chunk6SOPF5LZcjs.registerSuspenseHandler.call(void 0, (token) => {
+  _chunk6RCEIWZLcjs.registerSuspenseHandler.call(void 0, (token) => {
     const tokenEpoch = epoch;
     pending(pending() + 1);
     renderView(toFallback());
@@ -236,7 +236,7 @@ function Suspense(props) {
           const newPending = Math.max(0, pending() - 1);
           pending(newPending);
           _optionalChain([props, 'access', _9 => _9.onReject, 'optionalCall', _10 => _10(err)]);
-          if (!_chunk6SOPF5LZcjs.handleError.call(void 0, err, { source: "render" }, hostRoot)) {
+          if (!_chunk6RCEIWZLcjs.handleError.call(void 0, err, { source: "render" }, hostRoot)) {
             throw err;
           }
         }
@@ -250,7 +250,7 @@ function Suspense(props) {
     const isGetter = typeof props.resetKeys === "function" && props.resetKeys.length === 0;
     const getter = isGetter ? props.resetKeys : void 0;
     let prev = isGetter ? getter() : props.resetKeys;
-    _chunk6SOPF5LZcjs.createEffect.call(void 0, () => {
+    _chunk6RCEIWZLcjs.createEffect.call(void 0, () => {
       const next = getter ? getter() : props.resetKeys;
       if (prev !== next) {
         prev = next;
@@ -288,5 +288,5 @@ function Suspense(props) {
 
 
 
-exports.ErrorBoundary = ErrorBoundary; exports.Fragment = _chunkTKWN42TAcjs.Fragment; exports.Suspense = Suspense; exports.batch = _chunkTKWN42TAcjs.batch; exports.createContext = _chunkKYLNC4CDcjs.createContext; exports.createEffect = _chunk6SOPF5LZcjs.createEffect; exports.createElement = _chunkTKWN42TAcjs.createElement; exports.createMemo = _chunk6SOPF5LZcjs.createMemo; exports.createPortal = _chunkTKWN42TAcjs.createPortal; exports.createRef = createRef; exports.createRoot = _chunk6SOPF5LZcjs.createRoot; exports.createSuspenseToken = createSuspenseToken; exports.hasContext = _chunkKYLNC4CDcjs.hasContext; exports.keyed = _chunkTKWN42TAcjs.keyed; exports.mergeProps = _chunkTKWN42TAcjs.mergeProps; exports.onCleanup = _chunk6SOPF5LZcjs.onCleanup; exports.onDestroy = _chunk6SOPF5LZcjs.onDestroy; exports.onMount = _chunk6SOPF5LZcjs.onMount; exports.prop = _chunkTKWN42TAcjs.prop; exports.render = _chunkTKWN42TAcjs.render; exports.startTransition = _chunkTKWN42TAcjs.startTransition; exports.untrack = _chunkTKWN42TAcjs.untrack; exports.useContext = _chunkKYLNC4CDcjs.useContext; exports.useDeferredValue = _chunkTKWN42TAcjs.useDeferredValue; exports.useTransition = _chunkTKWN42TAcjs.useTransition;
+exports.ErrorBoundary = ErrorBoundary; exports.Fragment = _chunkWJHXPF7Mcjs.Fragment; exports.Suspense = Suspense; exports.batch = _chunkWJHXPF7Mcjs.batch; exports.createContext = _chunkLFMXNQZCcjs.createContext; exports.createEffect = _chunk6RCEIWZLcjs.createEffect; exports.createElement = _chunkWJHXPF7Mcjs.createElement; exports.createMemo = _chunk6RCEIWZLcjs.createMemo; exports.createPortal = _chunkWJHXPF7Mcjs.createPortal; exports.createRef = createRef; exports.createRoot = _chunk6RCEIWZLcjs.createRoot; exports.createSuspenseToken = createSuspenseToken; exports.hasContext = _chunkLFMXNQZCcjs.hasContext; exports.keyed = _chunkWJHXPF7Mcjs.keyed; exports.mergeProps = _chunkWJHXPF7Mcjs.mergeProps; exports.onCleanup = _chunk6RCEIWZLcjs.onCleanup; exports.onDestroy = _chunk6RCEIWZLcjs.onDestroy; exports.onMount = _chunk6RCEIWZLcjs.onMount; exports.prop = _chunkWJHXPF7Mcjs.prop; exports.render = _chunkWJHXPF7Mcjs.render; exports.startTransition = _chunkWJHXPF7Mcjs.startTransition; exports.untrack = _chunkWJHXPF7Mcjs.untrack; exports.useContext = _chunkLFMXNQZCcjs.useContext; exports.useDeferredValue = _chunkWJHXPF7Mcjs.useDeferredValue; exports.useTransition = _chunkWJHXPF7Mcjs.useTransition;
 //# sourceMappingURL=index.cjs.map

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)) {