zengen 0.2.5 → 0.3.0

package/src/utils/convertMarkdownToHtml.ts

@@ -1,26 +1,15 @@
 import { marked } from 'marked';
 import hljs from 'highlight.js';
 
-// 配置 marked 使用 highlight.js 进行代码高亮
-marked.setOptions({
-  highlight: function (code: string, lang: string) {
-    if (lang && hljs.getLanguage(lang)) {
-      try {
-        return hljs.highlight(code, { language: lang }).value;
-      } catch (err) {
-        console.warn(`Failed to highlight code with language ${lang}:`, err);
-      }
-    }
-    return hljs.highlightAuto(code).value;
-  },
-  pedantic: false,
-  gfm: true,
-  breaks: false,
-  sanitize: false,
-  smartLists: true,
-  smartypants: false,
-  xhtml: false,
-} as any);
+// 辅助函数：转义 HTML 特殊字符
+function escapeHtml(unsafe: string): string {
+  return unsafe
+    .replace(/&/g, '&')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#039;');
+}
 
 /**
  * 将 Markdown 内容转换为 HTML
@@ -28,5 +17,75 @@ marked.setOptions({
  * @returns 转换后的 HTML 字符串
  */
 export const convertMarkdownToHtml = (mdContent: string): string => {
-  return marked.parse(mdContent) as string;
+  // 创建自定义渲染器
+  const renderer = new marked.Renderer();
+  const originalCodeRenderer = renderer.code;
+
+  // 重写代码块渲染器以支持 Mermaid - 使用 any 类型绕过类型检查
+  (renderer as any).code = function (code: any, language?: string, isEscaped?: boolean) {
+    // 在 marked 17+ 中，code 参数是一个对象，包含 text 和 lang 属性
+    const codeText = typeof code === 'string' ? code : code?.text || '';
+    // 语言信息在 code.lang 中，而不是 language 参数
+    const lang = code?.lang || language;
+
+    // 检测 Mermaid 代码块
+    if (lang === 'mermaid') {
+      // 生成唯一的 ID 用于图表容器
+      const chartId = 'mermaid-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
+      return `
+<div class="mermaid-diagram" data-mermaid-id="${chartId}">
+  <pre class="mermaid">${escapeHtml(codeText)}</pre>
+</div>
+`;
+    }
+
+    // 其他代码块使用原有高亮逻辑
+    return (originalCodeRenderer as any).call(this, code, language, isEscaped);
+  };
+
+  // 使用 marked.parse 的同步版本
+  // marked 17+ 默认返回 Promise，但我们可以使用 marked.parseSync 或 marked.parse 的同步模式
+  // 这里我们使用 marked.parse 并假设它是同步的（对于简单情况）
+  try {
+    // 尝试同步解析
+    const result = marked.parse(mdContent, {
+      renderer,
+      highlight: function (code: string, lang: string) {
+        // 跳过 Mermaid 代码块的高亮
+        if (lang === 'mermaid') {
+          return code;
+        }
+
+        if (lang && hljs.getLanguage(lang)) {
+          try {
+            return hljs.highlight(code, { language: lang }).value;
+          } catch (err) {
+            console.warn(`Failed to highlight code with language ${lang}:`, err);
+          }
+        }
+        return hljs.highlightAuto(code).value;
+      },
+      pedantic: false,
+      gfm: true,
+      breaks: false,
+      sanitize: false,
+      smartLists: true,
+      smartypants: false,
+      xhtml: false,
+      async: false, // 强制同步模式
+    } as any);
+
+    // 如果结果是 Promise，等待它（虽然我们设置了 async: false）
+    if (result && typeof result.then === 'function') {
+      // 这不应该发生，但如果发生了，返回一个占位符
+      console.warn('marked.parse returned a Promise despite async: false');
+      return '<!-- Markdown conversion in progress -->';
+    }
+
+    return result as unknown as string;
+  } catch (error) {
+    console.error('Error converting Markdown to HTML:', error);
+    const errorMessage = error instanceof Error ? error.message : String(error);
+    return `<div class="error">Error converting Markdown: ${errorMessage}</div>`;
+  }
 };

package/.github/workflows/version.yml

@@ -1,88 +0,0 @@
-name: Version Management
-
-on:
-  push:
-    branches: [main]
-    paths:
-      - 'package.json'
-      - 'src/**'
-
-jobs:
-  check-version:
-    runs-on: ubuntu-latest
-    outputs:
-      version_changed: ${{ steps.check.outputs.version_changed }}
-      new_version: ${{ steps.check.outputs.new_version }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Check if version changed
-        id: check
-        run: |
-          # 获取当前版本
-          CURRENT_VERSION=$(jq -r '.version' package.json)
-          echo "Current version: $CURRENT_VERSION"
-
-          # 获取上一个提交的版本
-          git checkout HEAD~1 package.json 2>/dev/null || true
-          PREVIOUS_VERSION=$(jq -r '.version' package.json 2>/dev/null || echo "0.0.0")
-          git checkout HEAD package.json
-
-          echo "Previous version: $PREVIOUS_VERSION"
-
-          if [ "$CURRENT_VERSION" != "$PREVIOUS_VERSION" ]; then
-            echo "Version changed from $PREVIOUS_VERSION to $CURRENT_VERSION"
-            echo "version_changed=true" >> $GITHUB_OUTPUT
-            echo "new_version=$CURRENT_VERSION" >> $GITHUB_OUTPUT
-          else
-            echo "Version unchanged"
-            echo "version_changed=false" >> $GITHUB_OUTPUT
-            echo "new_version=" >> $GITHUB_OUTPUT
-          fi
-
-  create-release:
-    needs: check-version
-    if: needs.check-version.outputs.version_changed == 'true'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '24.x'
-
-      - name: Get version and changelog
-        id: get_info
-        run: |
-          VERSION=$(jq -r '.version' package.json)
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-          # 尝试获取最近的提交信息作为发布说明
-          CHANGELOG=$(git log --oneline -n 10 --grep="^feat\|^fix\|^chore\|^docs\|^style\|^refactor\|^test\|^perf" || echo "No significant changes found")
-          echo "changelog<<EOF" >> $GITHUB_OUTPUT
-          echo "$CHANGELOG" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-
-      - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
-        with:
-          tag_name: v${{ steps.get_info.outputs.version }}
-          name: Release v${{ steps.get_info.outputs.version }}
-          body: |
-            ## Changes in v${{ steps.get_info.outputs.version }}
-
-            ${{ steps.get_info.outputs.changelog }}
-
-            ### Automated Release
-            This release was automatically created when the package version was updated.
-          draft: false
-          prerelease: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}