fix: it should not throw on dispose call during active disposal

maverick-js · Jan 17, 2023 · 09eb2a7 · 09eb2a7
1 parent eba7b9a
commit 09eb2a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/core.ts b/src/core.ts
@@ -193,14 +193,14 @@ export function dispose(this: Scope, self = true) {
   if (current) {
     scopes.push(this);
     do {
+      current._state = STATE_DISPOSED;
       if (current._disposal) emptyDisposal(current);
       if (current._sources) removeSourceObservers(current, 0);
       current[SCOPE] = null;
       current._sources = null;
       current._observers = null;
       current._prevSibling = null;
       current._context = null;
-      current._state = STATE_DISPOSED;
       scopes.push(current);
       current = current._nextSibling as Computation | null;
       if (current && current._prevSibling) current._prevSibling._nextSibling = null;

diff --git a/tests/root.test.ts b/tests/root.test.ts
@@ -9,6 +9,7 @@ import {
   type Computation,
   type ReadSignal,
   type WriteSignal,
+  onDispose,
 } from '../src';
 
 afterEach(() => tick());
@@ -113,3 +114,13 @@ it('should not observe', () => {
     expect(scope._observers).toBeUndefined();
   });
 });
+
+it('should not throw if dispose called during active disposal process', () => {
+  root((dispose) => {
+    onDispose(() => {
+      dispose();
+    });
+
+    dispose();
+  });
+});