edytor 5.0.0 → 7.0.0

package/dist/crdt/flow.d.ts

@@ -1,47 +1,9 @@
 /**
- * Placement of an admitted flow — one prepared document operation for
- * paste, drop and fragment insertion. The rules are the `flow.*` rows of
- * `docs/editor-delete-contract.md`:
- *
- * - a flow is lines with fresh ids: a kinded block, or an inline run (no
- *   `type`); an empty flow changes nothing (`flow.shape`);
- * - one line joins the text at the position; an empty block takes a kinded
- *   line's kind (`flow.inline`);
- * - several lines split the block: the first joins the head, the last is the
- *   tail's block and takes the text after the position and the block's
- *   children, the rest go between (`flow.split`) — children the view
- *   hides (a closed toggle's body) stay with the head, as Enter keeps them;
- * - a line that joins no text (a list, a code block, a divider: it renders
- *   none of its own, or is a void or an island) is placed as a block, never
- *   joined; the text after the position stays in a shown line of the
- *   block's kind (`flow.apart`), and the caret ends the last pasted
- *   shown line;
- * - in a code line (a `lines` island) the lines, nested ones included, are
- *   placed as plain lines (`flow.lines`);
- * - a `whole` flow (a block-selection copy) goes after the block, replacing
- *   it when empty (`flow.whole`); over selected blocks the lines take their
- *   slot (`flow.slot`), and at a slot they are placed with nothing replaced
- *   (`flow.place`: an accepted suggestion), as plain inserts (`insertBlocks`: their order
- *   against a peer's split beside them is not claimed); a void
- *   takes one run (`flow.void`);
- * - a table's cell is never split: it takes the lines a flow shows, nested
- *   ones and a pasted table's cells included, as one text joined by line
- *   breaks; a cell outside a row (cells copied out of a table) is a line of
- *   text, and a row outside a table its cells (`table.paste`);
- * - a plain line that lands directly in a container takes its item kind
- *   (the document's `fitted`: a pasted paragraph in a list is its item),
- *   and so does a line of the list's flat item kind (the view's
- *   `itemKind`: a pasted numbered item in an `ordered-list`); any
- *   other kind keeps its kind and data (a pasted image stays an image, a
- *   bulleted item in an `ordered-list` a bulleted item).
+ * The types flow placement (`insertFlow`: the `flow.*` rows, prepared in
+ * `doc/ops.ts`) reads, and where the caret ends a placed block.
  */
 import type { BlockId, BlockSpec, Destination } from './placement/model.js';
-import type { Prepared } from './edytor-doc.js';
 import type { DocPosition, RangeView } from './rangeDelete.js';
-import type { OpsContext } from './doc/steps.js';
-import type { MoveOps } from './doc/moves.js';
-import type { DeleteOps } from './doc/delete.js';
-import type { MetaOps } from './doc/meta.js';
 /** One line of a flow: a kinded block, or an inline run when it has no `type`. */
 export type FlowLine = Omit<BlockSpec, 'type'> & {
     type?: string;
@@ -72,8 +34,8 @@ export type FlowTarget = DocPosition | {
 } | {
     slot: Destination;
 };
-/** What flow placement composes: the step writers and the ops it places and deletes with. */
-export type FlowContext = OpsContext & Pick<MoveOps, 'insertBlocks'> & Pick<DeleteOps, 'deleteBlocks'> & Pick<MetaOps, 'dataSteps' | 'replaceData'>;
+/** The units of a line's content (an atom counts 1). */
+export declare const lengthOf: (l: FlowLine) => number;
 /**
  * Where the caret ends a placed block: its own content's end when it shows a
  * line (renders its content, no void; a toggle's header, never its body),
@@ -85,7 +47,3 @@ export declare const placedEnd: (roleOf: (kind: string) => {
     childless: boolean;
     rendersContent: boolean;
 }) => (s: BlockSpec) => DocPosition | undefined;
-/** `insertFlow`, prepared. */
-export declare const flowOps: (c: FlowContext) => {
-    insertFlow: (target: FlowTarget, flow: Flow, view?: FlowView) => Prepared;
-};

package/dist/crdt/flow.js

@@ -1,9 +1,5 @@
-import { ref } from './doc/plan.js';
-import { id as freshId } from '../utils.js';
-import { sanitizeSpec } from '../utils/json.js';
-import { collides } from './placement/model.js';
-import { TYPE } from './schema.js';
-const lengthOf = (l) => (l.content ?? []).reduce((n, i) => n + (i.kind === 'text' ? i.text.length : 1), 0);
+/** The units of a line's content (an atom counts 1). */
+export const lengthOf = (l) => (l.content ?? []).reduce((n, i) => n + (i.kind === 'text' ? i.text.length : 1), 0);
 /**
  * Where the caret ends a placed block: its own content's end when it shows a
  * line (renders its content, no void; a toggle's header, never its body),
@@ -25,259 +21,3 @@ export const placedEnd = (roleOf) => {
     };
     return endOf;
 };
-/** `insertFlow`, prepared. */
-export const flowOps = (c) => {
-    const roleOf = c.roles.of;
-    /** What a kind is in a table: the table, its row or its cell. */
-    const tableKind = (kind) => roleOf(kind).table !== undefined
-        ? 'table'
-        : c.isRowKind(kind)
-            ? 'row'
-            : c.isCellKind(kind)
-                ? 'cell'
-                : undefined;
-    return {
-        insertFlow: (target, flow, view = {}) => {
-            // Ingress: a run carries a placeholder kind through the spec sanitizer.
-            let lines = flow.lines
-                .map((l) => sanitizeSpec({ ...l, type: l.type ?? '' }))
-                .map((s) => ({ ...s, type: s.type || undefined }));
-            if (lines.length === 0)
-                return c.plan([], []);
-            // A cell outside a row is its text, a row outside a table its cells (`table.paste`).
-            const unbare = (l, holder) => {
-                const kind = l.type ? tableKind(l.type) : undefined;
-                const kids = (next) => (l.children ?? []).flatMap((kid) => unbare(kid, next));
-                if (kind === 'cell' && holder !== 'row')
-                    return [{ id: l.id, content: l.content }, ...kids(null)];
-                if (kind === 'row' && holder !== 'table')
-                    return kids(null);
-                if (!l.children)
-                    return [l];
-                return [{ ...l, children: kids(kind === 'cell' ? null : (kind ?? null)) }];
-            };
-            lines = lines.flatMap((l) => unbare(l, null));
-            /** A line's kind under `parent`: the list's item for its flat item kind, then `fitted`. */
-            const fit = (parent, kind) => c.fitted(parent, parent !== null && kind !== undefined && kind === view.itemKind?.(parent)
-                ? c.defaultChild(parent)
-                : kind);
-            const specs = (parent, of = lines) => of.map((l) => ({ ...l, type: fit(parent, l.type) ?? c.defaultChild(parent) }));
-            const last = () => lines.at(-1);
-            /** `l` and its nested lines as runs, each line that shows its own content one run. */
-            const plain = (l) => [
-                ...(!l.type || roleOf(l.type).rendersContent ? [{ id: l.id, content: l.content }] : []),
-                ...(l.children ?? []).flatMap(plain)
-            ];
-            const endOf = placedEnd(roleOf);
-            /**
-             * A layout line, here or nested, as its items' lines in reading order, and
-             * any other child it holds (`flow.layout`): no layout lands in an item.
-             */
-            const unwrap = (l) => {
-                const item = l.type ? roleOf(l.type).layout : undefined;
-                if (item === undefined)
-                    return [l.children ? { ...l, children: l.children.flatMap(unwrap) } : l];
-                return (l.children ?? []).flatMap((kid) => kid.type === item ? (kid.children ?? []).flatMap(unwrap) : unwrap(kid));
-            };
-            const intoItem = (parent) => {
-                if (parent !== null && c.insideItem(parent))
-                    lines = lines.flatMap(unwrap);
-            };
-            /** Whole blocks at a slot, after `pre`; the caret ends the last one's shown content. */
-            const atSlot = (dest, pre) => {
-                const placed = specs(dest.parent);
-                const p = c.insertBlocks(dest, placed);
-                const at = endOf(placed.at(-1)) ?? { block: last().id, offset: lengthOf(last()) };
-                // The lines are placed while the replaced blocks still show (each step reads the
-                // display as it stands), then those go.
-                return 'writes' in p ? { ...c.plan(p.ids, [...p.writes, ...pre]), at } : p;
-            };
-            if ('replace' in target || 'slot' in target) {
-                let slot;
-                let pre = [];
-                if ('slot' in target)
-                    slot = target.slot;
-                else {
-                    // The lines fill the first block's slot: its parent is never emptied
-                    // by the delete, so a column keeps its layout (`layout.flow-slot`).
-                    const at = c.view().order.at;
-                    const first = target.replace
-                        .filter((id) => at.has(id))
-                        .sort((a, b) => at.get(a) - at.get(b))[0];
-                    const del = c.deleteBlocks(target.replace, false, first === undefined ? undefined : c.positionOf(first)?.parent);
-                    if (!('writes' in del))
-                        return del;
-                    if (first === undefined)
-                        return c.REFUSED;
-                    slot = c.positionOf(first);
-                    pre = [...del.writes];
-                }
-                intoItem(slot.parent);
-                if (lines.length === 0)
-                    return c.plan([], []);
-                // In a code block (selected lines, a slot), the lines are plain lines too (`flow.lines`).
-                if (slot.parent !== null && c.isLines(slot.parent)) {
-                    const shown = lines.flatMap(plain);
-                    lines = shown.length ? shown : [{ id: lines[0].id, content: [] }];
-                }
-                return atSlot(slot, pre);
-            }
-            const B = ref(target.block);
-            if (!c.contentTarget(B) || !c.rendersContent(B))
-                return c.REFUSED;
-            const len = c.displayLength(B);
-            const o = Math.max(0, Math.min(target.offset, len));
-            const { parent, index } = c.positionOf(B);
-            intoItem(B);
-            const empty = len === 0 && c.childrenIds(B).length === 0;
-            // A line of a lines island (a code line) takes plain lines: every line the flow
-            // shows, nested ones included, in order; no block lands in the island (`flow.lines`).
-            const inLines = parent !== null && c.isLines(parent);
-            if (inLines)
-                lines = lines.flatMap(plain);
-            // A table's cell is never split: the lines it shows join its text (`table.paste`).
-            const cell = c.isTableCell(B);
-            if (cell)
-                lines = lines.flatMap(plain);
-            // A line that joins no text under `under` (`flow.apart`): its kind renders
-            // none of its own (a list, a code block), or is a void or an island.
-            const apart = (l, under) => {
-                const kind = l.type && fit(under, l.type);
-                const role = kind ? roleOf(kind) : undefined;
-                return !!role && (!role.rendersContent || role.childless || role.island);
-            };
-            // At the end of a container's header whose body shows, what follows the caret
-            // leads its children and the body stays, as Enter opens a first child
-            // (`flow.header`), unless the first line stands apart and replaces an empty
-            // one (`flow.apart`); elsewhere it follows `B` among its siblings.
-            const header = view.header?.(B);
-            // A closed header shows no children: a line it takes brings none into its hidden
-            // body; they follow it, shown (`flow.header`).
-            const shut = header === 'closed';
-            const inside = o === len && !inLines && !flow.whole && header === true && !(empty && apart(lines[0], B));
-            const home = inside ? B : parent;
-            if (lines.length === 0)
-                return { ...c.plan([B], []), at: { block: B, offset: o } };
-            if (flow.whole && !inLines && !cell)
-                return atSlot({ parent, index: index + 1 }, empty ? [c.remove(B, [])] : []);
-            // A void is never split: its caption takes the lines as one run; nor is a cell.
-            const br = { kind: 'text', text: '\n' };
-            if (c.isVoid(B) || cell) {
-                const content = lines.flatMap((l, i) => [...(i ? [br] : []), ...(l.content ?? [])]);
-                lines = [{ id: lines[0].id, content }];
-            }
-            // So a first line it joins leaves its nested lines as lines of the flow after it.
-            if (shut && lines[0].children?.length && !apart(lines[0], home))
-                lines = [{ ...lines[0], children: undefined }, ...lines[0].children, ...lines.slice(1)];
-            const first = lines[0];
-            const [joinsHead, joinsTail] = [
-                !apart(first, home),
-                lines.length > 1 && !apart(last(), home)
-            ];
-            const all = specs(home);
-            const placed = all.slice(joinsHead ? 1 : 0, joinsTail ? -1 : undefined);
-            const ids = placed.map((s) => s.id);
-            if (collides(c.doc, [
-                ...(joinsHead ? (first.children ?? []) : []),
-                ...all.slice(joinsHead ? 1 : 0)
-            ]))
-                return c.REFUSED;
-            const writes = [];
-            /** A joined line's children lead the block it joins; `moved` follow them. */
-            const kids = (to, l, moved = []) => {
-                const k = l?.children?.length ?? 0;
-                if (k)
-                    writes.push({ op: 'insertBlocks', parent: to, index: 0, specs: l.children });
-                if (moved.length)
-                    writes.push({ op: 'moveBlocks', ids: moved, parent: to, index: k });
-            };
-            /**
-             * `l` joins `B` at `at`: its content, its kind when `B` shows no text (a header
-             * keeps its own, as Enter does), its children first.
-             */
-            const join = (l, at) => {
-                const end = c.writeContent(writes, B, at, l.content);
-                const kind = l.type && fit(parent, l.type);
-                if (len === 0 && !header && kind && kind === l.type)
-                    writes.push(...c.attr(B, TYPE, kind), ...(c.dataSteps(B, c.replaceData(l.data ?? {})) ?? []));
-                if (!shut)
-                    kids(B, l);
-                return end;
-            };
-            /** The placed lines at `at` under `home` (`split`: the tail of the split they come with). */
-            const place = (at, split) => {
-                if (placed.length)
-                    writes.push({
-                        op: 'insertBlocks',
-                        parent: home,
-                        index: at,
-                        specs: placed,
-                        ...(split !== undefined && { split })
-                    });
-            };
-            // Under a header, the first line's children, the placed lines and the rest, in order.
-            const k = joinsHead ? (first.children?.length ?? 0) : 0;
-            const slot = inside ? k : index + 1;
-            // Where the placed lines end the caret: after their last shown line (`flow.apart`).
-            const end = placed.length ? endOf(placed.at(-1)) : undefined;
-            // Nothing before the position and the first line stands apart: the lines go before `B`,
-            // which keeps its text and takes a joining last line, or goes when empty and not needed.
-            if (!joinsHead && o === 0 && !inside) {
-                place(index);
-                if (joinsTail) {
-                    const at = join(last(), 0);
-                    // A closed header's taken line's nested lines follow it, the caret ending them.
-                    const after = shut ? specs(parent, last().children ?? []) : [];
-                    if (after.length) {
-                        const slot = index + placed.length + 1;
-                        writes.push({ op: 'insertBlocks', parent, index: slot, specs: after });
-                    }
-                    const caret = after.length ? endOf(after.at(-1)) : undefined;
-                    const touched = [...ids, B, ...after.map((s) => s.id)];
-                    return { ...c.plan(touched, writes), at: caret ?? { block: B, offset: at } };
-                }
-                if (empty && end)
-                    return { ...c.plan(ids, [...writes, c.remove(B, [])]), at: end };
-                return { ...c.plan([...ids, B], writes), at: end ?? { block: B, offset: 0 } };
-            }
-            const head = joinsHead ? join(first, o) : o;
-            if (lines.length === 1 && joinsHead)
-                return { ...c.plan([B], writes), at: { block: B, offset: head } };
-            const moved = inside ? [] : c.childrenIds(B).filter((id) => !view.hidden?.(id));
-            // Nothing after the position to keep, and the caret has a line: no split.
-            if (!joinsTail && o === len && moved.length === 0 && end) {
-                place(slot);
-                return { ...c.plan([B, ...ids], writes), at: end };
-            }
-            // The rest of `B` stays in a shown line: the last line's block when it joins, else
-            // a line of `B`'s kind, as Enter makes; one made only for the caret (after a
-            // divider at the end) or under a header is a fresh line of its parent's default kind.
-            const T = joinsTail ? last().id : freshId('b');
-            const lastType = joinsTail && last().type && fit(home, last().type);
-            const bare = !joinsTail && o === len && moved.length === 0;
-            const tail = lastType
-                ? { type: lastType, data: last().data }
-                : bare || inside
-                    ? { type: c.defaultChild(home), data: {} }
-                    : { type: c.kindToCopy(B), data: c.blockDataOf(B) };
-            // After `B` (under a header: after the first line's children); the placed lines go before it.
-            const length = len - o;
-            writes.push({
-                op: 'splitBlock',
-                id: B,
-                offset: head,
-                length,
-                newId: T,
-                tail,
-                parent: home,
-                index: slot
-            });
-            kids(T, joinsTail ? last() : undefined, moved);
-            place(slot, T);
-            const at = joinsTail
-                ? { block: T, offset: c.writeContent(writes, T, 0, last().content) }
-                : (end ?? { block: T, offset: 0 });
-            return { ...c.plan([B, ...ids, T], writes), at };
-        }
-    };
-};

package/dist/crdt/index.d.ts

@@ -205,34 +205,8 @@ export declare const bindCrdt: (Y: EngineApi) => {
             api: object;
         } & {
             prepare: {
-                insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => import("./edytor-doc.js").Prepared;
-                deleteRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView) => import("./edytor-doc.js").Prepared;
-                replaceRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView) => import("./edytor-doc.js").Prepared;
                 nestBlock: (id: import("./index.js").BlockId, parent: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
                 deleteBlocks: (ids: readonly import("./index.js").BlockId[]) => import("./edytor-doc.js").Prepared;
-                insertText: (id: import("./index.js").BlockId, offset: number, text: string, marks?: Record<string, unknown>) => import("./edytor-doc.js").Prepared;
-                deleteText: (id: import("./index.js").BlockId, offset: number, length: number) => import("./edytor-doc.js").Prepared;
-                formatRange: (id: import("./index.js").BlockId, offset: number, length: number, marks: Record<string, unknown>) => import("./edytor-doc.js").Prepared;
-                clearMarks: (id: import("./index.js").BlockId, offset: number, length: number) => import("./edytor-doc.js").Prepared;
-                insertInline: (id: import("./index.js").BlockId, offset: number, atom: import("./doc/content.js").NewInline) => import("./edytor-doc.js").Prepared;
-                removeInline: (id: import("./index.js").BlockId, inlineId: string) => import("./edytor-doc.js").Prepared;
-                setBlockType: (id: import("./index.js").BlockId, type: string) => import("./edytor-doc.js").Prepared;
-                patchData: (target: import("./edytor-doc.js").DataTarget, patches: readonly import("./data.js").DataPatch[]) => import("./edytor-doc.js").Prepared;
-                setBlock: (id: import("./index.js").BlockId, value: {
-                    type?: string;
-                    data?: Record<string, unknown>;
-                    content?: (import("./index.js").ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-                    children?: (import("./index.js").BlockSpec | import("./index.js").JSONBlock)[];
-                }) => import("./edytor-doc.js").Prepared;
-                deleteBlock: (id: import("./index.js").BlockId, opts?: {
-                    keepChildren?: boolean;
-                }) => import("./edytor-doc.js").Prepared;
-                splitBlock: (id: import("./index.js").BlockId, offset: number, newId: import("./index.js").BlockId, tail?: import("./placement/model.js").SplitTail) => import("./edytor-doc.js").Prepared;
-                mergeBlocks: (fromId: import("./index.js").BlockId, intoId: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
-                mergeBackward: (id: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
-                mergeForward: (id: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
-                placeBeside: (ids: readonly import("./index.js").BlockId[], target: import("./index.js").BlockId, side: "left" | "right", kind?: string) => import("./edytor-doc.js").Prepared;
-                wrapInLayout: (ids: readonly import("./index.js").BlockId[], kind?: string, columns?: number) => import("./edytor-doc.js").Prepared;
                 insertBlocks: (dest: import("./index.js").Destination, specs: readonly (import("./index.js").BlockSpec | import("./index.js").JSONBlock)[]) => import("./edytor-doc.js").Prepared;
                 moveBlocks: (ids: readonly import("./index.js").BlockId[], dest: import("./index.js").Destination) => import("./edytor-doc.js").Prepared;
                 unNestBlocks: (ids: readonly import("./index.js").BlockId[]) => import("./edytor-doc.js").Prepared;
@@ -242,39 +216,39 @@ export declare const bindCrdt: (Y: EngineApi) => {
                     after?: readonly import("./index.js").BlockSpec[];
                 }) => import("./edytor-doc.js").Prepared;
                 duplicateBlock: (id: import("./index.js").BlockId, freshId?: (oldId: string, kind: "block" | "inline") => string) => import("./edytor-doc.js").Prepared;
+                placeBeside: (ids: readonly import("./index.js").BlockId[], target: import("./index.js").BlockId, side: "left" | "right", kind?: string) => import("./edytor-doc.js").Prepared;
+                wrapInLayout: (ids: readonly import("./index.js").BlockId[], kind?: string, columns?: number) => import("./edytor-doc.js").Prepared;
+                splitBlock: (id: import("./index.js").BlockId, offset: number, newId: import("./index.js").BlockId, tail?: import("./placement/model.js").SplitTail) => import("./edytor-doc.js").Prepared;
+                mergeBlocks: (fromId: import("./index.js").BlockId, intoId: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
+                mergeBackward: (id: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
+                mergeForward: (id: import("./index.js").BlockId) => import("./edytor-doc.js").Prepared;
+                deleteBlock: (id: import("./index.js").BlockId, opts?: {
+                    keepChildren?: boolean;
+                }) => import("./edytor-doc.js").Prepared;
+                setBlockType: (id: import("./index.js").BlockId, type: string) => import("./edytor-doc.js").Prepared;
+                patchData: (target: import("./edytor-doc.js").DataTarget, patches: readonly import("./data.js").DataPatch[]) => import("./edytor-doc.js").Prepared;
+                setBlock: (id: import("./index.js").BlockId, value: {
+                    type?: string;
+                    data?: Record<string, unknown>;
+                    content?: (import("./index.js").ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+                    children?: (import("./index.js").BlockSpec | import("./index.js").JSONBlock)[];
+                }) => import("./edytor-doc.js").Prepared;
+                insertText: (id: import("./index.js").BlockId, offset: number, text: string, marks?: Record<string, unknown>) => import("./edytor-doc.js").Prepared;
+                deleteText: (id: import("./index.js").BlockId, offset: number, length: number) => import("./edytor-doc.js").Prepared;
+                formatRange: (id: import("./index.js").BlockId, offset: number, length: number, marks: Record<string, unknown>) => import("./edytor-doc.js").Prepared;
+                clearMarks: (id: import("./index.js").BlockId, offset: number, length: number) => import("./edytor-doc.js").Prepared;
+                insertInline: (id: import("./index.js").BlockId, offset: number, atom: import("./doc/ops.js").NewInline) => import("./edytor-doc.js").Prepared;
+                removeInline: (id: import("./index.js").BlockId, inlineId: string) => import("./edytor-doc.js").Prepared;
+                insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView) => import("./edytor-doc.js").Prepared;
+                deleteRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView) => import("./edytor-doc.js").Prepared;
+                replaceRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView) => import("./edytor-doc.js").Prepared;
             };
             apply: (p: import("./edytor-doc.js").Prepared, quiet?: boolean) => import("./edytor-doc.js").OpResult;
             compose: (...parts: import("./edytor-doc.js").Prepared[]) => import("./edytor-doc.js").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) => import("./edytor-doc.js").OpResult;
-            deleteRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => import("./edytor-doc.js").OpResult;
-            replaceRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => import("./edytor-doc.js").OpResult;
             nestBlock: (id: string, parent: string) => import("./edytor-doc.js").OpResult;
             deleteBlocks: (ids: readonly string[]) => import("./edytor-doc.js").OpResult;
-            insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => import("./edytor-doc.js").OpResult;
-            deleteText: (id: string, offset: number, length: number) => import("./edytor-doc.js").OpResult;
-            formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => import("./edytor-doc.js").OpResult;
-            clearMarks: (id: string, offset: number, length: number) => import("./edytor-doc.js").OpResult;
-            insertInline: (id: string, offset: number, atom: import("./doc/content.js").NewInline) => import("./edytor-doc.js").OpResult;
-            removeInline: (id: string, inlineId: string) => import("./edytor-doc.js").OpResult;
-            setBlockType: (id: string, type: string) => import("./edytor-doc.js").OpResult;
-            patchData: (target: import("./edytor-doc.js").DataTarget, patches: readonly import("./data.js").DataPatch[]) => import("./edytor-doc.js").OpResult;
-            setBlock: (id: string, value: {
-                type?: string;
-                data?: Record<string, unknown>;
-                content?: (import("./index.js").ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
-                children?: (import("./index.js").BlockSpec | import("./index.js").JSONBlock)[];
-            }) => import("./edytor-doc.js").OpResult;
-            deleteBlock: (id: string, opts?: {
-                keepChildren?: boolean;
-            } | undefined) => import("./edytor-doc.js").OpResult;
-            splitBlock: (id: string, offset: number, newId: string, tail?: import("./placement/model.js").SplitTail | undefined) => import("./edytor-doc.js").OpResult;
-            mergeBlocks: (fromId: string, intoId: string) => import("./edytor-doc.js").OpResult;
-            mergeBackward: (id: string) => import("./edytor-doc.js").OpResult;
-            mergeForward: (id: string) => import("./edytor-doc.js").OpResult;
-            placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => import("./edytor-doc.js").OpResult;
-            wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => import("./edytor-doc.js").OpResult;
             insertBlocks: (dest: import("./index.js").Destination, specs: readonly (import("./index.js").JSONBlock | import("./index.js").BlockSpec)[]) => import("./edytor-doc.js").OpResult;
             moveBlocks: (ids: readonly string[], dest: import("./index.js").Destination) => import("./edytor-doc.js").OpResult;
             unNestBlocks: (ids: readonly string[]) => import("./edytor-doc.js").OpResult;
@@ -284,6 +258,32 @@ export declare const bindCrdt: (Y: EngineApi) => {
                 after?: readonly import("./index.js").BlockSpec[];
             } | undefined) => import("./edytor-doc.js").OpResult;
             duplicateBlock: (id: string, freshId?: ((oldId: string, kind: "block" | "inline") => string) | undefined) => import("./edytor-doc.js").OpResult;
+            placeBeside: (ids: readonly string[], target: string, side: "left" | "right", kind?: string | undefined) => import("./edytor-doc.js").OpResult;
+            wrapInLayout: (ids: readonly string[], kind?: string | undefined, columns?: number | undefined) => import("./edytor-doc.js").OpResult;
+            splitBlock: (id: string, offset: number, newId: string, tail?: import("./placement/model.js").SplitTail | undefined) => import("./edytor-doc.js").OpResult;
+            mergeBlocks: (fromId: string, intoId: string) => import("./edytor-doc.js").OpResult;
+            mergeBackward: (id: string) => import("./edytor-doc.js").OpResult;
+            mergeForward: (id: string) => import("./edytor-doc.js").OpResult;
+            deleteBlock: (id: string, opts?: {
+                keepChildren?: boolean;
+            } | undefined) => import("./edytor-doc.js").OpResult;
+            setBlockType: (id: string, type: string) => import("./edytor-doc.js").OpResult;
+            patchData: (target: import("./edytor-doc.js").DataTarget, patches: readonly import("./data.js").DataPatch[]) => import("./edytor-doc.js").OpResult;
+            setBlock: (id: string, value: {
+                type?: string;
+                data?: Record<string, unknown>;
+                content?: (import("./index.js").ContentItem | import("./index.js").JSONText | import("./index.js").JSONInlineBlock)[];
+                children?: (import("./index.js").BlockSpec | import("./index.js").JSONBlock)[];
+            }) => import("./edytor-doc.js").OpResult;
+            insertText: (id: string, offset: number, text: string, marks?: Record<string, unknown> | undefined) => import("./edytor-doc.js").OpResult;
+            deleteText: (id: string, offset: number, length: number) => import("./edytor-doc.js").OpResult;
+            formatRange: (id: string, offset: number, length: number, marks: Record<string, unknown>) => import("./edytor-doc.js").OpResult;
+            clearMarks: (id: string, offset: number, length: number) => import("./edytor-doc.js").OpResult;
+            insertInline: (id: string, offset: number, atom: import("./doc/ops.js").NewInline) => import("./edytor-doc.js").OpResult;
+            removeInline: (id: string, inlineId: string) => import("./edytor-doc.js").OpResult;
+            insertFlow: (target: import("./flow.js").FlowTarget, flow: import("./flow.js").Flow, view?: import("./flow.js").FlowView | undefined) => import("./edytor-doc.js").OpResult;
+            deleteRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => import("./edytor-doc.js").OpResult;
+            replaceRange: (from: import("./rangeDelete.js").DocPosition, to: import("./rangeDelete.js").DocPosition, view?: import("./rangeDelete.js").RangeView | undefined) => import("./edytor-doc.js").OpResult;
             project: () => import("./index.js").ProjectedDoc;
             toJSON: (options?: {
                 suggestions?: boolean;
@@ -360,7 +360,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
             text: import("./text/model.js").TextEngine;
         }, horizon: import("./purge.js").Horizon | null) => import("./purge.js").PurgeReport;
         horizonOf: (doc: import("./engine-api.js").EngineDoc) => import("./purge.js").Horizon | null;
-        restoreTo: <Plan>(doc: import("./engine-api.js").EngineDoc, facade: import("./restore.js").RestoreFacade<Plan>, json: import("./index.js").JSONDoc) => import("./restore.js").RestoreReport;
+        restoreTo: <Plan>(doc: import("./engine-api.js").EngineDoc, facade: import("./restore.js").RestoreFacade<Plan>, json: import("./index.js").JSONDoc, { rewrite, suggestions }?: import("./restore.js").RestoreOptions<Plan>) => import("./restore.js").RestoreReport;
         model: {
             REGISTRY_KEY: string;
             registryOf: (doc: import("./engine-api.js").EngineDoc) => import("./engine-api.js").EngineNode;
@@ -455,17 +455,12 @@ export declare const bindCrdt: (Y: EngineApi) => {
                 loadError: unknown;
                 _storeTimeout: number;
                 _storeTimeoutId: ReturnType<typeof setTimeout> | null;
-                _storeUpdate: (update: Uint8Array, origin: unknown) => void;
+                _unlisten: () => void;
                 awareness: _Awareness;
                 bcconnected: boolean;
                 disableBc: boolean;
                 _ownsAwareness: boolean;
                 _bcSubscriber: (data: ArrayBuffer | Uint8Array, origin: unknown) => void;
-                _awarenessUpdateHandler: (updates: {
-                    added: number[];
-                    updated: number[];
-                    removed: number[];
-                }, origin: unknown) => void;
                 get synced(): boolean;
                 messageHandlers: Record<number, import("./providers/room.js").RoomMessageHandler</*elided*/ any>>;
                 readMessage: (buf: Uint8Array, emitSynced: boolean) => import("lib0-v14/encoding").Encoder;
@@ -473,7 +468,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                 connectBc(): void;
                 disconnectBc(): void;
                 destroy(): Promise<void>;
-                emit<N extends "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "load-error">(name: N, args: Parameters<{
+                emit<N extends "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "load-error">(name: N, args: Parameters<{
                     synced: (provider: /*elided*/ any) => void;
                     'protocol-mismatch': (mismatch: import("./protocol.js").ProtocolMismatch, provider: /*elided*/ any) => void;
                     'load-error': (error: unknown, provider: /*elided*/ any) => void;
@@ -482,7 +477,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                     failed: (error: unknown, provider: /*elided*/ any) => void;
                 }[N]>): void;
                 _observers: Map<string, Set<any>>;
-                on<NAME extends "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
+                on<NAME extends "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
                     synced: (provider: /*elided*/ any) => void;
                     'protocol-mismatch': (mismatch: import("./protocol.js").ProtocolMismatch, provider: /*elided*/ any) => void;
                     'load-error': (error: unknown, provider: /*elided*/ any) => void;
@@ -497,7 +492,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                     'schema-mismatch': (detail: import("./protocol.js").SchemaMismatchDetail, provider: /*elided*/ any) => void;
                     failed: (error: unknown, provider: /*elided*/ any) => void;
                 }[NAME];
-                once<NAME extends "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
+                once<NAME extends "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
                     synced: (provider: /*elided*/ any) => void;
                     'protocol-mismatch': (mismatch: import("./protocol.js").ProtocolMismatch, provider: /*elided*/ any) => void;
                     'load-error': (error: unknown, provider: /*elided*/ any) => void;
@@ -505,7 +500,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                     'schema-mismatch': (detail: import("./protocol.js").SchemaMismatchDetail, provider: /*elided*/ any) => void;
                     failed: (error: unknown, provider: /*elided*/ any) => void;
                 }[NAME]): void;
-                off<NAME extends "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
+                off<NAME extends "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "load-error">(name: NAME, f: {
                     synced: (provider: /*elided*/ any) => void;
                     'protocol-mismatch': (mismatch: import("./protocol.js").ProtocolMismatch, provider: /*elided*/ any) => void;
                     'load-error': (error: unknown, provider: /*elided*/ any) => void;
@@ -556,6 +551,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                     deny(): void;
                     allow(): void;
                 };
+                _rebasing: boolean;
                 messageHandlers: Record<number, import("./providers/room.js").RoomMessageHandler</*elided*/ any>>;
                 hasSynced: boolean;
                 whenSynced: Promise<unknown>;
@@ -566,14 +562,7 @@ export declare const bindCrdt: (Y: EngineApi) => {
                 _resync: ReturnType<typeof setInterval> | undefined;
                 _connectTimer: ReturnType<typeof setTimeout> | undefined;
                 _checkInterval: ReturnType<typeof setInterval>;
-                _updateHandler: (update: Uint8Array, origin: unknown, doc?: unknown, transaction?: {
-                    local: boolean;
-                }) => void;
-                _awarenessUpdateHandler: (updates: {
-                    added: number[];
-                    updated: number[];
-                    removed: number[];
-                }, origin: unknown) => void;
+                _unlisten: () => void;
                 get url(): string;
                 get unsaved(): number;
                 get saved(): boolean;
@@ -583,11 +572,11 @@ export declare const bindCrdt: (Y: EngineApi) => {
                 destroy(): void;
                 disconnect(): void;
                 connect(): void;
-                emit<N extends "refused" | "status" | "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: N, args: Parameters<import("./protocol.js").WebsocketProviderEvents[N]>): void;
+                emit<N extends "refused" | "status" | "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: N, args: Parameters<import("./protocol.js").WebsocketProviderEvents[N]>): void;
                 _observers: Map<string, Set<any>>;
-                on<NAME extends "refused" | "status" | "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): import("./protocol.js").WebsocketProviderEvents[NAME];
-                once<NAME extends "refused" | "status" | "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): void;
-                off<NAME extends "refused" | "status" | "failed" | "schema-mismatch" | "message-error" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): void;
+                on<NAME extends "refused" | "status" | "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): import("./protocol.js").WebsocketProviderEvents[NAME];
+                once<NAME extends "refused" | "status" | "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): void;
+                off<NAME extends "refused" | "status" | "failed" | "message-error" | "schema-mismatch" | "protocol-mismatch" | "synced" | "access" | "connection-close" | "connection-error" | "saved" | "permission-denied" | "expired" | "unreachable">(name: NAME, f: import("./protocol.js").WebsocketProviderEvents[NAME]): void;
             };
         };
         watchComments: (server: string | null, roomName: string, listener: (message: import("./protocol.js").CommentMessage) => void) => (() => void);

package/dist/crdt/operations.d.ts

@@ -15,7 +15,7 @@
 import type { BlockAttribution } from './attribution/block.js';
 import type { AnchorAffinity, DataTarget, DocAnchor, DocChange, JsonObj, OpResult, OrderPolicy, Prepared } from './doc/types.js';
 import type { DataPatch } from './data.js';
-import type { NewInline } from './doc/content.js';
+import type { NewInline } from './doc/ops.js';
 import type { Flow, FlowTarget, FlowView } from './flow.js';
 import type { BlockId, BlockSpec, ContentItem, Destination, ProjectedDoc, SplitTail } from './placement/model.js';
 import type { DocPosition, RangeView } from './rangeDelete.js';

package/dist/crdt/placement/resolve.d.ts

@@ -3,7 +3,7 @@
  * slot belongs to, each block's display edges (the sequences that can show
  * its slot: its live move records', strongest first, then its parent's), the
  * places of every sequence, and the cycle walk. Which edge a block takes is
- * the index's acceptance (`text/index/placement.ts` `settle`). Pure over
+ * the index's acceptance (`text/index/build.ts` `settle`). Pure over
  * replicated state.
  */
 import type { EngineDoc, EngineNode } from '../engine-api.js';

package/dist/crdt/protocol.d.ts

@@ -27,9 +27,9 @@
 export { bindCrdt, type Crdt, type EngineApi, type EngineDoc, type EngineNode, type EngineTransaction, type EngineItemRef, type YNode, type YItem, type YDoc, type YUndoManager, type YTransaction } from './index.js';
 export { SCHEMA_VERSION, META_KEY } from './edytor-doc.js';
 export { GENERATION, generationWord, frame, PROTOCOL_VERSION, GENERATION_RECORD, GenerationMismatchError, readProtocolVersion, type GenerationRecord } from './protocols/envelope.js';
-export { messageSync, messageAwareness, messageAuth, messageQueryAwareness, messageSaved, messageChunk, messageComments, MAX_FRAME_BYTES, chunkFrame, createChunkReader, ChunkError, type ChunkReader, CLOSE } from './providers/room.js';
+export { messageSync, messageAwareness, messageAuth, messageQueryAwareness, messageSaved, messageChunk, messageComments, messageRebase, MAX_FRAME_BYTES, chunkFrame, createChunkReader, ChunkError, type ChunkReader, CLOSE } from './providers/room.js';
 export { messageYjsSyncStep1, messageYjsSyncStep2, messageYjsUpdate, type SyncProtocol } from './protocols/sync.js';
-export { messageAccess, messagePermissionDenied, messageReadOnly, writeAccess, writePermissionDenied, writeReadOnly } from './protocols/auth.js';
+export { messageAccess, messageEpoch, messagePermissionDenied, messageReadOnly, writeAccess, writeEpoch, writePermissionDenied, writeReadOnly } from './protocols/auth.js';
 export { commentsSubscribe, commentsSnapshot, commentsChange, writeCommentsSubscribe, writeCommentsSnapshot, writeCommentsChange, readCommentsMessage, type CommentChange, type CommentMessage, type CommentSnapshot, type CommentThread, type ThreadComment } from './protocols/comments.js';
 export { applyAwarenessUpdate, encodeAwarenessUpdate, readAwarenessEntries, writeAwarenessEntries, type AwarenessEntry } from './protocols/awareness.js';
 export { createDecoder, readVarUint, readVarUint8Array, type Decoder } from 'lib0-v14/decoding';