@fictjs/runtime 0.0.10 → 0.0.11

package/dist/index.js

@@ -346,6 +346,7 @@ var isInTransition = false;
 var enqueueMicrotask = typeof queueMicrotask === "function" ? queueMicrotask : (fn) => {
   Promise.resolve().then(fn);
 };
+var inCleanup = false;
 function link(dep, sub, version) {
   const prevDep = sub.depsTail;
   if (prevDep !== void 0 && prevDep.dep === dep) return;
@@ -591,7 +592,15 @@ function updateComputed(c) {
 }
 function runEffect(e) {
   const flags = e.flags;
-  if (flags & Dirty || flags & Pending && e.deps && checkDirty(e.deps, e)) {
+  if (flags & Dirty) {
+    if (e.runCleanup) {
+      inCleanup = true;
+      try {
+        e.runCleanup();
+      } finally {
+        inCleanup = false;
+      }
+    }
     ++cycle;
     effectRunDevtools(e);
     e.depsTail = void 0;
@@ -608,6 +617,35 @@ function runEffect(e) {
       e.flags = Watching;
       throw err;
     }
+  } else if (flags & Pending && e.deps) {
+    if (e.runCleanup) {
+      inCleanup = true;
+      try {
+        e.runCleanup();
+      } finally {
+        inCleanup = false;
+      }
+    }
+    if (checkDirty(e.deps, e)) {
+      ++cycle;
+      effectRunDevtools(e);
+      e.depsTail = void 0;
+      e.flags = WatchingRunning;
+      const prevSub = activeSub;
+      activeSub = e;
+      try {
+        e.fn();
+        activeSub = prevSub;
+        e.flags = Watching;
+        purgeDeps(e);
+      } catch (err) {
+        activeSub = prevSub;
+        e.flags = Watching;
+        throw err;
+      }
+    } else {
+      e.flags = Watching;
+    }
   } else {
     e.flags = Watching;
   }
@@ -703,7 +741,7 @@ function signalOper(value) {
     return;
   }
   const flags = this.flags;
-  if (flags & Dirty) {
+  if (flags & Dirty && !inCleanup) {
     if (updateSignal(this)) {
       const subs = this.subs;
       if (subs !== void 0) shallowPropagate(subs);
@@ -785,6 +823,30 @@ function effect(fn) {
   }
   return effectOper.bind(e);
 }
+function effectWithCleanup(fn, cleanupRunner) {
+  const e = {
+    fn,
+    subs: void 0,
+    subsTail: void 0,
+    deps: void 0,
+    depsTail: void 0,
+    flags: WatchingRunning,
+    runCleanup: cleanupRunner,
+    __id: void 0
+  };
+  registerEffectDevtools(e);
+  const prevSub = activeSub;
+  if (prevSub !== void 0) link(e, prevSub, 0);
+  activeSub = e;
+  try {
+    effectRunDevtools(e);
+    fn();
+  } finally {
+    activeSub = prevSub;
+    e.flags &= ~Running;
+  }
+  return effectOper.bind(e);
+}
 function effectOper() {
   disposeNode(this);
 }
@@ -1030,8 +1092,11 @@ var $memo = createMemo;
 function createEffect(fn) {
   let cleanups = [];
   const rootForError = getCurrentRoot();
-  const run = () => {
+  const doCleanup = () => {
     runCleanupList(cleanups);
+    cleanups = [];
+  };
+  const run = () => {
     const bucket = [];
     withEffectCleanups(bucket, () => {
       try {
@@ -1048,7 +1113,7 @@ function createEffect(fn) {
     });
     cleanups = bucket;
   };
-  const disposeEffect = effect(run);
+  const disposeEffect = effectWithCleanup(run, doCleanup);
   const teardown = () => {
     runCleanupList(cleanups);
     disposeEffect();
@@ -1060,11 +1125,13 @@ var $effect = createEffect;
 function createRenderEffect(fn) {
   let cleanup;
   const rootForError = getCurrentRoot();
-  const run = () => {
+  const doCleanup = () => {
     if (cleanup) {
       cleanup();
       cleanup = void 0;
     }
+  };
+  const run = () => {
     try {
       const maybeCleanup = fn();
       if (typeof maybeCleanup === "function") {
@@ -1078,7 +1145,7 @@ function createRenderEffect(fn) {
       throw err;
     }
   };
-  const disposeEffect = effect(run);
+  const disposeEffect = effectWithCleanup(run, doCleanup);
   const teardown = () => {
     if (cleanup) {
       cleanup();