@navette-js/database 1.0.0-beta.2 → 1.0.0-beta.4

package/lib/index.d.ts

@@ -7,6 +7,8 @@ export type ListQuery = {
     /** Global search: every word must appear in at least one of the searchable columns. */
     search?: string | null;
     searchColumns?: string[];
+    /** `false`: the search term is matched as a whole, instead of word by word. */
+    splitSearchTerms?: boolean;
     /** Per-column search: all conditions must match. */
     columnSearches?: Record<string, string>;
     /** Soft-deleted records: excluded by default, included, or only those. */
@@ -16,10 +18,14 @@ export type ListQuery = {
         direction: SortDirection;
     } | null;
     /** Table grouping: this sort is applied before `sort`. */
+    /** Rows are first ordered by their group: by `column`, or by `modify` (a custom order). */
     groupSort?: {
         column: string;
         direction: SortDirection;
+        modify?: (query: any, direction: SortDirection) => void;
     } | null;
+    /** Only these records (keys), e.g. the rows of the displayed page. */
+    keys?: string[];
     /** Extra server-side conditions (list tab, custom filter); never built from unvalidated browser input. */
     modifiers?: ((query: any) => void)[];
     page: number;

package/lib/index.js

@@ -136,9 +136,12 @@ export class ObjectionAdapter {
     /** Base query with modifiers, global search and per-column searches applied. */
     filtered(query) {
         const q = this.base(query.trashed ?? 'without');
+        if (query.keys)
+            q.whereIn(`${this.model.tableName}.${this.keyColumn}`, query.keys.map(String).slice(0, 10000));
         for (const modifier of query.modifiers ?? [])
             modifier(q);
-        const words = (query.search ?? '').trim().split(/\s+/).filter(Boolean);
+        const term = (query.search ?? '').trim();
+        const words = query.splitSearchTerms === false ? (term ? [term] : []) : term.split(/\s+/).filter(Boolean);
         const columns = query.searchColumns ?? [];
         if (words.length && columns.length) {
             // Each word must match at least one column, case-insensitively; LIKE wildcards in the input are escaped.
@@ -157,7 +160,9 @@ export class ObjectionAdapter {
     }
     async finishPagination(q, query) {
         const total = await q.clone().resultSize();
-        if (query.groupSort)
+        if (query.groupSort?.modify)
+            query.groupSort.modify(q, query.groupSort.direction);
+        else if (query.groupSort)
             q.orderBy(query.groupSort.column, query.groupSort.direction);
         if (query.sort)
             q.orderBy(query.sort.column, query.sort.direction);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@navette-js/database",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.4",
   "description": "Data adapters (Objection/Knex) for Navette panels.",
   "license": "MIT",
   "type": "module",