Skip to content

Commit a963ec1

Browse files
ryansolidClaude via Cursorcursoragent
authored
fix(signals): a failed derived-store refetch reaches Errored (#3887) (#3917)
pullFamily let a held render effect outside the flight's flush keep its frame when the derive had errored too; a rejection has no landing to learn of, so the error never reached the boundary. Co-authored-by: Claude via Cursor <[email protected]> Co-authored-by: Cursor <[email protected]>
1 parent 5a26ebe commit a963ec1

3 files changed

Lines changed: 118 additions & 1 deletion

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@solidjs/signals": patch
3+
---
4+
5+
Fix a derived store (`createStore(fn)`) whose re-fetch rejects never reaching `Errored`: a render effect outside the flight's flush kept showing the last value instead of throwing the derive's error, for sync-to-async and async-to-async derives alike. Memos were unaffected.

‎packages/signals/src/store/store.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1763,11 +1763,13 @@ function pullFamily(target: StoreTarget): void {
17631763
// One that already observes the flight (linked by the pass that saw it
17641764
// go up — the frame's hold, `blocked`) keeps observing it: a re-run for
17651765
// another reason (a guess it read, the seam) that dropped the link would
1766-
// release the hold with the flight still up.
1766+
// release the hold with the flight still up. An errored derive has no
1767+
// landing to learn of: the error is what the frame shows.
17671768
const c: any = context;
17681769
if (
17691770
c !== null &&
17701771
c._type === EFFECT_RENDER &&
1772+
!(fw._statusFlags & STATUS_ERROR) &&
17711773
fw._config & CONFIG_HELD &&
17721774
flushTransaction !== txOf(fw) &&
17731775
!linkedTo(c, fw)
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
/**
2+
* #3887: a derived store whose re-fetch rejects must reach the error
3+
* boundary, like a memo's does. The reader is the JSX shape — a render
4+
* effect under `Errored` > `Loading` — which `pullFamily` lets keep its frame
5+
* while the derive's flight is up; an errored derive has no landing for that
6+
* frame to wait for.
7+
*/
8+
import {
9+
createErrorBoundary,
10+
createLoadingBoundary,
11+
createMemo,
12+
createRenderEffect,
13+
createRoot,
14+
createSignal,
15+
createStore,
16+
flush
17+
} from "../../src/index.js";
18+
19+
async function settle() {
20+
for (let i = 0; i < 4; i++) {
21+
flush();
22+
await Promise.resolve();
23+
await new Promise(r => setTimeout(r));
24+
}
25+
flush();
26+
}
27+
28+
function mount(read: () => unknown) {
29+
const shown: unknown[] = [];
30+
const dispose = createRoot(dispose => {
31+
const view = createErrorBoundary(
32+
() =>
33+
createLoadingBoundary(
34+
() => {
35+
const text = createMemo(() => "content");
36+
createRenderEffect(read, () => {});
37+
return text;
38+
},
39+
() => "pending"
40+
),
41+
() => "error"
42+
);
43+
createRenderEffect(
44+
() => {
45+
let v: any = view();
46+
while (typeof v === "function") v = v();
47+
return v;
48+
},
49+
v => void shown.push(v)
50+
);
51+
return dispose;
52+
});
53+
return { shown, dispose };
54+
}
55+
56+
function failingReplacement<T>() {
57+
let reject!: (error: Error) => void;
58+
const promise = new Promise<T>((_, fail) => (reject = fail));
59+
return { promise, fail: () => reject(new Error("replacement failed")) };
60+
}
61+
62+
describe("a failed derived-store refetch reaches the error boundary (#3887)", () => {
63+
it("sync derive replaced by a rejecting async one", async () => {
64+
const replacement = failingReplacement<{ value: number }>();
65+
const [id, setId] = createSignal(0);
66+
const [store] = createStore(() => (id() ? replacement.promise : { value: 0 }), { value: 0 });
67+
const { shown, dispose } = mount(() => store.value);
68+
await settle();
69+
expect(shown.at(-1)).toBe("content");
70+
setId(1);
71+
await settle();
72+
replacement.fail();
73+
await settle();
74+
expect(shown.at(-1)).toBe("error");
75+
dispose();
76+
});
77+
78+
it("async derive replaced by a rejecting async one", async () => {
79+
const replacement = failingReplacement<{ value: number }>();
80+
const [id, setId] = createSignal(0);
81+
const [store] = createStore(
82+
() => (id() ? replacement.promise : Promise.resolve({ value: 0 })),
83+
{ value: -1 }
84+
);
85+
const { shown, dispose } = mount(() => store.value);
86+
await settle();
87+
expect(shown.at(-1)).toBe("content");
88+
setId(1);
89+
await settle();
90+
replacement.fail();
91+
await settle();
92+
expect(shown.at(-1)).toBe("error");
93+
dispose();
94+
});
95+
96+
it("memo parity: a memo replaced by a rejecting async one", async () => {
97+
const replacement = failingReplacement<number>();
98+
const [id, setId] = createSignal(0);
99+
const value = createRoot(() => createMemo(() => (id() ? replacement.promise : 0)));
100+
const { shown, dispose } = mount(value);
101+
await settle();
102+
expect(shown.at(-1)).toBe("content");
103+
setId(1);
104+
await settle();
105+
replacement.fail();
106+
await settle();
107+
expect(shown.at(-1)).toBe("error");
108+
dispose();
109+
});
110+
});

0 commit comments

Comments
 (0)