j-templates 8.0.15 → 8.0.16

package/Store/Diff/diffTree.d.ts

@@ -39,7 +39,7 @@ export interface IDiffTreeConstructor {
  * positionally in the same order, so each parameter can be typed at the call site instead of
  * cast out of a generic read.
  */
-export type DiffTreeProjectionFunc = (...values: any[]) => any;
+export type DiffTreeProjectionFunc = (keys: string[], ...values: any[]) => any;
 /**
  * A projection's declaration: the dot-separated paths it reads (a plain tree path, an
  * entity's key, or another projection's `$projection_<id>` key for chaining) and the

package/Store/Diff/diffTree.js

@@ -211,27 +211,30 @@ function RunProjections(source, keyFunc, projections, memo) {
     for (let x = 0; x < projections.length; x++) {
         const { id, reads, projection } = projections[x];
         const values = [];
+        const keys = [];
         let allPathsExist = true;
         let y = 0;
         for (; allPathsExist && y < reads.length && !reads[y].endsWith("*"); y++) {
             const read = reads[y];
             const [value, found] = GetPathValue(source, read);
             allPathsExist = found;
-            values[y] = (found && CreateSnapshot(source, keyFunc, value)) || value;
+            keys.push(read);
+            values.push((found && CreateSnapshot(source, keyFunc, value)) || value);
         }
         if (y < reads.length && reads[y].endsWith("*")) {
             const prefix = reads[y].slice(0, reads[y].length - 1);
-            const keys = Object.keys(source).filter(key => key.startsWith(prefix));
-            for (let z = 0; z < keys.length; z++) {
-                const [value, found] = GetPathValue(source, keys[z]);
+            const matchedKeys = Object.keys(source).filter(key => key.startsWith(prefix));
+            for (let z = 0; z < matchedKeys.length; z++) {
+                const [value, found] = GetPathValue(source, matchedKeys[z]);
                 allPathsExist = allPathsExist && found;
+                keys.push(matchedKeys[z]);
                 values.push((found && CreateSnapshot(source, keyFunc, value)) || value);
             }
         }
         if (allPathsExist) {
             const priorValues = memo.get(id);
             if (!ArraysEqual(priorValues, values)) {
-                const result = projection(...values);
+                const result = projection(keys, ...values);
                 memo.set(id, values);
                 // 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,

package/package.json

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