hinted-tree-merger 6.3.0 → 6.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hinted-tree-merger",
-  "version": "6.3.0",
+  "version": "6.4.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -49,7 +49,7 @@
     "typescript": "^5.9.3"
   },
   "engines": {
-    "node": ">=24.11.1"
+    "node": ">=24.12.0"
   },
   "repository": {
     "type": "git",

package/src/merger.mjs

@@ -10,7 +10,8 @@ import {
   keyFor,
   hasDeleteHint,
   compareWithDefinedOrder,
-  sortObjectsByKeys
+  sortObjectsByKeys,
+  toRegexp
 } from "./util.mjs";
 import { hintFor } from "./hint.mjs";
 
@@ -20,7 +21,6 @@ import { hintFor } from "./hint.mjs";
  * @param {Object} hints
  */
 
-
 function appendPath(path, suffix, separator = "") {
   return path === undefined || path.length === 0
     ? suffix
@@ -36,8 +36,8 @@ export function mergeSkip(a, b, path, actions, hints) {
 
 /**
  *
- * @param {Array} a
- * @param {Array} b
+ * @param {Array<any>} a
+ * @param {Array<any>} b
  * @param {string} path
  * @param {Actions} actions
  * @param {Object} hints
@@ -56,6 +56,16 @@ export function mergeArrays(a, b, path, actions = nullAction, hints) {
           return false;
         }
 
+        value = toRegexp(value);
+        if(value instanceof RegExp) {
+          for(let i = 0; i < a.length; i++) {
+            if(typeof a[i] === 'string' && a[i].match(value)) {
+              a.splice(i, 1);
+              actions({ remove: value, path: appendPath(path, `[${i}]`) }, h);
+            }
+          }
+        }
+
         const i = a.indexOf(value);
         if (i >= 0) {
           a.splice(i, 1);

package/src/reanimate-hints.mjs

@@ -7,6 +7,7 @@ import {
 } from "./versions.mjs";
 import { mergeExpressions } from "./string-expressions.mjs";
 import { mergeSkip } from "./merger.mjs";
+import { toRegexp } from "./util.mjs";
 
 const mergeFunctions = [
   mergeVersions,
@@ -29,17 +30,11 @@ export function reanimateHints(hints) {
         }
         break;
       case "orderBy":
-        parents[parents.length - 1].orderBy = value.map(v => {
-          if (typeof v === "string" && v[0] === "/" && v.match(/\/[img]?$/)) {
-            const m = v.match(/\/([a-z]*)$/)
-            const inner = v.substring(1,v.length - m[0].length)
-            return new RegExp(inner,m[1]);
-          }
-          return v;
-        });
+        parents[parents.length - 1].orderBy = value.map(v => toRegexp(v));
         break;
     }
   }
 
   return hints;
 }
+

package/src/util.mjs

@@ -379,3 +379,18 @@ export function compareWithDefinedOrder(a, b, definedOrder) {
 
   return ai - bi;
 }
+
+/**
+ * try to from a regexp from str.
+ * Str must start with '/' and end with '/<flags>'
+ * @param {string} str 
+ * @returns {RegExp|string}
+ */
+export function toRegexp(str) {
+  if (typeof str === "string" && str[0] === "/" && str.match(/\/[a-z]*$/)) {
+    const m = str.match(/\/([a-z]*)$/);
+    const inner = str.substring(1, str.length - m[0].length);
+    return new RegExp(inner, m[1]);
+  }
+  return str;
+}

package/types/merger.d.mts

@@ -4,13 +4,13 @@
 export function mergeSkip(a: any, b: any, path: any, actions: any, hints: any): any;
 /**
  *
- * @param {Array} a
- * @param {Array} b
+ * @param {Array<any>} a
+ * @param {Array<any>} b
  * @param {string} path
  * @param {Actions} actions
  * @param {Object} hints
  */
-export function mergeArrays(a: any[], b: any[], path: string, actions: Actions, hints: any): any[];
+export function mergeArrays(a: Array<any>, b: Array<any>, path: string, actions: Actions, hints: any): any[];
 /**
  * Merge to values.
  * @param {any} a

package/types/util.d.mts

@@ -53,3 +53,10 @@ export function sortObjectsByKeys(source: any, compare: any): any;
  * @param {Array<RegExp|string>} definedOrder
  */
 export function compareWithDefinedOrder(a: any, b: any, definedOrder: Array<RegExp | string>): number;
+/**
+ * try to from a regexp from str.
+ * Str must start with '/' and end with '/<flags>'
+ * @param {string} str
+ * @returns {RegExp|string}
+ */
+export function toRegexp(str: string): RegExp | string;