alinea 0.5.2 → 0.5.4

package/dist/backend/Database.js

@@ -201,6 +201,14 @@ ${JSON.stringify(mutation)}`
           );
         };
       }
+      case MutationType.Patch: {
+        const { patch } = mutation;
+        const rows = EntryRow({ entryId: mutation.entryId, main: true });
+        const current = await tx(rows.maybeFirst());
+        if (current)
+          await tx(rows.set({ data: { ...current.data, patch } }));
+        return () => this.updateHash(tx, rows);
+      }
       case MutationType.Archive: {
         const archived = EntryRow({
           entryId: mutation.entryId,

package/dist/backend/Store.js

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

package/dist/backend/data/ChangeSet.d.ts

@@ -1,5 +1,5 @@
 import { Config, EntryUrlMeta } from 'alinea/core';
-import { ArchiveMutation, CreateMutation, DiscardDraftMutation, EditMutation, FileRemoveMutation, MoveMutation, Mutation, OrderMutation, PublishMutation, RemoveEntryMutation, UploadMutation } from 'alinea/core/Mutation';
+import { ArchiveMutation, CreateMutation, DiscardDraftMutation, EditMutation, FileRemoveMutation, MoveMutation, Mutation, OrderMutation, PatchMutation, PublishMutation, RemoveEntryMutation, UploadMutation } from 'alinea/core/Mutation';
 export declare enum ChangeType {
     Write = "write",
     Rename = "rename",
@@ -42,6 +42,7 @@ export declare class ChangeSetCreator {
     constructor(config: Config);
     entryLocation({ locale, parentPaths, path, phase }: EntryUrlMeta, extension: string): string;
     editChanges({ previousFile, file, entry }: EditMutation): Array<Change>;
+    patchChanges({ file, patch }: PatchMutation): Array<Change>;
     createChanges({ file, entry }: CreateMutation): Array<Change>;
     publishChanges({ file }: PublishMutation): Array<Change>;
     archiveChanges({ file }: ArchiveMutation): Array<Change>;

package/dist/backend/data/ChangeSet.js

@@ -53,6 +53,9 @@ var ChangeSetCreator = class {
       contents: decoder.decode(loader.format(this.config.schema, record))
     });
   }
+  patchChanges({ file, patch }) {
+    return [{ type: "patch" /* Patch */, file, patch }];
+  }
   createChanges({ file, entry }) {
     const record = createRecord(entry);
     return [
@@ -160,6 +163,8 @@ var ChangeSetCreator = class {
     switch (mutation.type) {
       case MutationType.Edit:
         return this.editChanges(mutation);
+      case MutationType.Patch:
+        return this.patchChanges(mutation);
       case MutationType.Create:
         return this.createChanges(mutation);
       case MutationType.Publish:

package/dist/chunks/{chunk-KWP47LDR.js → chunk-TBAB475U.js}

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

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

@@ -336,7 +336,7 @@ var AsyncDriver = class extends DriverBase {
   }
   async transaction(run) {
     const id = `t${this.transactionId++}`;
-    const [connection, release] = this.isolate();
+    const [connection, release] = await this.isolate();
     await connection.executeQuery(
       new QueryData.Transaction({ op: QueryData.TransactionOperation.Begin, id })
     );
@@ -405,12 +405,14 @@ var SyncWrapper = class _SyncWrapper extends AsyncDriver {
   async schemaInstructions(tableName) {
     return this.sync.schemaInstructions(tableName);
   }
-  isolate() {
+  async isolate() {
+    const currentLock = this.lock;
     const connection = new _SyncWrapper(this.sync);
     let release, trigger = new Promise((resolve) => {
       release = async () => resolve();
     });
-    this.lock = Promise.resolve(this.lock).then(() => trigger);
+    this.lock = Promise.resolve(currentLock).then(() => trigger);
+    await currentLock;
     return [connection, release];
   }
 };

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

@@ -1,7 +1,7 @@
 import {
   SqlJsDriver,
   connect
-} from "./chunk-QV233D56.js";
+} from "./chunk-VRXHB6DJ.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-OZNQGHQS.js");
+  const { connect } = await import("../chunks/sql.js-75HGQX6U.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-KWP47LDR.js";
+} from "../chunks/chunk-TBAB475U.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-KWP47LDR.js";
+} from "../chunks/chunk-TBAB475U.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-KWP47LDR.js";
+} from "../../chunks/chunk-TBAB475U.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-KWP47LDR.js";
+} from "../../chunks/chunk-TBAB475U.js";
 import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/cloud/server/CloudAuthServer.ts

package/dist/core/Field.d.ts

@@ -11,6 +11,8 @@ export interface FieldOptions<Value> {
     readOnly?: boolean;
     /** The initial value of the field */
     initialValue?: Value;
+    /** The value of this field is shared across all languages  */
+    shared?: boolean;
 }
 export type WithoutLabel<Options extends FieldOptions<any>> = Omit<Options, 'label'>;
 export interface FieldMeta<Value, Mutator, Options extends FieldOptions<Value>> {

package/dist/core/Mutation.d.ts

@@ -6,6 +6,7 @@ export declare enum MutationProgress {
 }
 export declare enum MutationType {
     Edit = "update",
+    Patch = "patch",
     Create = "create",
     Publish = "publish",
     Archive = "archive",
@@ -20,7 +21,7 @@ export type PendingMutation = Mutation & {
     mutationId: string;
     createdAt: number;
 };
-export type Mutation = EditMutation | CreateMutation | PublishMutation | ArchiveMutation | RemoveEntryMutation | DiscardDraftMutation | OrderMutation | MoveMutation | UploadMutation | FileRemoveMutation;
+export type Mutation = EditMutation | PatchMutation | CreateMutation | PublishMutation | ArchiveMutation | RemoveEntryMutation | DiscardDraftMutation | OrderMutation | MoveMutation | UploadMutation | FileRemoveMutation;
 export interface EditMutation {
     type: MutationType.Edit;
     entryId: string;
@@ -56,6 +57,12 @@ export interface DiscardDraftMutation {
     entryId: string;
     file: string;
 }
+export interface PatchMutation {
+    type: MutationType.Patch;
+    entryId: string;
+    file: string;
+    patch: object;
+}
 export interface OrderMutation {
     type: MutationType.Order;
     entryId: string;

package/dist/core/Mutation.js

@@ -9,6 +9,7 @@ var MutationProgress = /* @__PURE__ */ ((MutationProgress2) => {
 })(MutationProgress || {});
 var MutationType = /* @__PURE__ */ ((MutationType2) => {
   MutationType2["Edit"] = "update";
+  MutationType2["Patch"] = "patch";
   MutationType2["Create"] = "create";
   MutationType2["Publish"] = "publish";
   MutationType2["Archive"] = "archive";

package/dist/core/Shape.d.ts

@@ -1,19 +1,11 @@
-import { LinkResolver } from 'alinea/backend/resolver/LinkResolver';
+import type { LinkResolver } from 'alinea/backend/resolver/LinkResolver';
 import * as Y from 'yjs';
 import { Label } from './Label.js';
-import { RecordShape } from './shape/RecordShape.js';
 type YType = Y.Map<any>;
-export interface ShapeInfo {
-    name: string;
-    parents: Array<string>;
-    shape: RecordShape;
-}
 export interface Shape<Value = any, Mutator = any> {
     initialValue?: Value;
     label: Label;
-    innerTypes(parents: Array<string>): Array<ShapeInfo>;
     create(): Value;
-    typeOfChild<C>(yValue: any, child: string): Shape<C, unknown>;
     toY(value: Value): any;
     fromY(yValue: any): Value;
     applyY(value: Value, parent: YType, key: string): void;

package/dist/core/Tracker.d.ts

@@ -1,3 +1,4 @@
+import { Mutation } from 'alinea/core/Mutation';
 import { Field, FieldOptions } from './Field.js';
 export interface FieldGetter {
     <Value>(field: Field<Value>): Value;
@@ -8,9 +9,12 @@ export interface OptionsTracker<Options = any> {
 export interface ValueTracker<Value = any> {
     (getter: FieldGetter): Value;
 }
+export interface MutationTracker {
+    (mutations: Array<Mutation>): Array<Mutation> | Promise<Array<Mutation>>;
+}
+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 optionTrackerOf(field: Field): OptionsTracker<any> | undefined;
     function value<Value>(field: Field<Value>, tracker: ValueTracker<Value>): void;
-    function valueTrackerOf(field: Field): ValueTracker<any> | undefined;
 }

package/dist/core/Tracker.js

@@ -3,26 +3,26 @@ import "../chunks/chunk-U5RRZUYZ.js";
 // src/core/Tracker.ts
 import { Field } from "./Field.js";
 var optionTrackers = /* @__PURE__ */ new Map();
+function optionTrackerOf(field) {
+  return optionTrackers.get(Field.ref(field));
+}
 var valueTrackers = /* @__PURE__ */ new Map();
+function valueTrackerOf(field) {
+  return valueTrackers.get(Field.ref(field));
+}
 var track;
 ((track2) => {
   function options(field, tracker) {
     optionTrackers.set(Field.ref(field), tracker);
   }
   track2.options = options;
-  function optionTrackerOf(field) {
-    return optionTrackers.get(Field.ref(field));
-  }
-  track2.optionTrackerOf = optionTrackerOf;
   function value(field, tracker) {
     valueTrackers.set(Field.ref(field), tracker);
   }
   track2.value = value;
-  function valueTrackerOf(field) {
-    return valueTrackers.get(Field.ref(field));
-  }
-  track2.valueTrackerOf = valueTrackerOf;
 })(track || (track = {}));
 export {
-  track
+  optionTrackerOf,
+  track,
+  valueTrackerOf
 };

package/dist/core/Type.d.ts

@@ -64,17 +64,14 @@ export declare namespace Type {
     function label(type: Type): Label;
     function meta(type: Type): TypeMeta;
     function shape(type: Type): RecordShape;
+    function fields(type: Type): Record<string, Field>;
     function hint(type: Type): Hint;
     function sections(type: Type): Section[];
     function isContainer(type: Type): boolean;
     function target(type: Type): TypeTarget;
     function field(type: Type, name: string): Field | undefined;
     function isType(type: any): type is Type;
-    function blankEntry(name: string, type: Type): {
-        id: string;
-        type: string;
-        [key: string]: any;
-    };
+    function sharedData(type: Type, entryData: Record<string, unknown>): Record<string, unknown> | undefined;
 }
 export interface TypeDefinition {
     [key: string]: Field<any, any> | Section;

package/dist/core/Type.js

@@ -5,7 +5,6 @@ import { Cursor } from "alinea/core/pages/Cursor";
 import { Expr, and } from "alinea/core/pages/Expr";
 import { Field } from "./Field.js";
 import { Hint } from "./Hint.js";
-import { createId } from "./Id.js";
 import { Meta } from "./Meta.js";
 import { Section, section } from "./Section.js";
 import { createExprData } from "./pages/CreateExprData.js";
@@ -35,6 +34,10 @@ var Type;
     return type2[Type2.Data].shape;
   }
   Type2.shape = shape;
+  function fields(type2) {
+    return type2;
+  }
+  Type2.fields = fields;
   function hint(type2) {
     return type2[Type2.Data].hint;
   }
@@ -59,14 +62,17 @@ var Type;
     return Boolean(type2 && type2[Type2.Data]);
   }
   Type2.isType = isType;
-  function blankEntry(name, type2) {
-    return {
-      ...Type2.shape(type2).create(),
-      type: name,
-      id: createId()
-    };
+  function sharedData(type2, entryData) {
+    const res = {};
+    for (const [key, field2] of entries(fields(type2))) {
+      if (Field.options(field2).shared)
+        res[key] = entryData[key];
+    }
+    if (keys(res).length === 0)
+      return void 0;
+    return res;
   }
-  Type2.blankEntry = blankEntry;
+  Type2.sharedData = sharedData;
 })(Type || (Type = {}));
 function fieldsOfDefinition(definition) {
   return entries(definition).flatMap(([key, value]) => {

package/dist/core/driver/TestDriver.js

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

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

@@ -1,7 +1,7 @@
 import { LinkResolver } from 'alinea/backend/resolver/LinkResolver';
 import * as Y from 'yjs';
 import { Label } from '../Label.js';
-import { Shape, ShapeInfo } from '../Shape.js';
+import { Shape } from '../Shape.js';
 import { PostProcess } from '../pages/PostProcess.js';
 import { RecordShape } from './RecordShape.js';
 export type ListRow = {
@@ -22,9 +22,7 @@ export declare class ListShape<T extends ListRow> implements Shape<Array<T>, Lis
     protected postProcess?: PostProcess<T[]> | undefined;
     values: Record<string, RecordShape>;
     constructor(label: Label, shapes: Record<string, RecordShape>, initialValue?: T[] | undefined, postProcess?: PostProcess<T[]> | undefined);
-    innerTypes(parents: Array<string>): Array<ShapeInfo>;
     create(): T[];
-    typeOfChild<C>(yValue: Y.Map<any>, child: string): Shape<C>;
     toY(value: Array<T>): Y.Map<unknown>;
     fromY(map: Y.Map<any>): Array<T>;
     applyY(value: T[], parent: Y.Map<any>, key: string): void;

package/dist/core/shape/ListShape.js

@@ -6,7 +6,6 @@ import "../../chunks/chunk-O6EXLFU2.js";
 import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/core/shape/ListShape.ts
-import { Hint } from "../Hint.js";
 import { createId } from "../Id.js";
 import { generateKeyBetween } from "../util/FractionalIndexing.js";
 import { RecordShape } from "./RecordShape.js";
@@ -39,26 +38,9 @@ var ListShape = class {
     );
   }
   values;
-  innerTypes(parents) {
-    return Object.entries(this.shapes).flatMap(([name, shape]) => {
-      const info = { name, shape, parents };
-      const inner = shape.innerTypes(parents.concat(name));
-      if (Hint.isDefinitionName(name))
-        return [info, ...inner];
-      return inner;
-    });
-  }
   create() {
     return this.initialValue ?? [];
   }
-  typeOfChild(yValue, child) {
-    const row = yValue.get(child);
-    const type = row && row.get("type");
-    const value = type && this.values[type];
-    if (value)
-      return value;
-    throw new Error(`Could not determine type of child "${child}"`);
-  }
   toY(value) {
     const map = new YMap();
     const rows = Array.isArray(value) ? value : [];

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

@@ -10,10 +10,8 @@ export declare class RecordShape<T = object> implements Shape<T, RecordMutator<T
     properties: Record<string, Shape>;
     initialValue?: T | undefined;
     constructor(label: Label, properties: Record<string, Shape>, initialValue?: T | undefined);
-    innerTypes(parents: Array<string>): import("../Shape.js").ShapeInfo[];
     concat<X>(that: RecordShape<X> | undefined): RecordShape<T & X>;
     create(): T;
-    typeOfChild<C>(yValue: T, child: string): Shape<C>;
     toY(value: T): Y.Map<unknown>;
     fromY(map: Y.Map<any>): T;
     applyY(value: T, map: Y.Doc | Y.Map<any>, key: string): undefined;

package/dist/core/shape/RecordShape.js

@@ -12,11 +12,6 @@ var RecordShape = class _RecordShape {
     this.properties = properties;
     this.initialValue = initialValue;
   }
-  innerTypes(parents) {
-    return entries(this.properties).flatMap(([name, shape]) => {
-      return shape.innerTypes(parents.concat(name));
-    });
-  }
   concat(that) {
     if (!that)
       return this;
@@ -32,9 +27,6 @@ var RecordShape = class _RecordShape {
       })
     );
   }
-  typeOfChild(yValue, child) {
-    return this.properties[child];
-  }
   toY(value) {
     const self = value || {};
     const map = new YMap();

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

@@ -27,9 +27,7 @@ export declare class RichTextShape<Blocks> implements Shape<TextDoc<Blocks>, Ric
     initialValue?: TextDoc<Blocks> | undefined;
     values: Record<string, RecordShape>;
     constructor(label: Label, shapes?: Record<string, RecordShape<object>> | undefined, initialValue?: TextDoc<Blocks> | undefined);
-    innerTypes(parents: Array<string>): import("../Shape.js").ShapeInfo[];
     create(): TextDoc<Blocks>;
-    typeOfChild<C>(yValue: Y.Map<any>, child: string): Shape<C>;
     toXml(rows: TextDoc<Blocks>): (Y.XmlElement<{
         [key: string]: string;
     }> | Y.XmlText)[];

package/dist/core/shape/RichTextShape.js

@@ -11,7 +11,6 @@ import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/core/shape/RichTextShape.ts
 import { Entry } from "../Entry.js";
-import { Hint } from "../Hint.js";
 import { TextNode } from "../TextDoc.js";
 import { entries, fromEntries, keys } from "../util/Objects.js";
 import { RecordShape } from "./RecordShape.js";
@@ -94,28 +93,9 @@ var RichTextShape = class {
     ) : {};
   }
   values;
-  innerTypes(parents) {
-    if (!this.shapes)
-      return [];
-    return entries(this.shapes).flatMap(([name, shape]) => {
-      const info = { name, shape, parents };
-      const inner = shape.innerTypes(parents.concat(name));
-      if (Hint.isDefinitionName(name))
-        return [info, ...inner];
-      return inner;
-    });
-  }
   create() {
     return this.initialValue ?? [];
   }
-  typeOfChild(yValue, child) {
-    const block = yValue.get(child);
-    const type = block && block.get("type");
-    const value = type && this.values && this.values[type];
-    if (value)
-      return value;
-    throw new Error(`Type of block "${child}" not found`);
-  }
   toXml(rows) {
     const types = this.values;
     return rows.map((row) => {
@@ -147,12 +127,12 @@ var RichTextShape = class {
     if (isEmpty)
       return [];
     return content.map((node) => {
-      const type = types[node.type];
-      if (type && "id" in node) {
+      const shape = types[node.type];
+      if (shape && "id" in node) {
         return {
           id: node.id,
           type: node.type,
-          ...type.fromY(value.get(node.id))
+          ...shape.fromY(value.get(node.id))
         };
       }
       return node;

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

@@ -6,9 +6,7 @@ export declare class ScalarShape<T> implements Shape<T, ScalarMutator<T>> {
     label: Label;
     initialValue?: T | undefined;
     constructor(label: Label, initialValue?: T | undefined);
-    innerTypes(): never[];
     create(): T;
-    typeOfChild<C>(yValue: T, child: string): Shape<C>;
     toY(value: T): T;
     fromY(yValue: any): any;
     applyY(value: T, parent: Y.Map<any>, key: string): void;

package/dist/core/shape/ScalarShape.js

@@ -6,15 +6,9 @@ var ScalarShape = class {
     this.label = label;
     this.initialValue = initialValue;
   }
-  innerTypes() {
-    return [];
-  }
   create() {
     return this.initialValue;
   }
-  typeOfChild(yValue, child) {
-    throw new Error(`No children in scalar values`);
-  }
   toY(value) {
     return value;
   }

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

@@ -1,7 +1,7 @@
 import { LinkResolver } from 'alinea/backend/resolver/LinkResolver';
 import * as Y from 'yjs';
 import { Label } from '../Label.js';
-import { Shape, ShapeInfo } from '../Shape.js';
+import { Shape } from '../Shape.js';
 import { PostProcess } from '../pages/PostProcess.js';
 import { RecordShape } from './RecordShape.js';
 export interface UnionRow {
@@ -18,9 +18,7 @@ export declare class UnionShape<T extends UnionRow> implements Shape<T, UnionMut
     protected postProcess?: PostProcess<T> | undefined;
     shapes: Record<string, RecordShape>;
     constructor(label: Label, shapes: Record<string, RecordShape>, initialValue?: T | undefined, postProcess?: PostProcess<T> | undefined);
-    innerTypes(parents: Array<string>): Array<ShapeInfo>;
     create(): T;
-    typeOfChild<C>(yValue: Y.Map<any>, child: string): Shape<C>;
     toY(value: T): Y.Map<unknown>;
     fromY(map: Y.Map<any>): T;
     applyY(value: T, parent: Y.Map<any>, key: string): void;

package/dist/core/shape/UnionShape.js

@@ -5,7 +5,6 @@ import "../../chunks/chunk-O6EXLFU2.js";
 import "../../chunks/chunk-U5RRZUYZ.js";
 
 // src/core/shape/UnionShape.ts
-import { Hint } from "../Hint.js";
 import { createId } from "../Id.js";
 import { entries, fromEntries } from "../util/Objects.js";
 import { RecordShape } from "./RecordShape.js";
@@ -29,25 +28,9 @@ var UnionShape = class {
     );
   }
   shapes;
-  innerTypes(parents) {
-    return entries(this.shapes).flatMap(([name, shape]) => {
-      const info = { name, shape, parents };
-      const inner = shape.innerTypes(parents.concat(name));
-      if (Hint.isDefinitionName(name))
-        return [info, ...inner];
-      return inner;
-    });
-  }
   create() {
     return this.initialValue ?? {};
   }
-  typeOfChild(yValue, child) {
-    const type = yValue && yValue.get("type");
-    const shape = type && this.shapes[type];
-    if (shape)
-      return shape.typeOfChild(yValue, child);
-    throw new Error(`Could not determine type of child "${child}"`);
-  }
   toY(value) {
     if (Array.isArray(value))
       value = value[0] ?? {};