Merge branch 'fix-computeds-using-ownkeys'

luisherranz · Jul 10, 2023 · 4607f19 · 4607f19
2 parents 16b1967 + a846d10
commit 4607f19
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 22 deletions.
diff --git a/.changeset/dry-goats-sing.md b/.changeset/dry-goats-sing.md
@@ -0,0 +1,5 @@
+---
+"deepsignal": patch
+---
+
+Avoid side-effects on the `ownKeys` trap.
diff --git a/packages/deepsignal/core/package.json b/packages/deepsignal/core/package.json
@@ -9,7 +9,7 @@
 	"source": "src/index.ts",
 	"license": "MIT",
 	"dependencies": {
-		"@preact/signals-core": "^1.0.0"
+		"@preact/signals-core": "^1.3.1"
 	},
 	"exports": {
 		".": {

diff --git a/packages/deepsignal/core/src/index.ts b/packages/deepsignal/core/src/index.ts
@@ -117,7 +117,7 @@ const objectHandlers = {
 	},
 	ownKeys(target: object): (string | symbol)[] {
 		if (!objToIterable.has(target)) objToIterable.set(target, signal(0));
-		objToIterable.get(target).value = objToIterable.get(target).value;
+		(objToIterable as any)._ = objToIterable.get(target).value;
 		return Reflect.ownKeys(target);
 	},
 };

diff --git a/packages/deepsignal/core/test/index.test.tsx b/packages/deepsignal/core/test/index.test.tsx
@@ -66,6 +66,20 @@ describe("deepsignal/core", () => {
 			expect(store.aOrB.data).to.equal("b");
 		});
 
+		it("should support getters using ownKeys traps", () => {
+			const state = deepSignal({
+				x: {
+					a: 1,
+					b: 2,
+				},
+				get y() {
+					return Object.values(state.x);
+				},
+			});
+
+			expect(state.y).to.deep.equal([1, 2]);
+		});
+
 		it("should work with normal functions", () => {
 			const store = deepSignal({
 				value: 1,

diff --git a/packages/deepsignal/package.json b/packages/deepsignal/package.json
@@ -45,9 +45,9 @@
 		"prepublishOnly": "cp ../../README.md . && cd ../.. && pnpm build"
 	},
 	"dependencies": {
-		"@preact/signals-core": "^1.0.0",
-		"@preact/signals": "^1.0.0",
-		"@preact/signals-react": "^1.0.0"
+		"@preact/signals-core": "^1.3.1",
+		"@preact/signals": "^1.1.4",
+		"@preact/signals-react": "^1.3.3"
 	},
 	"peerDependencies": {
 		"preact": "10.x"

diff --git a/packages/deepsignal/react/package.json b/packages/deepsignal/react/package.json
@@ -9,8 +9,8 @@
 	"source": "src/index.ts",
 	"license": "MIT",
 	"dependencies": {
-		"@preact/signals-core": "^1.0.0",
-		"@preact/signals-react": "^1.0.0"
+		"@preact/signals-core": "^1.3.1",
+		"@preact/signals-react": "^1.3.3"
 	},
 	"peerDependencies": {
 		"react": "17.x || 18.x"

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml