Skip to content
Open
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/server-null-prototype-stores.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"solid-js": patch
---

Support null-prototype objects in server store producers, reconciliation, and nested partial updates.
3 changes: 2 additions & 1 deletion packages/solid/store/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ export type {
export const $RAW = Symbol("state-raw");

export function isWrappable(obj: any) {
let proto;
return (
obj != null &&
typeof obj === "object" &&
(Object.getPrototypeOf(obj) === Object.prototype || Array.isArray(obj))
(!(proto = Object.getPrototypeOf(obj)) || proto === Object.prototype || Array.isArray(obj))
);
}

Expand Down
41 changes: 41 additions & 0 deletions packages/solid/test/server/null-prototype-store.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import { describe, expect, test } from "vitest";
import { createStore, produce, reconcile } from "../../store/src/server.js";

describe("null-prototype stores on the server", () => {
test("runs producers on a null-prototype object", () => {
const original = Object.assign(Object.create(null), { count: 1 });
const [state, setState] = createStore<{ count: number }>(original);

setState(produce(state => state.count++));

expect(state.count).toBe(2);
expect(state).toBe(original);
expect(Object.getPrototypeOf(state)).toBeNull();
});

test("reconciles removed properties of a null-prototype object", () => {
const original = Object.assign(Object.create(null), { count: 1, removed: true });
const [state, setState] = createStore<{ count: number; removed?: boolean }>(original);

setState(reconcile({ count: 2 }));

expect(state.count).toBe(2);
expect("removed" in state).toBe(false);
expect(state).toBe(original);
expect(Object.getPrototypeOf(state)).toBeNull();
});

test("merges partial updates into a nested null-prototype object", () => {
const original = Object.assign(Object.create(null), { count: 1, label: "kept" });
const [state, setState] = createStore<{ data: { count: number; label: string } }>({
data: original
});

setState("data", { count: 2 });

expect(state.data.count).toBe(2);
expect(state.data.label).toBe("kept");
expect(state.data).toBe(original);
expect(Object.getPrototypeOf(state.data)).toBeNull();
});
});
Loading