@nerd-bible/wordgard 0.5.2-beta3 → 0.5.2-beta5

package/README.md

@@ -1,14 +1,20 @@
 # Wordgard
 
-[ [**WEBSITE**](https://wordgard.net/) | [**DOCS**](https://wordgard.net/docs/) | [**ISSUES**](https://code.haverbeke.berlin/wordgard/wordgard/issues) | [**FORUM**](https://discuss.wordgard.net/) ]
+This is a downstream fork of
+[Wordgard](https://code.haverbeke.berlin/wordgard/wordgard). 
 
-This is the [Wordgard](https://wordgard.net) package. It implements a
-rich text editor framework for the browser.
+It follows these tagging rules:
+
+- If this upstream repo tagged the latest commit, it'll publish that version.
+- Otherwise, it'll add a -beta1 suffix. If the last tag already has such a suffix, it'll bump it.
+- The beta tag is always latest rather than prerelease. If you want only the upstream tagged versions, use the [official package](https://www.npmjs.com/package/@nerd-bible/wordgard).
 
 ```bash
-npm i wordgard
+npm install wordgard@npm:@nerd-bible/wordgard
 ```
 
+The upstream support has been so excellent that I currently don't plan on doing anything with my fork besides CI.
+
 ```javascript
 import {Wordgard, menuBar} from "wordgard/editor"
 import {fullSchema} from "wordgard/schema"
@@ -20,5 +26,3 @@ const myEditor = Wordgard.create({
   config: [fullSchema(), history(), menuBar()]
 })
 ```
-
-This project is licensed under an MIT license.

package/dist/command.d.ts

@@ -539,6 +539,24 @@ points.
 */
 declare const deleteToLineEnd: Command<"forward" | "backward">;
 /**
+Command similar to forward `deleteToLineEnd` for macOS's Ctrl-k
+binding. If there's no content left on the line, this will delete
+the node (generally a line break) after the cursor of, if at end
+of textblock, join it to the next textblock.
+
+Content deleted by this command is added to a ‘kill buffer’, and
+can be reinserted with {@link yankKilled}. Multiple kill actions
+in sequence will accumulate the deleted content in the buffer.
+Doing anything else and then running this command again will reset
+the buffer to hold only the newly killed content.
+*/
+declare const killToLineEnd: Command;
+/**
+Insert the content killed by the most recent {@link killToLineEnd}
+command (or sequence thereof) at the cursor position.
+*/
+declare const yankKilled: Command;
+/**
 Delete the selection, or if that is empty, the line around the
 cursor.
 */
@@ -805,4 +823,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, 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 };
+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, killToLineEnd, 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, yankKilled };

package/dist/command.js

@@ -807,7 +807,7 @@ const deleteToLineEnd = (wg, dir) => {
         return false;
     let tr = deleteSelection(wg.state), { selection } = wg.state;
     if (tr)
-        return (wg.dispatch(tr), true);
+        return tr;
     if (!(selection instanceof GardSelection.Text))
         return false;
     let end = wg.moveToLineBoundary(selection, dir == "forward");
@@ -819,12 +819,76 @@ const deleteToLineEnd = (wg, dir) => {
         userEvent: "delete." + dir
     };
 };
+const addToKillBuffer = /*@__PURE__*/Transaction.Effect.define();
+const killBuffer = /*@__PURE__*/GardState.Field.define({
+    create() { return { content: [], active: false }; },
+    update(value, tr) {
+        let add = tr.effects.find(e => e.is(addToKillBuffer));
+        if (add)
+            return { content: value.active ? value.content.concat(add.value) : add.value, active: true };
+        return !value.active || tr.annotation(Transaction.remote) || !(tr.docChanged || tr.selection)
+            ? value : { content: value.content, active: false };
+    }
+});
+function killText(state, from, to) {
+    let add = addToKillBuffer.of(state.doc.slice(from, to).content);
+    return state.field(killBuffer, false) ? [add] : [GardState.appendConfig.of(killBuffer), add];
+}
+const killToLineEnd = wg => {
+    let { state } = wg, { selection } = state;
+    if (state.readOnly || !(selection instanceof GardSelection.Text))
+        return false;
+    let end = wg.moveToLineBoundary(selection, true);
+    if (!end)
+        return false;
+    if (end.head > selection.head)
+        return {
+            changes: { correct: { from: selection.head, to: end.head } },
+            scrollIntoView: true,
+            effects: killText(state, selection.head, end.head),
+            userEvent: "delete.forward"
+        };
+    let join = joinForward(state);
+    if (join) {
+        let joinEnd;
+        state.doc.iterate(state.sel.head.textblockParent.after, state.doc.length, (node, pos) => {
+            if (joinEnd != null)
+                return false;
+            if (node.isPlot && node.isTextblock)
+                joinEnd = pos + 1;
+        });
+        return Transaction.merge(state, join, {
+            effects: joinEnd == null ? undefined : killText(state, selection.head, joinEnd)
+        });
+    }
+    let next = state.sel.head.nodeAfter;
+    if (next)
+        return {
+            changes: { correct: { from: selection.head, to: selection.head + next.length } },
+            scrollIntoView: true,
+            effects: killText(state, selection.head, selection.head + next.length),
+            userEvent: "delete.forward"
+        };
+    return false;
+};
+const yankKilled = wg => {
+    let { state } = wg, buffer = wg.state.field(killBuffer, false);
+    if (!buffer || !buffer.content.length || !(state.selection instanceof GardSelection.Text))
+        return false;
+    let { selection } = state;
+    return {
+        changes: { correct: { from: selection.from, to: selection.to, insert: buffer.content } },
+        scrollIntoView: true,
+        selection: (cx, changes) => GardSelection.near(cx, changes.mapPos(selection.from, 1)),
+        userEvent: "input.yank"
+    };
+};
 const deleteLine = wg => {
     if (wg.state.readOnly)
         return false;
     let tr = deleteSelection(wg.state), { selection } = wg.state;
     if (tr)
-        return (wg.dispatch(tr), true);
+        return tr;
     if (!(selection instanceof GardSelection.Text))
         return false;
     let start = wg.moveToLineBoundary(selection, false), end = wg.moveToLineBoundary(selection, true);
@@ -1476,4 +1540,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, 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 };
+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, killToLineEnd, 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, yankKilled };

package/dist/editor.d.ts

@@ -1422,11 +1422,12 @@ declare namespace KeyBinding {
      - `Ctrl-e` to {@link command.moveToTextblockSide} (`{dir: "forward"}`)
      - `Ctrl-d` to {@link command.deleteUnit} (`"forward"`)
      - `Ctrl-h` to {@link command.deleteUnit} (`"backward"`)
-     - `Ctrl-k` to {@link command.deleteToLineEnd} (`"forward"`)
+     - `Ctrl-k` to {@link command.killToLineEnd}
      - `Ctrl-Alt-h` to {@link command.deleteWord} (`"backward"`)
      - `Ctrl-o` to {@link command.insertLineBreak}
      - `Ctrl-t` to {@link command.transposeChars}
      - `Ctrl-v` to {@link command.moveByPage} (`{dir: "down"}`)
+     - `Ctrl-y` to {@link command.yankKilled}
     */
     const defaultKeymap: readonly KeyBinding[];
 }

package/dist/editor.js

@@ -2,7 +2,7 @@ import { GardState, GardSelection, TextblockMap, BidiSpan, Transaction } from 'w
 import { Attributes, Elt, Node, Leaf, parse, Slice, Plot, serialize, Pos, ChangeSet, ValidationError, Mark } from 'wordgard/doc';
 import { StyleModule } from 'style-mod';
 import { findClusterBreak } from '@marijn/find-cluster-break';
-import { enter, insertLineBreak, selectAll, undo, redo, transposeChars, Command, deleteUnit, deleteWord, deleteToLineEnd, moveByUnit, moveByLine, moveByWord, moveToLineSide, moveToDocSide, moveByPage, moveToTextblockSide, setAlignment, toggleUnderline, toggleEmphasis, toggleStrong, deleteLine, insertText, setDirection, deleteSelection, Menu, findWrappable, wrapBlockRange, autoJoinBlocks } from 'wordgard/command';
+import { enter, insertLineBreak, selectAll, undo, redo, killToLineEnd, yankKilled, transposeChars, Command, deleteUnit, deleteWord, deleteToLineEnd, moveByUnit, moveByLine, moveByWord, moveToLineSide, moveToDocSide, moveByPage, moveToTextblockSide, setAlignment, toggleUnderline, toggleEmphasis, toggleStrong, deleteLine, insertText, setDirection, deleteSelection, Menu, findWrappable, wrapBlockRange, autoJoinBlocks } from 'wordgard/command';
 import { PhraseSet, phrases } from 'wordgard/phrases';
 import { history } from 'wordgard/history';
 
@@ -643,7 +643,6 @@ class PointSet {
 }
 class PointIterator {
     set;
-    done = false;
     constructor(set) {
         this.set = set;
         this.fill(0);
@@ -658,18 +657,16 @@ class PointIterator {
         else {
             this.from = 1e8;
             this.value = null;
-            this.done = true;
         }
     }
     next() {
-        if (!this.done)
+        if (this.value)
             this.fill(this.i + 1);
     }
     get side() {
-        return this.done ? 1 : this.value.side;
+        return this.value ? this.value.side : 1;
     }
     goto(pos, inclusive) {
-        this.done = false;
         let i = findAbove(this.set.positions, 0, pos - 1);
         if (!inclusive) {
             while (i < this.set.values.length && this.set.values[i].side < 1000000000)
@@ -844,7 +841,6 @@ class RangeSet {
 }
 class RangeIterator {
     set;
-    done = false;
     constructor(set) {
         this.set = set;
         this.fill(0);
@@ -859,101 +855,16 @@ class RangeIterator {
         else {
             this.from = this.to = 1e8;
             this.value = null;
-            this.done = true;
         }
     }
     next() {
-        if (!this.done)
+        if (this.value)
             this.fill(this.i + 1);
     }
     goto(pos) {
-        this.done = false;
         this.fill(findAbove(this.set.to, 0, pos));
     }
 }
-class MultiSet {
-    sets;
-    pos;
-    constructor(sets, pos) {
-        this.sets = sets;
-        this.pos = pos;
-    }
-    map(changes) {
-        if (changes.empty)
-            return this;
-        let pos = this.pos.slice(), sets = this.sets.slice(), i = 0;
-        changes.iterGaps((fromA, toA, fromB, _toB, last) => {
-            while (i < sets.length && (last || pos[i] + sets[i].length < fromA)) {
-                pos[i++] += fromB - fromA;
-            }
-        }, (_fromA, toA) => {
-            while (i < sets.length && pos[i] <= toA) {
-                sets[i] = sets[i].map(changes, pos[i]);
-                pos[i] = changes.mapPos(pos[i], -1);
-                i++;
-            }
-        });
-        return new MultiSet(sets, pos);
-    }
-    iter() {
-        return new MultiIterator(this);
-    }
-    static empty = /*@__PURE__*/(() => new MultiSet([], []))();
-    static create(f) {
-        let sets = [], pos = [], at = 0;
-        f((p, set) => {
-            if (p < at)
-                throw new Error("Overlapping sets in MultiSet.create");
-            sets.push(set);
-            pos.push(p);
-            at = p + set.size;
-        });
-        return sets.length ? new MultiSet(sets, pos) : MultiSet.empty;
-    }
-}
-const empty = {
-    from: 1e9, to: 1e9,
-    value: null,
-    done: true,
-    next() { },
-    goto() { }
-};
-class MultiIterator {
-    set;
-    get value() { return this.cur.value; }
-    get done() { return this.cur.done; }
-    get from() { return this.cur.from + this.offset; }
-    get to() { return this.cur.to + this.offset; }
-    i = 0;
-    constructor(set) {
-        this.set = set;
-        this.nextSet();
-    }
-    next() {
-        this.cur.next();
-        while (this.cur != empty && this.cur.done)
-            this.nextSet();
-    }
-    nextSet() {
-        if (this.i == this.set.sets.length) {
-            this.offset = 0;
-            this.cur = empty;
-        }
-        else {
-            this.offset = this.set.pos[this.i];
-            this.cur = this.set.sets[this.i].iter();
-            this.i++;
-        }
-    }
-    goto(pos, inclusive = false) {
-        let i = 0;
-        while (i < this.set.pos.length && this.set.pos[i] + this.set.sets[i].size)
-            i++;
-        this.i = i;
-        this.nextSet();
-        this.cur.goto(pos - this.offset, inclusive);
-    }
-}
 function compareDecoSet(setA, setB, cmp) {
     for (let [srcA, valA] of setA)
         cmp(valA, setB.get(srcA) || null);
@@ -1076,7 +987,7 @@ class HeapIterator {
             return this;
         if (this.point) {
             this.point.next();
-            if (this.point.done)
+            if (!this.point.value)
                 popHeap(this.pointHeap, cmpPoint);
             else
                 bubble(this.pointHeap, 0, cmpPoint);
@@ -1112,7 +1023,7 @@ class HeapIterator {
             else {
                 let first = active[0];
                 first.next();
-                if (!first.done)
+                if (first.value)
                     sink(rangeHeap, rangeHeap.push(first) - 1, cmpRangeFrom);
                 popHeap(active, cmpRangeTo);
             }
@@ -1256,7 +1167,7 @@ class DecoIterator {
             i.goto(from);
         for (let i of this.pointIter)
             i.goto(from, inclusiveStart);
-        let iter = new HeapIterator(this.rangeIter.filter(i => !i.done), this.pointIter.filter(i => !i.done), from, to);
+        let iter = new HeapIterator(this.rangeIter.filter(i => i.value), this.pointIter.filter(i => i.value), from, to);
         let pos = this.pos.advance(from - this.pos.pos), started = inclusiveStart;
         let atomParent;
         for (let p = pos.parent; p; p = p.parent)
@@ -3946,7 +3857,8 @@ class KeyBinding {
             shift: Command.bind(moveToTextblockSide, { dir: "forward", extend: true }) },
         { mac: "Ctrl-d", run: Command.bind(deleteUnit, "forward") },
         { mac: "Ctrl-h", run: Command.bind(deleteUnit, "backward") },
-        { mac: "Ctrl-k", run: Command.bind(deleteToLineEnd, "forward") },
+        { mac: "Ctrl-k", run: killToLineEnd },
+        { mac: "Ctrl-y", run: yankKilled },
         { mac: "Ctrl-Alt-h", run: Command.bind(deleteWord, "backward") },
         { mac: "Ctrl-o", run: insertLineBreak },
         { mac: "Ctrl-t", run: transposeChars },
@@ -6299,7 +6211,7 @@ class MenuBar {
         }
         if (update && selection.some(e => e.flags & 32)) {
             let reset = selection[0].flags & 32 ? findChild(this.children, true) : selection[0];
-            this.setSelection(reset ? [reset] : [], this.dom.contains(document.activeElement));
+            this.setSelection(reset ? [reset] : [], this.dom.contains(this.wg.root.activeElement));
         }
     }
     setSelection(selection, focus = true) {
@@ -6398,7 +6310,7 @@ class MenuBar {
         event.preventDefault();
     }
     globalClick(event) {
-        if (!this.dom.contains(event.target)) {
+        if (!event.composedPath().includes(this.dom)) {
             this.dom.ownerDocument.removeEventListener("mousedown", this.globalClick);
             if (this.selection.length > 1)
                 this.setSelection([this.selection[0]], false);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.5.2-beta3",
+  "version": "0.5.2-beta5",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",
@@ -36,7 +36,7 @@
     "style-mod": "^4.1.3"
   },
   "devDependencies": {
-    "@nerd-bible/config": "^0.2.2",
+    "@nerd-bible/config": "^0.2.5",
     "@swc/wasm-typescript": "^1.15.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.10.2",