npm - zengen - Versions diffs - 0.2.6 → 0.3.1 - Mend

zengen 0.2.6 → 0.3.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (101) hide show

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "zengen",
-  "version": "0.2.6",
+  "version": "0.3.1",
   "description": "ZEN - A minimalist Markdown documentation site builder",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "scripts": {
     "build": "npx rimraf dist && tsc",
     "dev": "ts-node src/cli.ts",
-    "build:doc": "npm run build && node dist/cli.js build --base-url /ZEN --lang zh-Hans --lang en-US --lang ja-JP --lang ko-KR --lang es-ES --lang fr-FR --lang de-DE --lang ru-RU --lang pt-PT --lang it-IT --lang nl-NL --lang pl-PL --lang sv-SE --lang fi-FI --lang da-DK --lang no-NO --lang zh-Hant --lang hi-IN --lang ar-SA --lang th-TH --lang vi-VN --lang id-ID --lang pt-BR --lang es-MX --lang tr-TR --lang uk-UA --verbose",
+    "build:doc": "npm run build && node dist/cli.js build --lang zh-Hans --lang en-US --lang ja-JP --lang ko-KR --lang es-ES --lang fr-FR --lang de-DE --lang ru-RU --lang pt-PT --lang it-IT --lang nl-NL --lang pl-PL --lang sv-SE --lang fi-FI --lang da-DK --lang no-NO --lang zh-Hant --lang hi-IN --lang ar-SA --lang th-TH --lang vi-VN --lang id-ID --lang pt-BR --lang es-MX --lang tr-TR --lang uk-UA --verbose",
     "test": "npm run build && node --test dist/**/*.test.js",
     "test:types": "tsc --noEmit",
     "test:build": "npm run build && test -f dist/index.js && test -f dist/cli.js",

package/src/build/pipeline.ts CHANGED Viewed

@@ -17,7 +17,6 @@ async function validateConfig(options: BuildOptions): Promise<void> {
   if (verbose) {
     console.log(`🚀 Starting ZEN build...`);
-    console.log(`🔗 Base URL: ${options.baseUrl || '(not set)'}`);
     if (options.langs && options.langs.length > 0) {
       console.log(`🌐 Target languages: ${options.langs.join(', ')}`);
     }

package/src/cli.ts CHANGED Viewed

@@ -22,7 +22,6 @@ class BuildCommand extends Command {
   template = Option.String('-t,--template');
   verbose = Option.Boolean('-v,--verbose');
-  baseUrl = Option.String('--base-url');
   lang = Option.Array('--lang', {
     description: 'Target languages for translation (e.g., en-US, ja-JP)',
   });
@@ -44,7 +43,6 @@ class BuildCommand extends Command {
       await buildSite({
         template: this.template ? path.resolve(this.template) : undefined,
         verbose: this.verbose,
-        baseUrl: this.baseUrl,
         langs: this.lang,
       });

package/src/process/template.ts CHANGED Viewed

@@ -15,7 +15,7 @@ import { parseFrontmatter } from '../utils/frontmatter';
  */
 function generateLanguageSwitcher(templateData: TemplateData): string {
   const {
-    options: { langs = [], baseUrl = '/' },
+    options: { langs = [] },
   } = MetaData;
   const items = langs
@@ -50,10 +50,7 @@ const generateTagsHtml = (tags: string[]): string => {
  * @returns 导航 HTML 字符串
  */
 async function generateNavigationHtml(data: TemplateData): Promise<string> {
-  const {
-    files,
-    options: { baseUrl = '/' },
-  } = MetaData;
+  const { files } = MetaData;
   const navigation = await Promise.all(
     files.map(async file => {
@@ -161,10 +158,7 @@ async function renderTemplate(template: string, data: TemplateData): Promise<str
 }
 const renderRedirectTemplate = async (from: string, to: string): Promise<void> => {
-  const {
-    options: { baseUrl = '/' },
-  } = MetaData;
-  const toURL = path.join(baseUrl, to);
+  const toURL = path.relative(path.dirname(from), to);
   const html = `<!DOCTYPE html>
 <html lang="en">
 <head>

package/src/types.ts CHANGED Viewed

@@ -20,7 +20,6 @@ export interface MetaDataStore {
 export interface BuildOptions {
   template?: string;
   verbose?: boolean;
-  baseUrl?: string;
   langs?: string[]; // 目标语言数组
 }

package/src/utils/convertMarkdownToHtml.ts CHANGED Viewed

@@ -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, '&amp;')
+    .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>`;
+  }
 };