@anyblock/any-block-core 3.4.10 → 3.4.12

package/ABAlias.ts

@@ -123,18 +123,42 @@ const ABAlias_json_withSub: ABAlias_json[] = [
 
 // mdit块
 const ABAlias_json_mdit: ABAlias_json[] = [
-  {regex: /\|:::_140lne\|(2?tabs?|标签页?)\|/, replacement: "|mditTabs|"},
+  {regex: /\|:::_140lne\|((?:mdit2|2)?tabs?|标签页?)\|/, replacement: "|mditTabs|"},
   {regex: "|:::_140lne|demo|", replacement: "|mditDemo|"},
   {regex: "|:::_140lne|abDemo|", replacement: "|mditABDemo|"},
-  {regex: /\|:::_140lne\|(2?col|分栏)\|/, replacement: "|mditCol|"},
-  {regex: /\|:::_140lne\|(2?card|卡片)\|/, replacement: "|mditCard|"},
-  {regex: /\|:::_140lne\|(2?chat|聊天)\|/, replacement: "|mditChat|code(chat)|"},
+  {regex: /\|:::_140lne\|((?:mdit2|2)?col|分栏)\|/, replacement: "|mditCol|"},
+  {regex: /\|:::_140lne\|((?:mdit2|2)?card|卡片)\|/, replacement: "|mditCard|"},
+  {regex: /\|:::_140lne\|((?:mdit2|2)?chat|聊天)\|/, replacement: "|mditChat|code(chat)|"},
+
+  // 
+  // {regex: /\|:::_140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|"},
+  // {regex: /\|:::_140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|"},
+  // {regex: /\|:::_140lne\|2?(col|分栏)\||\|title2col\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-col)|"},
+  // {regex: /\|:::_140lne\|2?(card|卡片)\||\|title2card\|/, replacement: "|title2c2listdata|c2listdata2items|addClass(ab-card)|addClass(ab-lay-vfall)|"},
+  // {regex: /\|:::_140lne\|2?(nodes?|节点)\||\|(title2node|title2abMindmap)\|/, replacement: "|title2listdata|listdata2strict|listdata2nodes|"},
+
+  // list  - 多叉多层树
+  {regex: /\|:::_140lne\|(?:mdit2|2)?(mermaid|flow|流程图)\|/, replacement: "|mdit2list" + "|list2mermaid|"},
+  {regex: /\|:::_140lne\|(?:mdit2|2)?(mehrmaid|mdmermaid)\|/, replacement: "|mdit2list" + "|list2mehrmaidText|code(mehrmaid)|"},
+  {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|"},
+
+  // list - lt树 (属于多层一叉树)
+  {regex: /\|:::_140lne\|(?:mdit2|2)?(lt|listTable|treeTable|listGrid|treeGrid|列表格|树形表格?)\|/, replacement: "|mdit2list" + "|list2lt|"},
+  {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|"},
 ]
 
 // 标题块
 const ABAlias_json_title: ABAlias_json[] = [
-  {regex: "|title2list|", replacement: "|title2listdata|listdata2strict|listdata2list|"},
-
   // title - list&title
   {regex: /\|heading_140lne\|2?(timeline|时间线)\|/, replacement: "|title2timeline|"},
   {regex: /\|heading_140lne\|2?(tabs?|标签页?)\||\|title2tabs?\|/, replacement: "|title2c2listdata|c2listdata2tab|"},
@@ -157,6 +181,9 @@ const ABAlias_json_title: ABAlias_json[] = [
 
   // list - 二层树
   {regex: /\|heading_140lne\|(fakeList|仿列表)\|/, replacement: "|title2list" + "|list2table|addClass(ab-table-fc)|addClass(ab-table-likelist)|"},
+
+  // 至后
+  {regex: "|title2list|", replacement: "|title2listdata|listdata2strict|listdata2list|"},
 ]
 
 // 列表块

package/converter/abc_code.ts

@@ -53,6 +53,7 @@ const _abc_region2indent = ABConvert.factory({
   }
 })
 
+/// 这个处理器本来是想要用来解决mdit语法 `:::` 嵌套渲染的问题的
 const _abc_mdit2code = ABConvert.factory({
   id: "mdit2code",
   name: "mdit转代码块",

package/converter/abc_list.ts

@@ -267,7 +267,7 @@ export class ListProcess{
   }
 
   /**
-   * 标题大纲转列表数据（@todo 正文的level+10，要减掉）
+   * 标题大纲转列表数据
    * 
    * @detail
    * 这里要将标题、正文、列表 的等级合为一块，所以存在偏移值：
@@ -276,25 +276,35 @@ export class ListProcess{
    * 2. 正文等级,  = 0,              取值[+1,+Infi]
    * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
    * 
+   * (比较旧版是正文+10，列表+11，后来允许标题等级为负数。这样方便很多)
    */
-  static title2data(text: string){
+  static title2data(text: string): List_ListItem {
     let list_itemInfo:List_ListItem = []
 
     const list_text = text.split("\n")
     let mul_mode:"heading"|"para"|"list"|"" = ""                // 多行模式，标题/正文/列表/空
-    let codeBlockFlag = ''
+    let codeBlockFlag = '' // 代码块标志，避免在代码块内识别结束符号
     for (let line of list_text) {
-      // heading和mdit类型 需要跳过代码块内的结束标志
+      // heading和mdit类型都需要跳过代码块内的结束标志
       if (codeBlockFlag == '') {
         const match = line.match(ABReg.reg_code)
-        if (match && match[3]) {
-          codeBlockFlag = match[1]+match[3]
-          list_itemInfo[list_itemInfo.length-1].content = list_itemInfo[list_itemInfo.length-1].content+"\n"+line; continue
+        if (match && match[3]) { // 进入代码块。则将内容添加添加到最后的列表项 (不能是标题列表项)
+          if (mul_mode === "heading" || mul_mode === "") {
+            list_itemInfo.push({
+              content: line,
+              level: 0
+            })
+            mul_mode = "para"
+          } else {
+            codeBlockFlag = match[1]+match[3]
+            list_itemInfo[list_itemInfo.length-1].content += "\n" + line;
+          }
+          continue
         }
       }
-      else {
+      else { // 在代码块内，找代码块的结束标志
         if (line.indexOf(codeBlockFlag) == 0) codeBlockFlag = ''
-        list_itemInfo[list_itemInfo.length-1].content = list_itemInfo[list_itemInfo.length-1].content+"\n"+line; continue
+        list_itemInfo[list_itemInfo.length-1].content += "\n" + line; continue
       }
 
       //
@@ -304,7 +314,7 @@ export class ListProcess{
         removeTailBlank()
         list_itemInfo.push({
           content: match_heading[4],
-          level: (match_heading[3].length-1)-10
+          level: (match_heading[3].length-1) - 10
         })
         mul_mode = "heading"
       }
@@ -312,16 +322,16 @@ export class ListProcess{
         removeTailBlank()
         list_itemInfo.push({
           content: match_list[4],
-          level: match_list[1].length+1//+10
+          level: match_list[1].length + 1
         })
         mul_mode = "list"
       }
       else if (/^\S/.test(line) && mul_mode=="list"){         // 3. 带缩进且在列表层级中
-        list_itemInfo[list_itemInfo.length-1].content = list_itemInfo[list_itemInfo.length-1].content+"\n"+line
+        list_itemInfo[list_itemInfo.length-1].content += "\n" + line
       }
       else {                                                  // 4. 正文层级
         if (mul_mode=="para") {
-          list_itemInfo[list_itemInfo.length-1].content = list_itemInfo[list_itemInfo.length-1].content+"\n"+line
+          list_itemInfo[list_itemInfo.length-1].content += "\n" + line
         }
         else if(/^\s*$/.test(line)){
           continue
@@ -329,7 +339,7 @@ export class ListProcess{
         else{
           list_itemInfo.push({
             content: line,
-            level: 0//+10
+            level: 0
           })
           mul_mode = "para"
         }
@@ -345,6 +355,125 @@ export class ListProcess{
     }
   }
 
+  /**
+   * MarkdownIt 转列表数据
+   * 
+   * @detail
+   * 与 title2data 的逻辑基本相同
+   * 
+   * 这里要将Mdit标识 (@xxx)、正文、列表 的等级合为一块，所以存在偏移值：
+   * 
+   * 1. Mdit等级,  = `@<数字>`-100,
+   * 2. 正文等级,  = 0,              取值[+1,+Infi]
+   * 3. 列表等级,  = `(.*)-`个数+1,  取值[0]
+   * 
+   * 例如:
+   * 
+   * :::
+   * 
+   * @1 AAA
+   * 
+   * aaa
+   * 
+   * @2 BBB
+   * 
+   * @2 B22
+   * 
+   * ccc
+   * ddd
+   * 
+   * @1 A22
+   * 
+   * :::
+   * 
+   * 会被转化为
+   * 
+   * - AAA
+   *   - BBB
+   *   - B22
+   *     - ccc
+   *       ddd
+   * - A22
+   */
+  static mdit2data(text: string): List_ListItem {
+    let list_itemInfo: List_ListItem = []
+
+    const list_text = text.split("\n")
+    let mul_mode: "mdit" | "para" | "list" | "" = ""            // 多行模式，mdit/正文/列表/空
+    let codeBlockFlag = '' // 代码块标志，避免在代码块内识别结束符号
+    for (let line of list_text) {
+      // heading和mdit类型都需要跳过代码块内的结束标志
+      if (codeBlockFlag == '') {
+        const match = line.match(ABReg.reg_code)
+        if (match && match[3]) { // 进入代码块。则将内容添加到最后的列表项 (不能是mdit列表项)
+          if (mul_mode === "mdit" || mul_mode === "") {
+            list_itemInfo.push({
+              content: line,
+              level: 0
+            })
+            mul_mode = "para"
+          } else {
+            codeBlockFlag = match[1] + match[3]
+            list_itemInfo[list_itemInfo.length-1].content += "\n" + line
+          }
+          continue
+        }
+      }
+      else { // 在代码块内，找代码块的结束标志
+        if (line.indexOf(codeBlockFlag) == 0) codeBlockFlag = ''
+        list_itemInfo[list_itemInfo.length-1].content += "\n" + line
+        continue
+      }
+
+      //
+      const match_mdit = line.match(/^(\s*)@(\d+)\s+(.*)$/)
+      const match_list = line.match(ABReg.reg_list_noprefix)
+      if (match_mdit && !match_mdit[1]) {                       // 1. Mdit层级（只识别根处）
+        removeTailBlank()
+        list_itemInfo.push({
+          content: match_mdit[3],
+          level: Number(match_mdit[2]) - 100
+        })
+        mul_mode = "mdit"
+      }
+      else if (match_list) {                                    // 2. 列表层级 ~~（只识别根处）~~
+        removeTailBlank()
+        list_itemInfo.push({
+          content: match_list[4],
+          level: match_list[1].length + 1
+        })
+        mul_mode = "list"
+      }
+      else if (/^\S/.test(line) && mul_mode == "list") {        // 3. 带缩进且在列表层级中
+        list_itemInfo[list_itemInfo.length-1].content += "\n" + line
+      }
+      else {                                                    // 4. 正文层级
+        if (mul_mode == "para") {
+          list_itemInfo[list_itemInfo.length-1].content += "\n" + line
+        }
+        else if (/^\s*$/.test(line)) {
+          continue
+        }
+        else {
+          list_itemInfo.push({
+            content: line,
+            level: 0
+          })
+          mul_mode = "para"
+        }
+      }
+    }
+
+    removeTailBlank()
+    return list_itemInfo
+
+    function removeTailBlank(){
+      if (mul_mode == "para" || mul_mode == "list") {
+        list_itemInfo[list_itemInfo.length-1].content = list_itemInfo[list_itemInfo.length-1].content.replace(/\s*$/, "")
+      }
+    }
+  }
+
   // 这种类型的列表只有两层
   private static old_ulist2data(text: string){
     // 列表文本转列表数据
@@ -581,6 +710,17 @@ export const abc_title2listdata = ABConvert.factory({
   }
 })
 
+export const abc_mdit2listdata = 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: string): List_ListItem=>{
+    return ListProcess.mdit2data(content) as List_ListItem
+  }
+})
+
 const _abc_listdata2list = ABConvert.factory({
   id: "listdata2list",
   name: "listdata到列表",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anyblock/any-block-core",
-  "version": "3.4.10",
+  "version": "3.4.12",
   "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)",
   "main": "index.js",
   "scripts": {