edytor 5.0.0 → 7.0.0

package/dist/crdt/doc/suggest.d.ts

@@ -89,8 +89,12 @@ export type SuggestContext = DocBase & DocReads & {
     create: (doc: EngineDoc, config: EdytorDocConfig) => SuggestFacade;
     /** Its changes no index fact shows: counted in the facade's `version`. */
     v: number;
-    /** The export `toJSON()` gives unless asked for the suggestions. */
-    base: (() => JSONDoc | undefined) | undefined;
+    /**
+     * The document without its pending suggestions, read by `read` (the
+     * export `toJSON()` gives unless asked for the suggestions);
+     * `undefined` while none is pending.
+     */
+    base: (<T>(read: (other: SuggestFacade) => T) => T | undefined) | undefined;
 };
 /** The facade the part is built over: its `part`, and the operations it writes through. */
 export type SuggestFacade = {

package/dist/crdt/doc/suggest.js

@@ -526,10 +526,11 @@ const docSuggest = (f) => {
         return [...map.keys()].sort(c.compare).flatMap((b) => map.get(b));
     };
     /**
-     * The document without its pending suggestions (`sugg.json.base`): on a
-     * copy, every pending one rejected; `undefined` while none is pending.
+     * The document without its pending suggestions (`sugg.json.base`), read
+     * by `read`: on a copy, every pending one rejected; `undefined` while
+     * none is pending.
      */
-    const base = () => {
+    const base = (read) => {
         if (root().attrKeys().next().done || !changes().length)
             return;
         const { Y } = c;
@@ -538,11 +539,11 @@ const docSuggest = (f) => {
         const other = c.create(copy, { ...c.config, actor: undefined });
         const all = suggestionsOf(other);
         all.run(all.decide(all.changes(), false));
-        const json = other.toJSON({ suggestions: true });
+        const out = read(other);
         all.dispose();
         other.dispose();
         copy.destroy();
-        return json;
+        return out;
     };
     c.base = base;
     return {

package/dist/crdt/edytor-doc.d.ts

@@ -99,9 +99,6 @@ export declare const docFacade: <L extends Layers>(Y: EngineApi, layers: L) => (
 } & {
     /** Every op prepared: pure, a plan of named steps + its effect, or `refused`. */
     prepare: {
-        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
-        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
-        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
         /**
          * Move `id` to the last position under `parent` — under a container
          * it is no item of, under its last item (`nestParent`: Tab after a list).
@@ -109,29 +106,6 @@ export declare const docFacade: <L extends Layers>(Y: EngineApi, layers: L) => (
         nestBlock: (id: BlockId, parent: BlockId) => Prepared;
         /** Delete a block selection — one plan; only the members leave (`deleteBlocks` above). */
         deleteBlocks: (ids: readonly BlockId[]) => Prepared;
-        insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
-        deleteText: (id: BlockId, offset: number, length: number) => Prepared;
-        formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
-        clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
-        insertInline: (id: BlockId, offset: number, atom: import("./doc/content.js").NewInline) => Prepared;
-        removeInline: (id: BlockId, inlineId: string) => Prepared;
-        setBlockType: (id: BlockId, type: string) => Prepared;
-        patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
-        setBlock: (id: BlockId, value: {
-            type?: string;
-            data?: Record<string, unknown>;
-            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-            children?: (import("./index.js").BlockSpec | JSONBlock)[];
-        }) => Prepared;
-        deleteBlock: (id: BlockId, opts?: {
-            keepChildren?: boolean;
-        }) => Prepared;
-        splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
-        mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
-        mergeBackward: (id: BlockId) => Prepared;
-        mergeForward: (id: BlockId) => Prepared;
-        placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
-        wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
         insertBlocks: (dest: import("./index.js").Destination, specs: readonly (import("./index.js").BlockSpec | JSONBlock)[]) => Prepared;
         moveBlocks: (ids: readonly BlockId[], dest: import("./index.js").Destination) => Prepared;
         unNestBlocks: (ids: readonly BlockId[]) => Prepared;
@@ -141,40 +115,40 @@ export declare const docFacade: <L extends Layers>(Y: EngineApi, layers: L) => (
             after?: readonly import("./index.js").BlockSpec[];
         }) => Prepared;
         duplicateBlock: (id: BlockId, freshId?: (oldId: string, kind: "block" | "inline") => string) => Prepared;
+        placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
+        wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
+        splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
+        mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
+        mergeBackward: (id: BlockId) => Prepared;
+        mergeForward: (id: BlockId) => Prepared;
+        deleteBlock: (id: BlockId, opts?: {
+            keepChildren?: boolean;
+        }) => Prepared;
+        setBlockType: (id: BlockId, type: string) => Prepared;
+        patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
+        setBlock: (id: BlockId, value: {
+            type?: string;
+            data?: Record<string, unknown>;
+            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+            children?: (import("./index.js").BlockSpec | JSONBlock)[];
+        }) => Prepared;
+        insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
+        deleteText: (id: BlockId, offset: number, length: number) => Prepared;
+        formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
+        clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
+        insertInline: (id: BlockId, offset: number, atom: import("./doc/ops.js").NewInline) => Prepared;
+        removeInline: (id: BlockId, inlineId: string) => Prepared;
+        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
+        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
+        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
     };
     /** Write a prepared plan exactly (refusals pass through). */
     apply: (p: Prepared, quiet?: boolean) => OpResult;
     compose: (...parts: Prepared[]) => Prepared;
     transact: <R>(fn: () => R, origin?: unknown) => R;
     version: number;
-    insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
-    deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
-    replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
     nestBlock: (id: string, parent: string) => OpResult;
     deleteBlocks: (ids: readonly string[]) => OpResult;
-    insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
-    deleteText: (id: string, offset: number, length: number) => OpResult;
-    formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
-    clearMarks: (id: string, offset: number, length: number) => OpResult;
-    insertInline: (id: string, offset: number, atom: import("./doc/content.js").NewInline) => OpResult;
-    removeInline: (id: string, inlineId: string) => OpResult;
-    setBlockType: (id: string, type: string) => OpResult;
-    patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
-    setBlock: (id: string, value: {
-        type?: string;
-        data?: Record<string, unknown>;
-        content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-        children?: (import("./index.js").BlockSpec | JSONBlock)[];
-    }) => OpResult;
-    deleteBlock: (id: string, opts?: {
-        keepChildren?: boolean;
-    } | undefined) => OpResult;
-    splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
-    mergeBlocks: (fromId: string, intoId: string) => OpResult;
-    mergeBackward: (id: string) => OpResult;
-    mergeForward: (id: string) => OpResult;
-    placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
-    wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
     insertBlocks: (dest: import("./index.js").Destination, specs: readonly (JSONBlock | import("./index.js").BlockSpec)[]) => OpResult;
     moveBlocks: (ids: readonly string[], dest: import("./index.js").Destination) => OpResult;
     unNestBlocks: (ids: readonly string[]) => OpResult;
@@ -184,6 +158,32 @@ export declare const docFacade: <L extends Layers>(Y: EngineApi, layers: L) => (
         after?: readonly import("./index.js").BlockSpec[];
     } | undefined) => OpResult;
     duplicateBlock: (id: string, freshId?: ((oldId: string, kind: "block" | "inline") => string) | undefined) => OpResult;
+    placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
+    wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
+    splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
+    mergeBlocks: (fromId: string, intoId: string) => OpResult;
+    mergeBackward: (id: string) => OpResult;
+    mergeForward: (id: string) => OpResult;
+    deleteBlock: (id: string, opts?: {
+        keepChildren?: boolean;
+    } | undefined) => OpResult;
+    setBlockType: (id: string, type: string) => OpResult;
+    patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
+    setBlock: (id: string, value: {
+        type?: string;
+        data?: Record<string, unknown>;
+        content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+        children?: (import("./index.js").BlockSpec | JSONBlock)[];
+    }) => OpResult;
+    insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
+    deleteText: (id: string, offset: number, length: number) => OpResult;
+    formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
+    clearMarks: (id: string, offset: number, length: number) => OpResult;
+    insertInline: (id: string, offset: number, atom: import("./doc/ops.js").NewInline) => OpResult;
+    removeInline: (id: string, inlineId: string) => OpResult;
+    insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
+    deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
+    replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
     project: () => import("./index.js").ProjectedDoc;
     toJSON: (options?: {
         suggestions?: boolean;
@@ -427,9 +427,6 @@ export declare const bindDocModel: (Y: EngineApi) => {
     } & {
         /** Every op prepared: pure, a plan of named steps + its effect, or `refused`. */
         prepare: {
-            insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
-            deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
-            replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
             /**
              * Move `id` to the last position under `parent` — under a container
              * it is no item of, under its last item (`nestParent`: Tab after a list).
@@ -437,29 +434,6 @@ export declare const bindDocModel: (Y: EngineApi) => {
             nestBlock: (id: BlockId, parent: BlockId) => Prepared;
             /** Delete a block selection — one plan; only the members leave (`deleteBlocks` above). */
             deleteBlocks: (ids: readonly BlockId[]) => Prepared;
-            insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
-            deleteText: (id: BlockId, offset: number, length: number) => Prepared;
-            formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
-            clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
-            insertInline: (id: BlockId, offset: number, atom: import("./doc/content.js").NewInline) => Prepared;
-            removeInline: (id: BlockId, inlineId: string) => Prepared;
-            setBlockType: (id: BlockId, type: string) => Prepared;
-            patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
-            setBlock: (id: BlockId, value: {
-                type?: string;
-                data?: Record<string, unknown>;
-                content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-                children?: (import("./index.js").BlockSpec | JSONBlock)[];
-            }) => Prepared;
-            deleteBlock: (id: BlockId, opts?: {
-                keepChildren?: boolean;
-            }) => Prepared;
-            splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
-            mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
-            mergeBackward: (id: BlockId) => Prepared;
-            mergeForward: (id: BlockId) => Prepared;
-            placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
-            wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
             insertBlocks: (dest: import("./index.js").Destination, specs: readonly (import("./index.js").BlockSpec | JSONBlock)[]) => Prepared;
             moveBlocks: (ids: readonly BlockId[], dest: import("./index.js").Destination) => Prepared;
             unNestBlocks: (ids: readonly BlockId[]) => Prepared;
@@ -469,40 +443,40 @@ export declare const bindDocModel: (Y: EngineApi) => {
                 after?: readonly import("./index.js").BlockSpec[];
             }) => Prepared;
             duplicateBlock: (id: BlockId, freshId?: (oldId: string, kind: "block" | "inline") => string) => Prepared;
+            placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
+            wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
+            splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
+            mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
+            mergeBackward: (id: BlockId) => Prepared;
+            mergeForward: (id: BlockId) => Prepared;
+            deleteBlock: (id: BlockId, opts?: {
+                keepChildren?: boolean;
+            }) => Prepared;
+            setBlockType: (id: BlockId, type: string) => Prepared;
+            patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
+            setBlock: (id: BlockId, value: {
+                type?: string;
+                data?: Record<string, unknown>;
+                content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+                children?: (import("./index.js").BlockSpec | JSONBlock)[];
+            }) => Prepared;
+            insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
+            deleteText: (id: BlockId, offset: number, length: number) => Prepared;
+            formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
+            clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
+            insertInline: (id: BlockId, offset: number, atom: import("./doc/ops.js").NewInline) => Prepared;
+            removeInline: (id: BlockId, inlineId: string) => Prepared;
+            insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
+            deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
+            replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
         };
         /** Write a prepared plan exactly (refusals pass through). */
         apply: (p: Prepared, quiet?: boolean) => OpResult;
         compose: (...parts: Prepared[]) => Prepared;
         transact: <R>(fn: () => R, origin?: unknown) => R;
         version: number;
-        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
-        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
-        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
         nestBlock: (id: string, parent: string) => OpResult;
         deleteBlocks: (ids: readonly string[]) => OpResult;
-        insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
-        deleteText: (id: string, offset: number, length: number) => OpResult;
-        formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
-        clearMarks: (id: string, offset: number, length: number) => OpResult;
-        insertInline: (id: string, offset: number, atom: import("./doc/content.js").NewInline) => OpResult;
-        removeInline: (id: string, inlineId: string) => OpResult;
-        setBlockType: (id: string, type: string) => OpResult;
-        patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
-        setBlock: (id: string, value: {
-            type?: string;
-            data?: Record<string, unknown>;
-            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-            children?: (import("./index.js").BlockSpec | JSONBlock)[];
-        }) => OpResult;
-        deleteBlock: (id: string, opts?: {
-            keepChildren?: boolean;
-        } | undefined) => OpResult;
-        splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
-        mergeBlocks: (fromId: string, intoId: string) => OpResult;
-        mergeBackward: (id: string) => OpResult;
-        mergeForward: (id: string) => OpResult;
-        placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
-        wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
         insertBlocks: (dest: import("./index.js").Destination, specs: readonly (JSONBlock | import("./index.js").BlockSpec)[]) => OpResult;
         moveBlocks: (ids: readonly string[], dest: import("./index.js").Destination) => OpResult;
         unNestBlocks: (ids: readonly string[]) => OpResult;
@@ -512,6 +486,32 @@ export declare const bindDocModel: (Y: EngineApi) => {
             after?: readonly import("./index.js").BlockSpec[];
         } | undefined) => OpResult;
         duplicateBlock: (id: string, freshId?: ((oldId: string, kind: "block" | "inline") => string) | undefined) => OpResult;
+        placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
+        wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
+        splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
+        mergeBlocks: (fromId: string, intoId: string) => OpResult;
+        mergeBackward: (id: string) => OpResult;
+        mergeForward: (id: string) => OpResult;
+        deleteBlock: (id: string, opts?: {
+            keepChildren?: boolean;
+        } | undefined) => OpResult;
+        setBlockType: (id: string, type: string) => OpResult;
+        patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
+        setBlock: (id: string, value: {
+            type?: string;
+            data?: Record<string, unknown>;
+            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+            children?: (import("./index.js").BlockSpec | JSONBlock)[];
+        }) => OpResult;
+        insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
+        deleteText: (id: string, offset: number, length: number) => OpResult;
+        formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
+        clearMarks: (id: string, offset: number, length: number) => OpResult;
+        insertInline: (id: string, offset: number, atom: import("./doc/ops.js").NewInline) => OpResult;
+        removeInline: (id: string, inlineId: string) => OpResult;
+        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
+        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
+        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
         project: () => import("./index.js").ProjectedDoc;
         toJSON: (options?: {
             suggestions?: boolean;
@@ -834,9 +834,6 @@ export declare const bindEdytorDoc: (Y: EngineApi) => {
     } & {
         /** Every op prepared: pure, a plan of named steps + its effect, or `refused`. */
         prepare: {
-            insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
-            deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
-            replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
             /**
              * Move `id` to the last position under `parent` — under a container
              * it is no item of, under its last item (`nestParent`: Tab after a list).
@@ -844,29 +841,6 @@ export declare const bindEdytorDoc: (Y: EngineApi) => {
             nestBlock: (id: BlockId, parent: BlockId) => Prepared;
             /** Delete a block selection — one plan; only the members leave (`deleteBlocks` above). */
             deleteBlocks: (ids: readonly BlockId[]) => Prepared;
-            insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
-            deleteText: (id: BlockId, offset: number, length: number) => Prepared;
-            formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
-            clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
-            insertInline: (id: BlockId, offset: number, atom: import("./doc/content.js").NewInline) => Prepared;
-            removeInline: (id: BlockId, inlineId: string) => Prepared;
-            setBlockType: (id: BlockId, type: string) => Prepared;
-            patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
-            setBlock: (id: BlockId, value: {
-                type?: string;
-                data?: Record<string, unknown>;
-                content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-                children?: (import("./index.js").BlockSpec | JSONBlock)[];
-            }) => Prepared;
-            deleteBlock: (id: BlockId, opts?: {
-                keepChildren?: boolean;
-            }) => Prepared;
-            splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
-            mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
-            mergeBackward: (id: BlockId) => Prepared;
-            mergeForward: (id: BlockId) => Prepared;
-            placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
-            wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
             insertBlocks: (dest: import("./index.js").Destination, specs: readonly (import("./index.js").BlockSpec | JSONBlock)[]) => Prepared;
             moveBlocks: (ids: readonly BlockId[], dest: import("./index.js").Destination) => Prepared;
             unNestBlocks: (ids: readonly BlockId[]) => Prepared;
@@ -876,40 +850,40 @@ export declare const bindEdytorDoc: (Y: EngineApi) => {
                 after?: readonly import("./index.js").BlockSpec[];
             }) => Prepared;
             duplicateBlock: (id: BlockId, freshId?: (oldId: string, kind: "block" | "inline") => string) => Prepared;
+            placeBeside: (ids: readonly BlockId[], target: BlockId, side: "left" | "right", kind?: string) => Prepared;
+            wrapInLayout: (ids: readonly BlockId[], kind?: string, columns?: number) => Prepared;
+            splitBlock: (id: BlockId, offset: number, newId: BlockId, tail?: SplitTail) => Prepared;
+            mergeBlocks: (fromId: BlockId, intoId: BlockId) => Prepared;
+            mergeBackward: (id: BlockId) => Prepared;
+            mergeForward: (id: BlockId) => Prepared;
+            deleteBlock: (id: BlockId, opts?: {
+                keepChildren?: boolean;
+            }) => Prepared;
+            setBlockType: (id: BlockId, type: string) => Prepared;
+            patchData: (target: DataTarget, patches: readonly DataPatch[]) => Prepared;
+            setBlock: (id: BlockId, value: {
+                type?: string;
+                data?: Record<string, unknown>;
+                content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+                children?: (import("./index.js").BlockSpec | JSONBlock)[];
+            }) => Prepared;
+            insertText: (id: BlockId, offset: number, text: string, marks?: Record<string, unknown>) => Prepared;
+            deleteText: (id: BlockId, offset: number, length: number) => Prepared;
+            formatRange: (id: BlockId, offset: number, length: number, marks: Record<string, unknown>) => Prepared;
+            clearMarks: (id: BlockId, offset: number, length: number) => Prepared;
+            insertInline: (id: BlockId, offset: number, atom: import("./doc/ops.js").NewInline) => Prepared;
+            removeInline: (id: BlockId, inlineId: string) => Prepared;
+            insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => Prepared;
+            deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
+            replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView) => Prepared;
         };
         /** Write a prepared plan exactly (refusals pass through). */
         apply: (p: Prepared, quiet?: boolean) => OpResult;
         compose: (...parts: Prepared[]) => Prepared;
         transact: <R>(fn: () => R, origin?: unknown) => R;
         version: number;
-        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
-        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
-        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
         nestBlock: (id: string, parent: string) => OpResult;
         deleteBlocks: (ids: readonly string[]) => OpResult;
-        insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
-        deleteText: (id: string, offset: number, length: number) => OpResult;
-        formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
-        clearMarks: (id: string, offset: number, length: number) => OpResult;
-        insertInline: (id: string, offset: number, atom: import("./doc/content.js").NewInline) => OpResult;
-        removeInline: (id: string, inlineId: string) => OpResult;
-        setBlockType: (id: string, type: string) => OpResult;
-        patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
-        setBlock: (id: string, value: {
-            type?: string;
-            data?: Record<string, unknown>;
-            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-            children?: (import("./index.js").BlockSpec | JSONBlock)[];
-        }) => OpResult;
-        deleteBlock: (id: string, opts?: {
-            keepChildren?: boolean;
-        } | undefined) => OpResult;
-        splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
-        mergeBlocks: (fromId: string, intoId: string) => OpResult;
-        mergeBackward: (id: string) => OpResult;
-        mergeForward: (id: string) => OpResult;
-        placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
-        wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
         insertBlocks: (dest: import("./index.js").Destination, specs: readonly (JSONBlock | import("./index.js").BlockSpec)[]) => OpResult;
         moveBlocks: (ids: readonly string[], dest: import("./index.js").Destination) => OpResult;
         unNestBlocks: (ids: readonly string[]) => OpResult;
@@ -919,6 +893,32 @@ export declare const bindEdytorDoc: (Y: EngineApi) => {
             after?: readonly import("./index.js").BlockSpec[];
         } | undefined) => OpResult;
         duplicateBlock: (id: string, freshId?: ((oldId: string, kind: "block" | "inline") => string) | undefined) => OpResult;
+        placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => OpResult;
+        wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => OpResult;
+        splitBlock: (id: string, offset: number, newId: string, tail?: SplitTail | undefined) => OpResult;
+        mergeBlocks: (fromId: string, intoId: string) => OpResult;
+        mergeBackward: (id: string) => OpResult;
+        mergeForward: (id: string) => OpResult;
+        deleteBlock: (id: string, opts?: {
+            keepChildren?: boolean;
+        } | undefined) => OpResult;
+        setBlockType: (id: string, type: string) => OpResult;
+        patchData: (target: DataTarget, patches: readonly DataPatch[]) => OpResult;
+        setBlock: (id: string, value: {
+            type?: string;
+            data?: Record<string, unknown>;
+            content?: (ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+            children?: (import("./index.js").BlockSpec | JSONBlock)[];
+        }) => OpResult;
+        insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => OpResult;
+        deleteText: (id: string, offset: number, length: number) => OpResult;
+        formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => OpResult;
+        clearMarks: (id: string, offset: number, length: number) => OpResult;
+        insertInline: (id: string, offset: number, atom: import("./doc/ops.js").NewInline) => OpResult;
+        removeInline: (id: string, inlineId: string) => OpResult;
+        insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => OpResult;
+        deleteRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
+        replaceRange: (from: DocPosition, to: DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => OpResult;
         project: () => import("./index.js").ProjectedDoc;
         toJSON: (options?: {
             suggestions?: boolean;
@@ -1032,7 +1032,7 @@ export declare const bindEdytorDoc: (Y: EngineApi) => {
      * Make the visible document `doc` equal `json`, keeping the ids the
      * registry holds and writing only what differs (`room.history.restore`), inside the caller's transaction.
      */
-    restoreTo: <Plan>(doc: EngineDoc, facade: import("./restore.js").RestoreFacade<Plan>, json: JSONDoc) => import("./restore.js").RestoreReport;
+    restoreTo: <Plan>(doc: EngineDoc, facade: import("./restore.js").RestoreFacade<Plan>, json: JSONDoc, { rewrite, suggestions }?: import("./restore.js").RestoreOptions<Plan>) => import("./restore.js").RestoreReport;
     model: {
         REGISTRY_KEY: string;
         registryOf: (doc: EngineDoc) => EngineNode;

package/dist/crdt/edytor-doc.js

@@ -23,18 +23,16 @@
  *   `doc/types.ts` — the public types; `doc/plan.ts` — op results, a plan's
  *   effect, ingress normalization.
  * - `doc/reads.ts` (`DocBase`: the doc, its engine, its index and
- *   roles) — the reads, roles and document order; `doc/capability.ts` —
- *   structural capability (`canPlace`, `fits`, `canMerge`, the island and
- *   void rules).
+ *   roles) — the reads, roles and document order.
  * - `doc/funnel.ts` — the write funnel (`write`, `apply`, attribution);
  *   `doc/events.ts` — `onChange`; `doc/history.ts` —
  *   `createUndoManager`; `doc/anchors.ts` — caret anchors.
- * - `doc/steps.ts` — the step writers every op composes (ranks, settle,
- *   emptying, dissolving); the prepared op families over them
- *   (`OpsContext`): `doc/moves.ts`, `doc/layout.ts`, `doc/split-merge.ts`,
- *   `doc/delete.ts`, `doc/meta.ts` (type and data), `doc/content.ts`
- *   (text, atoms, marks); range deletion and flow placement are
- *   `rangeDelete.ts` and `flow.ts`.
+ * - `doc/ops.ts` — one closure over the reads: the structural capability
+ *   (`canPlace`, `fits`, `canMerge`, the island and void rules), the step
+ *   writers every op composes (ranks, settle, emptying, dissolving) and the
+ *   prepared op families (placement, layout, split and merge, delete, type
+ *   and data, text, atoms and marks), then range deletion and flow placement
+ *   over them (their types in `rangeDelete.ts` and `flow.ts`).
  *
  * ── Identity discipline ────────────────────────────────────────────────
  *
@@ -56,24 +54,15 @@ import { bindPurge, readHorizon } from './purge.js';
 import { restoreDocument } from './restore.js';
 import { bindRuns, indexOf } from './text/runs.js';
 import { bindBlockAttribution, blockAttributionOf } from './attribution/block.js';
-import { rangeDeleteOps } from './rangeDelete.js';
-import { flowOps } from './flow.js';
 import { assertSchema, checkSchema, isInitialized, META_KEY, registryEmpty, SCHEMA_NAME, SCHEMA_VERSION, SchemaMismatchError, schemaVersion } from './doc/gate.js';
 import { bindSeed, restore } from './doc/seed.js';
 import { applied, ref } from './doc/plan.js';
 import { docReads } from './doc/reads.js';
-import { docCapability } from './doc/capability.js';
 import { writeFunnel } from './doc/funnel.js';
 import { docEvents } from './doc/events.js';
 import { docHistory } from './doc/history.js';
 import { docAnchors } from './doc/anchors.js';
-import { planSteps } from './doc/steps.js';
-import { moveOps } from './doc/moves.js';
-import { layoutOps } from './doc/layout.js';
-import { splitMergeOps } from './doc/split-merge.js';
-import { deleteOps } from './doc/delete.js';
-import { metaOps } from './doc/meta.js';
-import { contentOps } from './doc/content.js';
+import { docOps } from './doc/ops.js';
 // ── schema manifest and gate (`doc/gate.ts`) ────────────────────────────
 export { SCHEMA };
 export { assertSchema, checkSchema, isInitialized, META_KEY, registryEmpty, SCHEMA_NAME, SCHEMA_VERSION, SchemaMismatchError, schemaVersion };
@@ -165,9 +154,10 @@ export const docFacade = (Y, layers) => {
         // The facade's parts, each over the ones before it (`doc/*`).
         const base = { Y, doc, runsView, roles, roleOf, rendersContentOf };
         const reads = { ...base, ...docReads(base) };
-        const shape = { ...reads, ...docCapability(reads) };
+        // The capability, the step writers and the prepared op families (`doc/ops.ts`).
+        const ops = { ...reads, ...docOps(reads) };
         const { blockJSON, view, blockTypeOf, blockDataOf, docData, dataItemIds, dataPreview, childrenIds, positionOf, pathOf, ancestorsOf, slotOf, isVoid, isIsland, isLines, islandOf, insideIsland, isLayout, isLayoutItem, order, compare, next, previous, displayLength, contentItems, hasBlock, live } = reads;
-        const { canPlace, fits, nestParent, canMerge, defaultChild } = shape;
+        const { canPlace, fits, nestParent, canMerge, defaultChild, plan, landingOf, besideAt } = ops;
         const funnel = writeFunnel({ ...reads, BA, config });
         const { write, apply } = funnel;
         const events = docEvents({ runsView });
@@ -178,37 +168,19 @@ export const docFacade = (Y, layers) => {
         };
         const { createUndoManager } = docHistory({ ...base, ...funnel, init });
         const { anchorAt, followUndo, resolveAnchor } = docAnchors(reads);
-        const steps = { ...shape, ...planSteps(shape) };
-        const { plan } = steps;
-        // The prepared op families (`OpsContext`: the reads, capability and step
-        // writers): every op they answer is a document write, but for the reads
-        // and step writers taken out here.
-        const { landingOf, ...moves } = moveOps(steps);
-        const { besideAt, ...layouts } = layoutOps(steps);
-        const { dataSteps, replaceData, ...metas } = metaOps(steps);
-        const deletes = deleteOps(steps);
-        /** What range deletion and flow placement compose: the step writers and the ops. */
-        const ops = { ...steps, ...moves, ...deletes, dataSteps, replaceData };
         /** Every document op, prepared — `apply(prepare.op(…))` is the op. */
         const prepare = {
-            ...moves,
-            ...layouts,
-            ...splitMergeOps(steps),
-            ...deletes,
-            ...metas,
-            ...contentOps(steps),
+            ...ops.prepare,
             /**
              * Move `id` to the last position under `parent` — under a container
              * it is no item of, under its last item (`nestParent`: Tab after a list).
              */
             nestBlock: (id, parent) => {
                 const at = nestParent([ref(id)], ref(parent));
-                return moves.moveBlocks([id], { parent: at, index: childrenIds(at).length });
+                return ops.prepare.moveBlocks([id], { parent: at, index: childrenIds(at).length });
             },
             /** Delete a block selection — one plan; only the members leave (`deleteBlocks` above). */
-            deleteBlocks: (ids) => deletes.deleteBlocks(ids),
-            ...rangeDeleteOps(ops),
-            ...flowOps(ops)
+            deleteBlocks: (ids) => ops.prepare.deleteBlocks(ids)
         };
         /**
          * What a part built over this document reads beyond the facade (the
@@ -248,7 +220,7 @@ export const docFacade = (Y, layers) => {
          */
         const toJSON = (options) => {
             // A part's export first (the shared suggestions': without the pending ones, `sugg.json.base`).
-            const base = !options?.suggestions && part.base?.();
+            const base = !options?.suggestions && part.base?.((other) => other.toJSON({ suggestions: true }));
             if (base)
                 return base;
             const data = docData();

package/dist/crdt/engine-room.d.ts

@@ -0,0 +1,4 @@
+import type * as V from './vendor/yjs/dts/index.js';
+
+export declare const clipUpdate: typeof V.clipUpdate;
+export declare const diffUpdate: typeof V.diffUpdate;

package/dist/crdt/engine-room.js

@@ -0,0 +1,6 @@
+/**
+ * The engine calls only the room makes (a re-seed's cut and rebase,
+ * `crdt/reseed.ts`): apart from the engine object (`engine.js`), which every
+ * app keeps whole, so an app's bundle holds none of them.
+ */
+export { clipUpdate, diffUpdate } from './vendor/yjs/src/index.js';