alinea 0.5.5 → 0.5.6

package/dist/backend/Database.js

@@ -5,7 +5,7 @@ import {
   alias,
   create,
   exists
-} from "../chunks/chunk-TY7XOXM3.js";
+} from "../chunks/chunk-CYNFUAZ7.js";
 import {
   Expr
 } from "../chunks/chunk-4JLFL6LD.js";
@@ -17,6 +17,7 @@ import {
   PageSeed,
   Root,
   Schema,
+  Type,
   Workspace,
   createId,
   unreachable
@@ -438,7 +439,7 @@ ${JSON.stringify(mutation)}`
       ...data,
       path: pathData
     };
-    const searchableText = "";
+    const searchableText = Type.searchableText(type, entryData);
     return {
       workspace: meta.workspace,
       root: meta.root,

package/dist/backend/Store.js

@@ -1,6 +1,6 @@
 import {
   connect
-} from "../chunks/chunk-VRXHB6DJ.js";
+} from "../chunks/chunk-LMUDRU2U.js";
 import "../chunks/chunk-FLZ4KUMA.js";
 import "../chunks/chunk-4JLFL6LD.js";
 import "../chunks/chunk-U5RRZUYZ.js";

package/dist/backend/resolver/EntryResolver.js

@@ -1,9 +1,10 @@
 import {
+  bm25,
   count,
   iif,
   match,
   withRecursive
-} from "../../chunks/chunk-TY7XOXM3.js";
+} from "../../chunks/chunk-CYNFUAZ7.js";
 import {
   BinOpType,
   Expr,
@@ -365,7 +366,9 @@ var EntryResolver = class {
       extra.singleResult = true;
     if (groupBy)
       extra.groupBy = groupBy.map((expr) => this.expr(ctx, expr));
-    if (orderBy)
+    if (searchTerms)
+      extra.orderBy = [bm25(EntrySearch, 20, 1).asc()];
+    else if (orderBy)
       extra.orderBy = this.orderBy(ctx, orderBy);
     return query[Query.Data].with(extra);
   }

package/dist/chunks/{chunk-TY7XOXM3.js → chunk-CYNFUAZ7.js}

@@ -36,6 +36,7 @@ var {
   iif,
   exists,
   match,
+  bm25,
   highlight,
   snippet,
   cast,
@@ -112,5 +113,6 @@ export {
   count,
   iif,
   exists,
-  match
+  match,
+  bm25
 };

package/dist/chunks/{chunk-ULWFKWBM.js → chunk-HWXESJ6U.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "0.5.5",
+  version: "0.5.6",
   license: "MIT",
   type: "module",
   scripts: {

package/dist/chunks/{chunk-VRXHB6DJ.js → chunk-LMUDRU2U.js}

@@ -335,8 +335,8 @@ var AsyncDriver = class extends DriverBase {
     }
   }
   async transaction(run) {
-    const id = `t${this.transactionId++}`;
     const [connection, release] = await this.isolate();
+    const id = `t${this.transactionId++}`;
     await connection.executeQuery(
       new QueryData.Transaction({ op: QueryData.TransactionOperation.Begin, id })
     );
@@ -1353,6 +1353,7 @@ var SqliteFormatter = class extends Formatter {
         stmt.raw(" MATCH ");
         this.formatExprValue(ctx, query);
         return stmt;
+      case "bm25":
       case "highlight":
       case "snippet":
         stmt.identifier(expr.method);

package/dist/chunks/{sql.js-75HGQX6U.js → sql.js-RSY2XONK.js}

@@ -1,7 +1,7 @@
 import {
   SqlJsDriver,
   connect
-} from "./chunk-VRXHB6DJ.js";
+} from "./chunk-LMUDRU2U.js";
 import "./chunk-FLZ4KUMA.js";
 import "./chunk-4JLFL6LD.js";
 import "./chunk-U5RRZUYZ.js";

package/dist/cli/Generate.js

@@ -27,7 +27,7 @@ function generatePackage(context, config) {
 async function createDb() {
   const { default: sqlite } = await import("@alinea/sqlite-wasm");
   const { Database } = await sqlite();
-  const { connect } = await import("../chunks/sql.js-75HGQX6U.js");
+  const { connect } = await import("../chunks/sql.js-RSY2XONK.js");
   const db = new Database();
   const store = connect(db).toAsync();
   return [store, () => db.export()];

package/dist/cli/Serve.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-ULWFKWBM.js";
+} from "../chunks/chunk-HWXESJ6U.js";
 import "../chunks/chunk-U5RRZUYZ.js";
 
 // src/cli/Serve.ts

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-ULWFKWBM.js";
+} from "../chunks/chunk-HWXESJ6U.js";
 import "../chunks/chunk-U5RRZUYZ.js";
 
 // node_modules/mri/lib/index.mjs

package/dist/cli/generate/GenerateDashboard.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../../chunks/chunk-ULWFKWBM.js";
+} from "../../chunks/chunk-HWXESJ6U.js";
 import {
   __commonJS,
   __toESM

package/dist/cloud/server/CloudAuthServer.js

@@ -3,7 +3,7 @@ import {
 } from "../../chunks/chunk-IKINPSS5.js";
 import {
   package_default
-} from "../../chunks/chunk-ULWFKWBM.js";
+} from "../../chunks/chunk-HWXESJ6U.js";
 import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/cloud/server/CloudAuthServer.ts

package/dist/core/EntrySearch.d.ts

@@ -2,5 +2,6 @@ import { table } from 'rado';
 export declare const EntrySearch: import("rado").Table<{
     title: import("rado").ValueColumn<string>;
     searchableText: import("rado").ValueColumn<string>;
+    rank: import("rado").ValueColumn<number>;
 }>;
 export type EntrySearch = table<typeof EntrySearch>;

package/dist/core/EntrySearch.js

@@ -9,6 +9,7 @@ var EntrySearch = table({
   EntrySearch: class {
     title = column.string;
     searchableText = column.string;
+    rank = column.number;
   }
 });
 export {

package/dist/core/Shape.d.ts

@@ -12,7 +12,7 @@ export interface Shape<Value = any, Mutator = any> {
     init(parent: YType, key: string): void;
     watch(parent: YType, key: string): (fun: () => void) => () => void;
     mutator(parent: YType, key: string, readOnly: boolean): Mutator;
-    toString(): string;
     applyLinks(value: Value, loader: LinkResolver): Promise<void>;
+    searchableText(value: Value): string;
 }
 export {};

package/dist/core/Type.d.ts

@@ -64,6 +64,7 @@ export declare namespace Type {
     function label(type: Type): Label;
     function meta(type: Type): TypeMeta;
     function shape(type: Type): RecordShape;
+    function searchableText(type: Type, value: any): string;
     function fields(type: Type): Record<string, Field>;
     function hint(type: Type): Hint;
     function sections(type: Type): Section[];

package/dist/core/Type.js

@@ -34,6 +34,10 @@ var Type;
     return type2[Type2.Data].shape;
   }
   Type2.shape = shape;
+  function searchableText(type2, value) {
+    return shape(type2).searchableText(value).trim();
+  }
+  Type2.searchableText = searchableText;
   function fields(type2) {
     return type2;
   }

package/dist/core/Type.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/core/driver/TestDriver.js

@@ -1,6 +1,6 @@
 import {
   connect
-} from "../../chunks/chunk-VRXHB6DJ.js";
+} from "../../chunks/chunk-LMUDRU2U.js";
 import "../../chunks/chunk-FLZ4KUMA.js";
 import "../../chunks/chunk-4JLFL6LD.js";
 import "../../chunks/chunk-U5RRZUYZ.js";

package/dist/core/field/RichTextField.d.ts

@@ -2,7 +2,9 @@ import { RichTextMutator } from 'alinea/core';
 import { Field, FieldMeta, FieldOptions } from '../Field.js';
 import { TextDoc } from '../TextDoc.js';
 import { RecordShape } from '../shape/RecordShape.js';
-export declare class RichTextField<Blocks, Options extends FieldOptions<TextDoc<Blocks>>> extends Field<TextDoc<Blocks>, RichTextMutator<Blocks>, Options> {
+export declare class RichTextField<Blocks, Options extends FieldOptions<TextDoc<Blocks>> & {
+    searchable?: boolean;
+}> extends Field<TextDoc<Blocks>, RichTextMutator<Blocks>, Options> {
     constructor(shape: {
         [key: string]: RecordShape<any>;
     } | undefined, meta: FieldMeta<TextDoc<Blocks>, RichTextMutator<Blocks>, Options>);

package/dist/core/field/RichTextField.js

@@ -9,7 +9,8 @@ var RichTextField = class extends Field {
       shape: new RichTextShape(
         meta.options.label,
         shape,
-        meta.options.initialValue
+        meta.options.initialValue,
+        meta.options.searchable
       ),
       ...meta
     });

package/dist/core/field/ScalarField.d.ts

@@ -1,4 +1,6 @@
 import { Field, FieldMeta, FieldOptions } from '../Field.js';
-export declare class ScalarField<Value, Options extends FieldOptions<Value>> extends Field<Value, (value: Value) => void, Options> {
+export declare class ScalarField<Value, Options extends FieldOptions<Value> & {
+    searchable?: boolean;
+}> extends Field<Value, (value: Value) => void, Options> {
     constructor(meta: FieldMeta<Value, (value: Value) => void, Options>);
 }

package/dist/core/field/ScalarField.js

@@ -6,7 +6,11 @@ import { ScalarShape } from "../shape/ScalarShape.js";
 var ScalarField = class extends Field {
   constructor(meta) {
     super({
-      shape: new ScalarShape(meta.options.label, meta.options.initialValue),
+      shape: new ScalarShape(
+        meta.options.label,
+        meta.options.initialValue,
+        meta.options.searchable
+      ),
       ...meta
     });
   }

package/dist/core/shape/ListShape.d.ts

@@ -36,4 +36,5 @@ export declare class ListShape<T extends ListRow> implements Shape<Array<T>, Lis
         move: (oldIndex: number, newIndex: number) => void;
     };
     applyLinks(value: Array<T>, loader: LinkResolver): Promise<void>;
+    searchableText(value: Array<T>): string;
 }

package/dist/core/shape/ListShape.js

@@ -206,6 +206,19 @@ var ListShape = class {
     if (this.postProcess)
       await this.postProcess(value, loader);
   }
+  searchableText(value) {
+    let res = "";
+    const rows = Array.isArray(value) ? value : [];
+    for (const row of rows) {
+      const id = row.id;
+      const type = row.type;
+      const shape = this.values[type];
+      if (!id || !type || !shape)
+        continue;
+      res += shape.searchableText(row);
+    }
+    return res;
+  }
 };
 export {
   ListShape

package/dist/core/shape/RecordShape.d.ts

@@ -21,4 +21,5 @@ export declare class RecordShape<T = object> implements Shape<T, RecordMutator<T
         set: <K extends keyof T>(k: K, v: T[K]) => void;
     };
     applyLinks(value: T, loader: LinkResolver): Promise<void>;
+    searchableText(value: T): string;
 }

package/dist/core/shape/RecordShape.js

@@ -81,6 +81,14 @@ var RecordShape = class _RecordShape {
     }
     await Promise.all(tasks);
   }
+  searchableText(value) {
+    let res = "";
+    const self = value || {};
+    for (const key of keys(this.properties)) {
+      res += this.properties[key].searchableText(self[key]);
+    }
+    return res;
+  }
 };
 export {
   RecordShape

package/dist/core/shape/RichTextShape.d.ts

@@ -2,7 +2,7 @@ import { LinkResolver } from 'alinea/backend/resolver/LinkResolver';
 import * as Y from 'yjs';
 import { Label } from '../Label.js';
 import { Shape } from '../Shape.js';
-import { TextDoc } from '../TextDoc.js';
+import { TextDoc, TextNode } from '../TextDoc.js';
 import { RecordShape } from './RecordShape.js';
 export type RichTextMutator<R> = {
     readOnly: boolean;
@@ -25,8 +25,9 @@ export declare class RichTextShape<Blocks> implements Shape<TextDoc<Blocks>, Ric
     label: Label;
     shapes?: Record<string, RecordShape<object>> | undefined;
     initialValue?: TextDoc<Blocks> | undefined;
+    searchable?: boolean | undefined;
     values: Record<string, RecordShape>;
-    constructor(label: Label, shapes?: Record<string, RecordShape<object>> | undefined, initialValue?: TextDoc<Blocks> | undefined);
+    constructor(label: Label, shapes?: Record<string, RecordShape<object>> | undefined, initialValue?: TextDoc<Blocks> | undefined, searchable?: boolean | undefined);
     create(): TextDoc<Blocks>;
     toXml(rows: TextDoc<Blocks>): (Y.XmlElement<{
         [key: string]: string;
@@ -43,4 +44,6 @@ export declare class RichTextShape<Blocks> implements Shape<TextDoc<Blocks>, Ric
         insert: (id: string, block: string) => void;
     };
     applyLinks(doc: TextDoc<Blocks>, loader: LinkResolver): Promise<void>;
+    searchableText(value: TextDoc<Blocks>): string;
+    textOf(node: TextNode<any>): string;
 }

package/dist/core/shape/RichTextShape.js

@@ -76,10 +76,11 @@ function unserialize(node) {
 }
 var linkInfoFields = void 0;
 var RichTextShape = class {
-  constructor(label, shapes, initialValue) {
+  constructor(label, shapes, initialValue, searchable) {
     this.label = label;
     this.shapes = shapes;
     this.initialValue = initialValue;
+    this.searchable = searchable;
     this.values = shapes ? fromEntries(
       entries(shapes).map(([key, value]) => {
         return [
@@ -298,6 +299,30 @@ var RichTextShape = class {
       )
     );
   }
+  searchableText(value) {
+    let res = "";
+    if (!this.searchable)
+      return res;
+    if (!Array.isArray(value))
+      return res;
+    return value.reduce((acc, node) => {
+      return acc + this.textOf(node);
+    }, "");
+  }
+  textOf(node) {
+    if (this.values[node.type]) {
+      const shape = this.values[node.type];
+      return shape.searchableText(node);
+    }
+    if (node.type === "text")
+      return " " + node.text;
+    if ("content" in node && Array.isArray(node.content)) {
+      return node.content.reduce((acc, node2) => {
+        return acc + this.textOf(node2);
+      }, "");
+    }
+    return "";
+  }
 };
 function iterMarks(doc, fn) {
   for (const row of doc) {

package/dist/core/shape/ScalarShape.d.ts

@@ -5,7 +5,8 @@ export type ScalarMutator<T> = (value: T) => void;
 export declare class ScalarShape<T> implements Shape<T, ScalarMutator<T>> {
     label: Label;
     initialValue?: T | undefined;
-    constructor(label: Label, initialValue?: T | undefined);
+    searchable?: boolean | undefined;
+    constructor(label: Label, initialValue?: T | undefined, searchable?: boolean | undefined);
     create(): T;
     toY(value: T): T;
     fromY(yValue: any): any;
@@ -14,4 +15,5 @@ export declare class ScalarShape<T> implements Shape<T, ScalarMutator<T>> {
     watch(parent: Y.Map<any>, key: string): (fun: () => void) => () => void;
     mutator(parent: Y.Map<any>, key: string, readOnly?: boolean): (value: T) => void;
     applyLinks(): Promise<void>;
+    searchableText(value: T): string;
 }

package/dist/core/shape/ScalarShape.js

@@ -2,9 +2,10 @@ import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/core/shape/ScalarShape.ts
 var ScalarShape = class {
-  constructor(label, initialValue) {
+  constructor(label, initialValue, searchable) {
     this.label = label;
     this.initialValue = initialValue;
+    this.searchable = searchable;
   }
   create() {
     return this.initialValue;
@@ -43,6 +44,12 @@ var ScalarShape = class {
   }
   async applyLinks() {
   }
+  searchableText(value) {
+    if (!this.searchable)
+      return "";
+    const stringified = String(value ?? "");
+    return stringified ? " " + stringified : "";
+  }
 };
 export {
   ScalarShape

package/dist/core/shape/UnionShape.d.ts

@@ -26,4 +26,5 @@ export declare class UnionShape<T extends UnionRow> implements Shape<T, UnionMut
     watch(parent: Y.Map<any>, key: string): (fun: () => void) => () => void;
     mutator(parent: Y.Map<any>, key: string, readOnly: boolean): UnionMutator<T>;
     applyLinks(value: T, loader: LinkResolver): Promise<void>;
+    searchableText(value: T): string;
 }

package/dist/core/shape/UnionShape.js

@@ -122,6 +122,22 @@ var UnionShape = class {
     if (this.postProcess)
       await this.postProcess(value, loader);
   }
+  searchableText(value) {
+    let res = "";
+    if (Array.isArray(value))
+      value = value[0] ?? {};
+    else
+      value = value ?? {};
+    const type = value.type;
+    const shape = this.shapes[type];
+    const self = value || {};
+    if (!shape)
+      return "";
+    for (const [key, field] of entries(shape.properties)) {
+      res += field.searchableText(self[key]);
+    }
+    return res;
+  }
 };
 export {
   UnionShape

package/dist/core/util/EntryRows.js

@@ -8,12 +8,15 @@ import { entryFilepath, entryInfo, entryUrl } from "../EntryFilenames.js";
 import { createRecord } from "../EntryRecord.js";
 import { EntryPhase } from "../EntryRow.js";
 import { Root } from "../Root.js";
+import { Type } from "../Type.js";
 async function createEntryRow(config, input) {
   const record = createRecord(input);
   const fileContents = JsonLoader.format(config.schema, record);
   const fileHash = await createFileHash(fileContents);
   const rowHash = await createRowHash({ ...input, fileHash });
-  return { ...input, fileHash, rowHash };
+  const type = config.schema[input.type];
+  const searchableText = Type.searchableText(type, input.data);
+  return { ...input, searchableText, fileHash, rowHash };
 }
 function entryParentPaths(config, entry) {
   const root = Root.data(config.workspaces[entry.workspace][entry.root]);

package/dist/dashboard/util/PersistentStore.js

@@ -3,7 +3,7 @@ import {
 } from "../../chunks/chunk-7YXWNKGS.js";
 import {
   connect
-} from "../../chunks/chunk-VRXHB6DJ.js";
+} from "../../chunks/chunk-LMUDRU2U.js";
 import "../../chunks/chunk-FLZ4KUMA.js";
 import {
   create,

package/dist/input/richtext/RichTextField.d.ts

@@ -12,12 +12,8 @@ export interface RichTextOptions<Blocks extends Schema> extends FieldOptions<Tex
     optional?: boolean;
     /** Display a minimal version */
     inline?: boolean;
-    /** A default value */
-    initialValue?: TextDoc<Blocks>;
-    /** Hide this rich text field */
-    hidden?: boolean;
-    /** Make this rich text field read-only */
-    readOnly?: boolean;
+    /** Index the text value of this field */
+    searchable?: boolean;
 }
 /** Create a rich text field configuration */
 export declare function richText<Blocks extends Schema = {}>(label: string, options?: WithoutLabel<RichTextOptions<Blocks>>): RichTextField<Blocks, RichTextOptions<Blocks>>;

package/dist/input/text/TextField.d.ts

@@ -19,6 +19,8 @@ export interface TextOptions extends FieldOptions<string> {
     iconRight?: ComponentType;
     /** Focus this input automatically */
     autoFocus?: boolean;
+    /** Index the text value of this field */
+    searchable?: boolean;
 }
 export declare class TextField extends ScalarField<string, TextOptions> {
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "bin": "./dist/cli.js",
   "name": "alinea",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "license": "MIT",
   "type": "module",
   "scripts": {