@cero-base/core 0.8.8 → 0.8.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cero-base/core",
-  "version": "0.8.8",
+  "version": "0.8.9",
   "description": "cero p2p primitives — identity, storage, network, database, blobs, rpc, pairing.",
   "type": "module",
   "main": "./src/index.js",

package/src/database/index.js

@@ -26,7 +26,7 @@ import { makeDispatcher } from './dispatch.js'
  *
  * @typedef {{ data: any | null }} SingleResult
  * @typedef {{ data: any[], total: number, size: number }} ListResult
- * @typedef {{ gt?: string, gte?: string, lt?: string, lte?: string, reverse?: boolean, limit?: number }} Query
+ * @typedef {{ gt?: string, gte?: string, lt?: string, lte?: string, reverse?: boolean, limit?: number, search?: string, fields?: string[] }} Query
  * @typedef {{ kind: string, verb: string, name: string }} Ref
  * @typedef {(ctx: any) => any | Promise<any>} HookFn
  */
@@ -428,6 +428,12 @@ export class Database extends ReadyResource {
       return { data: await this.view.get(col, { id: query }) }
     }
 
+    const idx = this.matchIndex(name, query)
+    if (idx) {
+      const data = await this.view.find(idx.path, idx.range).toArray()
+      return { data, total: data.length, size: data.length }
+    }
+
     const all = await this.view.find(col, {}).toArray()
     // collections carry an auto-increment `index`; return them in that order
     all.sort((a, b) => (a.index ?? 0) - (b.index ?? 0))
@@ -582,6 +588,25 @@ export class Database extends ReadyResource {
     return `@${this.ns}/${ref.name}`
   }
 
+  // Route an exact-field query to a declared secondary index, when one matches.
+  matchIndex(name, query) {
+    const indexes = this.refs[name]?.indexes
+    if (!indexes || !query) return null
+    const fields = Object.keys(query).filter((k) => !INDEX_RESERVED.has(k))
+    if (fields.length === 0) return null
+    for (const [idx, idxFields] of Object.entries(indexes)) {
+      if (idxFields.length === fields.length && idxFields.every((f) => fields.includes(f))) {
+        const point = {}
+        for (const f of idxFields) point[f] = query[f]
+        const range = { gte: point, lte: point }
+        if (query.limit !== undefined) range.limit = query.limit
+        if (query.reverse) range.reverse = true
+        return { path: `@${this.ns}/${name}-${idx}`, range }
+      }
+    }
+    return null
+  }
+
   _addHook(map, op, fn) {
     if (typeof fn !== 'function') throw CeroError.INVALID('hook fn must be a function')
     let arr = map.get(op)
@@ -610,6 +635,8 @@ export class Database extends ReadyResource {
   }
 }
 
+const INDEX_RESERVED = new Set(['gt', 'gte', 'lt', 'lte', 'limit', 'reverse', 'search', 'fields'])
+
 function paginate(rows, query) {
   if (!query) return rows
   let out = rows
@@ -617,7 +644,25 @@ function paginate(rows, query) {
   if (query.gte !== undefined) out = out.filter((r) => r.id >= query.gte)
   if (query.lt !== undefined) out = out.filter((r) => r.id < query.lt)
   if (query.lte !== undefined) out = out.filter((r) => r.id <= query.lte)
+  if (query.search) out = out.filter((r) => searchHit(r, query.search, query.fields))
   if (query.reverse) out = [...out].reverse()
   if (query.limit !== undefined) out = out.slice(0, query.limit)
   return out
 }
+
+// Lowercase, fold diacritics ('jose' → 'José'), drop whitespace.
+const fold = (s) =>
+  s
+    .normalize('NFD')
+    .replace(/\p{Diacritic}/gu, '')
+    .toLowerCase()
+    .replace(/\s/g, '')
+
+// keet's message-search style: every term must be a substring of `fields` (or
+// every string field). 'smith' → 'John Smith', 'jo sm' → both must appear.
+function searchHit(row, term, fields) {
+  const terms = String(term).split(/\s+/).map(fold).filter(Boolean)
+  const keys = fields && fields.length ? fields : Object.keys(row)
+  const hay = keys.map((k) => (typeof row[k] === 'string' ? fold(row[k]) : '')).join(' ')
+  return terms.every((t) => hay.includes(t))
+}

package/src/lib/schema.js

@@ -49,8 +49,10 @@ export const t = {
    * @param {Record<string, Prim>} fields
    * @returns {TypeDef}
    */
-  collection(fields) {
-    return { kind: COLLECTION, fields }
+  collection(fields, opts) {
+    const def = { kind: COLLECTION, fields }
+    if (opts?.indexes) def.indexes = opts.indexes
+    return def
   },
 
   /**

package/types/database/index.d.ts

@@ -13,7 +13,7 @@
  *
  * @typedef {{ data: any | null }} SingleResult
  * @typedef {{ data: any[], total: number, size: number }} ListResult
- * @typedef {{ gt?: string, gte?: string, lt?: string, lte?: string, reverse?: boolean, limit?: number }} Query
+ * @typedef {{ gt?: string, gte?: string, lt?: string, lte?: string, reverse?: boolean, limit?: number, search?: string, fields?: string[] }} Query
  * @typedef {{ kind: string, verb: string, name: string }} Ref
  * @typedef {(ctx: any) => any | Promise<any>} HookFn
  */
@@ -270,6 +270,13 @@ export class Database extends ReadyResource {
         verb: string;
     };
     col(ref: any): string;
+    matchIndex(name: any, query: any): {
+        path: string;
+        range: {
+            gte: {};
+            lte: {};
+        };
+    };
     _addHook(map: any, op: any, fn: any): () => void;
     _write(verb: any, hook: any, publicKey: any): Promise<void>;
 }
@@ -340,6 +347,8 @@ export type Query = {
     lte?: string;
     reverse?: boolean;
     limit?: number;
+    search?: string;
+    fields?: string[];
 };
 export type Ref = {
     kind: string;

package/types/lib/schema.d.ts

@@ -28,7 +28,7 @@ export namespace t {
      * @param {Record<string, Prim>} fields
      * @returns {TypeDef}
      */
-    function collection(fields: Record<string, Prim>): TypeDef;
+    function collection(fields: Record<string, Prim>, opts: any): TypeDef;
     /**
      * RPC-style mutation that doesn't persist a row.
      *