j-templates 8.1.0 → 8.1.2

package/Store/Diff/diffSync.js

@@ -35,7 +35,9 @@ export class DiffSync {
     }
     SplicePath(path, start, deleteCount, items) {
         const spliceResult = this.diffTree.SplicePath(path, start, deleteCount, items);
-        spliceResult.diffResult.push(...this.diffTree.RunProjections());
+        const projectionDiff = this.diffTree.RunProjections();
+        spliceResult.diffResult = spliceResult.diffResult.concat(projectionDiff);
+        // spliceResult.diffResult.push(...this.diffTree.RunProjections());
         return spliceResult;
     }
 }

package/Store/Diff/diffTree.js

@@ -214,7 +214,7 @@ function BuildProjectionOrder(projections) {
  * @returns Diff entries for every projection whose result changed
  */
 function RunProjections(source, keyFunc, projections, memo) {
-    const diffResult = [];
+    let diffResult = [];
     for (let x = 0; x < projections.length; x++) {
         const { id, reads, projection } = projections[x];
         const values = [];
@@ -244,10 +244,19 @@ function RunProjections(source, keyFunc, projections, memo) {
             if (!ArraysEqual(priorValues, values)) {
                 const result = projection(keys, ...values);
                 memo.set(id, values);
+                const diff = UpdateSource(source, PROJECTION_PREFIX + id, result, keyFunc);
+                diffResult = diffResult.concat(diff);
                 // The same diff-and-apply UpdateSource uses for any other write, so a keyed entity
                 // embedded in a projection's result is flattened to its own root like any other write,
                 // and the diff reported here is unfiltered, the same as DiffPath returns.
-                diffResult.push(...UpdateSource(source, PROJECTION_PREFIX + id, result, keyFunc));
+                /* diffResult.push(
+                  ...UpdateSource(
+                    source,
+                    PROJECTION_PREFIX + id,
+                    result,
+                    keyFunc,
+                  ),
+                ); */
             }
         }
     }
@@ -294,12 +303,13 @@ function ResolveKeyPath(source, path, keyFunc) {
  * @returns Diff results showing all changes made
  */
 function UpdateSource(source, path, value, keyFunc) {
-    const diffResult = [];
+    let diffResult = [];
     if (keyFunc) {
         const keyPath = ResolveKeyPath(source, path, keyFunc);
         if (keyPath !== path) {
             const keyDiffResult = UpdateSource(source, keyPath, value, keyFunc);
-            diffResult.push(...keyDiffResult);
+            diffResult = diffResult.concat(keyDiffResult);
+            // diffResult.push(...keyDiffResult);
         }
     }
     const [sourceValue] = GetPathValue(source, path);

package/Store/Store/store.js

@@ -83,7 +83,7 @@ export class ReadStore {
             this.rootMap.set(rootPath, newRootObject);
             return;
         }
-        ObservableNode.ApplyDiff(rootObject, results);
+        ObservableNode.ApplyDiff(rootObject, results, this.cloneData);
     }
 }
 /**

package/Store/Tree/observableNode.js

@@ -6,8 +6,8 @@ const NODE_PROXY = Symbol("NODE_PROXY");
 const NODE_SNAPSHOT = Symbol("NODE_SNAPSHOT");
 const toJSON = "toJSON";
 const IS_NODE = Symbol("IS_NODE");
+const ARRAY_SCOPE = Symbol("ARRAY_SCOPE");
 const OBJECT_SCOPE = Symbol("OBJECT_SCOPE");
-const ITERATOR_SCOPE = Symbol("ITERATOR_SCOPE");
 function Identity(value) {
     return value;
 }
@@ -34,34 +34,37 @@ function InvalidateSnapshotForValue(value) {
             InvalidateSnapshotForValue(parent);
 }
 function getOwnPropertyDescriptor(target, prop) {
+    ObservableScope.Touch(target[OBJECT_SCOPE]);
     const descriptor = Object.getOwnPropertyDescriptor(target[NODE_VALUE], prop);
-    return {
+    return descriptor && {
         ...descriptor,
         configurable: true,
     };
 }
 function getOwnPropertyDescriptorArray(target, prop) {
-    const descriptor = Object.getOwnPropertyDescriptor(target[NODE_VALUE], prop);
-    return {
-        ...descriptor,
-        configurable: true,
+    ObservableScope.Touch(target[ARRAY_SCOPE]);
+    const descriptor = Object.getOwnPropertyDescriptor(target, prop);
+    const nodeDescriptor = Object.getOwnPropertyDescriptor(target[NODE_VALUE], prop);
+    return nodeDescriptor && {
+        ...nodeDescriptor,
+        configurable: descriptor?.configurable ?? true,
     };
 }
 function has(value, prop) {
-    ObservableScope.Touch(value[ITERATOR_SCOPE]);
+    ObservableScope.Touch(value[OBJECT_SCOPE]);
     return Object.hasOwn(value[NODE_VALUE], prop);
 }
 function hasArray(value, prop) {
-    ObservableScope.Touch(value[ITERATOR_SCOPE]);
+    ObservableScope.Touch(value[ARRAY_SCOPE]);
     return Object.hasOwn(value[NODE_VALUE], prop);
 }
 function ownKeys(value) {
-    ObservableScope.Touch(value[ITERATOR_SCOPE]);
+    ObservableScope.Touch(value[OBJECT_SCOPE]);
     return Object.keys(value[NODE_VALUE]);
 }
 function ownKeysArray(value) {
-    ObservableScope.Touch(value[ITERATOR_SCOPE]);
-    return Object.keys(value[NODE_VALUE]);
+    ObservableScope.Touch(value[ARRAY_SCOPE]);
+    return Reflect.ownKeys(value[NODE_VALUE]);
 }
 function UnwrapProxy(value, type = JsonType(value)) {
     if (type === "value")
@@ -106,20 +109,30 @@ function CloneProxy(value, type = JsonType(value)) {
     }
     return value;
 }
-function GetPropertyScope(object, prop) {
-    return object[prop] ??= ObservableScope.Basic(Property.bind(null, object[NODE_VALUE], prop));
+function GetPropertyScope(object, prop, create = true) {
+    if (!Object.hasOwn(object, prop)) {
+        if (!create)
+            return undefined;
+        Object.defineProperty(object, prop, {
+            value: ObservableScope.Basic(Property.bind(null, object[NODE_VALUE], prop)),
+            writable: true,
+            enumerable: true,
+            configurable: true,
+        });
+    }
+    return object[prop];
 }
 function SetObjectValue(object, prop, value) {
     const propExists = Object.hasOwn(object[NODE_VALUE], prop);
     object[NODE_VALUE][prop] = value;
     InvalidateSnapshotForValue(object[NODE_VALUE]);
-    ObservableScope.Update(object[prop]);
-    !propExists && ObservableScope.Update(object[ITERATOR_SCOPE]);
+    Object.hasOwn(object, prop) && ObservableScope.Update(object[prop]);
+    !propExists && ObservableScope.Update(object[OBJECT_SCOPE]);
 }
 function SetArrayValue(object, prop, value) {
     object[NODE_VALUE][prop] = value;
     InvalidateSnapshotForValue(object[NODE_VALUE]);
-    ObservableScope.Update(object[OBJECT_SCOPE]);
+    ObservableScope.Update(object[ARRAY_SCOPE]);
 }
 function CreateProxyFactory(alias) {
     /**
@@ -174,7 +187,7 @@ function CreateProxyFactory(alias) {
         const wrapper = Object.assign([], {
             [NODE_VALUE]: value,
             [NODE_PROXY]: null,
-            [OBJECT_SCOPE]: ObservableScope.Basic(Identity.bind(null, value))
+            [ARRAY_SCOPE]: ObservableScope.Basic(Identity.bind(null, value))
         });
         const proxy = wrapper[NODE_PROXY] = new Proxy(wrapper, {
             get: ArrayProxyGetter,
@@ -217,7 +230,7 @@ function CreateProxyFactory(alias) {
             case NODE_SNAPSHOT:
                 return CreateSnapshot(object[NODE_VALUE]);
             default: {
-                const scope = object[OBJECT_SCOPE];
+                const scope = object[ARRAY_SCOPE];
                 const array = ObservableScope.Value(scope);
                 const arrayValue = array[prop];
                 if (typeof prop === "symbol")
@@ -254,7 +267,7 @@ function CreateProxyFactory(alias) {
         const wrapper = {
             [NODE_VALUE]: value,
             [NODE_PROXY]: null,
-            [ITERATOR_SCOPE]: ObservableScope.Basic(Identity.bind(null, value))
+            [OBJECT_SCOPE]: ObservableScope.Basic(Identity.bind(null, value))
         };
         const proxy = wrapper[NODE_PROXY] = new Proxy(wrapper, {
             get: ObjectProxyGetter,
@@ -274,7 +287,6 @@ function CreateProxyFactory(alias) {
         return true;
     }
     function ObjectProxyGetter(object, prop) {
-        ObservableScope.Touch(object[OBJECT_SCOPE]);
         switch (prop) {
             case IS_NODE:
                 return true;
@@ -314,7 +326,7 @@ function CreateProxyFactory(alias) {
             case "array": {
                 const wrapper = wrapperCache.get(value);
                 const proxy = wrapper?.[NODE_PROXY] ?? CreateArrayProxy(value);
-                ObservableScope.Touch(wrapper?.[OBJECT_SCOPE]);
+                ObservableScope.Touch(wrapper?.[ARRAY_SCOPE]);
                 return proxy;
             }
             default:
@@ -401,7 +413,7 @@ export var ObservableNode;
     function Update(value, prop) {
         const wrapper = wrapperCache.get(value);
         if (wrapper) {
-            const scope = Array.isArray(wrapper) ? wrapper[OBJECT_SCOPE] : (prop && wrapper[prop]) ?? wrapper[ITERATOR_SCOPE];
+            const scope = Array.isArray(wrapper) ? wrapper[ARRAY_SCOPE] : (prop && GetPropertyScope(wrapper, prop)) ?? wrapper[OBJECT_SCOPE];
             ObservableScope.Update(scope);
         }
     }
@@ -425,7 +437,7 @@ export var ObservableNode;
     function Touch(value, prop) {
         const wrapper = wrapperCache.get(value);
         if (wrapper) {
-            const scope = prop && GetPropertyScope(wrapper, prop) || wrapper[OBJECT_SCOPE];
+            const scope = prop && GetPropertyScope(wrapper, prop) || wrapper[ARRAY_SCOPE] || wrapper[OBJECT_SCOPE];
             ObservableScope.Touch(scope);
         }
     }
@@ -433,7 +445,7 @@ export var ObservableNode;
     function Read(value, prop) {
         const wrapper = wrapperCache.get(value);
         if (wrapper) {
-            const scope = Array.isArray(wrapper) ? wrapper[OBJECT_SCOPE] : (prop && wrapper[prop]) ?? wrapper[ITERATOR_SCOPE];
+            const scope = Array.isArray(wrapper) ? wrapper[ARRAY_SCOPE] : (prop && wrapper[prop]) ?? wrapper[OBJECT_SCOPE];
             ObservableScope.Update(scope);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "j-templates",
-  "version": "8.1.0",
+  "version": "8.1.2",
   "description": "j-templates",
   "license": "MIT",
   "repository": "https://github.com/TypesInCode/jTemplates",