Skip to content

Commit 5dd90c4

Browse files
authored
fix(store): fix traversed duplicating keys (#843)
fixes #840
1 parent 10183a0 commit 5dd90c4

3 files changed

Lines changed: 42 additions & 14 deletions

File tree

‎packages/solid/store/src/server.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,20 @@ export function updatePath(current: any, path: any[], traversed: (number | strin
4040
if (Array.isArray(part)) {
4141
// Ex. update('data', [2, 23], 'label', l => l + ' !!!');
4242
for (let i = 0; i < part.length; i++) {
43-
updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
43+
updatePath(current, [part[i]].concat(path), traversed);
4444
}
4545
return;
4646
} else if (isArray && partType === "function") {
4747
// Ex. update('data', i => i.id === 42, 'label', l => l + ' !!!');
4848
for (let i = 0; i < current.length; i++) {
49-
if (part(current[i], i))
50-
updatePath(current, [i].concat(path), ([i] as (number | string)[]).concat(traversed));
49+
if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
5150
}
5251
return;
5352
} else if (isArray && partType === "object") {
5453
// Ex. update('data', { from: 3, to: 12, by: 2 }, 'label', l => l + ' !!!');
5554
const { from = 0, to = current.length - 1, by = 1 } = part;
5655
for (let i = from; i <= to; i += by) {
57-
updatePath(current, [i].concat(path), ([i] as (number | string)[]).concat(traversed));
56+
updatePath(current, [i].concat(path), traversed);
5857
}
5958
return;
6059
} else if (path.length > 1) {

‎packages/solid/store/src/store.ts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,21 +180,20 @@ export function updatePath(current: StoreNode, path: any[], traversed: (keyof an
180180
if (Array.isArray(part)) {
181181
// Ex. update('data', [2, 23], 'label', l => l + ' !!!');
182182
for (let i = 0; i < part.length; i++) {
183-
updatePath(current, [part[i]].concat(path), [part[i]].concat(traversed));
183+
updatePath(current, [part[i]].concat(path), traversed);
184184
}
185185
return;
186186
} else if (isArray && partType === "function") {
187187
// Ex. update('data', i => i.id === 42, 'label', l => l + ' !!!');
188188
for (let i = 0; i < current.length; i++) {
189-
if (part(current[i], i))
190-
updatePath(current, [i].concat(path), [i as keyof any].concat(traversed));
189+
if (part(current[i], i)) updatePath(current, [i].concat(path), traversed);
191190
}
192191
return;
193192
} else if (isArray && partType === "object") {
194193
// Ex. update('data', { from: 3, to: 12, by: 2 }, 'label', l => l + ' !!!');
195194
const { from = 0, to = current.length - 1, by = 1 } = part;
196195
for (let i = from; i <= to; i += by) {
197-
updatePath(current, [i].concat(path), [i as keyof any].concat(traversed));
196+
updatePath(current, [i].concat(path), traversed);
198197
}
199198
return;
200199
} else if (path.length > 1) {

‎packages/solid/store/test/store.spec.ts‎

Lines changed: 36 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,10 @@ describe("Simple setState modes", () => {
8585

8686
test("Top level state function merge", () => {
8787
const [state, setState] = createStore({ starting: 1, ending: 1 });
88-
setState(s => ({ ending: s.starting + 1 }));
88+
setState((s, t) => {
89+
expect(t).toStrictEqual([]);
90+
return { ending: s.starting + 1 };
91+
});
8992
expect(state.starting).toBe(1);
9093
expect(state.ending).toBe(2);
9194
});
@@ -99,7 +102,10 @@ describe("Simple setState modes", () => {
99102

100103
test("Nested state function merge", () => {
101104
const [state, setState] = createStore({ data: { starting: 1, ending: 1 } });
102-
setState("data", d => ({ ending: d.starting + 1 }));
105+
setState("data", (d, t) => {
106+
expect(t).toStrictEqual(["data"]);
107+
return { ending: d.starting + 1 };
108+
});
103109
expect(state.data.starting).toBe(1);
104110
expect(state.data.ending).toBe(2);
105111
});
@@ -122,7 +128,13 @@ describe("Simple setState modes", () => {
122128
describe("Array setState modes", () => {
123129
test("Update Specific", () => {
124130
const [state, setState] = createStore({ rows: [1, 2, 3, 4, 5] });
125-
setState("rows", [1, 3], r => r * 2);
131+
setState("rows", [1, 3], (r, t) => {
132+
// @ts-ignore traversed types are wrong and incomplete
133+
expect(typeof t[0]).toBe("number");
134+
// @ts-ignore
135+
expect(t[1]).toBe("rows");
136+
return r * 2;
137+
});
126138
expect(state.rows[0]).toBe(1);
127139
expect(state.rows[1]).toBe(4);
128140
expect(state.rows[2]).toBe(3);
@@ -135,7 +147,13 @@ describe("Array setState modes", () => {
135147
setState(
136148
"rows",
137149
(r, i) => Boolean(i % 2),
138-
r => r * 2
150+
(r, t) => {
151+
// @ts-ignore
152+
expect(typeof t[0]).toBe("number");
153+
// @ts-ignore
154+
expect(t[1]).toBe("rows");
155+
return r * 2;
156+
}
139157
);
140158
expect(state.rows[0]).toBe(1);
141159
expect(state.rows[1]).toBe(4);
@@ -145,7 +163,13 @@ describe("Array setState modes", () => {
145163
});
146164
test("Update traversal range", () => {
147165
const [state, setState] = createStore({ rows: [1, 2, 3, 4, 5] });
148-
setState("rows", { from: 1, to: 4, by: 2 }, r => r * 2);
166+
setState("rows", { from: 1, to: 4, by: 2 }, (r, t) => {
167+
// @ts-ignore
168+
expect(typeof t[0]).toBe("number");
169+
// @ts-ignore
170+
expect(t[1]).toBe("rows");
171+
return r * 2;
172+
});
149173
expect(state.rows[0]).toBe(1);
150174
expect(state.rows[1]).toBe(4);
151175
expect(state.rows[2]).toBe(3);
@@ -154,7 +178,13 @@ describe("Array setState modes", () => {
154178
});
155179
test("Update traversal range defaults", () => {
156180
const [state, setState] = createStore({ rows: [1, 2, 3, 4, 5] });
157-
setState("rows", {}, r => r * 2);
181+
setState("rows", {}, (r, t) => {
182+
// @ts-ignore
183+
expect(typeof t[0]).toBe("number");
184+
// @ts-ignore
185+
expect(t[1]).toBe("rows");
186+
return r * 2;
187+
});
158188
expect(state.rows[0]).toBe(2);
159189
expect(state.rows[1]).toBe(4);
160190
expect(state.rows[2]).toBe(6);

0 commit comments

Comments
 (0)