hinted-tree-merger 6.2.8 → 6.3.0

package/README.md

@@ -8,7 +8,6 @@
 [![Styled with prettier](https://img.shields.io/badge/styled_with-prettier-ff69b4.svg)](https://github.com/prettier/prettier)
 [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
 [![Known Vulnerabilities](https://snyk.io/test/github/arlac77/hinted-tree-merger/badge.svg)](https://snyk.io/test/github/arlac77/hinted-tree-merger)
-[![Coverage Status](https://coveralls.io/repos/arlac77/hinted-tree-merger/badge.svg)](https://coveralls.io/github/arlac77/hinted-tree-merger)
 
 # hinted-tree-merger
 
@@ -214,7 +213,7 @@ Returns **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 *   `a` **any** 
 *   `b` **any** 
-*   `definedOrder`  
+*   `definedOrder` **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<([RegExp](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/RegExp) | [string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String))>**&#x20;
 
 ## matchingIndex
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hinted-tree-merger",
-  "version": "6.2.8",
+  "version": "6.3.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "ava": "^6.4.1",
-    "browser-ava": "^2.3.44",
+    "browser-ava": "^2.3.47",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.2",

package/src/reanimate-hints.mjs

@@ -19,13 +19,25 @@ const mergeFunctions = [
 
 export function reanimateHints(hints) {
   for (const { value, path, parents } of walk(hints)) {
-    if (path[path.length - 1] === "merge") {
-      for (const f of mergeFunctions) {
-        if (f.name === value) {
-          parents[parents.length - 1].merge = f;
-          break;
+    switch (path[path.length - 1]) {
+      case "merge":
+        for (const f of mergeFunctions) {
+          if (f.name === value) {
+            parents[parents.length - 1].merge = f;
+            break;
+          }
         }
-      }
+        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;
+        });
+        break;
     }
   }
 

package/src/util.mjs

@@ -4,7 +4,7 @@ import {
   OVERWRITE_HINT_REGEX
 } from "./hint.mjs";
 
-export function nullAction(options,hint) {}
+export function nullAction(options, hint) {}
 
 export function asArray(a) {
   return Array.isArray(a) ? a : a === undefined ? [] : [a];
@@ -293,7 +293,7 @@ export function indexFor(b, i, a) {
 }
 
 function normalizeValue(value, hint) {
-  if(typeof(value) === "string" && hint.normalizeValue) {
+  if (typeof value === "string" && hint.normalizeValue) {
     return value.replace(new RegExp(hint.normalizeValue), "");
   }
   return value;
@@ -339,15 +339,16 @@ export function sortObjectsByKeys(source, compare) {
   return sorted;
 }
 
-  /**
-   * 
-   * @param {any} a 
-   * @param {any} b
-   */
+/**
+ *
+ * @param {any} a
+ * @param {any} b
+ * @param {Array<RegExp|string>} definedOrder
+ */
 export function compareWithDefinedOrder(a, b, definedOrder) {
   /**
-   * 
-   * @param {any} value 
+   *
+   * @param {any} value
    * @returns {number}
    */
   function matchingIndex(value) {

package/types/util.d.mts

@@ -50,5 +50,6 @@ export function sortObjectsByKeys(source: any, compare: any): any;
  *
  * @param {any} a
  * @param {any} b
+ * @param {Array<RegExp|string>} definedOrder
  */
-export function compareWithDefinedOrder(a: any, b: any, definedOrder: any): number;
+export function compareWithDefinedOrder(a: any, b: any, definedOrder: Array<RegExp | string>): number;