vuewrite 0.0.26 → 0.0.28

package/dist/markdown.js

@@ -1,11 +1,74 @@
 let _counter = 0;
 const uid = () => (++_counter).toString();
-function markdownToBlocks(markdown) {
+function blockContentKey(block) {
+  const { id: _id, ...rest } = block;
+  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]);
+    }
+  }
+  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");
   const blocks = [];
   let i = 0;
   while (i < lines.length) {
     const line = lines[i];
+    const customFenceMatch = line.match(/^:::\s*(\S+)/);
+    if (customFenceMatch) {
+      const type = customFenceMatch[1];
+      const bodyLines = [];
+      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);
+      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);
+      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);
+      i++;
+      continue;
+    }
     if (line.startsWith("```")) {
       const codeLines = [];
       i++;
@@ -62,7 +125,24 @@ function markdownToBlocks(markdown) {
   if (blocks.length === 0) {
     blocks.push({ id: uid(), text: "" });
   }
-  return blocks;
+  if (previousBlocks.length === 0) return blocks;
+  const oldKeys = previousBlocks.map(blockContentKey);
+  const newKeys = blocks.map(blockContentKey);
+  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;
+  });
+}
+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;
 }
 function parseInline(md) {
   let plainText = "";
@@ -142,6 +222,7 @@ const MARKERS = {
   underline: { open: "__", close: "__" },
   code: { open: "`", close: "`" }
 };
+const STANDARD_FIELDS = /* @__PURE__ */ new Set(["id", "text", "type", "styles", "editable"]);
 function blocksToMarkdown(blocks) {
   const lines = [];
   let olCounter = 0;
@@ -153,6 +234,21 @@ function blocksToMarkdown(blocks) {
       olCounter = 0;
       continue;
     }
+    const extraKeys = Object.keys(block).filter((k) => !STANDARD_FIELDS.has(k));
+    if (block.type && extraKeys.length > 0) {
+      const attrStr = extraKeys.map((k) => {
+        const v = block[k];
+        return v === true ? k : `${k}="${v}"`;
+      }).join(" ");
+      const prefix = attrStr ? ` ${attrStr}` : "";
+      if (block.editable === false || !block.text) {
+        lines.push(`<${block.type}${prefix}/>`);
+      } else {
+        lines.push(`<${block.type}${prefix}>${renderInline(block.text, block.styles ?? [])}</${block.type}>`);
+      }
+      olCounter = 0;
+      continue;
+    }
     const inline = renderInline(block.text, block.styles ?? []);
     switch (block.type) {
       case "h1":
@@ -175,7 +271,13 @@ function blocksToMarkdown(blocks) {
         lines.push(`${++olCounter}. ${inline}`);
         break;
       default:
-        lines.push(inline);
+        if (block.type) {
+          lines.push(`:::${block.type}`);
+          lines.push(inline);
+          lines.push(":::");
+        } else {
+          lines.push(inline);
+        }
         olCounter = 0;
         break;
     }

package/dist/vuewrite.d.ts

@@ -64,6 +64,7 @@ decorator?: Decorator;
 renderer?: Renderer;
 single?: boolean;
 modelValue?: {
+id?: string;
 text: string;
 styles?: Style[];
 type?: string;
@@ -121,6 +122,7 @@ decorator?: Decorator;
 renderer?: Renderer;
 single?: boolean;
 modelValue?: {
+id?: string;
 text: string;
 styles?: Style[];
 type?: string;

package/dist/vuewrite.js

@@ -783,7 +783,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
         }
         store.blocks.length = newValue.length;
         for (let i = 0; i < newValue.length; i++) {
-          store.blocks[i] = { ...newValue[i], id: uid() };
+          store.blocks[i] = { ...newValue[i], id: newValue[i].id ?? uid() };
         }
       }
     }, { immediate: true });

package/package.json

@@ -2,7 +2,7 @@
   "name": "vuewrite",
   "description": "Rich Text Editor based on Vue3 reactivity",
   "private": false,
-  "version": "0.0.26",
+  "version": "0.0.28",
   "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"]