@openmarkdown-dev/editor 0.1.1 → 0.1.2

package/README.md

@@ -38,7 +38,7 @@ Lossless round-trip: open a Markdown file and save it without editing, and the f
 
 That names one sentence of the claim below. For edits, the claim says exactly what changes. This is the whole claim. Every sentence is backed by a test:
 
-> OpenMarkdown edits your Markdown source text directly; it never rebuilds the file from a document tree. Open and save without editing, and the file is byte-for-byte what it was: line endings (LF / CRLF), BOM, final newline, whitespace, tabs, escapes and Unicode spelling untouched. When you edit, only what you touched changes, with a few exceptions, each pinned by a test: a table you edit (or click into a cell of) is re-aligned as a whole when you leave it — alignment, cell text and escapes kept; table commands rewrite that table the same way; indenting a list item or pressing Enter in a numbered list renumbers the affected items; Enter in a list item drops trailing spaces before the cursor; a file with mixed line endings gets uniform ones once you edit it.
+> OpenMarkdown edits your Markdown source text directly; it never rebuilds the file from a document tree. Open and save without editing, and the file is byte-for-byte what it was: line endings (LF / CRLF), BOM, final newline, whitespace, tabs, escapes and Unicode spelling untouched. When you edit, only what you touched changes, with a few exceptions, each pinned by a test: a table you edit (or click into a cell of) is re-aligned as a whole when you leave it — alignment, cell text and escapes kept; table commands rewrite that table the same way; indenting a list item or pressing Enter in a numbered list renumbers the affected items; Enter in a list item drops trailing spaces before the cursor; a file with mixed line endings gets uniform ones once you edit it; typing on a lone blank line between two blocks adds a line break after that line, so the block below stays separate.
 
 The claim holds when your host reads and writes the file with the package's
 `openMarkdownFile` and `saveMarkdownFile`. The editor keeps the document as a string in `\n`

package/dist/editor.js

@@ -4436,7 +4436,7 @@ function strandedIn(state) {
   const sel = state.selection.main;
   if (!sel.empty) return null;
   const pos = sel.head;
-  const block = hooks.editable(state).find((b) => b.from < pos && pos < b.to);
+  const block = hooks.editable(state).find((b) => b.from < pos && pos <= b.to);
   if (!block || hooks.leave(state).length > 0) return null;
   return { block, pos };
 }
@@ -4462,6 +4462,9 @@ function navigateTo(view, pos) {
   });
   view.focus();
 }
+function isRevealed(state, range) {
+  return state.facet(livePreviewConfig).revealOnSelection && state.selection.ranges.some((r) => r.from <= range.to && r.to >= (range.revealFrom ?? range.from));
+}
 function loadMathThenRedraw(view) {
   ensureMath(() => {
     try {
@@ -5193,26 +5196,72 @@ function mermaidReason(e) {
   const reason = `${lines[0]} ${lines[lines.length - 1]}`;
   return reason.length > 200 ? `${reason.slice(0, 199)}…` : reason;
 }
-function requestMermaid(body, scheme, load, done) {
+function requestMermaid(body, scheme, load, done, wanted) {
   const key = cacheKey(body, scheme);
   if (cache.has(key)) return;
   const waiting = inflight.get(key);
   if (waiting) {
-    waiting.add(done);
+    waiting.set(done, wanted);
     return;
   }
-  const waiters = /* @__PURE__ */ new Set([done]);
+  const waiters = /* @__PURE__ */ new Map([[done, wanted]]);
   inflight.set(key, waiters);
   queue = queue.then(async () => {
     const mermaid = await loadMermaid(load);
-    inflight.delete(key);
-    if (!mermaid) return;
+    if (!mermaid || ![...waiters.values()].some((w) => w())) {
+      inflight.delete(key);
+      return;
+    }
     const result = await attemptRenderAsync(() => renderWith(mermaid, body, scheme));
     rememberMermaid(body, scheme, result);
-    for (const fn of waiters) queueMicrotask(fn);
+    inflight.delete(key);
+    for (const fn of waiters.keys()) queueMicrotask(fn);
   });
 }
 const schemeOf = (state) => state.facet(EditorView.darkTheme) ? "dark" : "light";
+function drawnMermaidBodies(state, viewport) {
+  const bodies = [];
+  progressiveTree(state).iterate({
+    enter: (node) => {
+      if (node.name !== "FencedCode") return;
+      const fence = mermaidFence(state, node);
+      if (fence && !isRevealed(state, fence)) {
+        bodies.push({ body: fence.body, near: fence.to >= viewport.from && fence.from <= viewport.to });
+      }
+      return false;
+    }
+  });
+  bodies.sort((a, b) => Number(b.near) - Number(a.near));
+  return bodies.map((b) => b.body);
+}
+class MermaidRequests {
+  constructor(redraw) {
+    this.redraw = redraw;
+  }
+  redraw;
+  alive = true;
+  wanted = /* @__PURE__ */ new Set();
+  request(state, viewport) {
+    const load = state.facet(mermaidLoader);
+    if (!load) return;
+    const scheme = schemeOf(state);
+    const bodies = drawnMermaidBodies(state, viewport);
+    const wanted = new Set(bodies.map((b) => `${scheme}
+${b}`));
+    this.wanted = wanted;
+    const done = () => {
+      if (this.alive) this.redraw();
+    };
+    for (const body of bodies) {
+      const key = `${scheme}
+${body}`;
+      requestMermaid(body, scheme, load, done, () => this.alive && this.wanted.has(key));
+    }
+  }
+  destroy() {
+    this.alive = false;
+  }
+}
 const mermaidEntry = {
   id: "mermaid",
   mode: "A",
@@ -5233,38 +5282,22 @@ const mermaidEntry = {
     class {
       constructor(view) {
         this.view = view;
+        this.requests = new MermaidRequests(() => view.dispatch({ effects: asyncRenderDone.of(null) }));
         this.request();
       }
       view;
-      alive = true;
+      requests;
       update(u) {
-        if (u.docChanged || treeChanged(u) || u.startState.facet(EditorView.darkTheme) !== u.state.facet(EditorView.darkTheme)) {
+        if (u.docChanged || // Which diagrams are drawn follows the selection (reveal) — design D3.
+        u.selectionSet || treeChanged(u) || u.startState.facet(EditorView.darkTheme) !== u.state.facet(EditorView.darkTheme)) {
           this.request();
         }
       }
       destroy() {
-        this.alive = false;
+        this.requests.destroy();
       }
-      /** Ask for every diagram in the document, those in view first. */
       request() {
-        const { state, viewport } = this.view;
-        const load = state.facet(mermaidLoader);
-        if (!load) return;
-        const scheme = schemeOf(state);
-        const bodies = [];
-        progressiveTree(state).iterate({
-          enter: (node) => {
-            if (node.name !== "FencedCode") return;
-            const fence = mermaidFence(state, node);
-            if (fence) bodies.push({ body: fence.body, near: fence.to >= viewport.from && fence.from <= viewport.to });
-            return false;
-          }
-        });
-        bodies.sort((a, b) => Number(b.near) - Number(a.near));
-        const redraw = () => {
-          if (this.alive) this.view.dispatch({ effects: asyncRenderDone.of(null) });
-        };
-        for (const { body } of bodies) requestMermaid(body, scheme, load, redraw);
+        this.requests.request(this.view.state, this.view.viewport);
       }
     }
   )
@@ -5339,9 +5372,8 @@ function buildBlockDecorations(state) {
   const config = state.facet(livePreviewConfig);
   const deco = [];
   const failed = [];
-  const revealed = (c) => config.revealOnSelection && state.selection.ranges.some((r) => r.from <= c.to && r.to >= (c.revealFrom ?? c.from));
   const push2 = (entry, c) => {
-    if (entry.mode === "A" && revealed(c)) return;
+    if (entry.mode === "A" && isRevealed(state, c)) return;
     deco.push(
       Decoration.replace({
         // Every block carries its selected state from here, the one exit, so no
@@ -5366,7 +5398,7 @@ function buildBlockDecorations(state) {
       if (!entry || !entry.range || !entry.widget) return;
       const range = entry.range(state, node);
       if (!range) return false;
-      if (entry.mode === "A" && revealed({ ...range })) return false;
+      if (entry.mode === "A" && isRevealed(state, range)) return false;
       const widget = entry.widget;
       const out = attemptRender(() => widget(state, node, range));
       if (out.kind === "rendered") push2(entry, { ...range, widget: out.value });
@@ -6136,12 +6168,12 @@ const headingFoldToggle = ViewPlugin.fromClass(
 function itemFoldRange(state, item) {
   const first = state.doc.lineAt(item.from);
   let last = state.doc.lineAt(Math.max(item.from, item.to));
-  while (last.number > first.number && (isBlank(state, last.from) || item.to <= last.from)) {
+  while (last.number > first.number && (isBlank$1(state, last.from) || item.to <= last.from)) {
     last = state.doc.line(last.number - 1);
   }
   return last.number > first.number ? { from: first.to, to: last.to } : null;
 }
-function isBlank(state, lineFrom) {
+function isBlank$1(state, lineFrom) {
   const p = linePrefix(state, lineFrom);
   return !/\S/.test(state.sliceDoc(p.end, p.line.to));
 }
@@ -7021,6 +7053,43 @@ function imagePaste(docPath, getSave, getNotify = () => void 0) {
     }
   });
 }
+const USER_INPUT = ["input.type", "input.paste", "input.drop"];
+const isBlank = (line) => /^[ \t]*$/.test(line.text);
+function loneSeparator(state, doc, n) {
+  if (n <= 1 || n >= doc.lines) return null;
+  const line = doc.line(n);
+  if (!isBlank(line) || isBlank(doc.line(n - 1)) || isBlank(doc.line(n + 1))) return null;
+  const tree = treeUpTo(state, line.from);
+  for (const side of [-1, 1]) {
+    const pos = side < 0 ? line.from : line.to;
+    if (tree.resolveInner(pos, side).name !== "Document") return null;
+  }
+  return line;
+}
+function separatorBreak(tr) {
+  if (!tr.docChanged || !USER_INPUT.some((e) => tr.isUserEvent(e))) return null;
+  const ranges = [];
+  tr.changes.iterChanges((fromA2, toA2, _fromB, toB2) => ranges.push({ fromA: fromA2, toA: toA2, toB: toB2 }));
+  if (ranges.length !== 1) return null;
+  const { fromA, toA, toB } = ranges[0];
+  const start = tr.startState;
+  const at = start.doc.lineAt(fromA);
+  if (start.doc.lineAt(toA).number !== at.number) return null;
+  const sep = loneSeparator(start, start.doc, at.number);
+  if (!sep) return null;
+  const doc = tr.newDoc;
+  const edited = doc.lineAt(toB);
+  if (isBlank(edited)) return null;
+  const below = doc.lineAt(tr.changes.mapPos(sep.to + 1, 1));
+  if (below.number !== edited.number + 1) return null;
+  return { from: sep.to, insert: start.lineBreak };
+}
+const separatorKeepsBlocks = EditorState.transactionFilter.of((tr) => {
+  const add2 = separatorBreak(tr);
+  if (!add2) return tr;
+  const spec = { changes: add2 };
+  return [tr, spec];
+});
 function changedRange(current, next) {
   if (current === next) return null;
   const max = Math.min(current.length, next.length);
@@ -7341,6 +7410,10 @@ function buildEditorState(options, loadMermaid2) {
       // caret-rules R2 / R2a / R2b) — one filter for every undo entry point.
       undoLanding,
       strandedCaret,
+      // Typing on the only blank line between two blocks keeps the block below
+      // separate (spec: editor-fidelity N8). Every mode: the file's structure
+      // is the same whether it is rendered or not.
+      separatorKeepsBlocks,
       drawSelection(),
       // Drop caret: draws a cursor at the drop position while dragging over the
       // editor, so a sidebar file drag (sidebar-drag-link) shows exactly where

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmarkdown-dev/editor",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "A live-preview Markdown editor on CodeMirror 6 that edits the Markdown source itself, for a lossless round-trip: open and save without editing, and the file is byte-for-byte what it was.",
   "license": "MIT",
   "type": "module",