@8btc/mditor 0.0.2 → 0.0.3

package/dist/index.css

@@ -1809,21 +1809,15 @@
 .vditor-sv__marker--strong {
   font-weight: bold;
 }
-.vditor--linenumber .vditor-reset {
-  counter-reset: linenumber;
-  padding-left: 4em;
-  /* 预留固定左侧行号栏位 */
-}
-.vditor--linenumber .vditor-reset > ul::before,
-.vditor--linenumber .vditor-reset ol::before {
+.vditor--linenumber .vditor-reset > ul [data-linenumber]:before,
+.vditor--linenumber .vditor-reset ol [data-linenumber]:before {
   margin-left: -4.5rem !important;
 }
-.vditor--linenumber .vditor-reset > [data-block="0"] {
+.vditor--linenumber .vditor-reset [data-linenumber] {
   position: relative;
-  counter-increment: linenumber;
 }
-.vditor--linenumber .vditor-reset > [data-block="0"]::before {
-  content: counter(linenumber);
+.vditor--linenumber .vditor-reset [data-linenumber]:before {
+  content: attr(data-linenumber);
   float: left;
   padding-right: 0.25rem;
   margin-left: -2.5rem;

package/dist/index.js

@@ -8676,9 +8676,202 @@ var highlightToolbarIR = function (vditor) {
     }, 200);
 };
 
+;// CONCATENATED MODULE: ./src/ts/util/attachLineNumbers.ts
+/**
+ * 为编辑区域中所有包含 `data-block` 的块级节点添加 `data-linenumber` 属性。
+ * 通过解析传入的 Markdown 源文本，建立块内容到源文件行号的映射，
+ * 并在 DOM 上写入对应的行号，兼顾多行文本、重复内容以及空白/特殊字符。
+ */
+var attachLineNumbersToBlocks = function (root, sourceMarkdown) {
+    if (!root || !sourceMarkdown) {
+        return;
+    }
+    var ZWSP = "\u200b";
+    var normalize = function (text) {
+        return text
+            .replace(/\r\n|\r/g, "\n")
+            .replace(new RegExp(ZWSP, "g"), "")
+            .replace(/\u00a0/g, " ")
+            .replace(/\u2006/g, "")
+            .replace(/[\t\f\v ]+/g, " ");
+    };
+    var srcNorm = normalize(sourceMarkdown);
+    var srcLines = srcNorm.split("\n");
+    var stripInlineMD = function (text) {
+        return (text
+            .replace(/\\([*_`~])/g, "$1")
+            .replace(/\*\*|__/g, "")
+            .replace(/\*|_/g, "")
+            .replace(/~~/g, "")
+            .replace(/`+/g, "")
+            // 数学行内分隔符：保留内容，仅移除分隔符
+            .replace(/\\\(/g, "(")
+            .replace(/\\\)/g, ")")
+            .replace(/\\\[/g, "[")
+            .replace(/\\\]/g, "]")
+            .replace(/\$/g, "")
+            .trim());
+    };
+    var strippedLines = srcLines.map(function (l) { return stripInlineMD(l); });
+    var lineLookup = new Map();
+    for (var i = 0; i < strippedLines.length; i++) {
+        var key = strippedLines[i];
+        if (!lineLookup.has(key)) {
+            lineLookup.set(key, [i + 1]);
+        }
+        else {
+            lineLookup.get(key).push(i + 1);
+        }
+    }
+    var usedLines = new Set();
+    var pickFirstUnused = function (candidates) {
+        if (!candidates || candidates.length === 0)
+            return -1;
+        for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
+            var ln = candidates_1[_i];
+            if (!usedLines.has(ln))
+                return ln;
+        }
+        return -1;
+    };
+    var findLineNumberByText = function (text) {
+        var stripped = stripInlineMD(text);
+        var ln = pickFirstUnused(lineLookup.get(stripped));
+        if (ln !== -1)
+            return ln;
+        for (var i = 0; i < strippedLines.length; i++) {
+            if (!usedLines.has(i + 1) &&
+                stripped &&
+                strippedLines[i].indexOf(stripped) !== -1) {
+                return i + 1;
+            }
+        }
+        return -1;
+    };
+    var blocks = root.querySelectorAll("[data-block]");
+    blocks.forEach(function (el) {
+        try {
+            var text = el.textContent || "";
+            var normText = normalize(text);
+            // 跳过纯空白块
+            if (!normText.trim()) {
+                el.setAttribute("data-linenumber", "");
+                return;
+            }
+            var lineNumber = -1;
+            var tag_1 = el.tagName;
+            if (tag_1 === "UL" || tag_1 === "OL") {
+                var listEl = el;
+                var items = Array.from(listEl.querySelectorAll(":scope > li"));
+                var cursor_1 = 0;
+                items.forEach(function (liEl) {
+                    var raw = normalize(liEl.textContent || "");
+                    if (!raw.trim()) {
+                        liEl.setAttribute("data-linenumber", "");
+                        return;
+                    }
+                    var firstLine = raw.split("\n").find(function (l) { return l.trim().length > 0; }) || raw;
+                    var strippedLi = stripInlineMD(firstLine);
+                    var ln = -1;
+                    if (tag_1 === "UL") {
+                        for (var i = Math.max(0, cursor_1); i < srcLines.length; i++) {
+                            if (usedLines.has(i + 1))
+                                continue;
+                            var s = srcLines[i];
+                            if (/^\s*[-*+]\s+/.test(s)) {
+                                var content = stripInlineMD(s.replace(/^\s*[-*+]\s+(\[[ xX]\]\s+)?/, ""));
+                                if (content.indexOf(strippedLi) !== -1) {
+                                    ln = i + 1;
+                                    cursor_1 = i + 1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    else {
+                        for (var i = Math.max(0, cursor_1); i < srcLines.length; i++) {
+                            if (usedLines.has(i + 1))
+                                continue;
+                            var s = srcLines[i];
+                            if (/^\s*\d+\.\s+/.test(s)) {
+                                var content = stripInlineMD(s.replace(/^\s*\d+\.\s+/, ""));
+                                if (content.indexOf(strippedLi) !== -1) {
+                                    ln = i + 1;
+                                    cursor_1 = i + 1;
+                                    break;
+                                }
+                            }
+                        }
+                    }
+                    if (ln === -1) {
+                        for (var i = 0; i < srcLines.length; i++) {
+                            if (usedLines.has(i + 1))
+                                continue;
+                            var s = srcLines[i];
+                            var isListLine = tag_1 === "UL"
+                                ? /^\s*[-*+]\s+/.test(s)
+                                : /^\s*\d+\.\s+/.test(s);
+                            if (!isListLine)
+                                continue;
+                            var content = stripInlineMD(tag_1 === "UL"
+                                ? s.replace(/^\s*[-*+]\s+(\[[ xX]\]\s+)?/, "")
+                                : s.replace(/^\s*\d+\.\s+/, ""));
+                            if (content.indexOf(strippedLi) !== -1) {
+                                ln = i + 1;
+                                cursor_1 = i + 1;
+                                break;
+                            }
+                        }
+                    }
+                    if (ln !== -1) {
+                        usedLines.add(ln);
+                        liEl.setAttribute("data-linenumber", String(ln));
+                    }
+                    else {
+                        liEl.setAttribute("data-linenumber", "");
+                    }
+                });
+                return;
+            }
+            else if (tag_1 === "BLOCKQUOTE") {
+                var firstLine = normText.split("\n").find(function (l) { return l.trim().length > 0; }) ||
+                    normText;
+                var stripped = stripInlineMD(firstLine);
+                for (var i = 0; i < srcLines.length; i++) {
+                    if (usedLines.has(i + 1))
+                        continue;
+                    if (/^\s*>+\s/.test(srcLines[i])) {
+                        var content = stripInlineMD(srcLines[i].replace(/^\s*>+\s+/, ""));
+                        if (content.indexOf(stripped) !== -1) {
+                            lineNumber = i + 1;
+                            break;
+                        }
+                    }
+                }
+            }
+            else {
+                var firstLine = normText.split("\n").find(function (l) { return l.trim().length > 0; }) ||
+                    normText;
+                lineNumber = findLineNumberByText(firstLine);
+            }
+            if (lineNumber !== -1) {
+                usedLines.add(lineNumber);
+                el.setAttribute("data-linenumber", String(lineNumber));
+            }
+            else {
+                el.setAttribute("data-linenumber", "");
+            }
+        }
+        catch (_a) {
+            void 0;
+        }
+    });
+};
+
 ;// CONCATENATED MODULE: ./src/ts/wysiwyg/afterRenderEvent.ts
 
 
+
 var afterRenderEvent = function (vditor, options) {
     if (options === void 0) { options = {
         enableAddUndoStack: true,
@@ -8712,6 +8905,12 @@ var afterRenderEvent = function (vditor, options) {
         if (options.enableAddUndoStack) {
             vditor.undo.addToUndoStack(vditor);
         }
+        try {
+            attachLineNumbersToBlocks(vditor.wysiwyg.element, text);
+        }
+        catch (_a) {
+            void 0;
+        }
     }, vditor.options.undoDelay);
 };
 
@@ -11197,6 +11396,7 @@ var selectEvent = function (vditor, editorElement) {
 
 
 
+
 var processPaste = function (vditor, text) {
     var range = (0,selection/* getEditorRange */.zh)(vditor);
     range.extractContents();
@@ -11207,9 +11407,10 @@ var processPaste = function (vditor, text) {
         blockElement = vditor.sv.element;
     }
     var spinHTML = vditor.lute.SpinVditorSVDOM(blockElement.textContent);
-    spinHTML = "<div data-block='0'>" +
-        spinHTML.replace(/<span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span><span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span></g, '<span data-type="newline"><br /><span style="display: none">\n</span></span><span data-type="newline"><br /><span style="display: none">\n</span></span></div><div data-block="0"><') +
-        "</div>";
+    spinHTML =
+        "<div data-block='0'>" +
+            spinHTML.replace(/<span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span><span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span></g, '<span data-type="newline"><br /><span style="display: none">\n</span></span><span data-type="newline"><br /><span style="display: none">\n</span></span></div><div data-block="0"><') +
+            "</div>";
     if (blockElement.isEqualNode(vditor.sv.element)) {
         blockElement.innerHTML = spinHTML;
     }
@@ -11242,9 +11443,10 @@ var getSideByType = function (spanNode, type, isPrevious) {
 var processSpinVditorSVDOM = function (html, vditor) {
     log("SpinVditorSVDOM", html, "argument", vditor.options.debugger);
     var spinHTML = vditor.lute.SpinVditorSVDOM(html);
-    html = "<div data-block='0'>" +
-        spinHTML.replace(/<span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span><span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span></g, '<span data-type="newline"><br /><span style="display: none">\n</span></span><span data-type="newline"><br /><span style="display: none">\n</span></span></div><div data-block="0"><') +
-        "</div>";
+    html =
+        "<div data-block='0'>" +
+            spinHTML.replace(/<span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span><span data-type="newline"><br \/><span style="display: none">\n<\/span><\/span></g, '<span data-type="newline"><br /><span style="display: none">\n</span></span><span data-type="newline"><br /><span style="display: none">\n</span></span></div><div data-block="0"><') +
+            "</div>";
     log("SpinVditorSVDOM", html, "result", vditor.options.debugger);
     return html;
 };
@@ -11252,21 +11454,32 @@ var processPreviousMarkers = function (spanElement) {
     var spanType = spanElement.getAttribute("data-type");
     var previousElement = spanElement.previousElementSibling;
     // 有内容的子列表/标题，在其 marker 后换行
-    var markerText = (spanType && spanType !== "text" && spanType !== "table" && spanType !== "heading-marker" &&
-        spanType !== "newline" && spanType !== "yaml-front-matter-open-marker" && spanType !== "yaml-front-matter-close-marker"
-        && spanType !== "code-block-info" && spanType !== "code-block-close-marker" && spanType !== "code-block-open-marker") ?
-        spanElement.textContent : "";
+    var markerText = spanType &&
+        spanType !== "text" &&
+        spanType !== "table" &&
+        spanType !== "heading-marker" &&
+        spanType !== "newline" &&
+        spanType !== "yaml-front-matter-open-marker" &&
+        spanType !== "yaml-front-matter-close-marker" &&
+        spanType !== "code-block-info" &&
+        spanType !== "code-block-close-marker" &&
+        spanType !== "code-block-open-marker"
+        ? spanElement.textContent
+        : "";
     var hasNL = false;
     if (spanType === "newline") {
         hasNL = true;
     }
     while (previousElement && !hasNL) {
         var previousType = previousElement.getAttribute("data-type");
-        if (previousType === "li-marker" || previousType === "blockquote-marker" || previousType === "task-marker" ||
+        if (previousType === "li-marker" ||
+            previousType === "blockquote-marker" ||
+            previousType === "task-marker" ||
             previousType === "padding") {
             var previousText = previousElement.textContent;
             if (previousType === "li-marker" &&
-                (spanType === "code-block-open-marker" || spanType === "code-block-info")) {
+                (spanType === "code-block-open-marker" ||
+                    spanType === "code-block-info")) {
                 // https://github.com/Vanessa219/vditor/issues/586
                 markerText = previousText.replace(/\S/g, " ") + markerText;
             }
@@ -11321,6 +11534,12 @@ var processAfterRender = function (vditor, options) {
         if (options.enableAddUndoStack && !vditor.sv.composingLock) {
             vditor.undo.addToUndoStack(vditor);
         }
+        try {
+            attachLineNumbersToBlocks(vditor.sv.element, text);
+        }
+        catch (_a) {
+            void 0;
+        }
     }, vditor.options.undoDelay);
 };
 var processHeading = function (vditor, value) {
@@ -11356,8 +11575,13 @@ var processToolbar = function (vditor, actionBtn, prefix, suffix) {
         document.execCommand("insertHTML", false, html);
         return;
     }
-    else if (commandName === "italic" || commandName === "bold" || commandName === "strike" ||
-        commandName === "inline-code" || commandName === "code" || commandName === "table" || commandName === "line") {
+    else if (commandName === "italic" ||
+        commandName === "bold" ||
+        commandName === "strike" ||
+        commandName === "inline-code" ||
+        commandName === "code" ||
+        commandName === "table" ||
+        commandName === "line") {
         var html = void 0;
         // https://github.com/Vanessa219/vditor/issues/563 代码块不需要后面的 ```
         if (range.toString() === "") {
@@ -11366,7 +11590,10 @@ var processToolbar = function (vditor, actionBtn, prefix, suffix) {
         else {
             html = "".concat(prefix).concat(range.toString()).concat(Lute.Caret).concat(commandName === "code" ? "" : suffix);
         }
-        if (commandName === "table" || (commandName === "code" && spanElement && spanElement.textContent !== "")) {
+        if (commandName === "table" ||
+            (commandName === "code" &&
+                spanElement &&
+                spanElement.textContent !== "")) {
             html = "\n\n" + html;
         }
         else if (commandName === "line") {
@@ -11375,7 +11602,9 @@ var processToolbar = function (vditor, actionBtn, prefix, suffix) {
         document.execCommand("insertHTML", false, html);
         return;
     }
-    else if (commandName === "check" || commandName === "list" || commandName === "ordered-list" ||
+    else if (commandName === "check" ||
+        commandName === "list" ||
+        commandName === "ordered-list" ||
         commandName === "quote") {
         if (spanElement) {
             var marker = "* ";
@@ -13682,6 +13911,7 @@ var templateObject_1;
 
 
 
+
 var processHint = function (vditor) {
     var _a, _b;
     vditor.hint.render(vditor);
@@ -13689,16 +13919,20 @@ var processHint = function (vditor) {
     // 代码块语言提示
     var preBeforeElement = (0,hasClosest/* hasClosestByAttribute */.a1)(startContainer, "data-type", "code-block-info");
     if (preBeforeElement) {
-        if (preBeforeElement.textContent.replace(constants/* Constants.ZWSP */.g.ZWSP, "") === "" && vditor.hint.recentLanguage) {
-            preBeforeElement.textContent = constants/* Constants.ZWSP */.g.ZWSP + vditor.hint.recentLanguage;
+        if (preBeforeElement.textContent.replace(constants/* Constants.ZWSP */.g.ZWSP, "") === "" &&
+            vditor.hint.recentLanguage) {
+            preBeforeElement.textContent =
+                constants/* Constants.ZWSP */.g.ZWSP + vditor.hint.recentLanguage;
             var range = (0,selection/* getEditorRange */.zh)(vditor);
             range.selectNodeContents(preBeforeElement);
         }
         else {
             var matchLangData_1 = [];
-            var key_1 = preBeforeElement.textContent.substring(0, (0,selection/* getSelectPosition */.im)(preBeforeElement, vditor.ir.element).start)
+            var key_1 = preBeforeElement.textContent
+                .substring(0, (0,selection/* getSelectPosition */.im)(preBeforeElement, vditor.ir.element).start)
                 .replace(constants/* Constants.ZWSP */.g.ZWSP, "");
-            (vditor.options.preview.hljs.langs || constants/* Constants.ALIAS_CODE_LANGUAGES.concat */.g.ALIAS_CODE_LANGUAGES.concat(((_b = (_a = window.hljs) === null || _a === void 0 ? void 0 : _a.listLanguages()) !== null && _b !== void 0 ? _b : []).sort())).forEach(function (keyName) {
+            (vditor.options.preview.hljs.langs ||
+                constants/* Constants.ALIAS_CODE_LANGUAGES.concat */.g.ALIAS_CODE_LANGUAGES.concat(((_b = (_a = window.hljs) === null || _a === void 0 ? void 0 : _a.listLanguages()) !== null && _b !== void 0 ? _b : []).sort())).forEach(function (keyName) {
                 if (keyName.indexOf(key_1.toLowerCase()) > -1) {
                     matchLangData_1.push({
                         html: keyName,
@@ -13743,11 +13977,18 @@ var process_processAfterRender = function (vditor, options) {
         if (options.enableAddUndoStack) {
             vditor.undo.addToUndoStack(vditor);
         }
+        try {
+            attachLineNumbersToBlocks(vditor.ir.element, text);
+        }
+        catch (_a) {
+            void 0;
+        }
     }, vditor.options.undoDelay);
 };
 var process_processHeading = function (vditor, value) {
     var range = (0,selection/* getEditorRange */.zh)(vditor);
-    var headingElement = (0,hasClosest/* hasClosestBlock */.F9)(range.startContainer) || range.startContainer;
+    var headingElement = (0,hasClosest/* hasClosestBlock */.F9)(range.startContainer) ||
+        range.startContainer;
     if (headingElement) {
         var headingMarkerElement = headingElement.querySelector(".vditor-ir__marker--heading");
         if (headingMarkerElement) {
@@ -13770,7 +14011,8 @@ var removeInline = function (range, vditor, type) {
         range.insertNode(document.createElement("wbr"));
         var tempElement = document.createElement("div");
         tempElement.innerHTML = vditor.lute.SpinVditorIRDOM(inlineElement.outerHTML);
-        inlineElement.outerHTML = tempElement.firstElementChild.innerHTML.trim();
+        inlineElement.outerHTML =
+            tempElement.firstElementChild.innerHTML.trim();
     }
 };
 var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
@@ -13787,8 +14029,10 @@ var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
             var quoteElement = (0,hasClosest/* hasClosestByMatchTag */.lG)(typeElement, "BLOCKQUOTE");
             if (quoteElement) {
                 range.insertNode(document.createElement("wbr"));
-                quoteElement.outerHTML = quoteElement.innerHTML.trim() === "" ?
-                    "<p data-block=\"0\">".concat(quoteElement.innerHTML, "</p>") : quoteElement.innerHTML;
+                quoteElement.outerHTML =
+                    quoteElement.innerHTML.trim() === ""
+                        ? "<p data-block=\"0\">".concat(quoteElement.innerHTML, "</p>")
+                        : quoteElement.innerHTML;
             }
         }
         else if (commandName === "link") {
@@ -13800,7 +14044,9 @@ var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
                     aElement.outerHTML = aTextElement.innerHTML;
                 }
                 else {
-                    aElement.outerHTML = aElement.querySelector(".vditor-ir__link").innerHTML + "<wbr>";
+                    aElement.outerHTML =
+                        aElement.querySelector(".vditor-ir__link").innerHTML +
+                            "<wbr>";
                 }
             }
         }
@@ -13816,7 +14062,9 @@ var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
         else if (commandName === "inline-code") {
             removeInline(range, vditor, "code");
         }
-        else if (commandName === "check" || commandName === "list" || commandName === "ordered-list") {
+        else if (commandName === "check" ||
+            commandName === "list" ||
+            commandName === "ordered-list") {
             listToggle(vditor, range, commandName);
             useHighlight = false;
             actionBtn.classList.remove("vditor-menu--current");
@@ -13860,8 +14108,12 @@ var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
             useHighlight = false;
             actionBtn.classList.add("vditor-menu--current");
         }
-        else if (commandName === "italic" || commandName === "bold" || commandName === "strike"
-            || commandName === "inline-code" || commandName === "code" || commandName === "table") {
+        else if (commandName === "italic" ||
+            commandName === "bold" ||
+            commandName === "strike" ||
+            commandName === "inline-code" ||
+            commandName === "code" ||
+            commandName === "table") {
             var html = void 0;
             if (range.toString() === "") {
                 html = "".concat(prefix, "<wbr>").concat(suffix);
@@ -13890,10 +14142,16 @@ var process_processToolbar = function (vditor, actionBtn, prefix, suffix) {
                 (0,selection/* setSelectionFocus */.Hc)(range);
             }
         }
-        else if (commandName === "check" || commandName === "list" || commandName === "ordered-list") {
+        else if (commandName === "check" ||
+            commandName === "list" ||
+            commandName === "ordered-list") {
             listToggle(vditor, range, commandName, false);
             useHighlight = false;
-            removeCurrentToolbar(vditor.toolbar.elements, ["check", "list", "ordered-list"]);
+            removeCurrentToolbar(vditor.toolbar.elements, [
+                "check",
+                "list",
+                "ordered-list",
+            ]);
             actionBtn.classList.add("vditor-menu--current");
         }
     }