@ls-stack/utils 3.26.0 → 3.26.1

package/docs/filterObjectOrArrayKeys.md

@@ -14,7 +14,7 @@
 function filterObjectOrArrayKeys(objOrArray, options): Record<string, any> | Record<string, any>[];
 ```
 
-Defined in: [packages/utils/src/filterObjectOrArrayKeys.ts:40](https://github.com/lucasols/utils/blob/main/packages/utils/src/filterObjectOrArrayKeys.ts#L40)
+Defined in: [packages/utils/src/filterObjectOrArrayKeys.ts:42](https://github.com/lucasols/utils/blob/main/packages/utils/src/filterObjectOrArrayKeys.ts#L42)
 
 Filters the keys of an object based on the provided patterns.
 
@@ -42,8 +42,10 @@ Filtering patterns in `rejectKeys` and `filterKeys`:
   - `'[*]**nested'` - all `nested` props of all items of the array
   - `'[0-2]'` - The first three items of the array
   - `'[4-*]'` - All items of the array from the fourth index to the end
-- Selecting multiple properties:
-  - `'prop.test.(prop1|prop2|prop3)'` - The `prop1`, `prop2`, and `prop3` properties of `prop.test` object
+- Pattern expansion with parentheses:
+  - `'prop.test.(prop1|prop2|prop3)'` - Expands to `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3`
+  - `'components[*].(table_id|columns|filters[*].value)'` - Expands to `components[*].table_id`, `components[*].columns`, and `components[*].filters[*].value`
+  - `'(users|admins)[*].name'` - Expands to `users[*].name` and `admins[*].name`
 
 #### Parameters
 

package/docs/testUtils.md

@@ -14,7 +14,7 @@
 function compactSnapshot(value, options): string;
 ```
 
-Defined in: [packages/utils/src/testUtils.ts:352](https://github.com/lucasols/utils/blob/main/packages/utils/src/testUtils.ts#L352)
+Defined in: [packages/utils/src/testUtils.ts:354](https://github.com/lucasols/utils/blob/main/packages/utils/src/testUtils.ts#L354)
 
 Produces a more compact and readable snapshot of a value using yaml.
 By default booleans are shown as `✅` and `❌`, use `showBooleansAs` to disable/configure this.
@@ -43,6 +43,8 @@ Filtering patterns in `rejectKeys` and `filterKeys`:
   - `'[*]**nested'` - all `nested` props of all items of the array
   - `'[0-2]'` - The first three items of the array
   - `'[4-*]'` - All items of the array from the fourth index to the end
+- Expanding the patterns with parentheses:
+  - `'prop.test.(prop1|prop2|prop3.prop4)'` - Will produce `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3.prop4`
 
 #### Parameters
 

package/lib/{chunk-FXRZ4RQU.js → chunk-2WZGT4NA.js}

@@ -13,8 +13,10 @@ function filterObjectOrArrayKeys(objOrArray, {
   const rejectPatternsRaw = toArray(rejectKeys);
   const hasFilters = filterPatternsRaw.length > 0;
   const hasRejects = rejectPatternsRaw.length > 0;
-  const filterPatterns = filterPatternsRaw.map(parsePattern);
-  const rejectPatterns = rejectPatternsRaw.map(parsePattern);
+  const expandedFilterPatterns = filterPatternsRaw.flatMap(expandPatterns);
+  const expandedRejectPatterns = rejectPatternsRaw.flatMap(expandPatterns);
+  const filterPatterns = expandedFilterPatterns.map(parsePattern);
+  const rejectPatterns = expandedRejectPatterns.map(parsePattern);
   function matchPath(path, pattern) {
     function rec(pi, pti) {
       if (pti >= pattern.length) return pi === path.length;
@@ -42,11 +44,6 @@ function filterObjectOrArrayKeys(objOrArray, {
             return rec(pi + 1, pti + 1);
           if (ct.type === "INDEX") return rec(pi + 1, pti);
           return false;
-        case "MULTI_KEY":
-          if (ct.type === "KEY" && pt.names.includes(ct.name))
-            return rec(pi + 1, pti + 1);
-          if (ct.type === "INDEX") return rec(pi + 1, pti);
-          return false;
         case "INDEX":
           if (ct.type === "INDEX" && ct.index === pt.index)
             return rec(pi + 1, pti + 1);
@@ -170,6 +167,32 @@ function filterObjectOrArrayKeys(objOrArray, {
   if (built === void 0) return Array.isArray(objOrArray) ? [] : {};
   return built;
 }
+function expandPatterns(pattern) {
+  function expandSingle(str) {
+    const start = str.indexOf("(");
+    if (start === -1) {
+      return [str];
+    }
+    const end = str.indexOf(")", start);
+    if (end === -1) {
+      return [str];
+    }
+    const before = str.slice(0, start);
+    const inside = str.slice(start + 1, end);
+    const after = str.slice(end + 1);
+    if (!inside.includes("|")) {
+      return expandSingle(before + inside + after);
+    }
+    const options = inside.split("|").filter((option) => option.trim().length > 0);
+    const results = [];
+    for (const option of options) {
+      const newStr = before + option + after;
+      results.push(...expandSingle(newStr));
+    }
+    return results;
+  }
+  return expandSingle(pattern);
+}
 function parsePattern(pattern) {
   const tokens = [];
   let i = 0;
@@ -207,18 +230,6 @@ function parsePattern(pattern) {
       i = end === -1 ? n : end + 1;
       continue;
     }
-    if (ch === "(") {
-      const end = pattern.indexOf(")", i + 1);
-      const inside = end === -1 ? pattern.slice(i + 1) : pattern.slice(i + 1, end);
-      if (inside.includes("|") && inside.trim().length > 0) {
-        const names = inside.split("|").filter((name) => name.length > 0);
-        if (names.length > 0) {
-          tokens.push({ type: "MULTI_KEY", names });
-        }
-      }
-      i = end === -1 ? n : end + 1;
-      continue;
-    }
     if (ch === "*") {
       if (pattern[i + 1] === "*") {
         tokens.push({ type: "WILDCARD_ANY" });

package/lib/filterObjectOrArrayKeys.cjs

@@ -48,8 +48,10 @@ function filterObjectOrArrayKeys(objOrArray, {
   const rejectPatternsRaw = toArray(rejectKeys);
   const hasFilters = filterPatternsRaw.length > 0;
   const hasRejects = rejectPatternsRaw.length > 0;
-  const filterPatterns = filterPatternsRaw.map(parsePattern);
-  const rejectPatterns = rejectPatternsRaw.map(parsePattern);
+  const expandedFilterPatterns = filterPatternsRaw.flatMap(expandPatterns);
+  const expandedRejectPatterns = rejectPatternsRaw.flatMap(expandPatterns);
+  const filterPatterns = expandedFilterPatterns.map(parsePattern);
+  const rejectPatterns = expandedRejectPatterns.map(parsePattern);
   function matchPath(path, pattern) {
     function rec(pi, pti) {
       if (pti >= pattern.length) return pi === path.length;
@@ -77,11 +79,6 @@ function filterObjectOrArrayKeys(objOrArray, {
             return rec(pi + 1, pti + 1);
           if (ct.type === "INDEX") return rec(pi + 1, pti);
           return false;
-        case "MULTI_KEY":
-          if (ct.type === "KEY" && pt.names.includes(ct.name))
-            return rec(pi + 1, pti + 1);
-          if (ct.type === "INDEX") return rec(pi + 1, pti);
-          return false;
         case "INDEX":
           if (ct.type === "INDEX" && ct.index === pt.index)
             return rec(pi + 1, pti + 1);
@@ -205,6 +202,32 @@ function filterObjectOrArrayKeys(objOrArray, {
   if (built === void 0) return Array.isArray(objOrArray) ? [] : {};
   return built;
 }
+function expandPatterns(pattern) {
+  function expandSingle(str) {
+    const start = str.indexOf("(");
+    if (start === -1) {
+      return [str];
+    }
+    const end = str.indexOf(")", start);
+    if (end === -1) {
+      return [str];
+    }
+    const before = str.slice(0, start);
+    const inside = str.slice(start + 1, end);
+    const after = str.slice(end + 1);
+    if (!inside.includes("|")) {
+      return expandSingle(before + inside + after);
+    }
+    const options = inside.split("|").filter((option) => option.trim().length > 0);
+    const results = [];
+    for (const option of options) {
+      const newStr = before + option + after;
+      results.push(...expandSingle(newStr));
+    }
+    return results;
+  }
+  return expandSingle(pattern);
+}
 function parsePattern(pattern) {
   const tokens = [];
   let i = 0;
@@ -242,18 +265,6 @@ function parsePattern(pattern) {
       i = end === -1 ? n : end + 1;
       continue;
     }
-    if (ch === "(") {
-      const end = pattern.indexOf(")", i + 1);
-      const inside = end === -1 ? pattern.slice(i + 1) : pattern.slice(i + 1, end);
-      if (inside.includes("|") && inside.trim().length > 0) {
-        const names = inside.split("|").filter((name) => name.length > 0);
-        if (names.length > 0) {
-          tokens.push({ type: "MULTI_KEY", names });
-        }
-      }
-      i = end === -1 ? n : end + 1;
-      continue;
-    }
     if (ch === "*") {
       if (pattern[i + 1] === "*") {
         tokens.push({ type: "WILDCARD_ANY" });

package/lib/filterObjectOrArrayKeys.d.cts

@@ -25,8 +25,10 @@
  *   - `'[*]**nested'` - all `nested` props of all items of the array
  *   - `'[0-2]'` - The first three items of the array
  *   - `'[4-*]'` - All items of the array from the fourth index to the end
- * - Selecting multiple properties:
- *   - `'prop.test.(prop1|prop2|prop3)'` - The `prop1`, `prop2`, and `prop3` properties of `prop.test` object
+ * - Pattern expansion with parentheses:
+ *   - `'prop.test.(prop1|prop2|prop3)'` - Expands to `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3`
+ *   - `'components[*].(table_id|columns|filters[*].value)'` - Expands to `components[*].table_id`, `components[*].columns`, and `components[*].filters[*].value`
+ *   - `'(users|admins)[*].name'` - Expands to `users[*].name` and `admins[*].name`
  *
  * @param objOrArray - The object or array to filter.
  * @param options - The options for the filter.

package/lib/filterObjectOrArrayKeys.d.ts

@@ -25,8 +25,10 @@
  *   - `'[*]**nested'` - all `nested` props of all items of the array
  *   - `'[0-2]'` - The first three items of the array
  *   - `'[4-*]'` - All items of the array from the fourth index to the end
- * - Selecting multiple properties:
- *   - `'prop.test.(prop1|prop2|prop3)'` - The `prop1`, `prop2`, and `prop3` properties of `prop.test` object
+ * - Pattern expansion with parentheses:
+ *   - `'prop.test.(prop1|prop2|prop3)'` - Expands to `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3`
+ *   - `'components[*].(table_id|columns|filters[*].value)'` - Expands to `components[*].table_id`, `components[*].columns`, and `components[*].filters[*].value`
+ *   - `'(users|admins)[*].name'` - Expands to `users[*].name` and `admins[*].name`
  *
  * @param objOrArray - The object or array to filter.
  * @param options - The options for the filter.

package/lib/filterObjectOrArrayKeys.js

@@ -1,6 +1,6 @@
 import {
   filterObjectOrArrayKeys
-} from "./chunk-FXRZ4RQU.js";
+} from "./chunk-2WZGT4NA.js";
 import "./chunk-JF2MDHOJ.js";
 export {
   filterObjectOrArrayKeys

package/lib/testUtils.cjs

@@ -142,8 +142,10 @@ function filterObjectOrArrayKeys(objOrArray, {
   const rejectPatternsRaw = toArray(rejectKeys);
   const hasFilters = filterPatternsRaw.length > 0;
   const hasRejects = rejectPatternsRaw.length > 0;
-  const filterPatterns = filterPatternsRaw.map(parsePattern);
-  const rejectPatterns = rejectPatternsRaw.map(parsePattern);
+  const expandedFilterPatterns = filterPatternsRaw.flatMap(expandPatterns);
+  const expandedRejectPatterns = rejectPatternsRaw.flatMap(expandPatterns);
+  const filterPatterns = expandedFilterPatterns.map(parsePattern);
+  const rejectPatterns = expandedRejectPatterns.map(parsePattern);
   function matchPath(path, pattern) {
     function rec(pi, pti) {
       if (pti >= pattern.length) return pi === path.length;
@@ -171,11 +173,6 @@ function filterObjectOrArrayKeys(objOrArray, {
             return rec(pi + 1, pti + 1);
           if (ct.type === "INDEX") return rec(pi + 1, pti);
           return false;
-        case "MULTI_KEY":
-          if (ct.type === "KEY" && pt.names.includes(ct.name))
-            return rec(pi + 1, pti + 1);
-          if (ct.type === "INDEX") return rec(pi + 1, pti);
-          return false;
         case "INDEX":
           if (ct.type === "INDEX" && ct.index === pt.index)
             return rec(pi + 1, pti + 1);
@@ -299,6 +296,32 @@ function filterObjectOrArrayKeys(objOrArray, {
   if (built === void 0) return Array.isArray(objOrArray) ? [] : {};
   return built;
 }
+function expandPatterns(pattern) {
+  function expandSingle(str) {
+    const start = str.indexOf("(");
+    if (start === -1) {
+      return [str];
+    }
+    const end = str.indexOf(")", start);
+    if (end === -1) {
+      return [str];
+    }
+    const before = str.slice(0, start);
+    const inside = str.slice(start + 1, end);
+    const after = str.slice(end + 1);
+    if (!inside.includes("|")) {
+      return expandSingle(before + inside + after);
+    }
+    const options = inside.split("|").filter((option) => option.trim().length > 0);
+    const results = [];
+    for (const option of options) {
+      const newStr = before + option + after;
+      results.push(...expandSingle(newStr));
+    }
+    return results;
+  }
+  return expandSingle(pattern);
+}
 function parsePattern(pattern) {
   const tokens = [];
   let i = 0;
@@ -336,18 +359,6 @@ function parsePattern(pattern) {
       i = end === -1 ? n : end + 1;
       continue;
     }
-    if (ch === "(") {
-      const end = pattern.indexOf(")", i + 1);
-      const inside = end === -1 ? pattern.slice(i + 1) : pattern.slice(i + 1, end);
-      if (inside.includes("|") && inside.trim().length > 0) {
-        const names = inside.split("|").filter((name) => name.length > 0);
-        if (names.length > 0) {
-          tokens.push({ type: "MULTI_KEY", names });
-        }
-      }
-      i = end === -1 ? n : end + 1;
-      continue;
-    }
     if (ch === "*") {
       if (pattern[i + 1] === "*") {
         tokens.push({ type: "WILDCARD_ANY" });

package/lib/testUtils.d.cts

@@ -69,6 +69,8 @@ declare function waitController(): {
  *   - `'[*]**nested'` - all `nested` props of all items of the array
  *   - `'[0-2]'` - The first three items of the array
  *   - `'[4-*]'` - All items of the array from the fourth index to the end
+ * - Expanding the patterns with parentheses:
+ *   - `'prop.test.(prop1|prop2|prop3.prop4)'` - Will produce `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3.prop4`
  *
  * @param value - The value to snapshot.
  * @param options - The options for the snapshot.

package/lib/testUtils.d.ts

@@ -69,6 +69,8 @@ declare function waitController(): {
  *   - `'[*]**nested'` - all `nested` props of all items of the array
  *   - `'[0-2]'` - The first three items of the array
  *   - `'[4-*]'` - All items of the array from the fourth index to the end
+ * - Expanding the patterns with parentheses:
+ *   - `'prop.test.(prop1|prop2|prop3.prop4)'` - Will produce `prop.test.prop1`, `prop.test.prop2`, and `prop.test.prop3.prop4`
  *
  * @param value - The value to snapshot.
  * @param options - The options for the snapshot.

package/lib/testUtils.js

@@ -11,7 +11,7 @@ import {
 } from "./chunk-JQFUKJU5.js";
 import {
   filterObjectOrArrayKeys
-} from "./chunk-FXRZ4RQU.js";
+} from "./chunk-2WZGT4NA.js";
 import {
   defer
 } from "./chunk-DFXNVEH6.js";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ls-stack/utils",
   "description": "Universal TypeScript utilities for browser and Node.js",
-  "version": "3.26.0",
+  "version": "3.26.1",
   "license": "MIT",
   "files": [
     "lib",