fix wrapping of object with null prototype (#2286)

* fix wrapping object with null prototype * Create yellow-rings-report.md --------- Co-authored-by: Ryan Carniato <[email protected]>
solidjs · Sep 23, 2024 · 94929af · 94929af
1 parent 9697c94
commit 94929af
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.changeset/yellow-rings-report.md b/.changeset/yellow-rings-report.md
@@ -0,0 +1,5 @@
+---
+"solid-js": patch
+---
+
+fix wrapping of object with `null` prototype
diff --git a/packages/solid/store/src/mutable.ts b/packages/solid/store/src/mutable.ts
@@ -97,6 +97,7 @@ function wrap<T extends StoreNode>(value: T): T {
 
     const proto = Object.getPrototypeOf(value);
     const isClass =
+      proto !== null &&
       value !== null &&
       typeof value === "object" &&
       !Array.isArray(value) &&

diff --git a/packages/solid/store/test/mutable.spec.ts b/packages/solid/store/test/mutable.spec.ts
@@ -2,6 +2,11 @@ import { createRoot, createSignal, createMemo, batch, createEffect } from "../..
 import { Accessor, Setter } from "../../types";
 import { createMutable, unwrap, $RAW } from "../src";
 
+test("Object.create(null) is allowed", () => {
+  const user = createMutable(Object.assign(Object.create(null), { name: "John" }));
+  expect(user.name).toBe("John");
+});
+
 describe("State Mutability", () => {
   test("Setting a property", () => {
     const user = createMutable({ name: "John" });