@inkandswitch/patchwork-pkg-base 0.0.124 → 0.0.125

package/module-settings-url

@@ -1 +1 @@
-automerge:26QrzDPdwUkvv4fzdBx1Md6JmTCc
+automerge:Wh4456nTsRj7WssD8ChKeeRFqa9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork-pkg-base",
-  "version": "0.0.124",
+  "version": "0.0.125",
   "type": "module",
   "description": "Base packages for the Patchwork system",
   "repository": {

package/packages/codemirror-markdown/dist/extensions/markdown.js

@@ -2066,7 +2066,7 @@ var searchExtensions = [
 ];
 
 // src/extensions/markdown.ts
-import { EditorView as EditorView6, keymap as keymap2 } from "@codemirror/view";
+import { EditorView as EditorView6, keymap as keymap3 } from "@codemirror/view";
 
 // src/extensions/formatting.ts
 import { EditorSelection as EditorSelection2 } from "@codemirror/state";
@@ -2234,7 +2234,6 @@ import {
   ViewPlugin as ViewPlugin3,
   WidgetType as WidgetType2
 } from "@codemirror/view";
-var hangMark = Decoration3.mark({ class: "cm-md-hang" });
 var numberMark = Decoration3.mark({ class: "cm-md-hang cm-md-hang-number" });
 var quoteMark = Decoration3.mark({ class: "cm-md-hang cm-md-hang-quote" });
 var hidden = Decoration3.replace({});
@@ -2271,6 +2270,37 @@ var Bullet = class extends WidgetType2 {
     return span;
   }
 };
+var NumberLabel = class extends WidgetType2 {
+  constructor(text) {
+    super();
+    this.text = text;
+  }
+  eq(other) {
+    return other.text === this.text;
+  }
+  toDOM() {
+    const span = document.createElement("span");
+    span.className = "cm-md-hang cm-md-hang-number";
+    span.textContent = this.text;
+    return span;
+  }
+};
+function renderedNumber(state, mark) {
+  const text = state.doc.sliceString(mark.from, mark.to);
+  const delimiter = text.slice(-1);
+  let item = mark.parent;
+  if (!item || item.name !== "ListItem") return text;
+  let index = 0;
+  let first = item;
+  for (let prev = item.prevSibling; prev; prev = prev.prevSibling) {
+    if (prev.name !== "ListItem") continue;
+    index++;
+    first = prev;
+  }
+  const firstMark = first.getChild("ListMark");
+  const start = firstMark ? parseInt(state.doc.sliceString(firstMark.from, firstMark.to), 10) : 1;
+  return `${(Number.isNaN(start) ? 1 : start) + index}${delimiter}`;
+}
 function caretLines(state) {
   const lines = /* @__PURE__ */ new Set();
   for (const r of state.selection.ranges) {
@@ -2301,16 +2331,11 @@ function build2(view) {
           const mark = node.node.firstChild;
           if (!mark || mark.name !== "HeaderMark" || mark.from !== node.from)
             return;
-          const end = skipSpaces(state, mark.to);
-          if (editing.has(doc.lineAt(node.from).number)) {
-            decos.push(hangMark.range(mark.from, end));
-          } else {
-            decos.push(
-              Decoration3.replace({
-                widget: new HeadingLabel(Number(heading[1]))
-              }).range(mark.from, end)
-            );
-          }
+          decos.push(
+            Decoration3.replace({
+              widget: new HeadingLabel(Number(heading[1]))
+            }).range(mark.from, skipSpaces(state, mark.to))
+          );
           return;
         }
         if (name === "ListMark") {
@@ -2328,8 +2353,14 @@ function build2(view) {
             decos.push(
               Decoration3.replace({ widget: new Bullet() }).range(node.from, end)
             );
-          } else {
+          } else if (editing.has(doc.lineAt(node.from).number)) {
             decos.push(numberMark.range(node.from, end));
+          } else {
+            decos.push(
+              Decoration3.replace({
+                widget: new NumberLabel(renderedNumber(state, node.node))
+              }).range(node.from, end)
+            );
           }
           return;
         }
@@ -2465,9 +2496,154 @@ var marginTheme = EditorView3.baseTheme({
 });
 var margin = [marginPlugin, marginTheme];
 
-// src/extensions/zoom.ts
-import { Prec as Prec2 } from "@codemirror/state";
+// src/extensions/headings.ts
+import { syntaxTree as syntaxTree3 } from "@codemirror/language";
+import {
+  EditorSelection as EditorSelection3,
+  EditorState as EditorState2,
+  Prec as Prec2
+} from "@codemirror/state";
 import { keymap } from "@codemirror/view";
+function headingPrefix(state, line) {
+  for (let node = syntaxTree3(state).resolveInner(line.from, 1); node; node = node.parent) {
+    const m = /^ATXHeading(\d)$/.exec(node.name);
+    if (!m) continue;
+    if (state.doc.lineAt(node.from).number !== line.number) return null;
+    const mark = node.firstChild;
+    if (!mark || mark.name !== "HeaderMark") return null;
+    let to = mark.to;
+    while (to < line.to && state.doc.sliceString(to, to + 1) === " ") to++;
+    return { from: line.from, to, level: Number(m[1]) };
+  }
+  return null;
+}
+var keepOutOfPrefix = EditorState2.transactionFilter.of((tr) => {
+  if (!tr.selection) return tr;
+  const { state } = tr;
+  const before = tr.startState.selection;
+  let moved = false;
+  const ranges = tr.selection.ranges.map((r, i) => {
+    if (!r.empty) return r;
+    const line = state.doc.lineAt(r.head);
+    if (r.head >= line.to && line.length > 0) return r;
+    const prefix = headingPrefix(state, line);
+    if (!prefix || r.head >= prefix.to) return r;
+    const old = before.ranges[i] ?? before.main;
+    const leaving = !tr.docChanged && old.empty && old.head === prefix.to && line.from > 0;
+    moved = true;
+    return EditorSelection3.cursor(leaving ? line.from - 1 : prefix.to);
+  });
+  if (!moved) return tr;
+  return [
+    tr,
+    {
+      selection: EditorSelection3.create(ranges, tr.selection.mainIndex),
+      sequential: true
+    }
+  ];
+});
+function selectedLines(state) {
+  const seen = /* @__PURE__ */ new Set();
+  const lines = [];
+  for (const r of state.selection.ranges) {
+    for (let n = state.doc.lineAt(r.from).number; n <= state.doc.lineAt(r.to).number; n++) {
+      if (seen.has(n)) continue;
+      seen.add(n);
+      lines.push(state.doc.line(n));
+    }
+  }
+  return lines;
+}
+var setHeading = (level) => ({ state, dispatch }) => {
+  const lines = selectedLines(state);
+  const prefixes = lines.map((line) => headingPrefix(state, line));
+  const already = level > 0 && prefixes.every((p) => p && p.level === level);
+  const target = already ? 0 : level;
+  const insert = target ? "#".repeat(target) + " " : "";
+  const changes = lines.map((line, i) => {
+    const p = prefixes[i];
+    return { from: line.from, to: p ? p.to : line.from, insert };
+  });
+  dispatch(
+    state.update({
+      changes,
+      scrollIntoView: true,
+      userEvent: "input.format"
+    })
+  );
+  return true;
+};
+function atHeadingStart(state) {
+  const sel = state.selection;
+  if (sel.ranges.length !== 1 || !sel.main.empty) return null;
+  const line = state.doc.lineAt(sel.main.head);
+  const prefix = headingPrefix(state, line);
+  return prefix && sel.main.head === prefix.to ? prefix : null;
+}
+var backspace = ({ state, dispatch }) => {
+  const prefix = atHeadingStart(state);
+  if (!prefix) return false;
+  dispatch(
+    state.update({
+      changes: { from: prefix.from, to: prefix.to },
+      selection: EditorSelection3.cursor(prefix.from),
+      userEvent: "delete.backward"
+    })
+  );
+  return true;
+};
+var enter = ({ state, dispatch }) => {
+  const prefix = atHeadingStart(state);
+  if (!prefix) return false;
+  const line = state.doc.lineAt(prefix.from);
+  if (prefix.to >= line.to) return false;
+  dispatch(
+    state.update({
+      changes: { from: line.from, insert: "\n" },
+      selection: EditorSelection3.cursor(prefix.to + 1),
+      scrollIntoView: true,
+      userEvent: "input"
+    })
+  );
+  return true;
+};
+var deleteForward = ({ state, dispatch }) => {
+  const sel = state.selection;
+  if (sel.ranges.length !== 1 || !sel.main.empty) return false;
+  const line = state.doc.lineAt(sel.main.head);
+  if (sel.main.head !== line.to || line.number >= state.doc.lines) return false;
+  const prefix = headingPrefix(state, state.doc.line(line.number + 1));
+  if (!prefix) return false;
+  dispatch(
+    state.update({
+      changes: { from: line.to, to: prefix.to },
+      userEvent: "delete.forward"
+    })
+  );
+  return true;
+};
+var headings = [
+  keepOutOfPrefix,
+  // above lang-markdown's own (Prec.high) Enter and Backspace.
+  Prec2.highest(
+    keymap.of([
+      { key: "Backspace", run: backspace },
+      { key: "Enter", run: enter },
+      { key: "Delete", run: deleteForward },
+      { key: "Mod-Shift-h", run: setHeading(2), preventDefault: true },
+      { key: "Mod-Shift-j", run: setHeading(3), preventDefault: true },
+      { key: "Mod-Shift-b", run: setHeading(0), preventDefault: true },
+      { key: "Mod-Alt-1", run: setHeading(1), preventDefault: true },
+      { key: "Mod-Alt-2", run: setHeading(2), preventDefault: true },
+      { key: "Mod-Alt-3", run: setHeading(3), preventDefault: true },
+      { key: "Mod-Alt-0", run: setHeading(0), preventDefault: true }
+    ])
+  )
+];
+
+// src/extensions/zoom.ts
+import { Prec as Prec3 } from "@codemirror/state";
+import { keymap as keymap2 } from "@codemirror/view";
 var MIN_FONT_SIZE = 6;
 var FALLBACK_FONT_SIZE = 16;
 var px = (value) => parseFloat(value) || FALLBACK_FONT_SIZE;
@@ -2496,8 +2672,8 @@ function step(view, by) {
 var zoomIn = (view) => step(view, 1);
 var zoomOut = (view) => step(view, -1);
 var zoomReset = (view) => step(view, 0);
-var markdownZoom = Prec2.high(
-  keymap.of([
+var markdownZoom = Prec3.high(
+  keymap2.of([
     // `+` and `_` are the shifted keys, for keyboards that need Shift.
     { key: "Mod-=", run: zoomIn, preventDefault: true },
     { key: "Mod-+", run: zoomIn, preventDefault: true },
@@ -2734,7 +2910,7 @@ function markdownExtensions() {
     ...theme("sans"),
     indentOnInput(),
     markdownZoom,
-    keymap2.of([
+    keymap3.of([
       ...markdownFormattingKeymap,
       ...defaultKeymap,
       ...searchKeymap,
@@ -2751,6 +2927,7 @@ function markdownExtensions() {
     }),
     taskCheckboxes,
     margin,
+    headings,
     indentUnit.of("    ")
   ];
 }