@anyblock/remark-any-block 3.4.11 → 3.5.0

package/dist/remark-any-block.cjs

@@ -451,17 +451,21 @@ const ABAlias_json_mdit = [
   { regex: /\|:::_140lne\|(?:mdit2|2)?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|mdit2list|list2pumlMindmap|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|mdit2list|list2markmap|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(wbs|(工作)?分解(图|结构))\|/, replacement: "|mdit2list|list2pumlWBS|" },
-  { regex: /\|:::_140lne\|(?:mdit2|2)?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|mdit2list|list2table|" },
+  { regex: /\|:::_140lne\|(?:mdit2|2)?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|mdit2Listdata|listdata2strict|listdata2table|" },
   // list - lt树 (属于多层一叉树)
   { regex: /\|:::_140lne\|(?:mdit2|2)?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|mdit2list|list2lt|" },
-  { regex: /\|:::_140lne\|(?:mdit2|2)?(list|列表)\|/, replacement: "|mdit2list|list2lt|addClass(ab-listtable-likelist)|" },
+  { regex: /\|:::_140lne\|2?(list|列表)\|/, replacement: "|mdit2list|list2lt|addClass(ab-listtable-likelist)|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|mdit2list|list2dt|" },
   // list - 二层树
   { regex: /\|:::_140lne\|(fakeList|仿列表)\|/, replacement: "|mdit2list|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" },
   // 至后
-  { regex: "|mdit2list|", replacement: "|mdit2listdata|listdata2strict|listdata2list|" }
+  { regex: "|mdit2list|", replacement: "|mdit2listdata|listdata2strict|listdata2list|" },
+  { regex: "|mdit2List|", replacement: "|mdit2Listdata|listdata2strict|listdata2list|" }
 ];
 const ABAlias_json_title = [
+  // 至前，特殊
+  { regex: "|heading2", replacement: "|title2" },
+  { regex: "|h2", replacement: "|title2" },
   // title - list&title
   { regex: /\|heading_140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|" },
   { regex: /\|heading_140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|" },
@@ -474,7 +478,7 @@ const ABAlias_json_title = [
   { regex: /\|heading_140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|title2list|list2pumlMindmap|" },
   { regex: /\|heading_140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|title2list|list2markmap|" },
   { regex: /\|heading_140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|title2list|list2pumlWBS|" },
-  { regex: /\|heading_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2list|list2table|" },
+  { regex: /\|heading_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2Listdata|listdata2strict|listdata2table|" },
   // list - lt树 (属于多层一叉树)
   { regex: /\|heading_140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|title2list|list2lt|" },
   { regex: /\|heading_140lne\|2?(list|列表)\|/, replacement: "|title2list|list2lt|addClass(ab-listtable-likelist)|" },
@@ -1208,8 +1212,12 @@ class ListProcess {
    * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
    * 
    * (比较旧版是正文+10，列表+11，后来允许标题等级为负数。这样方便很多)
+   * 
+   * @fine_mode 精细拆分模式
+   * - true:  会将正文和列表拆分成多个节点
+   * - false: 会将标题+正文+列表合并成一个节点
    */
-  static title2data(text2) {
+  static title2data(text2, fine_mode = true) {
     let list_itemInfo = [];
     const list_text = text2.split("\n");
     let mul_mode = "";
@@ -1218,14 +1226,17 @@ class ListProcess {
       if (codeBlockFlag == "") {
         const match2 = line.match(ABReg.reg_code);
         if (match2 && match2[3]) {
-          if (mul_mode === "heading" || mul_mode === "") {
+          codeBlockFlag = match2[1] + match2[3];
+          if (!fine_mode && list_itemInfo.length > 0) {
+            list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          } else if (mul_mode === "heading" || mul_mode === "") {
+            removeTailBlank();
             list_itemInfo.push({
               content: line,
               level: 0
             });
             mul_mode = "para";
           } else {
-            codeBlockFlag = match2[1] + match2[3];
             list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
           }
           continue;
@@ -1240,10 +1251,14 @@ class ListProcess {
       if (match_heading && !match_heading[1]) {
         removeTailBlank();
         list_itemInfo.push({
-          content: match_heading[4],
+          content: fine_mode ? match_heading[4] : line,
+          // 可选是否把标题标志也放进去
           level: match_heading[3].length - 1 - 10
         });
         mul_mode = "heading";
+      } else if (!fine_mode && list_itemInfo.length > 0) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+        continue;
       } else if (match_list) {
         removeTailBlank();
         list_itemInfo.push({
@@ -1251,19 +1266,23 @@ class ListProcess {
           level: match_list[1].length + 1
         });
         mul_mode = "list";
-      } else if (/^\S/.test(line) && mul_mode == "list") {
-        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+      } else if (mul_mode == "list" && /^\s/.test(line)) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line.trimStart();
+        continue;
       } else {
         if (mul_mode == "para") {
           list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          continue;
         } else if (/^\s*$/.test(line)) {
           continue;
         } else {
+          removeTailBlank();
           list_itemInfo.push({
             content: line,
             level: 0
           });
           mul_mode = "para";
+          continue;
         }
       }
     }
@@ -1281,41 +1300,20 @@ class ListProcess {
    * @detail
    * 与 title2data 的逻辑基本相同
    * 
-   * 这里要将Mdit标识 (@xxx)、正文、列表 的等级合为一块，所以存在偏移值：
-   * 
-   * 1. Mdit等级,  = `@<数字>`-100,
-   * 2. 正文等级,  = 0,              取值[+1,+Infi]
-   * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
-   * 
-   * 例如:
+   * 有很多写法变型和语法糖，所以逻辑比较复杂。
+   * 具体设计详见 "docs/docs/dev docs/其他层级表示法.md"
    * 
-   * :::
+   * 支持:
    * 
-   * @1 AAA
+   * - 单行标题模式
+   * - 多行标题模式
+   * - 缺少分割标题模式
    * 
-   * aaa
-   * 
-   * @2 BBB
-   * 
-   * @2 B22
-   * 
-   * ccc
-   * ddd
-   * 
-   * @1 A22
-   * 
-   * :::
-   * 
-   * 会被转化为
-   * 
-   * - AAA
-   *   - BBB
-   *   - B22
-   *     - ccc
-   *       ddd
-   * - A22
-   */
-  static mdit2data(text2) {
+   * @fine_mode 精细拆分模式
+   * - true:  会将正文和列表拆分成多个节点
+   * - false: 会将标题+正文+列表合并成一个节点
+   */
+  static mdit2data(text2, fine_mode = true) {
     let list_itemInfo = [];
     const list_text = text2.split("\n");
     let mul_mode = "";
@@ -1324,14 +1322,17 @@ class ListProcess {
       if (codeBlockFlag == "") {
         const match2 = line.match(ABReg.reg_code);
         if (match2 && match2[3]) {
-          if (mul_mode === "mdit" || mul_mode === "") {
+          codeBlockFlag = match2[1] + match2[3];
+          if (!fine_mode && list_itemInfo.length > 0) {
+            list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          } else if (mul_mode === "mdit" || mul_mode === "") {
+            removeTailBlank();
             list_itemInfo.push({
               content: line,
               level: 0
             });
             mul_mode = "para";
           } else {
-            codeBlockFlag = match2[1] + match2[3];
             list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
           }
           continue;
@@ -1341,15 +1342,18 @@ class ListProcess {
         list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
         continue;
       }
-      const match_mdit = line.match(/^(\s*)@(\d+)\s+(.*)$/);
+      const match_mdit = line.match(/^(\s*)@(\d+)(?:\s+(.*))?$/);
       const match_list = line.match(ABReg.reg_list_noprefix);
       if (match_mdit && !match_mdit[1]) {
         removeTailBlank();
         list_itemInfo.push({
-          content: match_mdit[3],
+          content: match_mdit[3] ?? "",
           level: Number(match_mdit[2]) - 100
         });
         mul_mode = "mdit";
+      } else if (!fine_mode && list_itemInfo.length > 0) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+        continue;
       } else if (match_list) {
         removeTailBlank();
         list_itemInfo.push({
@@ -1357,19 +1361,23 @@ class ListProcess {
           level: match_list[1].length + 1
         });
         mul_mode = "list";
-      } else if (/^\S/.test(line) && mul_mode == "list") {
-        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+      } else if (mul_mode == "list" && /^\s/.test(line)) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line.trimStart();
+        continue;
       } else {
         if (mul_mode == "para") {
           list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          continue;
         } else if (/^\s*$/.test(line)) {
           continue;
         } else {
+          removeTailBlank();
           list_itemInfo.push({
             content: line,
             level: 0
           });
           mul_mode = "para";
+          continue;
         }
       }
     }
@@ -1588,7 +1596,7 @@ const abc_list2listdata = ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "列表到listdata",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.list2data(content);
   }
 });
@@ -1597,9 +1605,19 @@ const abc_title2listdata = ABConvert.factory({
   name: "标题到listdata",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
-  detail: "标题到listdata",
-  process: (el, header, content) => {
-    return ListProcess.title2data(content);
+  detail: "标题到listdata。细粒度版本，列表会拆分成多个节点",
+  process: (_el, _header, content) => {
+    return ListProcess.title2data(content, true);
+  }
+});
+ABConvert.factory({
+  id: "title2Listdata",
+  name: "标题到Listdata",
+  process_param: ABConvert_IOEnum.text,
+  process_return: ABConvert_IOEnum.list_stream,
+  detail: "标题到Listdata。粗粒度版本，列表为一个节点，不会拆分",
+  process: (_el, _header, content) => {
+    return ListProcess.title2data(content, false);
   }
 });
 ABConvert.factory({
@@ -1607,9 +1625,19 @@ ABConvert.factory({
   name: "mdit到listdata",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
-  detail: "mdit到listdata",
-  process: (el, header, content) => {
-    return ListProcess.mdit2data(content);
+  detail: "mdit到listdata。细粒度版本，列表会拆分成多个节点",
+  process: (_el, _header, content) => {
+    return ListProcess.mdit2data(content, true);
+  }
+});
+ABConvert.factory({
+  id: "mdit2Listdata",
+  name: "mdit到Listdata",
+  process_param: ABConvert_IOEnum.text,
+  process_return: ABConvert_IOEnum.list_stream,
+  detail: "mdit到Listdata。粗粒度版本，列表为一个节点，不会拆分",
+  process: (_el, _header, content) => {
+    return ListProcess.mdit2data(content, false);
   }
 });
 ABConvert.factory({
@@ -1618,7 +1646,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.text,
   detail: "listdata到列表",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2list(content);
   }
 });
@@ -1628,17 +1656,18 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.el,
   detail: "listdata到节点图",
-  process: (el, header, content) => {
+  process: (el, _header, content) => {
     return ListProcess.data2nodes(content, el);
   }
 });
 ABConvert.factory({
   id: "listdata2strict",
   name: "listdata严格化",
+  match: /listdata2strict|listdata2lint/,
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "将列表数据转化为更规范的列表数据。统一缩进符(2空格 4空格 tab混用)为level 1、禁止跳等级(h1直接就到h3)",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2strict(content);
   }
 });
@@ -1648,7 +1677,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "当列表中存在任务列表项时，令此列表项支持任务项",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2taskData(content);
   }
 });
@@ -1658,7 +1687,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.json,
   detail: "列表到listnode",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     const data2 = ListProcess.list2listnode(content);
     return JSON.stringify(data2, null, 2);
   }
@@ -1669,7 +1698,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.json,
   detail: "列表到json",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     const data2 = ListProcess.list2json(content);
     return JSON.stringify(data2, null, 2);
   }
@@ -2182,6 +2211,19 @@ ABConvert.factory({
     return el = TableProcess.data2table(data2, el, matchs[2] == "T");
   }
 });
+ABConvert.factory({
+  id: "listdata2table",
+  name: "列表数据转表格",
+  match: /listdata2(md)?table(T)?/,
+  default: "listdata2table",
+  process_param: ABConvert_IOEnum.list_stream,
+  process_return: ABConvert_IOEnum.el,
+  process: (el, header, content) => {
+    const matchs = header.match(/listdata2(md)?table(T)?/);
+    if (!matchs) return el;
+    return el = TableProcess.data2table(content, el, matchs[2] == "T");
+  }
+});
 ABConvert.factory({
   id: "list2c2t",
   name: "列表转二列表格",

package/dist/remark-any-block.js

@@ -427,17 +427,21 @@ const ABAlias_json_mdit = [
   { regex: /\|:::_140lne\|(?:mdit2|2)?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|mdit2list|list2pumlMindmap|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|mdit2list|list2markmap|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(wbs|(工作)?分解(图|结构))\|/, replacement: "|mdit2list|list2pumlWBS|" },
-  { regex: /\|:::_140lne\|(?:mdit2|2)?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|mdit2list|list2table|" },
+  { regex: /\|:::_140lne\|(?:mdit2|2)?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|mdit2Listdata|listdata2strict|listdata2table|" },
   // list - lt树 (属于多层一叉树)
   { regex: /\|:::_140lne\|(?:mdit2|2)?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|mdit2list|list2lt|" },
-  { regex: /\|:::_140lne\|(?:mdit2|2)?(list|列表)\|/, replacement: "|mdit2list|list2lt|addClass(ab-listtable-likelist)|" },
+  { regex: /\|:::_140lne\|2?(list|列表)\|/, replacement: "|mdit2list|list2lt|addClass(ab-listtable-likelist)|" },
   { regex: /\|:::_140lne\|(?:mdit2|2)?(dir|dirTree|目录树?|目录结构)\|/, replacement: "|mdit2list|list2dt|" },
   // list - 二层树
   { regex: /\|:::_140lne\|(fakeList|仿列表)\|/, replacement: "|mdit2list|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|" },
   // 至后
-  { regex: "|mdit2list|", replacement: "|mdit2listdata|listdata2strict|listdata2list|" }
+  { regex: "|mdit2list|", replacement: "|mdit2listdata|listdata2strict|listdata2list|" },
+  { regex: "|mdit2List|", replacement: "|mdit2Listdata|listdata2strict|listdata2list|" }
 ];
 const ABAlias_json_title = [
+  // 至前，特殊
+  { regex: "|heading2", replacement: "|title2" },
+  { regex: "|h2", replacement: "|title2" },
   // title - list&title
   { regex: /\|heading_140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|" },
   { regex: /\|heading_140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|" },
@@ -450,7 +454,7 @@ const ABAlias_json_title = [
   { regex: /\|heading_140lne\|2?(puml)?(plantuml|mindmap|脑图|思维导图)\|/, replacement: "|title2list|list2pumlMindmap|" },
   { regex: /\|heading_140lne\|2?(markmap|mdMindmap|md脑图|md思维导图)\|/, replacement: "|title2list|list2markmap|" },
   { regex: /\|heading_140lne\|2?(wbs|(工作)?分解(图|结构))\|/, replacement: "|title2list|list2pumlWBS|" },
-  { regex: /\|heading_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2list|list2table|" },
+  { regex: /\|heading_140lne\|2?(table|multiWayTable|multiCrossTable|表格?|多叉表格?|跨行表格?)\|/, replacement: "|title2Listdata|listdata2strict|listdata2table|" },
   // list - lt树 (属于多层一叉树)
   { regex: /\|heading_140lne\|2?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|title2list|list2lt|" },
   { regex: /\|heading_140lne\|2?(list|列表)\|/, replacement: "|title2list|list2lt|addClass(ab-listtable-likelist)|" },
@@ -1184,8 +1188,12 @@ class ListProcess {
    * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
    * 
    * (比较旧版是正文+10，列表+11，后来允许标题等级为负数。这样方便很多)
+   * 
+   * @fine_mode 精细拆分模式
+   * - true:  会将正文和列表拆分成多个节点
+   * - false: 会将标题+正文+列表合并成一个节点
    */
-  static title2data(text2) {
+  static title2data(text2, fine_mode = true) {
     let list_itemInfo = [];
     const list_text = text2.split("\n");
     let mul_mode = "";
@@ -1194,14 +1202,17 @@ class ListProcess {
       if (codeBlockFlag == "") {
         const match2 = line.match(ABReg.reg_code);
         if (match2 && match2[3]) {
-          if (mul_mode === "heading" || mul_mode === "") {
+          codeBlockFlag = match2[1] + match2[3];
+          if (!fine_mode && list_itemInfo.length > 0) {
+            list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          } else if (mul_mode === "heading" || mul_mode === "") {
+            removeTailBlank();
             list_itemInfo.push({
               content: line,
               level: 0
             });
             mul_mode = "para";
           } else {
-            codeBlockFlag = match2[1] + match2[3];
             list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
           }
           continue;
@@ -1216,10 +1227,14 @@ class ListProcess {
       if (match_heading && !match_heading[1]) {
         removeTailBlank();
         list_itemInfo.push({
-          content: match_heading[4],
+          content: fine_mode ? match_heading[4] : line,
+          // 可选是否把标题标志也放进去
           level: match_heading[3].length - 1 - 10
         });
         mul_mode = "heading";
+      } else if (!fine_mode && list_itemInfo.length > 0) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+        continue;
       } else if (match_list) {
         removeTailBlank();
         list_itemInfo.push({
@@ -1227,19 +1242,23 @@ class ListProcess {
           level: match_list[1].length + 1
         });
         mul_mode = "list";
-      } else if (/^\S/.test(line) && mul_mode == "list") {
-        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+      } else if (mul_mode == "list" && /^\s/.test(line)) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line.trimStart();
+        continue;
       } else {
         if (mul_mode == "para") {
           list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          continue;
         } else if (/^\s*$/.test(line)) {
           continue;
         } else {
+          removeTailBlank();
           list_itemInfo.push({
             content: line,
             level: 0
           });
           mul_mode = "para";
+          continue;
         }
       }
     }
@@ -1257,41 +1276,20 @@ class ListProcess {
    * @detail
    * 与 title2data 的逻辑基本相同
    * 
-   * 这里要将Mdit标识 (@xxx)、正文、列表 的等级合为一块，所以存在偏移值：
-   * 
-   * 1. Mdit等级,  = `@<数字>`-100,
-   * 2. 正文等级,  = 0,              取值[+1,+Infi]
-   * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
-   * 
-   * 例如:
+   * 有很多写法变型和语法糖，所以逻辑比较复杂。
+   * 具体设计详见 "docs/docs/dev docs/其他层级表示法.md"
    * 
-   * :::
+   * 支持:
    * 
-   * @1 AAA
+   * - 单行标题模式
+   * - 多行标题模式
+   * - 缺少分割标题模式
    * 
-   * aaa
-   * 
-   * @2 BBB
-   * 
-   * @2 B22
-   * 
-   * ccc
-   * ddd
-   * 
-   * @1 A22
-   * 
-   * :::
-   * 
-   * 会被转化为
-   * 
-   * - AAA
-   *   - BBB
-   *   - B22
-   *     - ccc
-   *       ddd
-   * - A22
-   */
-  static mdit2data(text2) {
+   * @fine_mode 精细拆分模式
+   * - true:  会将正文和列表拆分成多个节点
+   * - false: 会将标题+正文+列表合并成一个节点
+   */
+  static mdit2data(text2, fine_mode = true) {
     let list_itemInfo = [];
     const list_text = text2.split("\n");
     let mul_mode = "";
@@ -1300,14 +1298,17 @@ class ListProcess {
       if (codeBlockFlag == "") {
         const match2 = line.match(ABReg.reg_code);
         if (match2 && match2[3]) {
-          if (mul_mode === "mdit" || mul_mode === "") {
+          codeBlockFlag = match2[1] + match2[3];
+          if (!fine_mode && list_itemInfo.length > 0) {
+            list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          } else if (mul_mode === "mdit" || mul_mode === "") {
+            removeTailBlank();
             list_itemInfo.push({
               content: line,
               level: 0
             });
             mul_mode = "para";
           } else {
-            codeBlockFlag = match2[1] + match2[3];
             list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
           }
           continue;
@@ -1317,15 +1318,18 @@ class ListProcess {
         list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
         continue;
       }
-      const match_mdit = line.match(/^(\s*)@(\d+)\s+(.*)$/);
+      const match_mdit = line.match(/^(\s*)@(\d+)(?:\s+(.*))?$/);
       const match_list = line.match(ABReg.reg_list_noprefix);
       if (match_mdit && !match_mdit[1]) {
         removeTailBlank();
         list_itemInfo.push({
-          content: match_mdit[3],
+          content: match_mdit[3] ?? "",
           level: Number(match_mdit[2]) - 100
         });
         mul_mode = "mdit";
+      } else if (!fine_mode && list_itemInfo.length > 0) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+        continue;
       } else if (match_list) {
         removeTailBlank();
         list_itemInfo.push({
@@ -1333,19 +1337,23 @@ class ListProcess {
           level: match_list[1].length + 1
         });
         mul_mode = "list";
-      } else if (/^\S/.test(line) && mul_mode == "list") {
-        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+      } else if (mul_mode == "list" && /^\s/.test(line)) {
+        list_itemInfo[list_itemInfo.length - 1].content += "\n" + line.trimStart();
+        continue;
       } else {
         if (mul_mode == "para") {
           list_itemInfo[list_itemInfo.length - 1].content += "\n" + line;
+          continue;
         } else if (/^\s*$/.test(line)) {
           continue;
         } else {
+          removeTailBlank();
           list_itemInfo.push({
             content: line,
             level: 0
           });
           mul_mode = "para";
+          continue;
         }
       }
     }
@@ -1564,7 +1572,7 @@ const abc_list2listdata = ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "列表到listdata",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.list2data(content);
   }
 });
@@ -1573,9 +1581,19 @@ const abc_title2listdata = ABConvert.factory({
   name: "标题到listdata",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
-  detail: "标题到listdata",
-  process: (el, header, content) => {
-    return ListProcess.title2data(content);
+  detail: "标题到listdata。细粒度版本，列表会拆分成多个节点",
+  process: (_el, _header, content) => {
+    return ListProcess.title2data(content, true);
+  }
+});
+ABConvert.factory({
+  id: "title2Listdata",
+  name: "标题到Listdata",
+  process_param: ABConvert_IOEnum.text,
+  process_return: ABConvert_IOEnum.list_stream,
+  detail: "标题到Listdata。粗粒度版本，列表为一个节点，不会拆分",
+  process: (_el, _header, content) => {
+    return ListProcess.title2data(content, false);
   }
 });
 ABConvert.factory({
@@ -1583,9 +1601,19 @@ ABConvert.factory({
   name: "mdit到listdata",
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.list_stream,
-  detail: "mdit到listdata",
-  process: (el, header, content) => {
-    return ListProcess.mdit2data(content);
+  detail: "mdit到listdata。细粒度版本，列表会拆分成多个节点",
+  process: (_el, _header, content) => {
+    return ListProcess.mdit2data(content, true);
+  }
+});
+ABConvert.factory({
+  id: "mdit2Listdata",
+  name: "mdit到Listdata",
+  process_param: ABConvert_IOEnum.text,
+  process_return: ABConvert_IOEnum.list_stream,
+  detail: "mdit到Listdata。粗粒度版本，列表为一个节点，不会拆分",
+  process: (_el, _header, content) => {
+    return ListProcess.mdit2data(content, false);
   }
 });
 ABConvert.factory({
@@ -1594,7 +1622,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.text,
   detail: "listdata到列表",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2list(content);
   }
 });
@@ -1604,17 +1632,18 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.el,
   detail: "listdata到节点图",
-  process: (el, header, content) => {
+  process: (el, _header, content) => {
     return ListProcess.data2nodes(content, el);
   }
 });
 ABConvert.factory({
   id: "listdata2strict",
   name: "listdata严格化",
+  match: /listdata2strict|listdata2lint/,
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "将列表数据转化为更规范的列表数据。统一缩进符(2空格 4空格 tab混用)为level 1、禁止跳等级(h1直接就到h3)",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2strict(content);
   }
 });
@@ -1624,7 +1653,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.list_stream,
   process_return: ABConvert_IOEnum.list_stream,
   detail: "当列表中存在任务列表项时，令此列表项支持任务项",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     return ListProcess.data2taskData(content);
   }
 });
@@ -1634,7 +1663,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.json,
   detail: "列表到listnode",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     const data2 = ListProcess.list2listnode(content);
     return JSON.stringify(data2, null, 2);
   }
@@ -1645,7 +1674,7 @@ ABConvert.factory({
   process_param: ABConvert_IOEnum.text,
   process_return: ABConvert_IOEnum.json,
   detail: "列表到json",
-  process: (el, header, content) => {
+  process: (_el, _header, content) => {
     const data2 = ListProcess.list2json(content);
     return JSON.stringify(data2, null, 2);
   }
@@ -2158,6 +2187,19 @@ ABConvert.factory({
     return el = TableProcess.data2table(data2, el, matchs[2] == "T");
   }
 });
+ABConvert.factory({
+  id: "listdata2table",
+  name: "列表数据转表格",
+  match: /listdata2(md)?table(T)?/,
+  default: "listdata2table",
+  process_param: ABConvert_IOEnum.list_stream,
+  process_return: ABConvert_IOEnum.el,
+  process: (el, header, content) => {
+    const matchs = header.match(/listdata2(md)?table(T)?/);
+    if (!matchs) return el;
+    return el = TableProcess.data2table(content, el, matchs[2] == "T");
+  }
+});
 ABConvert.factory({
   id: "list2c2t",
   name: "列表转二列表格",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyblock/remark-any-block",
-  "version": "3.4.11",
+  "version": "3.5.0",
   "description": "You can flexibility to create a 'Block' by many means. It also provides many useful features, like `list to table`.",
   "types": "@types/index_remark.d.ts",
   "type": "module",