json-diff-ts 1.2.5 → 1.2.6

package/README.md

@@ -281,7 +281,7 @@ Blog: https://blog.leitwolf.io
 Twitter: [@cglessner](https://twitter.com/cglessner)
 
 ## Changelog
-
+- v1.2.6 Improve handling of JSON Path segments that include periods (PR by [EdVinyard](https://github.com/EdVinyard))
 - v1.2.5 Patch all dependencies; add support for resolving a key name if a function is used to get the key value
 - v1.2.4 Fix readme (npm install); update TypeScript and Lodash
 - v1.2.3 Update outdated dependencies; update TypeScript version to 4.5.2

package/lib/jsonDiff.js

@@ -309,14 +309,16 @@ const flattenChangeset = (obj, path = '$', embeddedKey) => {
                     ? `${path}[${obj.key}]`
                     : obj.type === Operation.ADD
                         ? path
-                        : `${path}[?(@.${embeddedKey}='${obj.key}')]`
-                : (path = `${path}.${obj.key}`);
+                        : filterExpression(path, embeddedKey, obj.key)
+                : (path = append(path, obj.key));
             return (0, exports.flattenChangeset)(obj.changes || obj, path, obj.embeddedKey);
         }
         else {
             const valueType = (0, exports.getTypeOfObj)(obj.value);
             return [
-                Object.assign(Object.assign({}, obj), { path: valueType === 'Object' || path.endsWith(`[${obj.key}]`) ? path : `${path}.${obj.key}`, valueType })
+                Object.assign(Object.assign({}, obj), { path: valueType === 'Object' || path.endsWith(`[${obj.key}]`)
+                        ? path
+                        : append(path, obj.key), valueType })
             ];
         }
     }
@@ -438,3 +440,15 @@ const unflattenChanges = (changes) => {
     return changesArr;
 };
 exports.unflattenChanges = unflattenChanges;
+/** combine a base JSON Path with a subsequent segment */
+function append(basePath, nextSegment) {
+    return nextSegment.includes('.')
+        ? `${basePath}[${nextSegment}]`
+        : `${basePath}.${nextSegment}`;
+}
+/** returns a JSON Path filter expression; e.g., `$.pet[(?name='spot')]` */
+function filterExpression(basePath, filterKey, filterValue) {
+    return typeof filterKey === 'string' && filterKey.includes('.')
+        ? `${basePath}[?(@[${filterKey}]='${filterValue}')]`
+        : `${basePath}[?(@.${filterKey}='${filterValue}')]`;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-diff-ts",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "A diff tool for JavaScript based on https://www.npmjs.com/package/diff-json written in TypeScript.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",