fix: remove dirty tracking redundancy

Author: cha0s

src/array.test.js

@@ -131,13 +131,13 @@ test('reactivity (proxy)', () => {
   const proxy = new Proxy();
   expect(dirties).toEqual(0);
   proxy.setAt(0, {x: 3});
-  expect(dirties).toEqual(2);
+  expect(dirties).toEqual(1);
   proxy.setAt(1, {x: 4});
-  expect(dirties).toEqual(4);
+  expect(dirties).toEqual(2);
   proxy[0].x = 5;
-  expect(dirties).toEqual(5);
+  expect(dirties).toEqual(3);
   proxy.setAt(1, proxy[0]);
-  expect(dirties).toEqual(6);
+  expect(dirties).toEqual(4);
 });
 
 test('disabled diff (proxy)', () => {

src/object.js

@@ -201,7 +201,6 @@ registry.object = class extends ProxyProperty {
                 }`;
               }).join('\n')
           }
-          this[SetWithDefaults](property.defaultValue);
         }
         [Set](value) {
           if (!value) return;
@@ -215,16 +214,39 @@ registry.object = class extends ProxyProperty {
           if (value) {
             ${
               Object.keys(properties).map((key) => `{
-                this['${key}'] = '${key}' in value
-                  ? value['${key}']
-                  : properties['${key}'].defaultValue;
+                let localValue;
+                if ('${key}' in value) {
+                  localValue = value['${key}'];
+                }
+                else if (property.defaultValue && '${key}' in property.defaultValue) {
+                  localValue = property.defaultValue['${key}'];
+                }
+                else {
+                  localValue = properties['${key}'].defaultValue;
+                }
+                ${
+                  properties[key] instanceof ProxyProperty
+                    ? `this['${key}'][SetWithDefaults](localValue);`
+                    : `this['${key}'] = localValue;`
+                }
               }`).join('\n')
             }
           }
           else {
             ${
               Object.keys(properties).map((key) => `{
-                this['${key}'] = properties['${key}'].defaultValue;
+                let localValue;
+                if (property.defaultValue && '${key}' in property.defaultValue) {
+                  localValue = property.defaultValue['${key}'];
+                }
+                else {
+                  localValue = properties['${key}'].defaultValue;
+                }
+                ${
+                  properties[key] instanceof ProxyProperty
+                    ? `this['${key}'][SetWithDefaults](localValue);`
+                    : `this['${key}'] = localValue;`
+                }
               }`).join('\n')
             }
           }
@@ -276,20 +298,6 @@ registry.object = class extends ProxyProperty {
     return (blueprint.Proxy ?? ((C) => C))(
       codegen(`
         return class MappedProxy extends Proxy {
-          ${
-            views.dirty
-            ? `
-              constructor(dataIndex, dirtyIndex) {
-                super(dataIndex, dirtyIndex);
-                let bit = this[DirtyOffset];
-                for (let i = 0; i < property.dirtyWidth; ++i) {
-                  views.dirty[bit >> 3] |= 1 << (bit & 7);
-                  bit += 1;
-                }
-              }
-            `
-            : ''
-          }
           ${(() => {
             let dataIndex = 0;
             let dirtyIndex = 0;

src/object.test.js

@@ -2,7 +2,7 @@ import {expect, test} from 'vitest';
 
 import './object.js';
 import './primitives.js';
-import {Diff, Set, ToJSON, ToJSONWithoutDefaults} from './proxy.js';
+import {Diff, Set, SetWithDefaults, ToJSON, ToJSONWithoutDefaults} from './proxy.js';
 import {registry} from './register.js';
 
 test('concrete', () => {
@@ -94,6 +94,7 @@ test('mapped onDirty', () => {
   const Proxy = property.map({data, dirty, onDirty: () => { dirties += 1; }});
   expect(dirties).toEqual(0);
   const proxy = new Proxy(0);
+  proxy[SetWithDefaults]();
   expect(dirties).toEqual(4);
   dirties = 0;
   proxy.x = 2;
@@ -220,5 +221,6 @@ test('default value', () => {
   });
   const Proxy = property.concrete();
   const proxy = new Proxy(0);
+  proxy[SetWithDefaults]();
   expect(proxy[ToJSON]()).toEqual({x: 1, y: 2, z: 3, a: 0});
 });