alinea 0.5.4 → 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-TBAB475U.js → chunk-HWXESJ6U.js}

@@ -2,7 +2,7 @@
 var package_default = {
   bin: "./dist/cli.js",
   name: "alinea",
-  version: "0.5.4",
+  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-TBAB475U.js";
+} from "../chunks/chunk-HWXESJ6U.js";
 import "../chunks/chunk-U5RRZUYZ.js";
 
 // src/cli/Serve.ts
@@ -49,7 +49,7 @@ async function serve(options) {
     liveReload: new LiveReload()
   };
   server.then(async () => {
-    console.log(`   \x1B[36mAlinea ${package_default.version}\x1B[39m`);
+    console.log(`   \x1B[36m\u03B1 Alinea ${package_default.version}\x1B[39m`);
     console.log(`   - Local CMS:    ${await dashboardUrl}
 `);
   });

package/dist/cli/bin.js

@@ -1,6 +1,6 @@
 import {
   package_default
-} from "../chunks/chunk-TBAB475U.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-TBAB475U.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-TBAB475U.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/Tracker.d.ts

@@ -15,6 +15,6 @@ export interface MutationTracker {
 export declare function optionTrackerOf(field: Field): OptionsTracker<any> | undefined;
 export declare function valueTrackerOf(field: Field): ValueTracker<any> | undefined;
 export declare namespace track {
-    function options<Value, OnChange, Options extends FieldOptions<Value>>(field: Field<Value, OnChange, Options>, tracker: OptionsTracker<Options>): void;
-    function value<Value>(field: Field<Value>, tracker: ValueTracker<Value>): void;
+    function options<Value, OnChange, Options extends FieldOptions<Value>>(field: Field<Value, OnChange, Options>, tracker: OptionsTracker<Options>): Field<Value, OnChange, Options>;
+    function value<Value>(field: Field<Value>, tracker: ValueTracker<Value>): Field<Value>;
 }

package/dist/core/Tracker.js

@@ -14,10 +14,12 @@ var track;
 ((track2) => {
   function options(field, tracker) {
     optionTrackers.set(Field.ref(field), tracker);
+    return field;
   }
   track2.options = options;
   function value(field, tracker) {
     valueTrackers.set(Field.ref(field), tracker);
+    return field;
   }
   track2.value = value;
 })(track || (track = {}));

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/atoms/FormAtoms.d.ts

@@ -1,5 +1,5 @@
-import { Field, FieldGetter, FieldOptions, Type } from 'alinea/core';
-import { Atom, Getter } from 'jotai';
+import { Field, FieldOptions, Type } from 'alinea/core';
+import { Atom } from 'jotai';
 import { PropsWithChildren } from 'react';
 import * as Y from 'yjs';
 export interface FieldInfo<Value = any, Mutator = any, Options extends FieldOptions<Value> = FieldOptions<Value>> {
@@ -13,16 +13,16 @@ export declare class FormAtoms<T = any> {
     type: Type<T>;
     container: Y.Map<any>;
     private options;
-    fieldInfo: Map<symbol, FieldInfo<any, any, FieldOptions<any>>>;
+    private fields;
     constructor(type: Type<T>, container: Y.Map<any>, options?: {
         readOnly: boolean;
     });
     data(): Type.Infer<T>;
-    getter: (get: Getter) => FieldGetter;
+    private getter;
     private valueAtom;
     fieldByKey(key: string): Field;
     keyOf(field: Field): string;
-    atomsOf<Value, Mutator, Options extends FieldOptions<Value>>(field: Field<Value, Mutator, Options>): FieldInfo<Value, Mutator, Options>;
+    fieldInfo<Value, Mutator, Options extends FieldOptions<Value>>(field: Field<Value, Mutator, Options>): FieldInfo<Value, Mutator, Options>;
 }
 export interface UseFormOptions<T> {
     doc?: Y.Doc;

package/dist/dashboard/atoms/FormAtoms.js

@@ -51,7 +51,7 @@ var FormAtoms = class {
           ) : atom(defaultOptions);
           const valueTracker = valueTrackerOf(field);
           const value = this.valueAtom(field, key, valueTracker);
-          this.fieldInfo.set(ref, {
+          this.fields.set(ref, {
             key,
             field,
             value,
@@ -62,12 +62,12 @@ var FormAtoms = class {
       }
     }, "self");
   }
-  fieldInfo = /* @__PURE__ */ new Map();
+  fields = /* @__PURE__ */ new Map();
   data() {
     return Type.shape(this.type).fromY(this.container);
   }
   getter = (get) => (field) => {
-    const info = this.fieldInfo.get(Field.ref(field));
+    const info = this.fields.get(Field.ref(field));
     if (!info)
       throw new Error(`Field not found: ${Field.label(field)}`);
     return get(info.value);
@@ -91,20 +91,20 @@ var FormAtoms = class {
     });
   }
   fieldByKey(key) {
-    for (const info of this.fieldInfo.values())
+    for (const info of this.fields.values())
       if (info.key === key)
         return info.field;
     throw new Error(`Field not found: "${key}"`);
   }
   keyOf(field) {
-    const res = this.fieldInfo.get(Field.ref(field));
+    const res = this.fields.get(Field.ref(field));
     const label = Field.label(field);
     if (!res)
       throw new Error(`Field not found: ${label}`);
     return res.key;
   }
-  atomsOf(field) {
-    const res = this.fieldInfo.get(Field.ref(field));
+  fieldInfo(field) {
+    const res = this.fields.get(Field.ref(field));
     const label = Field.label(field);
     if (!res)
       throw new Error(`Field not found: ${label}`);

package/dist/dashboard/editor/UseField.js

@@ -28,17 +28,17 @@ function useFieldKey(field) {
 }
 function useFieldOptions(field) {
   const atoms = useFormContext();
-  const atom = atoms.atomsOf(field);
+  const atom = atoms.fieldInfo(field);
   return useAtomValue(atom.options);
 }
 function useFieldValue(field) {
   const atoms = useFormContext();
-  const atom = atoms.atomsOf(field);
+  const atom = atoms.fieldInfo(field);
   return useAtomValue(atom.value);
 }
 function useFieldMutator(field) {
   const atoms = useFormContext();
-  const atom = atoms.atomsOf(field);
+  const atom = atoms.fieldInfo(field);
   return atom.mutator;
 }
 export {

package/dist/dashboard/hook/UseExplorer.d.ts

@@ -7,6 +7,7 @@ type ExplorerContext = {
     onSelect: (entry: ExporerItemSelect) => void;
     onNavigate?: (entryId: string) => void;
     showMedia?: boolean;
+    withNavigation?: boolean;
     border?: boolean;
 };
 export declare function useExplorer(): ExplorerContext;

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/dashboard/view/entry/EntrySummary.js

@@ -2,7 +2,7 @@ import "../../../chunks/chunk-U5RRZUYZ.js";
 
 // src/dashboard/view/entry/EntrySummary.tsx
 import { Entry, Type, view } from "alinea/core";
-import { Chip, HStack, TextLabel, Typo, VStack, fromModule } from "alinea/ui";
+import { Chip, HStack, TextLabel, Typo, VStack, fromModule, px } from "alinea/ui";
 import { Ellipsis } from "alinea/ui/Ellipsis";
 import { IcRoundKeyboardArrowRight } from "alinea/ui/icons/IcRoundKeyboardArrowRight";
 import { Fragment } from "react";
@@ -59,7 +59,7 @@ var EntrySummaryRow = view(
       return null;
     return /* @__PURE__ */ jsxs(HStack, { center: true, full: true, gap: 10, className: styles.row(), children: [
       /* @__PURE__ */ jsxs(VStack, { children: [
-        parents.length > 0 && /* @__PURE__ */ jsx(Ellipsis, { children: /* @__PURE__ */ jsx(Typo.Small, { children: /* @__PURE__ */ jsx(HStack, { center: true, gap: 3, children: parents.map(({ entryId: entryId2, title: title2 }) => /* @__PURE__ */ jsx(Fragment, { children: title2 }, entryId2)).reduce((prev, curr, i) => [
+        parents.length > 0 && /* @__PURE__ */ jsx(Ellipsis, { style: { marginTop: px(-1) }, children: /* @__PURE__ */ jsx(Typo.Small, { children: /* @__PURE__ */ jsx(HStack, { center: true, gap: 3, children: parents.map(({ entryId: entryId2, title: title2 }) => /* @__PURE__ */ jsx(Fragment, { children: title2 }, entryId2)).reduce((prev, curr, i) => [
           prev,
           /* @__PURE__ */ jsx(IcRoundKeyboardArrowRight, {}, `s${i}`),
           curr

package/dist/dashboard/view/entry/NewEntry.js

@@ -36,9 +36,10 @@ import { Modal } from "alinea/dashboard/view/Modal";
 import { link } from "alinea/input/link";
 import { select } from "alinea/input/select";
 import { text } from "alinea/input/text";
+import { entryFields, entryPicker } from "alinea/picker/entry/EntryPicker";
 import { Button, Loader, fromModule } from "alinea/ui";
 import { Link } from "alinea/ui/Link";
-import { Suspense, useMemo, useState } from "react";
+import { Suspense, useEffect, useMemo, useState } from "react";
 import { changedEntriesAtom, graphAtom, useMutate } from "../../atoms/DbAtoms.js";
 import { useConfig } from "../../hook/UseConfig.js";
 import { useLocale } from "../../hook/UseLocale.js";
@@ -102,8 +103,8 @@ function NewEntryForm({ parentId }) {
     return Type.meta(type2).isContainer;
   }).map((pair) => pair[0]);
   const root = useRoot();
-  const parentField = useMemo(
-    () => link.entry("Parent", {
+  const parentField = useMemo(() => {
+    return link.entry("Parent", {
       condition: Entry.type.isIn(containerTypes).and(Entry.workspace.is(workspace)).and(Entry.root.is(root.name)),
       initialValue: preselectedId ? {
         id: "parent",
@@ -111,26 +112,25 @@ function NewEntryForm({ parentId }) {
         type: "entry",
         entry: preselectedId
       } : void 0
-    }),
-    []
-  );
+    });
+  }, []);
+  async function allowedTypes(parentId2) {
+    if (!parentId2) {
+      return root.contains ?? [];
+    } else {
+      const parent = await graph.preferDraft.get(
+        Entry({ entryId: parentId2 }).select(parentData)
+      );
+      const parentType = parent && config.schema[parent.type];
+      return parentType && Type.meta(parentType).contains || keys(config.schema);
+    }
+  }
   const typeField = useMemo(() => {
-    const result = select("Select type", {});
-    track.options(result, async (get) => {
-      const types = [];
-      const selectedParent = get(parentField);
-      const parentId2 = selectedParent?.entry;
-      if (!parentId2) {
-        types.push(...root.contains ?? []);
-      } else {
-        const parent = await graph.preferDraft.get(
-          Entry({ entryId: parentId2 }).select(parentData)
-        );
-        const parentType = parent && config.schema[parent.type];
-        types.push(
-          ...parentType && Type.meta(parentType).contains || keys(config.schema)
-        );
-      }
+    const typeField2 = select("Select type", {});
+    return track.options(typeField2, async (get) => {
+      const selectedParent2 = get(parentField);
+      const parentId2 = selectedParent2?.entry;
+      const types = await allowedTypes(parentId2);
       return {
         items: fromEntries(
           types.map((key) => {
@@ -141,7 +141,25 @@ function NewEntryForm({ parentId }) {
         )
       };
     });
-    return result;
+  }, []);
+  const copyFromField = useMemo(() => {
+    const copyFromField2 = link.entry("Copy content from");
+    return track.options(copyFromField2, (get) => {
+      const type2 = get(typeField);
+      return {
+        readOnly: !type2,
+        pickers: {
+          entry: entryPicker({
+            condition: Entry.type.is(type2),
+            withNavigation: false,
+            hint: void 0,
+            title: "Copy content from",
+            max: 1,
+            selection: entryFields
+          })
+        }
+      };
+    });
   }, []);
   const [isCreating, setIsCreating] = useState(false);
   const updateEntries = useSetAtom(changedEntriesAtom);
@@ -149,11 +167,26 @@ function NewEntryForm({ parentId }) {
     () => type({
       parent: parentField,
       title: titleField,
-      type: typeField
+      type: typeField,
+      copyFrom: copyFromField
     }),
     []
   );
   const form = useForm(formType);
+  const parentAtoms = form.fieldInfo(parentField);
+  const typeAtoms = form.fieldInfo(typeField);
+  const copyFromAtoms = form.fieldInfo(copyFromField);
+  const selectedType = useAtomValue(typeAtoms.value);
+  const selectedParent = useAtomValue(parentAtoms.value);
+  useEffect(() => {
+    allowedTypes(selectedParent?.entry).then((types) => {
+      if (types.length > 0)
+        typeAtoms.mutator(types[0]);
+    });
+  }, [selectedParent]);
+  useEffect(() => {
+    copyFromAtoms.mutator.replace(void 0);
+  }, [selectedType]);
   async function handleCreate(e) {
     e.preventDefault();
     const { title, type: selected } = form.data();
@@ -170,7 +203,7 @@ function NewEntryForm({ parentId }) {
       phase: config.enableDrafts ? EntryPhase.Draft : EntryPhase.Published
     };
     const parentId2 = form.data().parent?.entry;
-    const parent = await graph.preferDraft.get(
+    const parent = await graph.preferPublished.get(
       Entry({ entryId: parentId2 }).select(parentData)
     );
     const parentPaths = parent ? parent.parentPaths.concat(parent.path) : [];
@@ -179,6 +212,10 @@ function NewEntryForm({ parentId }) {
     const parentDir = dirname(filePath);
     const entryType = config.schema[selected];
     const url = entryUrl(entryType, { ...data, parentPaths });
+    const copyFrom = form.data().copyFrom?.entry;
+    const entryData = copyFrom ? await graph.preferPublished.get(
+      Entry({ entryId: copyFrom }).select(Entry.data)
+    ) : {};
     const entry = await createEntryRow(config, {
       entryId,
       ...data,
@@ -197,7 +234,7 @@ function NewEntryForm({ parentId }) {
       modifiedAt: Date.now(),
       active: true,
       main: false,
-      data: { title, path },
+      data: { ...entryData, title, path },
       searchableText: ""
     });
     return mutate({

package/dist/dashboard/view/explorer/Explorer.d.ts

@@ -19,6 +19,7 @@ export interface ExplorerProps {
     toggleSelect?: (entry: ExporerItemSelect) => void;
     onNavigate?: (entryId: string) => void;
     showMedia?: boolean;
+    withNavigation?: boolean;
     border?: boolean;
 }
 export declare function Explorer({ type, cursor, virtualized, max, selectable, selection, toggleSelect, onNavigate, showMedia, border }: ExplorerProps): import("react/jsx-runtime").JSX.Element;

package/dist/dashboard/view/explorer/ExplorerItem.js

@@ -99,7 +99,7 @@ function ExplorerItem({
             ]
           }
         ),
-        explorer.onNavigate && childrenAmount > 0 && /* @__PURE__ */ jsxs(
+        explorer.withNavigation && explorer.onNavigate && childrenAmount > 0 && /* @__PURE__ */ jsxs(
           "button",
           {
             type: "button",

package/dist/index.css

@@ -225,7 +225,7 @@ button {
 /* src/dashboard/view/Create.module.scss */
 .alinea-Create {
   width: 100%;
-  padding: 0.1875rem 0.625rem;
+  padding: 0.25rem 0.625rem;
   gap: 0.625rem;
   display: flex;
   flex-wrap: wrap;
@@ -582,6 +582,7 @@ button {
   min-width: 0;
   font-size: 0.8125rem;
   padding: 0 0.25rem;
+  min-height: 1.75rem;
 }
 .alinea-EntrySummary-thumb {
   height: 100%;
@@ -3834,7 +3835,7 @@ h3.alinea-RichTextKit-heading:not(:last-child) {
   display: flex;
   align-items: center;
   gap: 0.5rem;
-  padding: 0.625rem;
+  padding: 0.375rem 0.5rem;
 }
 .alinea-Sink-title {
   font-size: 0.8125rem;

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/dist/picker/entry/EntryPicker.browser.js

@@ -303,7 +303,8 @@ function EntryPickerModal({
           showMedia,
           onNavigate: search ? void 0 : (entryId) => {
             setDestination({ ...destination, parentId: entryId });
-          }
+          },
+          withNavigation
         }
       ) }) }),
       showMedia && /* @__PURE__ */ jsx(

package/package.json

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