@nerd-bible/wordgard 0.3.5 → 0.5.2-beta

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;
@@ -1556,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++) {
@@ -1627,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);
             }
@@ -2154,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 = [];
@@ -2274,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 {
@@ -2376,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;
@@ -2577,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);
 }
@@ -2973,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);
@@ -3005,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;
@@ -3017,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) {
@@ -3069,6 +3066,9 @@ function splatContext(top, cx) {
     for (let ch of cx.children)
         top.push(ch);
 }
+function isFitBarrier(plot) {
+    return plot.isolating || plot.isInline;
+}
 function fitReplacement(doc, from, to, slice, context) {
     if (!slice.length)
         return fitDeletion(doc, from, to);
@@ -3099,10 +3099,10 @@ function fitReplacement(doc, from, to, slice, context) {
     let found, foundCost = 1e8;
     let neutral = true, toEnd = true;
     scan: for (let cxFrom = from.parent, cxTo = to.parent, fromDepth = from.depth, toDepth = to.depth, start = from.pos, end = to.pos; cxFrom.parent; cxFrom = cxFrom.parent, start--, fromDepth--) {
-        if (cxFrom.start != start || cxFrom.node.type.isolating)
+        if (cxFrom.start != start || isFitBarrier(cxFrom.node.type))
             break;
         while (toDepth > fromDepth) {
-            if (cxTo.node.type.isolating)
+            if (isFitBarrier(cxTo.node.type))
                 break scan;
             cxTo = cxTo.parent;
             toDepth--;
@@ -3136,17 +3136,22 @@ function fitReplacement(doc, from, to, slice, context) {
     if (found)
         return found;
     if (from.pos == to.pos && !from.inText) {
-        let cx = from.parent, before = from.pos, after = from.pos;
-        for (; cx.parent && !cx.node.type.isolating && (before == cx.start || after == cx.end); cx = cx.parent, before--, after++) {
+        let cx = from.parent;
+        for (let before = from.index ? -1 : from.pos, after = from.pos == from.parent.end ? from.pos : -1; before > -1 || after > -1;) {
             for (let i = -1; i < context.length; i++) {
                 let type = i >= 0 ? context[i].type : firstType;
                 if (!type)
                     continue;
-                if (doc.schema.canContain(cx.parent.node.type, type)) {
-                    let pos = before == cx.start ? cx.before : cx.after;
+                if (doc.schema.canContain(cx.node.type, type)) {
+                    let pos = before > -1 ? before : after;
                     return { from: pos, to: pos, slice: i >= 0 ? closeSlice(doc.schema, slice, context, i + 1, true) : slice };
                 }
             }
+            if (isFitBarrier(cx.node.type) || !cx.parent)
+                break;
+            before = before == cx.start ? before - 1 : -1;
+            after = after == cx.end ? after + 1 : -1;
+            cx = cx.parent;
         }
     }
     for (let i = 0; i < context.length; i++) {
@@ -3161,7 +3166,7 @@ function fitDeletion(doc, from, to) {
     let toDepth = to.depth;
     let covered;
     for (let cx = from.parent, cxTo = to.parent, depth = from.depth, start = from.pos, end = to.pos; cx.parent; start--, cx = cx.parent, depth--) {
-        if (cx.start != start || cx.node.type.isolating)
+        if (cx.start != start || isFitBarrier(cx.node.type))
             break;
         while (toDepth > depth) {
             cxTo = cxTo.parent;
@@ -3350,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;