j-templates 8.0.23 → 8.0.24

package/Store/Diff/diffTree.js

@@ -34,16 +34,16 @@ function FlattenValue(root, value, keyFunc) {
  * @param path - Dot-separated path to the value (empty string returns source)
  * @returns The value at the specified path
  */
-function GetPathValue(source, path) {
+function GetPathValue(source, path, keyFunc) {
     if (path === "")
         return [source, true];
     const parts = path.split(".");
     let curr = source;
     let x = 0;
     for (; curr && x < parts.length - 1; x++)
-        curr = curr[parts[x]];
+        curr = ResolveKeyed(source, curr[parts[x]], keyFunc);
     if (curr && Object.hasOwn(curr, parts[x])) {
-        curr = curr[parts[x]];
+        curr = ResolveKeyed(source, curr[parts[x]], keyFunc);
         x++;
     }
     else
@@ -224,7 +224,7 @@ function RunProjections(source, keyFunc, projections, memo) {
         let y = 0;
         for (; allPathsExist && y < reads.length && !reads[y].endsWith("*"); y++) {
             const read = reads[y];
-            const [value, found] = GetPathValue(source, read);
+            const [value, found] = GetPathValue(source, read, keyFunc);
             allPathsExist = found;
             keys.push(read);
             values.push((found && CreateSnapshot(source, keyFunc, value)) || value);
@@ -233,6 +233,7 @@ function RunProjections(source, keyFunc, projections, memo) {
             const prefix = reads[y].slice(0, reads[y].length - 1);
             const matchedKeys = Object.keys(source).filter(key => key.startsWith(prefix));
             for (let z = 0; z < matchedKeys.length; z++) {
+                // No keyFunc passed because dot paths are not supported for wildcard paths
                 const [value, found] = GetPathValue(source, matchedKeys[z]);
                 allPathsExist = allPathsExist && found;
                 keys.push(matchedKeys[z]);
@@ -253,6 +254,12 @@ function RunProjections(source, keyFunc, projections, memo) {
     }
     return diffResult;
 }
+function ResolveKeyed(source, value, keyFunc) {
+    if (keyFunc === undefined || JsonType(value) === 'value')
+        return value;
+    const key = keyFunc(value);
+    return (key && source[key]) ?? value;
+}
 /**
  * Resolves a path to its keyed root object if applicable.
  * Searches up the path to find an object with a key from keyFunc.
@@ -402,7 +409,7 @@ export class DiffTree {
      * @returns The value at the specified path
      */
     GetPath(path) {
-        const [value] = GetPathValue(this.rootState, path);
+        const [value] = GetPathValue(this.rootState, path, this.keyFunc);
         return value;
     }
     /**
@@ -411,7 +418,7 @@ export class DiffTree {
      * @param path - Dot-separated path to the value
      */
     Snapshot(path) {
-        const [value, found] = GetPathValue(this.rootState, path);
+        const [value, found] = GetPathValue(this.rootState, path, this.keyFunc);
         if (!found)
             throw `Unable to get snapshot for path ${path}`;
         return CreateSnapshot(this.rootState, this.keyFunc, value);

package/package.json

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