markdown-it-any-block 3.3.1-beta1 → 3.3.2-beta1

package/README.md

@@ -1,6 +1,11 @@
 # AnyBlock MarkdownIt
 
-markdown-it 版本的入口
+- en
+  - Welcome to learn more about it in [the GitHub project](https://github.com/any-block/any-block)
+  - Here you will find more detailed function descriptions and multilingual documents.
+- zh
+  - 欢迎到此 [github项目](https://github.com/any-block/any-block) 中了解更多
+  - 这里有更详细的功能介绍和多语言文档
 
 ## markdown-it-any-block 使用
 

package/dist/mdit-any-block.cjs

@@ -204,7 +204,10 @@ const ABReg = {
   // 内联切分。`|`或全角符号+一空格，半角符号+两空格 (后者由于空格压缩，若经历了重渲染可能有问题)
 };
 const ABCSetting = {
-  env: "obsidian"
+  env: "obsidian",
+  // MarkdownPostProcessorContext类型, obsidian专用
+  mermaid: void 0
+  // obsidian专用，表示使用哪种方式渲染mermaid
 };
 function autoABAlias(header, selectorName, content) {
   if (!header.trimEnd().endsWith("|")) header = header + "|";
@@ -255,7 +258,7 @@ const ABAlias_json_withSub = [
   //   quote, cite
   // `其他` 避免错字, 我之前加过 warn, tips。后面又删了
   { regex: /\|(note|warning|caution|attention|error|info|danger|tip|hint|example|abstract|summary|tldr|quote|cite|todo|success|check|done|important|question|help|faq|failure|fail|missing|bug)([+-]?)(\s.*)?\|/, replacement: "|add([!$1]$2$3)|addQuote|" },
-  { regex: /\|callout (\S+)([+-]?)\s?(.*)\|/, replacement: "|add([!$1]$2 $3)|addQuote|" }
+  { regex: /\|(callout|alert) ([^+-\s]+)([+-]?)\s?(.*)\|/, replacement: "|add([!$2]$3 $4)|addQuote|" }
   // 注意避免和原上/上面的callout语法冲突，以及自身递归
 ];
 const ABAlias_json_mdit = [
@@ -2332,23 +2335,22 @@ ABConvert.factory({
     sub_button.onclick = fn_fold;
     mid_el.appendChild(sub_button);
     mid_el.appendChild(sub_el);
-    if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
-      if (sub_el.classList.contains("ab-list-table")) {
-        const btn = sub_el.querySelector(":scope>.ab-table-fold");
-        if (btn) {
-          fn_fold();
-          sub_button.textContent = "全部折叠/展开";
-          const fn_fold2 = () => {
-            const clickEvent = new MouseEvent("click", {
-              view: window,
-              bubbles: true,
-              cancelable: true
-            });
-            btn.dispatchEvent(clickEvent);
-          };
-          fn_fold2();
-          sub_button.onclick = fn_fold2;
-        }
+    const isListTable = sub_el.classList.contains("ab-list-table-parent");
+    const listTable_btn = sub_el.querySelector(".ab-table-fold");
+    if (isListTable && listTable_btn) {
+      if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+        fn_fold();
+        sub_button.textContent = "折叠/展开";
+        const fn_fold2 = () => {
+          const clickEvent = new MouseEvent("click", {
+            view: window,
+            bubbles: true,
+            cancelable: true
+          });
+          listTable_btn.dispatchEvent(clickEvent);
+        };
+        fn_fold2();
+        sub_button.onclick = fn_fold2;
       }
     }
     return content;
@@ -2357,18 +2359,17 @@ ABConvert.factory({
 ABConvert.factory({
   id: "scroll",
   name: "滚动",
-  match: /^scroll(\((\d+)\))?(T)?$/,
+  match: /^scroll(X)?(\((\d+)\))?$/,
   default: "scroll(460)",
+  detail: "默认是纵向滚动。可以指定溢出滚动的范围，可以使用scrollX进行横向滚动",
   process_param: ABConvert_IOEnum.el,
   process_return: ABConvert_IOEnum.el,
   process: (el, header, content) => {
-    const matchs = header.match(/^scroll(\((\d+)\))?(T)?$/);
+    const matchs = header.match(/^scroll(X)?(\((\d+)\))?$/);
     if (!matchs) return content;
-    let arg1;
-    if (!matchs[1]) arg1 = 460;
-    else {
-      if (!matchs[2]) return content;
-      arg1 = Number(matchs[2]);
+    let arg1 = 0;
+    if (matchs[2] && matchs[3]) {
+      arg1 = Number(matchs[3]);
       if (isNaN(arg1)) return content;
     }
     if (content.children.length != 1) return content;
@@ -2377,13 +2378,14 @@ ABConvert.factory({
     const mid_el = document.createElement("div");
     content.appendChild(mid_el);
     mid_el.classList.add("ab-deco-scroll");
-    if (!matchs[3]) {
+    mid_el.appendChild(sub_el);
+    if (!matchs[1]) {
       mid_el.classList.add("ab-deco-scroll-y");
-      mid_el.setAttribute("style", `max-height: ${arg1}px`);
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "460px"}`);
     } else {
       mid_el.classList.add("ab-deco-scroll-x");
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "100%"}`);
     }
-    mid_el.appendChild(sub_el);
     return content;
   }
 });
@@ -2904,9 +2906,8 @@ ABConvert.factory({
   }
 });
 ABConvert.factory({
-  id: "info",
+  id: "info_converter",
   name: "INFO",
-  match: "info",
   detail: "查看当前软件版本下的注册处理器表",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.el,
@@ -7903,11 +7904,6 @@ function list2ActivityDiagramText(listdata) {
   let result = "@startuml\n";
   const stats = listdata.map((item) => new Stat(item.content.trim(), item.level));
   const { result: bodyResult } = processBlock(stats, 0, -1);
-  const swimLanes = bodyResult.split("\n").filter((line) => line.startsWith("|") && line.endsWith("|"));
-  if (swimLanes.length > 0) {
-    result += swimLanes.join("\n");
-    result += "\n";
-  }
   result += bodyResult;
   result += "@enduml";
   return result;
@@ -7986,7 +7982,6 @@ async function render_pumlText(text2, div) {
   div.innerHTML = `<img src="${url}">`;
   return div;
 }
-let mermaid = null;
 function getID(length = 16) {
   return Number(Math.random().toString().substr(3, length) + Date.now()).toString(36);
 }
@@ -8159,21 +8154,17 @@ async function data2mindmap(list_itemInfo, div) {
   return render_mermaidText(mermaidText, div);
 }
 async function render_mermaidText(mermaidText, div) {
-  if (ABCSetting.env == "obsidian") {
-    await init_mermaid();
-    const { svg } = await mermaid?.render("ab-mermaid-" + getID(), mermaidText);
-    div.innerHTML = svg;
-  } else if (ABCSetting.env == "obsidian-min") {
-    ABConvertManager.getInstance().m_renderMarkdownFn("```mermaid\n" + mermaidText + "\n```", div);
+  if ((ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") && ABCSetting.mermaid) {
+    ABCSetting.mermaid.then(async (mermaid) => {
+      const { svg } = await mermaid.render("ab-mermaid-" + getID(), mermaidText);
+      div.innerHTML = svg;
+    });
   } else {
     div.classList.add("ab-raw");
     div.innerHTML = `<div class="ab-raw-data" type-data="mermaid" content-data='${mermaidText}'></div>`;
   }
   return div;
 }
-async function init_mermaid() {
-  if (ABCSetting.env !== "obsidian" || true) return;
-}
 function abConvertEvent(d, isCycle = false) {
   if (d.querySelector(".ab-super-width")) {
     const els_note = d.querySelectorAll(".ab-note");

package/dist/mdit-any-block.js

@@ -180,7 +180,10 @@ const ABReg = {
   // 内联切分。`|`或全角符号+一空格，半角符号+两空格 (后者由于空格压缩，若经历了重渲染可能有问题)
 };
 const ABCSetting = {
-  env: "obsidian"
+  env: "obsidian",
+  // MarkdownPostProcessorContext类型, obsidian专用
+  mermaid: void 0
+  // obsidian专用，表示使用哪种方式渲染mermaid
 };
 function autoABAlias(header, selectorName, content) {
   if (!header.trimEnd().endsWith("|")) header = header + "|";
@@ -231,7 +234,7 @@ const ABAlias_json_withSub = [
   //   quote, cite
   // `其他` 避免错字, 我之前加过 warn, tips。后面又删了
   { regex: /\|(note|warning|caution|attention|error|info|danger|tip|hint|example|abstract|summary|tldr|quote|cite|todo|success|check|done|important|question|help|faq|failure|fail|missing|bug)([+-]?)(\s.*)?\|/, replacement: "|add([!$1]$2$3)|addQuote|" },
-  { regex: /\|callout (\S+)([+-]?)\s?(.*)\|/, replacement: "|add([!$1]$2 $3)|addQuote|" }
+  { regex: /\|(callout|alert) ([^+-\s]+)([+-]?)\s?(.*)\|/, replacement: "|add([!$2]$3 $4)|addQuote|" }
   // 注意避免和原上/上面的callout语法冲突，以及自身递归
 ];
 const ABAlias_json_mdit = [
@@ -2308,23 +2311,22 @@ ABConvert.factory({
     sub_button.onclick = fn_fold;
     mid_el.appendChild(sub_button);
     mid_el.appendChild(sub_el);
-    if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
-      if (sub_el.classList.contains("ab-list-table")) {
-        const btn = sub_el.querySelector(":scope>.ab-table-fold");
-        if (btn) {
-          fn_fold();
-          sub_button.textContent = "全部折叠/展开";
-          const fn_fold2 = () => {
-            const clickEvent = new MouseEvent("click", {
-              view: window,
-              bubbles: true,
-              cancelable: true
-            });
-            btn.dispatchEvent(clickEvent);
-          };
-          fn_fold2();
-          sub_button.onclick = fn_fold2;
-        }
+    const isListTable = sub_el.classList.contains("ab-list-table-parent");
+    const listTable_btn = sub_el.querySelector(".ab-table-fold");
+    if (isListTable && listTable_btn) {
+      if (ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") {
+        fn_fold();
+        sub_button.textContent = "折叠/展开";
+        const fn_fold2 = () => {
+          const clickEvent = new MouseEvent("click", {
+            view: window,
+            bubbles: true,
+            cancelable: true
+          });
+          listTable_btn.dispatchEvent(clickEvent);
+        };
+        fn_fold2();
+        sub_button.onclick = fn_fold2;
       }
     }
     return content;
@@ -2333,18 +2335,17 @@ ABConvert.factory({
 ABConvert.factory({
   id: "scroll",
   name: "滚动",
-  match: /^scroll(\((\d+)\))?(T)?$/,
+  match: /^scroll(X)?(\((\d+)\))?$/,
   default: "scroll(460)",
+  detail: "默认是纵向滚动。可以指定溢出滚动的范围，可以使用scrollX进行横向滚动",
   process_param: ABConvert_IOEnum.el,
   process_return: ABConvert_IOEnum.el,
   process: (el, header, content) => {
-    const matchs = header.match(/^scroll(\((\d+)\))?(T)?$/);
+    const matchs = header.match(/^scroll(X)?(\((\d+)\))?$/);
     if (!matchs) return content;
-    let arg1;
-    if (!matchs[1]) arg1 = 460;
-    else {
-      if (!matchs[2]) return content;
-      arg1 = Number(matchs[2]);
+    let arg1 = 0;
+    if (matchs[2] && matchs[3]) {
+      arg1 = Number(matchs[3]);
       if (isNaN(arg1)) return content;
     }
     if (content.children.length != 1) return content;
@@ -2353,13 +2354,14 @@ ABConvert.factory({
     const mid_el = document.createElement("div");
     content.appendChild(mid_el);
     mid_el.classList.add("ab-deco-scroll");
-    if (!matchs[3]) {
+    mid_el.appendChild(sub_el);
+    if (!matchs[1]) {
       mid_el.classList.add("ab-deco-scroll-y");
-      mid_el.setAttribute("style", `max-height: ${arg1}px`);
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "460px"}`);
     } else {
       mid_el.classList.add("ab-deco-scroll-x");
+      mid_el.setAttribute("style", `max-height: ${arg1 !== 0 ? arg1 + "px" : "100%"}`);
     }
-    mid_el.appendChild(sub_el);
     return content;
   }
 });
@@ -2880,9 +2882,8 @@ ABConvert.factory({
   }
 });
 ABConvert.factory({
-  id: "info",
+  id: "info_converter",
   name: "INFO",
-  match: "info",
   detail: "查看当前软件版本下的注册处理器表",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.el,
@@ -7879,11 +7880,6 @@ function list2ActivityDiagramText(listdata) {
   let result = "@startuml\n";
   const stats = listdata.map((item) => new Stat(item.content.trim(), item.level));
   const { result: bodyResult } = processBlock(stats, 0, -1);
-  const swimLanes = bodyResult.split("\n").filter((line) => line.startsWith("|") && line.endsWith("|"));
-  if (swimLanes.length > 0) {
-    result += swimLanes.join("\n");
-    result += "\n";
-  }
   result += bodyResult;
   result += "@enduml";
   return result;
@@ -7962,7 +7958,6 @@ async function render_pumlText(text2, div) {
   div.innerHTML = `<img src="${url}">`;
   return div;
 }
-let mermaid = null;
 function getID(length = 16) {
   return Number(Math.random().toString().substr(3, length) + Date.now()).toString(36);
 }
@@ -8135,21 +8130,17 @@ async function data2mindmap(list_itemInfo, div) {
   return render_mermaidText(mermaidText, div);
 }
 async function render_mermaidText(mermaidText, div) {
-  if (ABCSetting.env == "obsidian") {
-    await init_mermaid();
-    const { svg } = await mermaid?.render("ab-mermaid-" + getID(), mermaidText);
-    div.innerHTML = svg;
-  } else if (ABCSetting.env == "obsidian-min") {
-    ABConvertManager.getInstance().m_renderMarkdownFn("```mermaid\n" + mermaidText + "\n```", div);
+  if ((ABCSetting.env == "obsidian" || ABCSetting.env == "obsidian-min") && ABCSetting.mermaid) {
+    ABCSetting.mermaid.then(async (mermaid) => {
+      const { svg } = await mermaid.render("ab-mermaid-" + getID(), mermaidText);
+      div.innerHTML = svg;
+    });
   } else {
     div.classList.add("ab-raw");
     div.innerHTML = `<div class="ab-raw-data" type-data="mermaid" content-data='${mermaidText}'></div>`;
   }
   return div;
 }
-async function init_mermaid() {
-  if (ABCSetting.env !== "obsidian" || true) return;
-}
 function abConvertEvent(d, isCycle = false) {
   if (d.querySelector(".ab-super-width")) {
     const els_note = d.querySelectorAll(".ab-note");

package/index_mdit.ts

@@ -62,7 +62,7 @@ import "../ABConverter/converter/abc_deco"
 import "../ABConverter/converter/abc_ex"
 import "../ABConverter/converter/abc_mdit_container"
 import "../ABConverter/converter/abc_plantuml" // 可选建议：
-import "../ABConverter/converter/abc_mermaid.min" // 可选建议：非 min 环境下 7.1MB
+import "../ABConverter/converter/abc_mermaid"  // 可选建议：新版无额外依赖，旧版非 min 环境下 7.1MB
 import "../ABConverter/converter/abc_markmap"  // 可选建议：1.3MB
 
 interface Options {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "markdown-it-any-block",
-  "version": "3.3.1-beta1",
-  "description": "```typescript\r import { ABConvertManager } from \"ABConvertManager\"",
+  "version": "3.3.2-beta1",
+  "description": "You can flexibility to create a 'Block' by many means. It also provides many useful features, like `list to table`. (obsidian/markdown-it/vuepress plugin/app)",
   "types": "@types/index_mdit.d.ts",
   "type": "module",
   "main": "dist/mdit-any-block.cjs",
@@ -22,6 +22,10 @@
     "prepublishOnly": "pnpm build",
     "copy_abc_style": "copyfiles --flat ../../src/ABConverter/style/styles.css ./"
   },
+  "keywords": [
+		"anyblock", "any-block",
+		"markdown", "markdown-it"
+	],
   "author": "LincZero",
   "license": "GNU Affero General Public License v3.0",
   "peerDependencies": {

package/styles.css

@@ -207,6 +207,7 @@ html[data-theme=dark] #app {
   padding-right: 20px;
   font-size: 0.9em;
   font-weight: bold;
+  cursor: pointer;
 }
 .ab-note .ab-tab-root .ab-tab-nav .ab-tab-nav-item[is_activate=false] {
   background-color: var(--ab-tab-root-bd-color);