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

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';
 
@@ -3946,7 +3946,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 },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.5.2-beta3",
+  "version": "0.5.2-beta4",
   "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.4",
     "@swc/wasm-typescript": "^1.15.3",
     "@types/mocha": "^10.0.10",
     "@types/node": "^24.10.2",