feat: Add Markdown renderer

terwer · Apr 9, 2023 · 32e8427 · 32e8427
1 parent 82103d8
commit 32e8427
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/packages/zhi-common/src/lib/markdownUtil.ts b/packages/zhi-common/src/lib/markdownUtil.ts
@@ -23,8 +23,8 @@
  * questions.
  */
 
-import LuteAdaptor from "./md-adaptor/LuteAdaptor";
-import ShowdownAdaptor from "./md-adaptor/ShowdownAdaptor";
+import LuteAdaptor from "./md-adaptor/LuteAdaptor"
+import ShowdownAdaptor from "./md-adaptor/ShowdownAdaptor"
 
 /**
  * Markdown 处理工具类
@@ -35,12 +35,11 @@ import ShowdownAdaptor from "./md-adaptor/ShowdownAdaptor";
  */
 class MarkdownUtil {
     public mdAdaptor
-    private readonly lute: LuteAdaptor
 
     constructor() {
-        this.lute = new LuteAdaptor()
-        if (this.lute.isAvailable()) {
-            this.mdAdaptor = this.lute
+        const lute = new LuteAdaptor()
+        if (lute.isAvailable()) {
+            this.mdAdaptor = lute
         } else {
             this.mdAdaptor = new ShowdownAdaptor()
         }
@@ -50,12 +49,8 @@ class MarkdownUtil {
      * 渲染Markdown
      *
      * @param md - Markdown文本
-     * @param useLute - 使用 Lute
      */
-    public async renderHTML(md: string, useLute?: boolean): Promise<string> {
-        if (useLute) {
-            this.mdAdaptor = this.lute
-        }
+    public async renderHTML(md: string): Promise<string> {
         return await this.mdAdaptor.renderMarkdownStr(md)
     }
 }

diff --git a/packages/zhi-siyuan-api/src/lib/siYuanApiAdaptor.ts b/packages/zhi-siyuan-api/src/lib/siYuanApiAdaptor.ts
@@ -105,7 +105,7 @@ class SiYuanApiAdaptor implements IBlogApi {
         // 渲染Markdown
         const adaptorName = Object.getPrototypeOf(this.common.markdownUtil.mdAdaptor).constructor.name
         this.logger.info("Using markdown adaptor =>", adaptorName)
-        let html = await this.common.markdownUtil.renderHTML(md.content,true)
+        let html = await this.common.markdownUtil.renderHTML(md.content)
         // 移除挂件html
         html = this.common.htmlUtil.removeWidgetTag(html)
         if (this.cfg.fixTitle) {