markdown-it-any-block 3.2.12 → 3.3.1

package/docs/README.md

@@ -38,6 +38,7 @@ import { ABConvertManager } from "ABConvertManager"
 // 加载所有转换器 (都是可选的)
 // (当然，如果A转换器依赖B转换器，那么你导入A必然导入B)
 import {} from "./ABConverter/converter/abc_text"
+import {} from "./ABConverter/converter/abc_code"
 import {} from "./ABConverter/converter/abc_list"
 import {} from "./ABConverter/converter/abc_table"
 import {} from "./ABConverter/converter/abc_deco"

package/index_mdit.ts

@@ -53,6 +53,7 @@ import { ABCSetting, ABReg } from "../ABConverter/ABReg"
 // 加载所有转换器 (都是可选的)
 // (当然，如果A转换器依赖B转换器，那么你导入A必然导入B)
 import "../ABConverter/converter/abc_text"
+import "../ABConverter/converter/abc_code"
 import "../ABConverter/converter/abc_list"
 import "../ABConverter/converter/abc_c2list"
 import "../ABConverter/converter/abc_table"
@@ -61,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 {
@@ -97,7 +98,7 @@ function abSelector_squareInline(md: MarkdownIt, options?: Partial<Options>): vo
 
     // (2) 匹配ab块范围
     // const prefix // ab块 - 前缀，TODO 前缀功能以后再做，暂不支持。不过ob的mc要处理前缀避免嵌套问题，感觉mdit的token应该不需要处理？
-    let ab_blankLine_counter = 0            // ab块 - 连续空行计数器，为1则跳到下行，为2则结束ab块
+    let ab_blankLine_counter = 0            // ab块 - 连续空行计数器，为1则跳到下行，为2则结束ab块 (仅列表)
     const ab_startLine: number = state.line // ab块 - 起始行
     let ab_content: string = ""             // ab块 - 内容
     state.line += 1
@@ -138,14 +139,14 @@ function abSelector_squareInline(md: MarkdownIt, options?: Partial<Options>): vo
         return
       }
 
-      // 2. 连续空行结束
+      // 2. 空行 (如果是列表，且连续空行，则结束)
       if (text.trim() == "") {
-        if (ab_blankLine_counter < 1) {
-          ab_blankLine_counter++;
-          ab_content += "\n"; state.line += 1; return findAbEnd()
+        if (ab_blockType == "list" && ab_blankLine_counter >= 1) {
+          return  
         }
         else {
-          return
+          ab_blankLine_counter++;
+          ab_content += "\n"; state.line += 1; return findAbEnd()
         }
       } else {
         ab_blankLine_counter = 0;
@@ -188,7 +189,7 @@ function abSelector_squareInline(md: MarkdownIt, options?: Partial<Options>): vo
       } else if (ab_blockType == "heading") { // TODO 这里需要跳过标题内的代码块 (python代码块的 `#` 会误截断)
         // heading和mdit类型 需要跳过代码块内的结束标志
         if (codeBlockFlag == '') {
-          const match = text.match(/^((\s|>\s|-\s|\*\s|\+\s)*)(````*|~~~~*)(.*)/)
+          const match = text.match(ABReg.reg_code)
           if (match && match[3]) {
             codeBlockFlag = match[1]+match[3]
             ab_content += "\n" + text; state.line += 1; return findAbEnd()
@@ -267,96 +268,78 @@ function abSelector_container_vuepress(md: MarkdownIt, options?: Partial<Options
  * @param options 可选配置参数
  */
 function abSelector_container(md: MarkdownIt, options?: Partial<Options>): void {
-  md.block.ruler.before('fence', 'AnyBlockMditContainer', (
-    state, startLine, endLine, silent
-  ): boolean => {
-    const typeNames = ["mditABDemo"] // 在这里设置需要接管ab块类型，其余放行
-    let start = state.bMarks[startLine];
-    let max = state.eMarks[startLine];
-
-    // 快速检查第一个字符，过滤掉非容器块
-    if (state.src[start] !== ":") return false;
-
-    let pos = start + 1;
-
-    // 检查标记字符串的剩余部分
-    while (pos <= max) {
-      if (state.src[pos] !== ":") break;
-      pos++;
+  md.block.ruler.before('fence', 'AnyBlockMditContainer', (state, startLine, endLine): boolean => {
+    // 黑白名单机制：白名单为空标注允许所有规则，黑名单会减少白名单的规则
+    const mdit_whitelist: string[] = ["mditABDemo"]
+    const mdit_blacklist: string[] = [
+      // "left", "center", "right", "justify", // https://mdit-plugins.github.io/zh/align.html
+      // "note", "warning", "tip", "info",     // https://mdit-plugins.github.io/zh/container.html
+      // "demo", "md-demo", "codedemo",
+      // "tabs", // TODO: 可能是 `tabs#fruit` 这种形式的，应该改成手动循环判断，不能以这些开头
+    ]
+
+    // (1) 匹配 mdit 块头部
+    let mdit_header: string                 // 块 - 头部 (全行)
+    let mdit_match: RegExpMatchArray        // 块 - 正则结果
+    {
+      state.line = startLine
+      const pos = state.bMarks[state.line]  // 这行字符的初始位置
+      const max = state.eMarks[state.line]  // 这行字符的结束位置
+      mdit_header = state.src.substring(pos, max)  // 这一行的内容
+      
+      mdit_match = mdit_header.match(ABReg.reg_mdit_head)
+      if (!mdit_match || !mdit_match.length) return false // 不匹配，则退出
+      if (mdit_whitelist.length && !mdit_whitelist.includes(mdit_match[4].split("|")[0].trim())) { // 检查白名单
+        return false;
+      }
+      if (mdit_blacklist.length && mdit_blacklist.includes(mdit_match[4].split("|")[0].trim())) {  // 检查黑名单
+        return false;
+      }
     }
+    const mdit_flag:string = mdit_match[3]
+    const mdit_type:string = mdit_match[4]
 
-    const markerCount = pos - start;
-
-    // 需要至少3个冒号才视为有效标记
-    if (markerCount < 3) return false;
+    // (2) 匹配 mdit 块范围
+    const mdit_startLine: number = state.line // mdit块 - 起始行
+    let mdit_content: string = ""             // mdit块 - 内容 (不包含首尾 `:::`)
+    state.line += 1
+    findMditEnd()
+    const mdit_endLine: number = state.line   // mdit块 - 结束行 (不包含)
 
-    const markup = state.src.slice(start, pos);
-    const ab_mdit_header = state.src.slice(pos, max);
+    // (3) 插入 mdit 块token
+    const token = state.push('fence', 'code', 0)
+    token.info = "AnyBlock"
+    token.content = `[${mdit_type}]\n${mdit_content}`
+    token.map = [mdit_startLine, mdit_endLine]
+    token.markup = mdit_flag;
+    token.nesting = 0;
+    return true
 
-    // 检查是否在允许的类型列表中
-    if (!typeNames.includes(ab_mdit_header.split("|")[0].trim())) return false;
+    // -------------------------- 子函数部分 ------------------------
 
-    // 静默模式下直接返回验证成功
-    if (silent) return true;
+    /// 找到ab块的结尾，迭代部分
+    function findMditEnd() {
+      const pos = state.bMarks[state.line]  // 这行字符的初始位置
+      const max = state.eMarks[state.line]  // 这行字符的结束位置
+      const text = state.src.substring(pos, max) // 这一行的内容
 
-    const ab_startLine = startLine;
-    let nextLine = startLine;
-    let autoClosed = false;
+      // 1. 文章末行结束
+      if (state.line > endLine) {
+        state.line = endLine+1
+        return
+      }
 
-    let ab_content = "";
+      // 2. 结束
+      if (text.trim() == mdit_flag) {
+        state.line += 1; return
+      }
 
-    // 搜索块的结束标记
-    while (
-      // unclosed block should be auto closed by end of document.
-      // also block seems to be auto closed by end of parent
-      nextLine < endLine
-    ) {
-      nextLine++;
-      start = state.bMarks[nextLine];
-      max = state.eMarks[nextLine];
-      
-      if (start < max && state.sCount[nextLine] < state.blkIndent)
-        // non-empty line with negative indent should stop the list:
-        // - ```
-        //  test
-        break;
-      if (
-        // match start
-        state.src[start] === ":" &&
-        // closing fence should be indented less than 4 spaces
-        state.sCount[nextLine] - state.blkIndent < 4
-      ) {
-        // check rest of marker
-        for (pos = start + 1; pos <= max; pos++)
-          if (state.src[pos] !== ":") break;
-
-        // closing code fence must be at least as long as the opening one
-        if (pos - start >= markerCount) {
-          // make sure tail has spaces only
-          pos = state.skipSpaces(pos);
-
-          if (pos >= max) {
-            // found!
-            autoClosed = true;
-            break;
-          }
-          
-        }
+      // 3. 未结束，继续递归寻找
+      else {
+        mdit_content += "\n" + text; state.line += 1; return findMditEnd()
       }
-      ab_content += "\n" + state.src.substring(start, max);
     }
-
-    state.line = nextLine + (autoClosed ? 1 : 0);
-
-    const token = state.push('fence', 'code', 0)
-    token.info = "AnyBlock"
-    token.content = `[${ab_mdit_header}]\n${ab_content}`
-    token.map = [ab_startLine, nextLine]
-    token.markup = markup;
-    token.nesting = 0;
-
-    return true
-  });
+  })
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "markdown-it-any-block",
-  "version": "3.2.12",
+  "version": "3.3.1",
   "description": "```typescript\r import { ABConvertManager } from \"ABConvertManager\"",
   "types": "@types/index_mdit.d.ts",
   "type": "module",

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);