@nerd-bible/wordgard 0.3.4 → 0.3.6

package/dist/schema.js

@@ -4,7 +4,7 @@ import { Paragraph, Heading, Direction, Blockquote, HorizontalRule, Alignment, D
 import { phrases, imagePhrases, colorNames } from 'wordgard/phrases';
 import { Command, setTextblockType, Menu, setAlignment, setDirection, toggleBlock, listIsActive, toggleList, enter, toggleMark } from 'wordgard/command';
 import { history } from 'wordgard/history';
-import { KeyBinding, InputRule, Wordgard, Panel, Dialog, Decoration, PointSet, Tooltip } from 'wordgard/editor';
+import { KeyBinding, InputRule, Wordgard, Widget, Decoration, Panel, Dialog, PointSet, Tooltip } from 'wordgard/editor';
 import cr from 'crelt';
 
 function blockDoc() {
@@ -313,6 +313,97 @@ function codeBlock() {
         };
     }));
 ;return codeBlock})(codeBlock);
+function codeBlockLanguage(options = {}) {
+    return [
+        GardState.schemaElement.of(CodeBlockLanguage),
+        options.languages ? [
+            languageStyles,
+            languageOptions.of(options.languages),
+            languageSelect,
+            codeBlockLanguage.selectLanguageBinding
+        ] : []
+    ];
+}
+const languageStyles = /*@__PURE__*/Wordgard.styles({
+    pre: {
+        position: "relative",
+        "& select.wg-code-language": {
+            font: "var(--wg-dialog-font)",
+            fontSize: "70%",
+            position: "absolute",
+            top: "2px",
+            right: "4px",
+            border: "none",
+            borderRadius: "4px"
+        }
+    }
+});
+const languageOptions = /*@__PURE__*/GardState.Facet.define({
+    combine: input => input.reduce((a, b) => a.concat(b), [])
+});
+function option(text, selected, value) {
+    let node = document.createElement("option");
+    node.textContent = text;
+    node.value = value;
+    if (selected)
+        node.selected = true;
+    return node;
+}
+const languageWidget = /*@__PURE__*/Widget.define({
+    render({ options, value }, wg) {
+        let sel = document.createElement("select");
+        sel.className = "wg-code-language";
+        sel.tabIndex = -1;
+        sel.appendChild(option("Plain", value == null, ""));
+        let selected = value && options.find(o => o.toLowerCase() == value);
+        if (value && !selected)
+            sel.appendChild(option(value, true, value));
+        for (let opt of options)
+            sel.appendChild(option(opt, opt == selected, opt.toLowerCase()));
+        sel.onchange = () => {
+            let value = sel.value || undefined;
+            let pos = wg.posAtDOM(sel.parentNode);
+            let block = pos > 0 && wg.state.doc.nodeAt(pos - 1);
+            if (block && block.type == CodeBlock.type && block.mark(CodeBlockLanguage) != value) {
+                wg.dispatch({
+                    changes: value ? { from: pos - 1, add: CodeBlockLanguage.of(value) } :
+                        { from: pos - 1, remove: CodeBlockLanguage.isInSet(block.tag.marks) }
+                });
+                wg.focus();
+            }
+        };
+        return sel;
+    },
+    propagateEvent: false,
+    eq(a, b) {
+        return a.value == b.value && a.options.length == b.options.length &&
+            a.options.every((o, i) => o == b.options[i]);
+    },
+    inFlow: false
+});
+const languageSelect = /*@__PURE__*/Decoration.Tag.widget.dynamic(CodeBlock, "end", state => {
+    let options = state.facet(languageOptions);
+    return tag => {
+        return languageWidget.of({ options, value: tag.mark(CodeBlockLanguage) });
+    };
+});
+;codeBlockLanguage = /*@__PURE__*/(function (codeBlockLanguage) {
+    codeBlockLanguage.selectLanguage = wg => {
+        let blk = wg.state.sel.head.textblockParent;
+        if (!blk || blk.node.type != CodeBlock.type)
+            return false;
+        let sel = wg.nodeDOM(blk.before)?.querySelector("select.wg-code-language");
+        if (!sel)
+            return false;
+        sel.focus();
+        sel.showPicker();
+        return true;
+    };
+    codeBlockLanguage.selectLanguageBinding = KeyBinding.of({
+        key: "Shift-Mod-l",
+        run: codeBlockLanguage.selectLanguage
+    });
+;return codeBlockLanguage})(codeBlockLanguage);
 
 function strong() {
     return [GardState.schemaElement.of(Strong), strong.button, strong.keyBinding];
@@ -1188,7 +1279,7 @@ function toggleLink(wg) {
             let url = form && form.elements.namedItem("url")?.value;
             if (url)
                 wg.dispatch({
-                    changes: selection.ranges.map(r => ({ from: r.from, to: r.to, add: Link.of(url) })),
+                    changes: wg.state.selection.ranges.map(r => ({ from: r.from, to: r.to, add: Link.of(url) })),
                     userEvent: "mark.add"
                 });
         });

package/dist/state.d.ts

@@ -136,6 +136,10 @@ declare abstract class GardSelection {
     */
     static cursor(pos: number, side?: -1 | 1, goalColumn?: number): GardSelection.Text;
     /**
+    Find a normal cursor near the given position.
+    */
+    static near(cx: GardSelection.Context, pos: number, side?: -1 | 1, goalColumn?: number): GardSelection.Text;
+    /**
     Create a text selection.
     */
     static range(anchor: number, head?: number, headSide?: -1 | 1, goalColumn?: number): GardSelection.Text;
@@ -161,18 +165,10 @@ declare abstract class GardSelection {
     */
     nextNormalCursor(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
     /**
-    Get a normal cursor at the start or end of this selection.
-    */
-    normalCursorAtBound(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
-    /**
     Move across one word starting from this selection's head.
     */
     skipWord(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
     /**
-    Find a normal selection near the given position.
-    */
-    static near(cx: GardSelection.Context, pos: number, bias?: -1 | 1): GardSelection.Text;
-    /**
     Find a normal selection at the start of the document or the
     given textblock.
     */

package/dist/state.js

@@ -384,7 +384,7 @@ class TextblockMap {
                         sectionPos = pos + ch.length;
                     }
                 }
-                else if (ch.type.spec.cursorInsideBounds) {
+                else if (ch.type.cursorInsideBounds) {
                     text += " ";
                     scan(ch, pos + 1);
                     text += " ";
@@ -590,6 +590,10 @@ class GardSelection {
     static cursor(pos, side, goalColumn) {
         return GardSelection.Text.createInner(pos, pos, side, goalColumn);
     }
+    static near(cx, pos, side = 1, goalColumn) {
+        let norm = findNormalAt(cx, pos, side);
+        return GardSelection.cursor(norm.pos, norm.side, goalColumn);
+    }
     static range(anchor, head, headSide, goalColumn) {
         return GardSelection.Text.createInner(anchor, head ?? anchor, headSide, goalColumn);
     }
@@ -597,23 +601,13 @@ class GardSelection {
         return GardSelection.Node.create(pos, node, goalColumn);
     }
     nextNormalCursor(cx, forward = true) {
-        let found = scanNormalFrom(cx, this.head, this.headSide, forward, true);
-        return found && GardSelection.cursor(found.pos, found.side);
-    }
-    normalCursorAtBound(cx, forward = true) {
-        let found = scanNormalFrom(cx, forward ? this.to : this.from, forward ? -1 : 1, forward, false);
+        let found = scanNormalFrom(cx, this.head, this.headSide, forward);
         return found && GardSelection.cursor(found.pos, found.side);
     }
     skipWord(cx, forward = true) {
         let found = skipWord(cx, this.head, this.headSide, forward);
         return found && GardSelection.cursor(found.pos, found.side);
     }
-    static near(cx, pos, bias = 1) {
-        let norm = scanNormalFrom(cx, pos, bias, bias > 0, false) ??
-            scanNormalFrom(cx, pos, -bias, bias < 0, false) ??
-            { pos: pos, side: -1 };
-        return GardSelection.cursor(norm.pos, norm.side);
-    }
     static atStart(cx, block) {
         return cursorAtStart(cx, block);
     }
@@ -621,7 +615,7 @@ class GardSelection {
         let found = block
             ? TextblockMap.get(cx, block.start, block.node).visualSide(false)
             : cx.doc.inlineContent ? TextblockMap.get(cx, 0, cx.doc).visualSide(false)
-                : scanNormalFrom(cx, cx.doc.length, -1, false, false) ?? { pos: cx.doc.length, side: -1 };
+                : findNormalAt(cx, cx.doc.length, -1);
         return GardSelection.cursor(found.pos, found.side);
     }
 }
@@ -760,7 +754,7 @@ function cursorAtStart(cx, block) {
     let found = block
         ? TextblockMap.get(cx, block.start, block.node).visualSide(true)
         : cx.doc.inlineContent ? TextblockMap.get(cx, 0, cx.doc).visualSide(true)
-            : scanNormalFrom(cx, 0, 1, true, false) ?? { pos: 0, side: 1 };
+            : findNormalAt(cx, 0, 1);
     return GardSelection.cursor(found.pos, found.side);
 }
 function isBarrier(cx, node) {
@@ -769,13 +763,11 @@ function isBarrier(cx, node) {
     let override = node.type.spec.cursorBarrier;
     if (override != null)
         return override;
-    return node.type.isolating || node.type.preserveWhitespace || node.type.isBlock && cx.config.isAtom(node.type);
+    return node.type.isBlock && (node.type.isolating || node.type.preserveWhitespace || cx.config.isAtom(node.type));
 }
-function scanNormalFrom(cx, from, side, forward, mustMove) {
+function scanNormalFrom(cx, from, side, forward) {
     let pos = cx.doc.resolve(from), pastBarrier = false;
     if (pos.parent.node.inlineContent) {
-        if (!mustMove)
-            return { pos: pos.pos, side };
         let block = pos.textblockParent;
         let map = TextblockMap.get(cx, block.start, block.node);
         let next = cx.config.visualCursorMotion ? map.moveVisually(pos.pos, side, forward) : map.moveLogically(pos.pos, forward);
@@ -813,7 +805,7 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         }
         if (index == (forward ? node.content.length : 0)) {
             let barrier = !next || isBarrier(cx, node);
-            if ((bottom != from || !mustMove) && pastBarrier && barrier)
+            if ((bottom != from) && pastBarrier && barrier)
                 return { pos: bottom, side: forward ? -1 : 1 };
             if (!next)
                 return null;
@@ -827,7 +819,7 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         else {
             let nextNode = node.content[index - (forward ? 0 : 1)];
             let barrier = isBarrier(cx, nextNode);
-            if (pastBarrier && (bottom != from || !mustMove) && barrier)
+            if (pastBarrier && (bottom != from) && barrier)
                 return { pos: bottom, side: forward ? -1 : 1 };
             if (nextNode.isLeaf || cx.config.isAtom(nextNode.type)) {
                 index += step;
@@ -847,12 +839,52 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         }
     }
 }
+function findNormalAt(cx, pos, bias) {
+    let res = cx.doc.resolve(pos), lowest = pos;
+    if (res.inText) {
+        let text = res.parent.node.content[res.index].tag.param;
+        let off = bias > 0 ? findClusterBreak(text, res.inText - 1) : findClusterBreak(text, res.inText + 1, false);
+        pos += off - res.inText;
+        if (off > 0 && off < text.length)
+            return { pos, side: bias };
+        res = Pos.create(res.parent, pos, res.index + (off ? 1 : 0), 0);
+    }
+    for (let pass = 0; pass < 2; pass++) {
+        let dir = !pass ? bias : -bias, { parent, index } = res, curPos = pos;
+        for (;;) {
+            if (parent.node.inlineContent &&
+                (parent.node.type.isBlock || curPos > parent.start && curPos < parent.end || parent.node.type.cursorInsideBounds))
+                return { pos: curPos, side: bias };
+            if (index == (dir > 0 ? parent.node.content.length : 0)) {
+                if ((parent.node.type.isInline ? parent.node.type.cursorInsideBounds : isBarrier(cx, parent.node)) ||
+                    !parent.parent)
+                    break;
+                lowest = curPos = curPos + dir;
+                index = parent.index + (dir > 0 ? 1 : 0);
+                parent = parent.parent;
+            }
+            else {
+                let next = parent.node.content[index + (dir > 0 ? 0 : -1)];
+                if (next.isLeaf || isBarrier(cx, next))
+                    break;
+                if (!parent.node.inlineContent && next.inlineContent && cx.config.visualCursorMotion) {
+                    let startPos = curPos - (dir > 0 ? 0 : next.length) + 1;
+                    return TextblockMap.get(cx, startPos, next).visualSide(dir > 0);
+                }
+                parent = Pos.Plot.create(parent, next, curPos, index);
+                index = dir > 0 ? 0 : next.content.length;
+                curPos += dir;
+            }
+        }
+    }
+    return { pos: lowest, side: bias };
+}
 function skipWord(cx, start, side, forward) {
     let last = null;
     for (let pos = start, visually = cx.config.visualCursorMotion;;) {
         let block = cx.doc.resolve(pos).textblockParent;
         if (!block) {
-            let next = scanNormalFrom(cx, pos, side, forward, true);
+            let next = scanNormalFrom(cx, pos, side, forward);
             if (!next)
                 return last;
             ({ pos, side } = next);
@@ -1884,6 +1916,7 @@ function scanChanges(changes, doc, corrections) {
                             pos = off;
                             break;
                         }
+                        off = end;
                     }
                     if (queried.has(pos))
                         return;

package/dist/table.js

@@ -159,7 +159,7 @@ function sameCell(a, b) {
     return a != 0 && a == b;
 }
 function computeMap(table) {
-    if (table.tag != Table)
+    if (table.type != Table.type)
         throw new RangeError(`Not a table node: ${table.type.name}`);
     let width = table.content[0].content.reduce((w, c) => w + (c.mark(ColSpan) ?? 1), 0);
     let height = table.content.length;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",