hinted-tree-merger 4.7.2 → 4.8.3

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2019-2021 by arlac77
+Copyright (c) 2019-2022 by arlac77
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

package/README.md

@@ -160,7 +160,7 @@ Returns **any** value without hint
 
 ## indexFor
 
-Find best insertion point for b\[i] in a
+Find best insertion point for b\[i] in a.
 
 ### Parameters
 
@@ -170,7 +170,7 @@ Find best insertion point for b\[i] in a
 
 ## keyFor
 
-Deliver key value to identify object
+Deliver key value to identify object.
 
 ### Parameters
 
@@ -181,7 +181,7 @@ Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 ## sortObjectsByKeys
 
-Sort keys in source
+Sort keys in source.
 
 ### Parameters
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hinted-tree-merger",
-  "version": "4.7.2",
+  "version": "4.8.3",
   "publishConfig": {
     "access": "public"
   },
@@ -32,13 +32,13 @@
     "lint:docs": "documentation lint ./src/**/*.mjs"
   },
   "devDependencies": {
-    "ava": "^3.15.0",
-    "c8": "^7.7.3",
+    "ava": "^4.0.1",
+    "c8": "^7.11.0",
     "documentation": "^13.2.5",
-    "semantic-release": "^17.4.3"
+    "semantic-release": "^19.0.2"
   },
   "engines": {
-    "node": ">=14.17.1"
+    "node": ">=14.18.3"
   },
   "repository": {
     "type": "git",

package/src/util.mjs

@@ -270,7 +270,7 @@ export function isScalar(a) {
 }
 
 /**
- * Find best insertion point for b[i] in a
+ * Find best insertion point for b[i] in a.
  * @param {any[]} b
  * @param {number} i
  * @param {any[]} a
@@ -281,8 +281,15 @@ export function indexFor(b, i, a) {
   return f >= 0 ? f : a.length;
 }
 
+function normalizeValue(value, hint) {
+  if (value !== undefined && hint.normalizeValue) {
+    return value.replace(new RegExp(hint.normalizeValue), '');
+  }
+  return value;
+}
+
 /**
- * Deliver key value to identify object
+ * Deliver key value to identify object.
  * @param {any} object
  * @param {Object} hint
  * @return {string}
@@ -292,21 +299,21 @@ export function keyFor(object, hint) {
     const andKeys = Array.isArray(hint.key) ? hint.key : hint.key.split(/\&/);
 
     if (andKeys.length > 1) {
-      const keyValues = andKeys.map(k => object[k]);
+      const keyValues = andKeys.map(k => normalizeValue(object[k], hint));
       return keyValues.every(v => v === undefined)
         ? undefined
         : keyValues.join(":");
     }
 
     const orKeys = Array.isArray(hint.key) ? hint.key : hint.key.split(/\|/);
-    return orKeys.map(k => object[k]).find(v => v !== undefined);
+    return orKeys.map(k => normalizeValue(object[k], hint)).find(v => v !== undefined);
   }
 
   return undefined;
 }
 
 /**
- * Sort keys in source
+ * Sort keys in source.
  * @param {Object} source
  * @param compare
  * @return {Object} source with keys orderd by compare function