vuewrite 0.0.27 → 0.0.29

package/dist/markdown.js

@@ -1,148 +1,139 @@
 let _counter = 0;
 const uid = () => (++_counter).toString();
-function blockContentKey(block) {
-  const { id: _id, ...rest } = block;
-  return JSON.stringify(rest);
+function markdownToBlocks(markdown, previousBlocks = [], options = {}) {
+  const raw = parseBlocks(markdown.split("\n"), options.softBreaks ?? false);
+  return reconcileIds(raw, previousBlocks);
 }
-function lcsIndices(oldKeys, newKeys) {
-  const m = oldKeys.length;
-  const n = newKeys.length;
-  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
-  for (let i2 = 1; i2 <= m; i2++) {
-    for (let j2 = 1; j2 <= n; j2++) {
-      dp[i2][j2] = oldKeys[i2 - 1] === newKeys[j2 - 1] ? dp[i2 - 1][j2 - 1] + 1 : Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
-    }
-  }
-  const pairs = [];
-  let i = m;
-  let j = n;
-  while (i > 0 && j > 0) {
-    if (oldKeys[i - 1] === newKeys[j - 1]) {
-      pairs.unshift([i - 1, j - 1]);
-      i--;
-      j--;
-    } else if (dp[i - 1][j] >= dp[i][j - 1]) {
-      i--;
-    } else {
-      j--;
-    }
-  }
-  return pairs;
-}
-function markdownToBlocks(markdown, previousBlocks = []) {
-  const lines = markdown.split("\n");
+function parseBlocks(lines, softBreaks) {
   const blocks = [];
+  const push = (block) => blocks.push({ id: "", ...block });
   let i = 0;
+  let prevWasBlank = false;
   while (i < lines.length) {
     const line = lines[i];
-    const customFenceMatch = line.match(/^:::\s*(\S+)/);
-    if (customFenceMatch) {
-      const type = customFenceMatch[1];
-      const bodyLines = [];
+    const wasBlank = prevWasBlank;
+    prevWasBlank = line === "";
+    const fenceMatch = line.match(/^:::\s*(\S+)/);
+    if (fenceMatch) {
+      const body = [];
       i++;
-      while (i < lines.length && lines[i].trim() !== ":::") {
-        bodyLines.push(lines[i]);
-        i++;
-      }
-      const { text: text2, styles: styles2 } = parseInline(bodyLines.join("\n"));
-      const block2 = { id: uid(), text: text2, type };
-      if (styles2.length > 0) block2.styles = styles2;
-      blocks.push(block2);
+      while (i < lines.length && lines[i].trim() !== ":::") body.push(lines[i++]);
+      push({ type: fenceMatch[1], ...withStyles(parseInline(body.join("\n"))) });
       i++;
       continue;
     }
-    const xmlPairedMatch = line.match(/^<(\w[\w-]*)(\s[^>]*)?>(.+)<\/\1>$/);
-    if (xmlPairedMatch) {
-      const attrs = parseAttributes(xmlPairedMatch[2] ?? "");
-      const { text: text2, styles: styles2 } = parseInline(xmlPairedMatch[3]);
-      const block2 = { id: uid(), text: text2, type: xmlPairedMatch[1], ...attrs };
-      if (styles2.length > 0) block2.styles = styles2;
-      blocks.push(block2);
+    const xmlPaired = line.match(/^<(\w[\w-]*)(\s[^>]*)?>(.+)<\/\1>$/);
+    if (xmlPaired) {
+      push({ type: xmlPaired[1], ...parseAttributes(xmlPaired[2] ?? ""), ...withStyles(parseInline(xmlPaired[3])) });
       i++;
       continue;
     }
-    const xmlSelfMatch = line.match(/^<(\w[\w-]*)(\s[^>]*)?\s*\/?>$/);
-    if (xmlSelfMatch) {
-      const attrs = parseAttributes(xmlSelfMatch[2] ?? "");
-      const block2 = { id: uid(), text: "", type: xmlSelfMatch[1], editable: false, ...attrs };
-      blocks.push(block2);
+    const xmlSelf = line.match(/^<(\w[\w-]*)(\s[^>]*)?\s*\/?>$/);
+    if (xmlSelf) {
+      push({ text: "", type: xmlSelf[1], editable: false, ...parseAttributes(xmlSelf[2] ?? "") });
       i++;
       continue;
     }
     if (line.startsWith("```")) {
       const codeLines = [];
       i++;
-      while (i < lines.length && !lines[i].startsWith("```")) {
-        codeLines.push(lines[i]);
-        i++;
-      }
-      blocks.push({ id: uid(), text: codeLines.join("\n"), type: "code", editable: false });
+      while (i < lines.length && !lines[i].startsWith("```")) codeLines.push(lines[i++]);
+      push({ text: codeLines.join("\n"), type: "code", editable: false });
       i++;
       continue;
     }
     const headingMatch = line.match(/^(#{1,3}) (.+)$/);
     if (headingMatch) {
-      const level = headingMatch[1].length;
-      const type = level === 1 ? "h1" : level === 2 ? "h2" : "h3";
-      const { text: text2, styles: styles2 } = parseInline(headingMatch[2]);
-      const block2 = { id: uid(), text: text2, type };
-      if (styles2.length > 0) block2.styles = styles2;
-      blocks.push(block2);
+      push({ type: `h${headingMatch[1].length}`, ...withStyles(parseInline(headingMatch[2])) });
       i++;
       continue;
     }
     const ulMatch = line.match(/^[-*] (.+)$/);
     if (ulMatch) {
-      const { text: text2, styles: styles2 } = parseInline(ulMatch[1]);
-      const block2 = { id: uid(), text: text2, type: "li" };
-      if (styles2.length > 0) block2.styles = styles2;
-      blocks.push(block2);
+      push({ type: "li", ...withStyles(parseInline(ulMatch[1])) });
       i++;
       continue;
     }
     const olMatch = line.match(/^\d+\. (.+)$/);
     if (olMatch) {
-      const { text: text2, styles: styles2 } = parseInline(olMatch[1]);
-      const block2 = { id: uid(), text: text2, type: "ol" };
-      if (styles2.length > 0) block2.styles = styles2;
-      blocks.push(block2);
+      push({ type: "ol", ...withStyles(parseInline(olMatch[1])) });
       i++;
       continue;
     }
     if (line === "") {
-      if (blocks.length > 0 && i < lines.length - 1) {
-        blocks.push({ id: uid(), text: "" });
-      }
+      if (!softBreaks && blocks.length > 0 && i < lines.length - 1) push({ text: "" });
       i++;
       continue;
     }
-    const { text, styles } = parseInline(line);
-    const block = { id: uid(), text };
-    if (styles.length > 0) block.styles = styles;
-    blocks.push(block);
+    const parsed = parseInline(line);
+    const last = blocks[blocks.length - 1];
+    if (softBreaks && !wasBlank && (last == null ? void 0 : last.type) === void 0 && (last == null ? void 0 : last.text)) {
+      appendToLastParagraph(last, parsed);
+    } else {
+      push(withStyles(parsed));
+    }
     i++;
   }
-  if (blocks.length === 0) {
-    blocks.push({ id: uid(), text: "" });
+  if (blocks.length === 0) push({ text: "" });
+  return blocks;
+}
+function withStyles({ text, styles }) {
+  return styles.length > 0 ? { text, styles } : { text };
+}
+function appendToLastParagraph(block, { text, styles }) {
+  const offset = block.text.length + 1;
+  block.text += "\n" + text;
+  if (styles.length > 0) {
+    if (!block.styles) block.styles = [];
+    for (const s of styles) block.styles.push({ ...s, start: s.start + offset, end: s.end + offset });
   }
-  if (previousBlocks.length === 0) return blocks;
-  const oldKeys = previousBlocks.map(blockContentKey);
-  const newKeys = blocks.map(blockContentKey);
+}
+function reconcileIds(blocks, previousBlocks) {
+  if (previousBlocks.length === 0) return blocks.map((b) => ({ ...b, id: uid() }));
+  const idMap = buildIdMap(blocks, previousBlocks);
+  return blocks.map((b, j) => ({ ...b, id: idMap.get(j) ?? uid() }));
+}
+function buildIdMap(blocks, previousBlocks) {
+  const oldKeys = previousBlocks.map(contentKey);
+  const newKeys = blocks.map(contentKey);
   const pairs = lcsIndices(oldKeys, newKeys);
-  const oldIdByNewIndex = new Map(pairs.map(([i2, j]) => [j, previousBlocks[i2].id]));
-  return blocks.map((block, j) => {
-    const oldId = oldIdByNewIndex.get(j);
-    return oldId !== void 0 ? { ...block, id: oldId } : block;
-  });
+  const map = new Map(pairs.map(([i, j]) => [j, previousBlocks[i].id]));
+  const lastJ = blocks.length - 1;
+  const lastOld = previousBlocks[previousBlocks.length - 1];
+  const lastNew = blocks[lastJ];
+  if (lastNew && lastOld && !map.has(lastJ) && lastNew.type === lastOld.type) {
+    const usedIds = new Set(map.values());
+    if (!usedIds.has(lastOld.id)) map.set(lastJ, lastOld.id);
+  }
+  return map;
 }
-function parseAttributes(attrStr) {
-  const result = {};
-  const re = /(\w[\w-]*)(?:=(?:"([^"]*)"|'([^']*)'|(\S+)))?/g;
-  let m;
-  while ((m = re.exec(attrStr)) !== null) {
-    result[m[1]] = m[2] ?? m[3] ?? m[4] ?? true;
+function contentKey({ id: _id, ...rest }) {
+  return JSON.stringify(rest);
+}
+function lcsIndices(oldKeys, newKeys) {
+  const m = oldKeys.length;
+  const n = newKeys.length;
+  const dp = Array.from({ length: m + 1 }, () => new Array(n + 1).fill(0));
+  for (let i2 = 1; i2 <= m; i2++) {
+    for (let j2 = 1; j2 <= n; j2++) {
+      dp[i2][j2] = oldKeys[i2 - 1] === newKeys[j2 - 1] ? dp[i2 - 1][j2 - 1] + 1 : Math.max(dp[i2 - 1][j2], dp[i2][j2 - 1]);
+    }
   }
-  return result;
+  const pairs = [];
+  let i = m;
+  let j = n;
+  while (i > 0 && j > 0) {
+    if (oldKeys[i - 1] === newKeys[j - 1]) {
+      pairs.unshift([i - 1, j - 1]);
+      i--;
+      j--;
+    } else if (dp[i - 1][j] >= dp[i][j - 1]) {
+      i--;
+    } else {
+      j--;
+    }
+  }
+  return pairs;
 }
 function parseInline(md) {
   let plainText = "";
@@ -216,6 +207,13 @@ function parseInline(md) {
   }
   return { text: plainText, styles };
 }
+function parseAttributes(attrStr) {
+  const result = {};
+  const re = /(\w[\w-]*)(?:=(?:"([^"]*)"|'([^']*)'|(\S+)))?/g;
+  let m;
+  while ((m = re.exec(attrStr)) !== null) result[m[1]] = m[2] ?? m[3] ?? m[4] ?? true;
+  return result;
+}
 const MARKERS = {
   bold: { open: "**", close: "**" },
   italic: { open: "*", close: "*" },

package/package.json

@@ -2,7 +2,7 @@
   "name": "vuewrite",
   "description": "Rich Text Editor based on Vue3 reactivity",
   "private": false,
-  "version": "0.0.27",
+  "version": "0.0.29",
   "type": "module",
   "license": "MIT",
   "author": "den59k",
@@ -27,8 +27,7 @@
     "dev": "vite build --watch"
   },
   "dependencies": {
-    "vue": "^3",
-    "vuewrite-markdown": "0.0.1"
+    "vue": "^3"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.0.4",
@@ -36,6 +35,7 @@
     "vite": "^5.2.0",
     "vite-plugin-dts": "^3.9.1",
     "vuesix": "^1.0.12",
+    "vuewrite-markdown": "0.0.1",
     "vue-tsc": "^2.0.6"
   },
   "files": ["dist"]