More WIP

packages/interactivity/package.json

@@ -29,6 +29,7 @@
 	"dependencies": {
 		"@preact/signals": "^1.2.2",
 		"@preact/signals-core": "1.6.1",
+		"deepsignal": "1.5.0",
 		"preact": "^10.19.3"
 	},
 	"publishConfig": {

packages/interactivity/src/store/handlers.ts

@@ -30,11 +30,11 @@ export const stateHandlers: ProxyHandler< object > = {
 		 */
 		const getter = descriptor( target, key )?.get;
 		if ( getter && ns ) {
-			prop.updateGetter( getter );
+			prop.update( { get: getter } );
 			setNamespace( ns );
-			const result = prop.accessor( withScope ).value;
+			const value = prop.get( withScope ).value;
 			resetNamespace();
-			return result;
+			return value;
 		}
 
 		/*
@@ -43,13 +43,14 @@ export const stateHandlers: ProxyHandler< object > = {
 		 * is updated, which only triggers a re-render when the value changes.
 		 */
 		const value = Reflect.get( target, key, receiver );
-		prop.updateSignal(
-			shouldProxy( value ) && ns
-				? proxify( value, stateHandlers, ns )
-				: value
-		);
-
-		return prop.accessor().value;
+		prop.update( {
+			value:
+				shouldProxy( value ) && ns
+					? proxify( value, stateHandlers, ns )
+					: value,
+		} );
+
+		return prop.get().value;
 	},
 
 	set(
@@ -78,7 +79,7 @@ export const stateHandlers: ProxyHandler< object > = {
 
 			if ( Array.isArray( target ) ) {
 				const length = getProperty( target, 'length' );
-				length.updateSignal( target.length );
+				length.update( { value: target.length } );
 			}
 		}
 
@@ -94,11 +95,7 @@ export const stateHandlers: ProxyHandler< object > = {
 		const result = Reflect.defineProperty( target, key, desc );
 
 		if ( result ) {
-			if ( desc.get ) {
-				prop.updateGetter( desc.get );
-			} else if ( desc.value ) {
-				prop.updateSignal( desc.value );
-			}
+			prop.update( desc );
 		}
 		return result;
 	},
@@ -108,7 +105,7 @@ export const stateHandlers: ProxyHandler< object > = {
 
 		if ( result ) {
 			const prop = getProperty( target, key );
-			prop.updateSignal( undefined );
+			prop.update( {} );
 
 			if ( objToIterable.has( target ) ) {
 				objToIterable.get( target ).value++;

packages/interactivity/src/store/properties.ts

@@ -15,7 +15,7 @@ import {
 import { getProxy } from './proxies';
 import { getScope } from '../hooks';
 
-const DEFAULT_SCOPE = {};
+const DEFAULT_SCOPE = Symbol();
 const objToProps: WeakMap< object, Map< string, Property > > = new WeakMap();
 
 export const getProperty = ( target: object, key: string ) => {
@@ -40,33 +40,28 @@ class Property {
 		this.accessors = new WeakMap();
 	}
 
-	updateSignal( value: unknown | undefined ) {
+	public update( {
+		get,
+		value,
+	}: {
+		get?: () => any;
+		value?: unknown;
+	} ): void {
 		if ( ! this.signal ) {
 			this.signal = signal( value );
-			this.getter = signal( undefined );
-		} else if ( value !== this.signal.peek() ) {
+			this.getter = signal( get );
+		} else if (
+			value !== this.signal.peek() ||
+			get !== this.getter?.peek()
+		) {
 			batch( () => {
 				this.signal!.value = value;
-				this.getter!.value = undefined;
+				this.getter!.value = get;
 			} );
 		}
 	}
 
-	updateGetter( getter: () => any | undefined ) {
-		if ( ! this.getter ) {
-			this.signal = signal( undefined );
-			this.getter = signal( getter );
-		} else if ( getter !== this.getter.peek() ) {
-			batch( () => {
-				this.signal!.value = undefined;
-				this.getter!.value = getter;
-			} );
-		}
-	}
-
-	accessor(
-		wrapper?: < G extends () => any >( getter: G ) => G
-	): ReadonlySignal {
+	get( wrapper?: < G extends () => any >( getter: G ) => G ): ReadonlySignal {
 		const scope = getScope() || DEFAULT_SCOPE;
 
 		if ( ! this.accessors.has( scope ) ) {
@@ -85,6 +80,7 @@ class Property {
 				} )
 			);
 		}
+
 		return this.accessors.get( scope )!;
 	}
 }