@inkandswitch/patchwork-pkg-base 0.0.124 → 0.0.126

package/module-settings-url

@@ -1 +1 @@
-automerge:26QrzDPdwUkvv4fzdBx1Md6JmTCc
+automerge:3LxJsuExcL8S2E8j8758gWkK1Hdp

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inkandswitch/patchwork-pkg-base",
-  "version": "0.0.124",
+  "version": "0.0.126",
   "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 EditorView7, 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,473 @@ 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/lists.ts
+import { syntaxTree as syntaxTree4 } from "@codemirror/language";
+import {
+  StateEffect as StateEffect2,
+  StateField as StateField2
+} from "@codemirror/state";
+import {
+  Decoration as Decoration4,
+  EditorView as EditorView4,
+  ViewPlugin as ViewPlugin4,
+  WidgetType as WidgetType3
+} from "@codemirror/view";
+function listAt(state, pos) {
+  for (let n = syntaxTree4(state).resolveInner(pos, 1); n; n = n.parent) {
+    if (n.name === "BulletList" || n.name === "OrderedList") return n;
+  }
+  return null;
+}
+var items = (list) => list.getChildren("ListItem");
+function done(state, item) {
+  const marker = item.getChild("Task")?.getChild("TaskMarker");
+  if (!marker) return null;
+  return state.doc.sliceString(marker.from + 1, marker.to - 1).trim() !== "";
+}
+var startOf = (state, item) => state.doc.lineAt(item.from).from;
+var textOf = (state, item) => state.doc.sliceString(startOf(state, item), item.to);
+function deleteItems(state, all, gone) {
+  const changes = [];
+  for (let i = 0; i < all.length; ) {
+    if (!gone.has(i)) {
+      i++;
+      continue;
+    }
+    let j = i;
+    while (j + 1 < all.length && gone.has(j + 1)) j++;
+    if (j + 1 < all.length) {
+      changes.push({ from: startOf(state, all[i]), to: startOf(state, all[j + 1]) });
+    } else if (i > 0) {
+      changes.push({ from: all[i - 1].to, to: all[j].to });
+    } else {
+      changes.push({ from: startOf(state, all[i]), to: all[j].to });
+    }
+    i = j + 1;
+  }
+  return changes;
+}
+function renumber(state, list) {
+  const changes = [];
+  const all = items(list);
+  const firstMark = all[0]?.getChild("ListMark");
+  if (!firstMark) return changes;
+  const start = parseInt(state.doc.sliceString(firstMark.from, firstMark.to), 10) || 0;
+  all.forEach((item, i) => {
+    const mark = item.getChild("ListMark");
+    if (!mark) return;
+    const text = state.doc.sliceString(mark.from, mark.to);
+    const want = `${start + i}${text.slice(-1)}`;
+    if (want === text) return;
+    changes.push({ from: mark.from, to: mark.to, insert: want });
+    const shift = want.length - text.length;
+    const first = state.doc.lineAt(item.from).number;
+    const last = state.doc.lineAt(item.to).number;
+    for (let n = first + 1; n <= last; n++) {
+      const line = state.doc.line(n);
+      if (shift > 0) {
+        if (line.length) changes.push({ from: line.from, insert: " ".repeat(shift) });
+      } else {
+        const spaces = /^ */.exec(line.text)[0].length;
+        const cut = Math.min(spaces, -shift);
+        if (cut) changes.push({ from: line.from, to: line.from + cut });
+      }
+    }
+  });
+  return changes;
+}
+function needsRenumber(state, list) {
+  return list.name === "OrderedList" && renumber(state, list).length > 0;
+}
+function clearDone(state, list) {
+  const all = items(list);
+  const gone = new Set(all.flatMap((it, i) => done(state, it) ? [i] : []));
+  return deleteItems(state, all, gone);
+}
+function moveDoneDown(state, list) {
+  const all = items(list);
+  let lastOpen = -1;
+  all.forEach((it, i) => {
+    if (done(state, it) === false || done(state, it) === null) lastOpen = i;
+  });
+  const moving = /* @__PURE__ */ new Set();
+  for (let i = 0; i < lastOpen; i++) if (done(state, all[i])) moving.add(i);
+  if (!moving.size) return [];
+  const texts = [...moving].map((i) => textOf(state, all[i]));
+  return [
+    ...deleteItems(state, all, moving),
+    { from: all[lastOpen].to, insert: "\n" + texts.join("\n") }
+  ];
+}
+var countDone = (state, list) => items(list).filter((it) => done(state, it)).length;
+var setHideDone = StateEffect2.define();
+var HiddenDone = class extends WidgetType3 {
+  constructor(count) {
+    super();
+    this.count = count;
+  }
+  eq(other) {
+    return other.count === this.count;
+  }
+  toDOM(view) {
+    const button = document.createElement("button");
+    button.type = "button";
+    button.className = "cm-md-hidden-done";
+    button.textContent = `${this.count} done`;
+    button.title = "Show done tasks";
+    button.addEventListener("mousedown", (event) => {
+      event.preventDefault();
+      view.dispatch({ effects: setHideDone.of(false) });
+    });
+    return button;
+  }
+  ignoreEvent() {
+    return true;
+  }
+};
+function hiddenDone(state) {
+  const decos = [];
+  const hide = Decoration4.replace({ block: true });
+  let hiddenTo = -1;
+  syntaxTree4(state).iterate({
+    enter: (node) => {
+      if (node.from < hiddenTo) return false;
+      if (node.name !== "BulletList" && node.name !== "OrderedList") return;
+      const all = items(node.node);
+      const total = all.filter((it) => done(state, it)).length;
+      if (!total) return;
+      const button = new HiddenDone(total);
+      for (let i = 0; i < all.length; ) {
+        if (!done(state, all[i])) {
+          i++;
+          continue;
+        }
+        let j = i;
+        while (j + 1 < all.length && done(state, all[j + 1])) j++;
+        const last = j === all.length - 1;
+        decos.push(
+          (last ? Decoration4.replace({ block: true, widget: button }) : hide).range(
+            startOf(state, all[i]),
+            all[j].to
+          )
+        );
+        hiddenTo = Math.max(hiddenTo, all[j].to);
+        i = j + 1;
+      }
+      const end = all[all.length - 1];
+      if (!done(state, end)) {
+        decos.push(
+          Decoration4.widget({ block: true, side: 1, widget: button }).range(end.to)
+        );
+      }
+    }
+  });
+  return Decoration4.set(decos, true);
+}
+var hideDoneField = StateField2.define({
+  create: () => ({ on: false, decos: Decoration4.none }),
+  update(value, tr) {
+    let on = value.on;
+    for (const e of tr.effects) if (e.is(setHideDone)) on = e.value;
+    if (!on) return { on, decos: Decoration4.none };
+    if (on === value.on && !tr.docChanged && syntaxTree4(tr.startState) === syntaxTree4(tr.state))
+      return value;
+    return { on, decos: hiddenDone(tr.state) };
+  },
+  provide: (f) => [
+    EditorView4.decorations.from(f, (v) => v.decos),
+    EditorView4.atomicRanges.from(f, (v) => () => v.decos)
+  ]
+});
+var isHidingDone = (state) => state.field(hideDoneField, false)?.on ?? false;
+function menuItems(view, pos) {
+  const { state } = view;
+  const list = listAt(state, pos);
+  if (!list) return [];
+  const apply = (changes, userEvent) => () => view.dispatch({ changes, userEvent });
+  const out = [];
+  if (needsRenumber(state, list)) {
+    out.push({ label: "Fix numbering", run: apply(renumber(state, list), "input.renumber") });
+  }
+  const hasTasks = items(list).some((it) => done(state, it) !== null);
+  if (hasTasks) {
+    const n = countDone(state, list);
+    if (moveDoneDown(state, list).length)
+      out.push({ label: "Move done to bottom", run: apply(moveDoneDown(state, list), "input.move") });
+    if (n)
+      out.push({ label: `Clear done (${n})`, run: apply(clearDone(state, list), "delete.clear-done") });
+    const hiding = isHidingDone(state);
+    out.push({
+      label: hiding ? "Show done" : "Hide done",
+      run: () => view.dispatch({ effects: setHideDone.of(!hiding) })
+    });
+  }
+  return out;
+}
+function openMenu(view, x, y, entries) {
+  const menu = document.createElement("div");
+  menu.className = "cm-md-menu";
+  menu.setAttribute("role", "menu");
+  menu.style.left = `${x}px`;
+  menu.style.top = `${y}px`;
+  const buttons = entries.map(({ label, run }) => {
+    const b = document.createElement("button");
+    b.type = "button";
+    b.className = "cm-md-menu-item";
+    b.setAttribute("role", "menuitem");
+    b.textContent = label;
+    b.addEventListener("click", () => {
+      close();
+      run();
+      view.focus();
+    });
+    return b;
+  });
+  menu.append(...buttons);
+  const outside = (e) => {
+    if (!menu.contains(e.target)) close();
+  };
+  const keys = (e) => {
+    const i = buttons.indexOf(document.activeElement);
+    if (e.key === "Escape") {
+      e.preventDefault();
+      close();
+      view.focus();
+    } else if (e.key === "ArrowDown" || e.key === "ArrowUp") {
+      e.preventDefault();
+      const step2 = e.key === "ArrowDown" ? 1 : -1;
+      buttons[(i + step2 + buttons.length) % buttons.length]?.focus();
+    }
+  };
+  function close() {
+    menu.remove();
+    window.removeEventListener("pointerdown", outside, true);
+    window.removeEventListener("scroll", close, true);
+    window.removeEventListener("blur", close);
+    menu.removeEventListener("keydown", keys);
+  }
+  window.addEventListener("pointerdown", outside, true);
+  window.addEventListener("scroll", close, true);
+  window.addEventListener("blur", close);
+  menu.addEventListener("keydown", keys);
+  view.dom.appendChild(menu);
+  const r = menu.getBoundingClientRect();
+  if (r.right > window.innerWidth) menu.style.left = `${Math.max(0, x - r.width)}px`;
+  if (r.bottom > window.innerHeight) menu.style.top = `${Math.max(0, y - r.height)}px`;
+  buttons[0]?.focus();
+  return close;
+}
+var menuPlugin = ViewPlugin4.fromClass(
+  class {
+    constructor(view) {
+      this.view = view;
+      view.contentDOM.addEventListener("contextmenu", this.open);
+    }
+    close = null;
+    open = (event) => {
+      const { view } = this;
+      const target = event.target;
+      const marker = target?.closest(".cm-md-hang, .cm-md-hidden-done");
+      if (!marker || !view.contentDOM.contains(marker)) return;
+      const entries = menuItems(view, view.posAtDOM(marker));
+      if (!entries.length) return;
+      event.preventDefault();
+      this.close?.();
+      this.close = openMenu(view, event.clientX, event.clientY, entries);
+    };
+    destroy() {
+      this.view.contentDOM.removeEventListener("contextmenu", this.open);
+      this.close?.();
+    }
+  }
+);
+var listsTheme = EditorView4.baseTheme({
+  ".cm-md-menu": {
+    position: "fixed",
+    zIndex: "var(--studio-layer-popover, 4000)",
+    display: "flex",
+    flexDirection: "column",
+    minWidth: "12rem",
+    padding: "4px",
+    borderRadius: "6px",
+    background: "var(--studio-fill, white)",
+    color: "var(--studio-line, black)",
+    border: "var(--studio-border-width, 1px) var(--studio-border-style, solid) var(--studio-fill-offset-30, #ddd)",
+    boxShadow: "var(--studio-shadow-md, 0 4px 6px -1px rgb(0 0 0 / 0.1))",
+    fontFamily: "var(--studio-family-ui, system-ui, sans-serif)",
+    fontSize: "0.8rem"
+  },
+  ".cm-md-menu-item": {
+    all: "unset",
+    padding: "8px 12px",
+    borderRadius: "4px",
+    cursor: "var(--studio-cursor-default, default)"
+  },
+  ".cm-md-menu-item:hover, .cm-md-menu-item:focus-visible": {
+    background: "var(--studio-fill-offset-20, #eee)"
+  },
+  ".cm-md-hidden-done": {
+    all: "unset",
+    display: "block",
+    paddingInline: "6px 2px",
+    fontSize: "0.8rem",
+    color: "var(--text-editor-line-offset-40, #999)",
+    cursor: "var(--studio-cursor-pointer, pointer)"
+  },
+  ".cm-md-hidden-done:hover": {
+    textDecoration: "underline"
+  }
+});
+var lists = [hideDoneField, menuPlugin, listsTheme];
+
+// 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 +2991,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 },
@@ -2509,7 +3004,7 @@ var markdownZoom = Prec2.high(
 
 // src/themes/markdown.ts
 import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
-import { EditorView as EditorView5 } from "@codemirror/view";
+import { EditorView as EditorView6 } from "@codemirror/view";
 var bodyFont = (style) => style == "serif" ? 'var(--text-editor-family-serif, "Merriweather", serif)' : "var(--text-editor-family-sans)";
 var zoomed2 = (length) => `calc(${length} * var(--markdown-zoom, 1))`;
 var markdownStyles = (style) => ({
@@ -2724,7 +3219,7 @@ var markdownSyntaxHighlighting = (style) => HighlightStyle.define([
   { tag: tags.monospace, ...baseCodeStyles }
 ]);
 var theme = (style) => [
-  EditorView5.theme(markdownStyles(style)),
+  EditorView6.theme(markdownStyles(style)),
   syntaxHighlighting(markdownSyntaxHighlighting(style))
 ];
 
@@ -2734,7 +3229,7 @@ function markdownExtensions() {
     ...theme("sans"),
     indentOnInput(),
     markdownZoom,
-    keymap2.of([
+    keymap3.of([
       ...markdownFormattingKeymap,
       ...defaultKeymap,
       ...searchKeymap,
@@ -2742,7 +3237,7 @@ function markdownExtensions() {
       ...completionKeymap,
       indentWithTab
     ]),
-    EditorView6.lineWrapping,
+    EditorView7.lineWrapping,
     // GFM base: task lists, tables, strikethrough, autolinks.
     markdown({
       base: markdownLanguage,
@@ -2751,6 +3246,8 @@ function markdownExtensions() {
     }),
     taskCheckboxes,
     margin,
+    headings,
+    lists,
     indentUnit.of("    ")
   ];
 }