Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/quiet-lazy-cleanups.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@solidjs/signals": patch
---

Restore deferred lazy releases when an unfinished frame's cleanup throws, so later unrelated lazy memos still clean up when their last observer is removed.
7 changes: 5 additions & 2 deletions packages/signals/src/core/core.ts
Original file line number Diff line number Diff line change
Expand Up @@ -400,8 +400,11 @@ export function recompute(el: Computed<any>, create: boolean = false): void {
// ends, if the pass doesn't read it again (#4142).
const prev = deferredReleases;
deferReleases((released = []));
disposeChildren(el);
deferReleases(prev);
try {
disposeChildren(el);
} finally {
deferReleases(prev);
}
} else if (el._firstChild !== null || el._disposal !== null) parkChildren(el);
// An error a pass staged (D-41) is replaced by this pass's answer: a
// value, a flight, or an error of its own (#4109, #4145).
Expand Down
63 changes: 63 additions & 0 deletions packages/signals/tests/deferred-release-cleanup-throw.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
import { expect, it } from "vitest";
import {
createMemo,
createRenderEffect,
createRoot,
createSignal,
flush,
onCleanup
} from "../src/index.js";

// #4164 defers last-reader releases while an unfinished pass's frame is
// dismantled. A cleanup throw must not leave that collector installed for
// later, unrelated disposal.
it.each([false, true])(
"a cleanup throw does not suppress unrelated lazy cleanup (throws: %s)",
throws => {
const failure = new Error("cleanup failed");
const [version, setVersion] = createSignal(0);
const disposePending = createRoot(dispose => {
createMemo(() => {
version();
onCleanup(() => {
if (throws) throw failure;
});
return new Promise<number>(() => {});
});
return dispose;
});
let disposeOther: (() => void) | undefined;
try {
flush();
setVersion(1);
if (throws) expect(() => flush()).toThrow(failure);
else expect(() => flush()).not.toThrow();

let cleaned = 0;
let stop!: () => void;
disposeOther = createRoot(dispose => {
const value = createMemo(
() => {
onCleanup(() => cleaned++);
return 1;
},
{ lazy: true }
);
stop = createRoot(dispose => {
createRenderEffect(value, () => {});
return dispose;
});
return dispose;
});
flush();
stop();
flush();
// Its owner is still alive: losing the last observer releases it.
expect(cleaned).toBe(1);
} finally {
disposeOther?.();
disposePending();
flush();
}
}
);
Loading