@nerd-bible/wordgard 0.3.6 → 0.5.2-beta2

package/README.md

@@ -1,6 +1,6 @@
 # Wordgard
 
-[ [**WEBSITE**](https://wordgard.net/) | [**DOCS**](https://wordgard.net/docs/) | [**ISSUES**](https://code.haverbeke.berlin/wordgard/wordgard/issues) | [**FORUM**](https://discuss.wordgard.net/)
+[ [**WEBSITE**](https://wordgard.net/) | [**DOCS**](https://wordgard.net/docs/) | [**ISSUES**](https://code.haverbeke.berlin/wordgard/wordgard/issues) | [**FORUM**](https://discuss.wordgard.net/) ]
 
 This is the [Wordgard](https://wordgard.net) package. It implements a
 rich text editor framework for the browser.

package/dist/command.d.ts

@@ -510,8 +510,9 @@ declare const insertLineBreak: Command.Pure;
 /**
 The command that handles enter presses. The default handler will,
 if the selection is not in an inline context, insert an empty
-default textblock in its position. Otherwise it first tries
-`liftEmptyBlock`, then `splitTextblock`.
+default textblock in its position. Otherwise it first tries {@link
+enterInCode}, then {@link liftEmptyBlock}, and finally {@link
+splitTextblock}.
 */
 declare const enter: Command.Pure;
 /**
@@ -694,6 +695,17 @@ parent, return a transaction that does this.
 */
 declare function liftEmptyBlock(state: GardState): Transaction.Spec | false;
 /**
+If the selection is in a {@link Plot.Spec.preserveWhitespace
+`preserveWhitespace`} textblock, replace the selected content with
+a {@link Schema.lineBreak line break}.
+
+If the selection additionally is a cursor on an otherwise empty
+line after a blank line, split or trunctate (if at end) the parent
+textblock and create a blank default text block in place of the
+empty line.
+*/
+declare function enterInCode(state: GardState): Transaction.Spec | false;
+/**
 Split the textblock at the cursor position, if any. If the
 textblock is the first child of a list item, also split that item,
 unless `splitListItem` is false.
@@ -793,4 +805,4 @@ updated to perform those joins.
 */
 declare function autoJoinBlocks(state: GardState, tr: Transaction.Spec): Transaction.Spec;
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/command.js

@@ -62,7 +62,7 @@ function liftEmptyBlock(state) {
                 scrollIntoView: true,
                 userEvent: "unwrap.empty"
             };
-        if (level.node.type.isInline || level.node.type.isolating)
+        if (level.node.isInline || level.node.type.isolating)
             break;
         if (index)
             atStart = false;
@@ -79,6 +79,35 @@ function liftEmptyBlock(state) {
     }
     return false;
 }
+function enterInCode(state) {
+    let { sel } = state, { head } = sel;
+    if (!head.parent.node.inlineContent || !head.parent.node.type.preserveWhitespace ||
+        head.parent.start != sel.anchor.parent.start || !state.schema.lineBreak)
+        return false;
+    if (sel.selection.empty && head.parent.parent && !head.inText && head.index > 1 &&
+        head.nodeBefore.type == state.schema.lineBreak.type &&
+        (head.pos == head.parent.end || head.nodeAfter.type == state.schema.lineBreak.type) &&
+        head.parent.node.content[head.index - 2].type == state.schema.lineBreak.type) {
+        let textblock = state.schema.defaultContentPlot(head.parent.parent.node.type);
+        if (textblock?.type.inlineContent)
+            return {
+                changes: {
+                    from: head.pos - 2, to: head.pos + 1,
+                    insert: head.pos == head.parent.end ? [Plot.End, textblock, Plot.End]
+                        : [Plot.End, textblock, Plot.End, head.parent.node.tag]
+                },
+                selection: GardSelection.cursor(head.pos, -1),
+                scrollIntoView: true,
+                userEvent: "split.textblock"
+            };
+    }
+    return {
+        changes: { from: sel.from.pos, to: sel.to.pos, insert: [state.schema.lineBreak] },
+        selection: GardSelection.cursor(sel.from.pos + 1, -1),
+        scrollIntoView: true,
+        userEvent: "input"
+    };
+}
 function splitTextblock(state, splitListItem = true) {
     let { from, to } = state.sel.replacementRange, { schema } = state.doc;
     let before = from.textblockParent;
@@ -174,12 +203,12 @@ function joinBackward(state) {
         if (!scan.parent)
             return false;
         scan = scan.parent;
-        if (scan.node.type.isolating || !scan.node.type.isBlock)
+        if (scan.node.type.isolating || !scan.node.isBlock)
             return false;
     }
     let before = scan.previousSibling, parent = scan.parent.node, pos = scan.start - 1;
     while (before.isLeaf || !before.isTextblock) {
-        if (before.isLeaf || state.isAtom(before.type) || before.type.isolating || !before.type.isBlock)
+        if (before.isLeaf || state.isAtom(before.type) || before.type.isolating || !before.isBlock)
             return false;
         let last = before.content.length - 1;
         if (last < 0)
@@ -216,7 +245,7 @@ function joinListItems(state) {
         let next = scan.parent;
         if (!next)
             return false;
-        if (scan.node.type.isBlock && next.node.type.hasRole(Node.Role.List)) {
+        if (scan.node.isBlock && next.node.type.hasRole(Node.Role.List)) {
             const prev = scan.previousSibling;
             if (!prev || !prev.isLeaf && scan.node.content.some(ch => !state.schema.canContain(prev.type, ch.type)))
                 return false;
@@ -244,12 +273,12 @@ function joinForward(state) {
         if (scan.index < scan.parent.node.content.length - 1)
             break;
         scan = scan.parent;
-        if (scan.node.type.isolating || !scan.node.type.isBlock)
+        if (scan.node.type.isolating || !scan.node.isBlock)
             return false;
     }
     let after = scan.nextSibling, parent = scan.parent.node, pos = scan.after;
     while (after.isLeaf || !after.isTextblock) {
-        if (after.isLeaf || after.type.isolating || state.isAtom(after.type) || !after.type.isBlock || !after.content.length)
+        if (after.isLeaf || after.type.isolating || state.isAtom(after.type) || !after.isBlock || !after.content.length)
             return false;
         parent = after;
         after = after.content[0];
@@ -279,7 +308,7 @@ function deleteBackward(state, word = false) {
     let { parent: scan, index, pos } = sel.head;
     if (!sel.head.inText)
         while (!index) {
-            if (scan.node.type.isolating || !scan.parent)
+            if (scan.node.type.isolating || !scan.parent || (!scan.node.contentLength && scan.node.isInline))
                 return false;
             index = scan.index;
             scan = scan.parent;
@@ -333,8 +362,8 @@ function deleteBackward(state, word = false) {
     }
     let from = pos - next.length, to = pos;
     let parent = state.doc.resolve(pos).parent;
-    if (next.type.isBlock)
-        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+    if (next.isBlock)
+        while (parent && parent.node.isBlock && parent.node.content.length == 1) {
             if (!parent.parent)
                 return false;
             parent = parent.parent;
@@ -354,7 +383,7 @@ function deleteForward(state, word = false) {
     let { parent: scan, index, pos } = sel.head;
     if (!sel.head.inText)
         while (index == scan.node.content.length) {
-            if (scan.node.type.isolating || !scan.parent)
+            if (scan.node.type.isolating || !scan.parent || (!scan.node.contentLength && scan.node.isInline))
                 return false;
             index = scan.index + 1;
             scan = scan.parent;
@@ -408,8 +437,8 @@ function deleteForward(state, word = false) {
     }
     let from = pos, to = pos + next.length;
     let parent = state.doc.resolve(pos).parent;
-    if (next.type.isBlock)
-        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+    if (next.isBlock)
+        while (parent && parent.node.isBlock && parent.node.content.length == 1) {
             if (!parent.parent)
                 return false;
             parent = parent.parent;
@@ -510,7 +539,7 @@ function findUnwrappable(schema, from, to, query) {
     let outerCandidates = [];
     let { doc } = from;
     doc.iterate(fromStart, toEnd, (node, p, parent) => {
-        if (node.type.isBlock && node.isPlot && !node.inlineContent && parent &&
+        if (node.isBlock && node.isPlot && !node.inlineContent && parent &&
             (fromTextblock ? doc.schema.canContain(parent.type, fromTextblock) : textblockChild(doc.schema, parent.type)) &&
             (!query || schema.matchNode(node.type, query))) {
             let pos = doc.resolveNode(p), depth = pos.depth;
@@ -675,13 +704,13 @@ function autoJoinBlocks(state, tr) {
     let cursor = doc.resolve(0), check = (pos) => {
         cursor = cursor.advance(pos - cursor.pos);
         let before = cursor.nodeBefore, after = cursor.nodeAfter;
-        if (before && after && before.isPlot && before.type.isBlock && after.isPlot && after.type == before.type) {
+        if (before && after && before.isPlot && before.isBlock && after.isPlot && after.type == before.type) {
             let { autoJoin } = after.type.spec;
             if (autoJoin && (typeof autoJoin != "function" || autoJoin(before.tag, after.tag))) {
                 let from = pos - 1, to = pos + 1;
                 for (;;) {
                     let last = before.lastChild, first = after.firstChild;
-                    if (!first || !last || first.isLeaf || last.isLeaf || first.type != last.type || first.type.isInline)
+                    if (!first || !last || first.isLeaf || last.isLeaf || first.type != last.type || first.isInline)
                         break;
                     autoJoin = last.type.spec.autoJoin;
                     if (!autoJoin || (typeof autoJoin == "function" && !autoJoin(last.tag, first.tag)))
@@ -757,7 +786,7 @@ const enter = ({ state }) => {
             userEvent: "insert.textblock"
         };
     }
-    return liftEmptyBlock(state) || splitTextblock(state);
+    return enterInCode(state) || liftEmptyBlock(state) || splitTextblock(state);
 };
 const deleteUnit = ({ state }, dir) => {
     if (state.readOnly)
@@ -1159,8 +1188,11 @@ const moveByPage = (wg, { dir, extend }) => {
     return moved ? setSelection(extend ? extendSel(selection, moved) : moved) : false;
 };
 const moveToLineSide = (wg, { dir, extend }) => {
-    let pos = wg.moveToLineBoundary(wg.state.selection, isForward(dir, wg.state));
-    return pos ? setSelection(extend ? extendSel(wg.state.selection, pos) : pos) : false;
+    let forward = isForward(dir, wg.state), { selection } = wg.state;
+    let pos = wg.moveToLineBoundary(selection, forward);
+    return pos ? setSelection(extend ? extendSel(selection, pos) : pos)
+        : extend || selection.empty ? false
+            : setSelection(GardSelection.near(wg.state, forward ? selection.to : selection.from));
 };
 const moveToTextblockSide = (wg, { dir, extend }) => {
     let { state } = wg, block = state.sel.head.textblockParent;
@@ -1444,4 +1476,4 @@ const Menu = /*@__PURE__*/(function (Menu) {
     Menu.resolve = resolve;
 ;return Menu})({});
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, enterInCode, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/doc.d.ts

@@ -1136,6 +1136,14 @@ declare namespace Node {
         */
         isPlot: boolean;
         /**
+        True when this node is a block node.
+        */
+        isBlock: boolean;
+        /**
+        Indicate whether this is an inline node.
+        */
+        isInline: boolean;
+        /**
         Convert this node to its JSON-serializeable representation.
         */
         toJSON(): Node.JSON;
@@ -1415,6 +1423,8 @@ declare class Leaf<Param = unknown> extends BaseTag<Param> implements Node.Share
     get tokenType(): Token.Type.Node;
     get isLeaf(): true;
     get isPlot(): false;
+    get isInline(): boolean;
+    get isBlock(): boolean;
     get length(): number;
     /**
     Create a text node with the given text and mark set.
@@ -1469,6 +1479,9 @@ declare namespace Leaf {
     a given set of marks. The only leaf with a length that isn't
     always 1. Adjacent text leaves with the same marks are merged
     automatically.
+    
+    Text leaves must not include newline or return characters. Line
+    breaks in the document are modeled with {@link LineBreak} nodes.
     */
     const Text: Leaf.Type<string>;
 }
@@ -1518,6 +1531,8 @@ declare class Plot implements Node.Shared {
     get isTextblock(): boolean;
     get isLeaf(): false;
     get isPlot(): true;
+    get isInline(): boolean;
+    get isBlock(): boolean;
     /**
     True if this is a document node.
     */
@@ -1685,11 +1700,6 @@ declare namespace Plot {
         */
         readonly orientation: "row" | "column";
         /**
-        True if this is an inline plot with {@link
-        Plot.Spec.cursorInsideBounds `cursorInsideBounds`} set.
-        */
-        readonly cursorInsideBounds: boolean;
-        /**
         The spec used to define this plot type.
         */
         readonly spec: Plot.Spec<any>;
@@ -1818,13 +1828,6 @@ declare namespace Plot {
         this to true on a textblock type will prevent that behavior.
         */
         preserveOnSplitAtEnd?: boolean;
-        /**
-        For inline nodes with inline content, this determines whether
-        there are normalized cursor positions directly inside the node.
-        The default is to only have cursor positions right outside the
-        node.
-        */
-        cursorInsideBounds?: boolean;
     }
     /**
     Document plots are used as the top level plot in a document.
@@ -2017,7 +2020,7 @@ declare class ChangeSet {
     position of the range in the original document, `posB` the
     position in the changed document.
     */
-    iterGaps(gap: (fromA: number, toA: number, fromB: number, toB: number) => void, change?: (fromA: number, toA: number, fromB: number, toB: number) => void): void;
+    iterGaps(gap: (fromA: number, toA: number, fromB: number, toB: number, last: boolean) => void, change?: (fromA: number, toA: number, fromB: number, toB: number) => void): void;
     /**
     Iterate over the ranges changed (either replaced or modified) by
     this change desc. Joins adjacent changed ranges together.

package/dist/doc.js

@@ -13,7 +13,7 @@ class TextOutput {
                 : node.type.spec.toText ? node.type.spec.toText(node)
                     : this.leafText ? this.leafText(node)
                         : "";
-        if (node.isLeaf ? node.type.isBlock && nodeText : node.isTextblock)
+        if (node.isLeaf ? node.isBlock && nodeText : node.isTextblock)
             this.openBlock();
         if (nodeText != null) {
             this.text += nodeText;
@@ -1001,7 +1001,7 @@ class Pos {
     }
     Pos.Plot = Plot;
 ;return Pos})(Pos);
-const posCache = /*@__PURE__*/(() => new Map())(), cacheSize = 8;
+const posCache = /*@__PURE__*/(() => new WeakMap())(), cacheSize = 8;
 let cachePos = 0;
 function cacheFor(doc) {
     let found = posCache.get(doc);
@@ -1184,6 +1184,8 @@ class Leaf extends BaseTag {
     get tokenType() { return Token.Type.Node; }
     get isLeaf() { return true; }
     get isPlot() { return false; }
+    get isInline() { return this.type.isInline; }
+    get isBlock() { return this.type.isBlock; }
     get length() { return this.is(Leaf.Text) ? this.param.length : 1; }
     pushTo(nodes) {
         if (this.is(Leaf.Text)) {
@@ -1291,6 +1293,8 @@ class Plot {
     get isTextblock() { return this.type.isTextblock; }
     get isLeaf() { return false; }
     get isPlot() { return true; }
+    get isInline() { return this.type.isInline; }
+    get isBlock() { return this.type.isBlock; }
     get isDoc() { return this.type.isDoc; }
     get firstChild() {
         return this.content.length ? this.content[0] : null;
@@ -1429,7 +1433,6 @@ class Plot {
         neutral;
         preserveWhitespace;
         orientation;
-        cursorInsideBounds;
         spec;
         constructor(name, flags, spec) {
             super(name, flags, spec, NodeShape.from(name, false, spec.shape));
@@ -1441,7 +1444,6 @@ class Plot {
             this.neutral = spec.neutral ?? !this.defining;
             this.preserveWhitespace = spec.preserveWhitespace ?? !!this.hasRole(Node.Role.Code);
             this.orientation = flags & 2 ? "row" : spec.orientation || "column";
-            this.cursorInsideBounds = !!((flags & 1) && spec.cursorInsideBounds);
             this.default = "defaultParam" in spec ? Plot.Tag.new(this, spec.defaultParam, none) :
                 (flags & 16) ? Plot.Tag.new(this, null, none) : null;
             if (!this.shape.atom && this.isInline && !this.inlineContent)
@@ -1558,7 +1560,7 @@ function sliceContent(out, content, from, to) {
     }
 }
 function joinText(nodes) {
-    if (!nodes.length || nodes[0].type.isBlock)
+    if (!nodes.length || nodes[0].isBlock)
         return nodes;
     let joined;
     for (let i = 0, last = null; i < nodes.length; i++) {
@@ -1629,7 +1631,7 @@ class Schema {
             if (!node.type.canBeEmpty && node.content.length == 0)
                 throw new ValidationError(`Node ${node.name} with block content may not be empty`);
             for (let ch of node.content) {
-                if (!this.canContain(node.type, ch.type) || node.inlineContent != ch.type.isInline)
+                if (!this.canContain(node.type, ch.type) || node.inlineContent != ch.isInline)
                     throw new ValidationError(`Node type ${node.name} cannot contain child ${ch.name}`);
                 this.validate(ch);
             }
@@ -2156,8 +2158,43 @@ class ChangeSet {
         return fix ? set.compose(fix) : set;
     }
     compose(other) {
-        let { sections, data } = compose(this.sections, other.sections, this.data, other.data);
-        return new ChangeSet(sections, data);
+        let sectionsA = this.sections, dataA = this.data;
+        let sectionsB = other.sections, dataB = other.data;
+        let sections = [], data = [];
+        let a = new SectionIter(sectionsA, dataA), b = new SectionIter(sectionsB, dataB);
+        for (let open = false;;) {
+            if (a.done && b.done) {
+                return new ChangeSet(sections, data);
+            }
+            else if (a.ins == 0) {                addSection(sections, data, a.len, 0, a.slice, open);
+                a.next();
+            }
+            else if (b.len == 0 && !b.done) {                addSection(sections, data, 0, b.ins, b.slice, open);
+                b.next();
+            }
+            else if (a.done || b.done) {
+                throw new ValidationError("Mismatched change set lengths");
+            }
+            else {
+                let len = Math.min(a.len2, b.len), sectionLen = sections.length;
+                if (a.keep && b.keep) {
+                    let mods = combineMods(a.mods, b.mods);
+                    addSection(sections, data, len, mods ? -2 : -1, mods, open);
+                }
+                else if (a.keep) {
+                    addSection(sections, data, len, b.off ? 0 : b.ins, b.off ? Slice.empty : b.slice, open);
+                }
+                else if (b.keep) {
+                    addSection(sections, data, a.off ? 0 : a.len, len, applyModsToSlice(a.slicePart(len), b.mods), open);
+                }
+                else {
+                    addSection(sections, data, a.off ? 0 : a.len, b.off ? 0 : b.ins, b.off ? Slice.empty : b.slice, open);
+                }
+                open = (a.ins > len || b.ins >= 0 && b.len > len) && (open || sections.length > sectionLen);
+                a.forward2(len);
+                b.forward(len);
+            }
+        }
     }
     invert(doc) {
         let sections = [], data = [];
@@ -2276,7 +2313,7 @@ class ChangeSet {
                     len += this.sections[i];
                     i += 2;
                 }
-                gap(posA, posA + len, posB, posB + len);
+                gap(posA, posA + len, posB, posB + len, i == this.sections.length);
                 posB += len;
             }
             else {
@@ -2378,9 +2415,6 @@ class ChangeSet {
         }
         return result;
     }
-    static composeSections(a, b) {
-        return compose(a, b).sections;
-    }
     static transform(doc, a, b) {
         let { set: mA, fix } = transform(a, b, doc, true, true);
         let mB = transform(b, a, doc, false, false).set;
@@ -2579,43 +2613,6 @@ function transform(setA, setB, doc, before, fit) {
         }
     }
 }
-function compose(sectionsA, sectionsB, dataA, dataB) {
-    let sections = [], data = dataA ? [] : null;
-    let a = new SectionIter(sectionsA, dataA), b = new SectionIter(sectionsB, dataB);
-    for (let open = false;;) {
-        if (a.done && b.done) {
-            return { sections, data };
-        }
-        else if (a.ins == 0) {            addSection(sections, data, a.len, 0, a.slice, open);
-            a.next();
-        }
-        else if (b.len == 0 && !b.done) {            addSection(sections, data, 0, b.ins, b.slice, open);
-            b.next();
-        }
-        else if (a.done || b.done) {
-            throw new ValidationError("Mismatched change set lengths");
-        }
-        else {
-            let len = Math.min(a.len2, b.len), sectionLen = sections.length;
-            if (a.keep && b.keep) {
-                let mods = combineMods(a.mods, b.mods);
-                addSection(sections, data, len, (data ? mods : a.ins == -2 || b.ins == -2) ? -2 : -1, mods, open);
-            }
-            else if (a.keep) {
-                addSection(sections, data, len, b.off ? 0 : b.ins, b.off ? Slice.empty : b.slice, open);
-            }
-            else if (b.keep) {
-                addSection(sections, data, a.off ? 0 : a.len, len, data ? applyModsToSlice(a.slicePart(len), b.mods) : null, open);
-            }
-            else {
-                addSection(sections, data, a.off ? 0 : a.len, b.off ? 0 : b.ins, b.off ? Slice.empty : b.slice, open);
-            }
-            open = (a.ins > len || b.ins >= 0 && b.len > len) && (open || sections.length > sectionLen);
-            a.forward2(len);
-            b.forward(len);
-        }
-    }
-}
 function combineMods(a, b) {
     return !a ? b : !b ? a : a.concat(b);
 }
@@ -2975,10 +2972,10 @@ class SectionIter {
     get done() { return this.ins == -3; }
     get len2() { return this.ins < 0 ? this.len : this.ins; }
     get mods() {
-        return this.data ? this.data[(this.i - 2) >> 1] : null;
+        return this.data[(this.i - 2) >> 1];
     }
     get slice() {
-        return this.data ? this.data[(this.i - 2) >> 1] : Slice.empty;
+        return this.data[(this.i - 2) >> 1];
     }
     slicePart(len) {
         return this.slice.slice(this.off, len == null ? undefined : this.off + len);
@@ -3007,7 +3004,7 @@ function addSection(sections, data, len, ins, value, forceJoin = false) {
         return;
     let last = sections.length - 2;
     if (last >= 0 && ins <= 0 && ins == sections[last + 1]) {
-        let lastValue = data ? data[data.length - 1] : null;
+        let lastValue = data[data.length - 1];
         let match = ins == 0 ? true
             : value ? lastValue && compareModifications(lastValue, value)
                 : !lastValue;
@@ -3019,13 +3016,11 @@ function addSection(sections, data, len, ins, value, forceJoin = false) {
     if (forceJoin || last >= 0 && len == 0 && sections[last] == 0) {
         sections[last] += len;
         sections[last + 1] += ins;
-        if (data)
-            data[data.length - 1] = data[data.length - 1].concat(value);
+        data[data.length - 1] = data[data.length - 1].concat(value);
     }
     else {
         sections.push(len, ins);
-        if (data)
-            data.push(value);
+        data.push(value);
     }
 }
 function finishCx(cx, schema) {
@@ -3072,7 +3067,7 @@ function splatContext(top, cx) {
         top.push(ch);
 }
 function isFitBarrier(plot) {
-    return plot.isolating || plot.cursorInsideBounds;
+    return plot.isolating || plot.isInline;
 }
 function fitReplacement(doc, from, to, slice, context) {
     if (!slice.length)
@@ -3360,7 +3355,7 @@ class ParseContext {
         else if (!match || match.rule.ignore === "skip") {
             let sync, top = this.top;
             if (blockTags.has(name)) {
-                if (top.children.length && top.children[0].type.isInline && top.parent)
+                if (top.children.length && top.children[0].isInline && top.parent)
                     this.close();
                 sync = true;
             }

package/dist/editor.d.ts

@@ -351,11 +351,13 @@ declare class PointSet<T extends PointSet.Value = PointSet.Value> {
     set with the adjusted points. May delete points when the content
     around them was deleted.
     */
-    map(changes: ChangeSet): PointSet<T>;
+    map(changes: ChangeSet, start?: number): PointSet<T>;
     /**
-    Returns the union of this set and the given set.
+    Returns the union of this set and the given set. If
+    `maskFrom`/`maskTo` are given, drop any points from `this`
+    between or at those positions.
     */
-    merge(other: PointSet<T>): PointSet<T>;
+    merge(other: PointSet<T>, maskFrom?: number, maskTo?: number | undefined): PointSet<T>;
     /**
     Get the value at the given position, if any. If there's multiple
     values at that position, the one with the lowest side is
@@ -421,7 +423,13 @@ declare class RangeSet<T extends RangeSet.Value = RangeSet.Value> {
     Adjust the positions of the ranges for the given change set.
     Returns a set with the updated ranges.
     */
-    map(changes: ChangeSet): RangeSet<T>;
+    map(changes: ChangeSet, start?: number): RangeSet<T>;
+    /**
+    Merge this set with another set. If `maskFrom`/`maskTo` are
+    given, any ranges overlapping the masked range in `this` are
+    not included in the merged set.
+    */
+    merge(other: RangeSet<T>, maskFrom?: number, maskTo?: number | undefined): RangeSet<T>;
     /**
     Create a range set from an iterable of `[from, to, value]`
     tuples, or a function that calls its argument for every range to
@@ -512,6 +520,7 @@ declare abstract class Tile {
     get boundary(): 0 | 1;
     get firstChild(): Tile | null;
     get lastChild(): Tile | null;
+    get nodeParent(): Tile;
     ignoreEvent(event: Event): boolean;
     get ignoreMutations(): boolean;
     toString(): string;