@thi.ng/oquery 2.2.41 → 2.2.42

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Change Log
 
-- **Last updated**: 2024-05-08T18:24:32Z
+- **Last updated**: 2024-06-21T19:34:38Z
 - **Generator**: [thi.ng/monopub](https://thi.ng/monopub)
 
 All notable changes to this project will be documented in this file.
@@ -9,6 +9,13 @@ See [Conventional Commits](https://conventionalcommits.org/) for commit guidelin
 **Note:** Unlisted _patch_ versions only involve non-code or otherwise excluded changes
 and/or version bumps of transitive dependencies.
 
+### [2.2.42](https://github.com/thi-ng/umbrella/tree/@thi.ng/oquery@2.2.42) (2024-06-21)
+
+#### ♻️ Refactoring
+
+- enforce uniform naming convention of internal functions ([56992b2](https://github.com/thi-ng/umbrella/commit/56992b2))
+- minor internal restructuring ([3aa9e8b](https://github.com/thi-ng/umbrella/commit/3aa9e8b))
+
 ### [2.2.26](https://github.com/thi-ng/umbrella/tree/@thi.ng/oquery@2.2.26) (2024-02-22)
 
 #### ♻️ Refactoring

package/README.md

@@ -7,7 +7,7 @@
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/109331703950160316?domain=https%3A%2F%2Fmastodon.thi.ng&style=social)](https://mastodon.thi.ng/@toxi)
 
 > [!NOTE]
-> This is one of 192 standalone projects, maintained as part
+> This is one of 193 standalone projects, maintained as part
 > of the [@thi.ng/umbrella](https://github.com/thi-ng/umbrella/) monorepo
 > and anti-framework.
 >
@@ -89,7 +89,7 @@ For Node.js REPL:
 const oq = await import("@thi.ng/oquery");
 ```
 
-Package sizes (brotli'd, pre-treeshake): ESM: 1.66 KB
+Package sizes (brotli'd, pre-treeshake): ESM: 1.69 KB
 
 ## Dependencies
 

package/api.d.ts

@@ -72,15 +72,19 @@ export interface QueryOpts {
      * successfully matched property values will be included for each result.
      *
      * @example
-     * ```ts
+     * ```ts tangle:../export/def-query.ts
      * import { defQuery } from "@thi.ng/oquery";
      *
      * const DB = { a: { id: 1, name: "alice" }, b: { name: "bob" } };
      *
-     * defQuery({ partial: false })(DB, null, "id", 1)
+     * console.log(
+     *   defQuery({ partial: false })(DB, null, "id", 1)
+     * );
      * // { a: { id: 1, name: "alice" } }
      *
-     * defQuery({ partial: true })(DB, null, "id", 1)
+     * console.log(
+     *   defQuery({ partial: true })(DB, null, "id", 1)
+     * );
      * // { a: { id: 1 } }
      * ```
      *
@@ -97,15 +101,20 @@ export interface QueryOpts {
      * ALWAYS matched in a componentwise manner.
      *
      * @example
-     * ```ts
+     * ```ts tangle:../export/def-query-2.ts
      * import { defQuery } from "@thi.ng/oquery";
      *
      * const DB = { a: { knows: ["b","c"] }, b: { knows: ["a","c"] }};
-     * defQuery({ cwise: true })(DB, null, "knows", "b")
-     * // { a: { knows: ["b","c"] } }
      *
-     * defQuery({ cwise: false })(DB, null, "knows", (x) => x.includes("b"))
-     * // { a: { knows: ["b","c"] } }
+     * console.log(
+     *   defQuery({ cwise: true })(DB, null, "knows", "b")
+     * );
+     * // { a: { knows: ["b", "c"] } }
+     *
+     * console.log(
+     *   defQuery({ cwise: false })(DB, null, "knows", (x) => x.includes("b"))
+     * );
+     * // { a: { knows: ["b", "c"] } }
      * ```
      *
      * @defaultValue true

package/match.d.ts

@@ -23,30 +23,10 @@ export interface MatchMultipleOpts<T> {
  * which contains any of these exclusions is automatically rejected, even if
  * other strings could be matched.
  *
- * See {@link matchMultiple} for more details & code example.
- *
- * @param key
- * @param matches
- * @param opts
- * @returns
- */
-export declare const matchStrings: <T extends QueryObj = QueryObj>(key: QueryTerm["q"][0], matches: string[], opts?: Partial<MatchMultipleOpts<string>>) => QueryTerm<T>;
-/**
- * Returns a {@link QueryTerm} for use with {@link query} to perform set-like
- * intersection or union queries with optional negation/exclusions. Matches set
- * of given values against an item's chosen field of values and by default only
- * succeeds if all provided `includes` can be matched (aka intersection query)
- * and there're no values from `excludes` present.
- *
- * @remarks
- * If the `union` option is true, only one of the provided values needs to
- * match. Exclusions _always_ take precedence.
- *
- * Note: See {@link matchStrings} for a syntax sugar of this function, aimed at
- * matching `string[]` options.
+ * See {@link matchMultiple} for more details.
  *
  * @example
- * ```ts
+ * ```ts tangle:../export/match-strings.ts
  * import { query, matchStrings } from "@thi.ng/oquery";
  *
  * const DB = [
@@ -56,22 +36,48 @@ export declare const matchStrings: <T extends QueryObj = QueryObj>(key: QueryTer
  * ];
  *
  * // tag intersection
- * query(DB, [matchStrings("tags", ["a", "b"])])
+ * console.log(
+ *   query(DB, [matchStrings("tags", ["a", "b"])])
+ * );
  * // [ { id: 1, tags: ["a", "b"] } ]
  *
  * // tag union
- * query(DB, [matchStrings("tags", ["a", "b"])])
+ * console.log(
+ *   query(DB, [matchStrings("tags", ["a", "b"])])
+ * );
  * // here returns full DB...
  * // since each item either has `a` and/or `b` tags
  *
  * // tag exclusion (require `a`, disallow `b`)
- * query(DB, [matchStrings("tags", ["a", "!b"])])
+ * console.log(
+ *   query(DB, [matchStrings("tags", ["a", "!b"])])
+ * );
  * // [ { id: 3, tags: ["c", "a"] } ]
  * ```
  *
  * @param key
  * @param matches
  * @param opts
+ * @returns
+ */
+export declare const matchStrings: <T extends QueryObj = QueryObj>(key: QueryTerm["q"][0], matches: string[], opts?: Partial<MatchMultipleOpts<string>>) => QueryTerm<T>;
+/**
+ * Returns a {@link QueryTerm} for use with {@link query} to perform set-like
+ * intersection or union queries with optional negation/exclusions. Matches set
+ * of given values against an item's chosen field of values and by default only
+ * succeeds if all provided `includes` can be matched (aka intersection query)
+ * and there're no values from `excludes` present.
+ *
+ * @remarks
+ * If the `union` option is true, only one of the provided values needs to
+ * match. Exclusions _always_ take precedence.
+ *
+ * Note: See {@link matchStrings} for a syntax sugar & examples of this
+ * function, aimed at matching `string[]` options.
+ *
+ * @param key
+ * @param matches
+ * @param opts
  */
 export declare const matchMultiple: <T extends QueryObj = QueryObj, V = any>(key: QueryTerm["q"][0], includes: V[], excludes: V[], opts?: Partial<MatchMultipleOpts<V>>) => QueryTerm<T>;
 /**
@@ -89,7 +95,7 @@ export declare const matchMultiple: <T extends QueryObj = QueryObj, V = any>(key
  *   between operator and value are ignored.
  *
  * @example
- * ```ts
+ * ```ts tangle:../export/match-pattern.ts
  * import { query, matchPattern } from "@thi.ng/oquery";
  *
  * const DB = [
@@ -98,12 +104,19 @@ export declare const matchMultiple: <T extends QueryObj = QueryObj, V = any>(key
  *   { id: "c", score: 15 },
  * ];
  *
- * query(DB, [matchPattern("id", /[a-z]{4,}/)]);
+ * console.log(
+ *   query(DB, [matchPattern("id", /[a-z]{4,}/)])
+ * );
  * // [{ id: "bbbb", score: 60 }]
- * query(DB, [matchPattern("id", ">= c")]);
+ *
+ * console.log(
+ *   query(DB, [matchPattern("id", ">= c")])
+ * );
  * // [{ id: "c", score: 15 }]
  *
- * query(DB, [matchPattern("score", "<50")]);
+ * console.log(
+ *   query(DB, [matchPattern("score", "<50")])
+ * );
  * // [{ id: "a", score: 32 }, { id: "c", score: 15 }]
  * ```
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thi.ng/oquery",
-  "version": "2.2.41",
+  "version": "2.2.42",
   "description": "Datalog-inspired, optimized pattern/predicate query engine for JS objects & arrays of objects",
   "type": "module",
   "module": "./index.js",
@@ -10,7 +10,7 @@
     "type": "git",
     "url": "https://github.com/thi-ng/umbrella.git"
   },
-  "homepage": "https://github.com/thi-ng/umbrella/tree/develop/packages/oquery#readme",
+  "homepage": "https://thi.ng/oquery",
   "funding": [
     {
       "type": "github",
@@ -36,17 +36,17 @@
     "tool:tangle": "../../node_modules/.bin/tangle src/**/*.ts"
   },
   "dependencies": {
-    "@thi.ng/api": "^8.11.2",
-    "@thi.ng/checks": "^3.6.4",
-    "@thi.ng/compare": "^2.3.5",
-    "@thi.ng/defmulti": "^3.0.39",
-    "@thi.ng/equiv": "^2.1.58"
+    "@thi.ng/api": "^8.11.3",
+    "@thi.ng/checks": "^3.6.5",
+    "@thi.ng/compare": "^2.3.6",
+    "@thi.ng/defmulti": "^3.0.40",
+    "@thi.ng/equiv": "^2.1.59"
   },
   "devDependencies": {
-    "@microsoft/api-extractor": "^7.43.2",
-    "esbuild": "^0.21.1",
+    "@microsoft/api-extractor": "^7.47.0",
+    "esbuild": "^0.21.5",
     "typedoc": "^0.25.13",
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.2"
   },
   "keywords": [
     "array",
@@ -96,5 +96,5 @@
     ],
     "year": 2020
   },
-  "gitHead": "df34b4a9e650cc7323575356de207d78933bdcf3\n"
+  "gitHead": "154c95cf9d6bab32174498ec3b5b5d87e42be7f9\n"
 }

package/query.js

@@ -6,268 +6,268 @@ import { compareByKey } from "@thi.ng/compare/keys";
 import { reverse } from "@thi.ng/compare/reverse";
 import { defmulti } from "@thi.ng/defmulti/defmulti";
 import { equiv } from "@thi.ng/equiv";
-const classify = (x) => x != null ? isFunction(x) ? "f" : "l" : "n";
-const ensureArray = (src) => isArray(src) ? src : [...src];
-const ensureSet = (src) => isArray(src) ? new Set(src) : src;
-const intersect = (src) => {
-  const a = ensureArray(src);
+const __classify = (x) => x != null ? isFunction(x) ? "f" : "l" : "n";
+const __ensureArray = (src) => isArray(src) ? src : [...src];
+const __ensureSet = (src) => isArray(src) ? new Set(src) : src;
+const __intersect = (src) => {
+  const a = __ensureArray(src);
   const num = a.length;
   return (b) => {
-    const $b = ensureSet(b);
+    const $b = __ensureSet(b);
     for (let i = num; i-- > 0; ) {
       if (!$b.has(a[i])) return false;
     }
     return true;
   };
 };
-const coerce = (x, isec = false) => isArray(x) ? isec ? intersect(x) : (y) => x.includes(y) : isSet(x) ? isec ? intersect(x) : (y) => x.has(y) : x;
-const coerceStr = (x) => isArray(x) ? coerce(x.map((y) => String(y))) : isSet(x) ? coerce(new Set([...x].map((y) => String(y)))) : x == null || isFunction(x) ? x : String(x);
-const addTriple = (acc, s, p, o) => {
+const __coerce = (x, isec = false) => isArray(x) ? isec ? __intersect(x) : (y) => x.includes(y) : isSet(x) ? isec ? __intersect(x) : (y) => x.has(y) : x;
+const __coerceStr = (x) => isArray(x) ? __coerce(x.map((y) => String(y))) : isSet(x) ? __coerce(new Set([...x].map((y) => String(y)))) : x == null || isFunction(x) ? x : String(x);
+const __addTriple = (acc, s, p, o) => {
   const sval = acc[s];
   sval ? sval[p] = o : acc[s] = { [p]: o };
 };
-const match = (o, val, opts) => {
+const __match = (o, val, opts) => {
   if (val != null) {
     const pred = isFunction(o) ? o : ($) => opts.equiv(o, $);
     return opts.cwise && isArray(val) ? val.some(pred) : pred(val);
   }
   return false;
 };
-const collect = (acc, s, p, o, val, opts) => {
+const __collect = (acc, s, p, o, val, opts) => {
   if (val != null) {
     const pred = isFunction(o) ? o : ($) => opts.equiv(o, $);
     if (opts.cwise && isArray(val)) {
       val = val.filter(pred);
-      val.length && addTriple(acc, s, p, val);
+      val.length && __addTriple(acc, s, p, val);
     } else if (pred(val)) {
-      addTriple(acc, s, p, val);
+      __addTriple(acc, s, p, val);
     }
   }
 };
-const collectFull = (res, s, val) => res[s] = val;
-const collectSP = (res, sval, s, p, o, opts) => {
+const __collectFull = (res, s, val) => res[s] = val;
+const __collectSP = (res, sval, s, p, o, opts) => {
   if (opts.partial) {
     for (let $p in sval) {
-      p($p) && collect(res, s, $p, o, sval[$p], opts);
+      p($p) && __collect(res, s, $p, o, sval[$p], opts);
     }
   } else {
     for (let $p in sval) {
-      if (p($p) && match(o, sval[$p], opts)) {
-        collectFull(res, s, sval);
+      if (p($p) && __match(o, sval[$p], opts)) {
+        __collectFull(res, s, sval);
         return;
       }
     }
   }
 };
-const collectSO = (res, sval, s, o, opts) => {
+const __collectSO = (res, sval, s, o, opts) => {
   if (opts.partial) {
     for (let p in sval) {
-      collect(res, s, p, o, sval[p], opts);
+      __collect(res, s, p, o, sval[p], opts);
     }
   } else {
     for (let p in sval) {
-      if (match(o, sval[p], opts)) {
-        collectFull(res, s, sval);
+      if (__match(o, sval[p], opts)) {
+        __collectFull(res, s, sval);
         return;
       }
     }
   }
 };
-const queryLL = (res, db, s, p, o, opts) => {
+const __queryLL = (res, db, s, p, o, opts) => {
   const sval = db[s];
   const val = sval?.[p];
   if (opts.partial) {
-    collect(res, s, p, o, val, opts);
+    __collect(res, s, p, o, val, opts);
   } else {
-    match(o, val, opts) && collectFull(res, s, sval);
+    __match(o, val, opts) && __collectFull(res, s, sval);
   }
 };
-const queryLF = (res, db, s, p, o, opts) => {
+const __queryLF = (res, db, s, p, o, opts) => {
   const sval = db[s];
-  sval != null && collectSP(res, sval, s, p, o, opts);
+  sval != null && __collectSP(res, sval, s, p, o, opts);
 };
-const queryLN = (res, db, s, _, o, opts) => {
+const __queryLN = (res, db, s, _, o, opts) => {
   const sval = db[s];
-  sval != null && collectSO(res, sval, s, o, opts);
+  sval != null && __collectSO(res, sval, s, o, opts);
 };
-const queryFL = (res, db, s, p, o, opts) => {
+const __queryFL = (res, db, s, p, o, opts) => {
   if (opts.partial) {
     for (let $s in db) {
-      s($s) && collect(res, $s, p, o, db[$s]?.[p], opts);
+      s($s) && __collect(res, $s, p, o, db[$s]?.[p], opts);
     }
   } else {
     for (let $s in db) {
       const sval = db[$s];
-      s($s) && match(o, sval?.[p], opts) && collectFull(res, $s, sval);
+      s($s) && __match(o, sval?.[p], opts) && __collectFull(res, $s, sval);
     }
   }
 };
-const queryFF = (res, db, s, p, o, opts) => {
+const __queryFF = (res, db, s, p, o, opts) => {
   for (let $s in db) {
-    s($s) && collectSP(res, db[$s], $s, p, o, opts);
+    s($s) && __collectSP(res, db[$s], $s, p, o, opts);
   }
 };
-const queryFN = (res, db, s, _, o, opts) => {
+const __queryFFNPartial = (res, db, s, p) => {
   for (let $s in db) {
-    s($s) && collectSO(res, db[$s], $s, o, opts);
+    if (s($s)) {
+      const sval = db[$s];
+      for (let $p in sval) {
+        p($p) && __addTriple(res, $s, $p, sval[$p]);
+      }
+    }
+  }
+};
+const __queryFFN = (res, db, s, p) => {
+  for (let $s in db) {
+    if (s($s)) {
+      const sval = db[$s];
+      for (let $p in sval) {
+        if (p($p)) {
+          __collectFull(res, $s, sval);
+          break;
+        }
+      }
+    }
+  }
+};
+const __queryFN = (res, db, s, _, o, opts) => {
+  for (let $s in db) {
+    s($s) && __collectSO(res, db[$s], $s, o, opts);
   }
 };
-const queryNL = (res, db, _, p, o, opts) => {
+const __queryNL = (res, db, _, p, o, opts) => {
   if (opts.partial) {
     for (let s in db) {
-      collect(res, s, p, o, db[s][p], opts);
+      __collect(res, s, p, o, db[s][p], opts);
     }
   } else {
     for (let s in db) {
       const sval = db[s];
-      match(o, sval[p], opts) && collectFull(res, s, sval);
+      __match(o, sval[p], opts) && __collectFull(res, s, sval);
     }
   }
 };
-const queryNF = (res, db, _, p, o, opts) => {
+const __queryNF = (res, db, _, p, o, opts) => {
+  for (let s in db) {
+    __collectSP(res, db[s], s, p, o, opts);
+  }
+};
+const __queryNN = (res, db, _, __, o, opts) => {
   for (let s in db) {
-    collectSP(res, db[s], s, p, o, opts);
+    __collectSO(res, db[s], s, o, opts);
   }
 };
-const queryNN = (res, db, _, __, o, opts) => {
+const __queryNLNPartial = (res, db, _, p) => {
   for (let s in db) {
-    collectSO(res, db[s], s, o, opts);
+    const val = db[s][p];
+    val != null && __addTriple(res, s, p, val);
   }
 };
-const querySP = (res, sval, s, p, _, opts) => {
+const __queryNLN = (res, db, _, p) => {
+  for (let s in db) {
+    const sval = db[s];
+    const val = sval[p];
+    val != null && __collectFull(res, s, sval);
+  }
+};
+const __querySP = (res, sval, s, p, _, opts) => {
   if (opts.partial) {
     for (let q in sval) {
       if (p(q)) {
         const val = sval[q];
-        val != null && addTriple(res, s, q, val);
+        val != null && __addTriple(res, s, q, val);
       }
     }
   } else {
     for (let q in sval) {
       if (p(q)) {
-        collectFull(res, s, sval);
+        __collectFull(res, s, sval);
         return;
       }
     }
   }
 };
-const queryO = (res, db, s, p, _, opts) => {
+const __queryO = (res, db, s, p, _, opts) => {
   const sval = db[s];
   const val = sval?.[p];
-  val != null && (opts.partial ? addTriple(res, s, p, val) : collectFull(res, s, sval));
+  val != null && (opts.partial ? __addTriple(res, s, p, val) : __collectFull(res, s, sval));
 };
 const IMPLS = {
-  lll: queryLL,
-  llf: queryLL,
-  lln: queryO,
-  lfl: queryLF,
-  lff: queryLF,
+  lll: __queryLL,
+  llf: __queryLL,
+  lln: __queryO,
+  lfl: __queryLF,
+  lff: __queryLF,
   lfn: (res, db, s, p, _, opts) => {
     const sval = db[s];
-    sval != null && querySP(res, sval, s, p, null, opts);
+    sval != null && __querySP(res, sval, s, p, null, opts);
   },
-  lnl: queryLN,
-  lnf: queryLN,
+  lnl: __queryLN,
+  lnf: __queryLN,
   lnn: (res, db, s) => {
     const sval = db[s];
-    sval != null && collectFull(res, s, sval);
+    sval != null && __collectFull(res, s, sval);
   },
-  fll: queryFL,
-  flf: queryFL,
+  fll: __queryFL,
+  flf: __queryFL,
   fln: (res, db, s, p, _, opts) => {
     for (let $s in db) {
-      s($s) && queryO(res, db, $s, p, null, opts);
-    }
-  },
-  ffl: queryFF,
-  fff: queryFF,
-  ffn: (res, db, s, p, _, opts) => {
-    if (opts.partial) {
-      for (let $s in db) {
-        if (s($s)) {
-          const sval = db[$s];
-          for (let $p in sval) {
-            p($p) && addTriple(res, $s, $p, sval[$p]);
-          }
-        }
-      }
-    } else {
-      for (let $s in db) {
-        if (s($s)) {
-          const sval = db[$s];
-          for (let $p in sval) {
-            if (p($p)) {
-              collectFull(res, $s, sval);
-              break;
-            }
-          }
-        }
-      }
+      s($s) && __queryO(res, db, $s, p, null, opts);
     }
   },
-  fnl: queryFN,
-  fnf: queryFN,
+  ffl: __queryFF,
+  fff: __queryFF,
+  ffn: (res, db, s, p, o, opts) => (opts.partial ? __queryFFNPartial : __queryFFN)(res, db, s, p, o, opts),
+  fnl: __queryFN,
+  fnf: __queryFN,
   fnn: (res, db, s) => {
     for (let $s in db) {
       if (s($s)) {
         const sval = db[$s];
-        sval != null && collectFull(res, $s, sval);
-      }
-    }
-  },
-  nll: queryNL,
-  nlf: queryNL,
-  nln: (res, db, _, p, __, opts) => {
-    if (opts.partial) {
-      for (let s in db) {
-        const val = db[s][p];
-        val != null && addTriple(res, s, p, val);
-      }
-    } else {
-      for (let s in db) {
-        const sval = db[s];
-        const val = sval[p];
-        val != null && collectFull(res, s, sval);
+        sval != null && __collectFull(res, $s, sval);
       }
     }
   },
-  nfl: queryNF,
-  nff: queryNF,
+  nll: __queryNL,
+  nlf: __queryNL,
+  nln: (res, db, s, p, o, opts) => (opts.partial ? __queryNLNPartial : __queryNLN)(res, db, s, p, o, opts),
+  nfl: __queryNF,
+  nff: __queryNF,
   nfn: (res, db, _, p, __, opts) => {
     for (let s in db) {
-      querySP(res, db[s], s, p, null, opts);
+      __querySP(res, db[s], s, p, null, opts);
     }
   },
-  nnl: queryNN,
-  nnf: queryNN,
+  nnl: __queryNN,
+  nnf: __queryNN,
   nnn: (res, db) => Object.assign(res, db)
 };
-const impl = defmulti((_, __, s, p, o) => classify(s) + classify(p) + classify(o), {}, IMPLS);
-const objQuery = (src, opts, args) => {
+const __impl = defmulti((_, __, s, p, o) => __classify(s) + __classify(p) + __classify(o), {}, IMPLS);
+const __objQuery = (src, opts, args) => {
   const isIsec = opts.cwise && opts.intersect;
   isIsec && (opts.cwise = false);
   let [s, p, o, out] = args;
   out = out || {};
-  impl(
+  __impl(
     out,
     src,
-    coerceStr(s),
-    coerceStr(p),
-    coerce(o, isIsec),
+    __coerceStr(s),
+    __coerceStr(p),
+    __coerce(o, isIsec),
     opts
   );
   return out;
 };
-const arrayQuery = (src, opts, p, o, collect2) => {
+const __arrayQuery = (src, opts, p, o, collect) => {
   const isIsec = opts.cwise && opts.intersect;
   isIsec && (opts.cwise = false);
-  const $p = coerceStr(p);
-  const $o = coerce(o, isIsec);
-  const impl2 = IMPLS["n" + classify($p) + classify($o)];
+  const $p = __coerceStr(p);
+  const $o = __coerce(o, isIsec);
+  const impl = IMPLS["n" + __classify($p) + __classify($o)];
   for (let i = 0, n = src.length; i < n; i++) {
     const res = {};
-    impl2(res, { _: src[i] }, "_", $p, $o, opts);
-    res._ && collect2(res._, i);
+    impl(res, { _: src[i] }, "_", $p, $o, opts);
+    res._ && collect(res._, i);
   }
 };
 const DEFAULT_OPTS = {
@@ -281,10 +281,10 @@ const defQuery = (opts) => {
   return (src, ...args) => {
     if (isArray(src)) {
       const out = args[2] || [];
-      arrayQuery(src, $opts, args[0], args[1], (x) => out.push(x));
+      __arrayQuery(src, $opts, args[0], args[1], (x) => out.push(x));
       return out;
     } else {
-      return objQuery(src, $opts, args);
+      return __objQuery(src, $opts, args);
     }
   };
 };
@@ -293,10 +293,10 @@ const defKeyQuery = (opts) => {
   return (src, ...args) => {
     if (isArray(src)) {
       const out = args[2] || /* @__PURE__ */ new Set();
-      arrayQuery(src, $opts, args[0], args[1], (_, i) => out.add(i));
+      __arrayQuery(src, $opts, args[0], args[1], (_, i) => out.add(i));
       return out;
     } else {
-      const res = objQuery(src, $opts, args.slice(0, 3));
+      const res = __objQuery(src, $opts, args.slice(0, 3));
       const out = args[3];
       if (!out) return new Set(Object.keys(res));
       for (let k in res) out.add(k);