cherry-muse 1.0.3 → 1.0.5

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cherry-muse",
   "license": "Apache-2.0",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Lightweight Cherry Markdown fork with 83% smaller bundle size (800KB vs 4.8MB)",
   "repository": {
     "type": "git",

package/src/Cherry.config.js

@@ -403,7 +403,6 @@ const defaultConfig = {
   locale: 'zh_CN',
   // cherry初始化后是否检查 location.hash 尝试滚动到对应位置
   autoScrollByHashAfterInit: true,
-  stats: true,
 };
 if (window.outerWidth <= 600) {
   defaultConfig.toolbars.toolbar = ['switchModel'];

package/src/Stats.js

@@ -3,8 +3,6 @@ import Event from '@/Event';
 export default class Stats {
   constructor(options) {
     this.$cherry = options.$cherry;
-    console.log(options);
-    if (!this.$cherry.options.stats) return;
     this.container = null;
     this.stats = {
       characters: 0,

package/src/core/hooks/Blockquote.js

@@ -35,6 +35,40 @@ export default class Blockquote extends ParagraphBase {
     // TODO: String.prototype.repeat polyfill
   }
 
+  getAlertInfo(line) {
+    const match = line.match(/^\s*\[!(NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]/i);
+    if (match) {
+      return {
+        type: match[1].toUpperCase(),
+        remaining: line.replace(/^\s*\[!(NOTE|TIP|IMPORTANT|WARNING|CAUTION)\]/i, ''),
+      };
+    }
+    return null;
+  }
+
+  getPanelClass(type) {
+    const map = {
+      NOTE: 'note',
+      TIP: 'tip',
+      IMPORTANT: 'important',
+      WARNING: 'warning',
+      CAUTION: 'danger',
+    };
+    const t = map[type] || 'note';
+    return `cherry-panel cherry-panel__${t}`;
+  }
+
+  getPanelTitle(type) {
+    const map = {
+      NOTE: 'Note',
+      TIP: 'Tip',
+      IMPORTANT: 'Important',
+      WARNING: 'Warning',
+      CAUTION: 'Caution',
+    };
+    return map[type] || type;
+  }
+
   handleMatch(str, sentenceMakeFunc) {
     return str.replace(this.RULE.reg, (match, lines, content) => {
       const { sign: contentSign, html: parsedHtml } = sentenceMakeFunc(content);
@@ -47,9 +81,13 @@ export default class Blockquote extends ParagraphBase {
       const contentLines = parsedHtml.split('\n');
       const replaceReg = /^[>\s]+/;
       const countReg = />/g;
-      let lastLevel = 1;
-      let level = 0;
-      let handledHtml = `<blockquote data-sign="${sign}_${lineCount}" data-lines="${lineCount}">`;
+      let lastLevel = 0;
+      let handledHtml = '';
+      const tagStack = [];
+      const rootAttrs = ` data-sign="${sign}_${lineCount}" data-lines="${lineCount}"`;
+      let isRoot = true;
+      let skipNextBr = false;
+
       for (let i = 0; contentLines[i]; i++) {
         if (i !== 0) {
           const leadIndent = computeLeadingSpaces(contentLines[i]);
@@ -59,31 +97,63 @@ export default class Blockquote extends ParagraphBase {
           lastIndent = leadIndent;
         }
         /* eslint-disable no-loop-func */
-        const $line = contentLines[i].replace(replaceReg, (leadSymbol) => {
+        let currentLevel = 0;
+        let $line = contentLines[i].replace(replaceReg, (leadSymbol) => {
           const leadSymbols = leadSymbol.match(countReg);
           // 本行引用嵌套层级比上层要多
           if (leadSymbols && leadSymbols.length > lastLevel) {
-            level = leadSymbols.length;
+            currentLevel = leadSymbols.length;
           } else {
             // 否则保持当前缩进层级
-            level = lastLevel;
+            currentLevel = lastLevel;
           }
           return '';
         });
+
         // 同层级，且不为首行时补充一个换行
-        if (lastLevel === level && i !== 0) {
-          handledHtml += '<br>';
+        if (lastLevel === currentLevel && i !== 0) {
+          if (!skipNextBr) {
+            handledHtml += '<br>';
+          }
+          skipNextBr = false;
         }
+
         // 补充缩进
-        if (lastLevel < level) {
-          handledHtml += '<blockquote>'.repeat(level - lastLevel);
-          lastLevel = level;
+        if (lastLevel < currentLevel) {
+          for (let l = lastLevel + 1; l <= currentLevel; l++) {
+            let tagOpen = `<blockquote${isRoot ? rootAttrs : ''}>`;
+            let tagClose = '</blockquote>';
+
+            // Check for Alert
+            if (l === currentLevel) {
+              const alertInfo = this.getAlertInfo($line);
+              if (alertInfo) {
+                const className = this.getPanelClass(alertInfo.type);
+                const title = this.getPanelTitle(alertInfo.type);
+                tagOpen = `<div class="${className}"${
+                  isRoot ? rootAttrs : ''
+                }><div class="cherry-panel--title cherry-panel--title__not-empty">${title}</div><div class="cherry-panel--body"><p>`;
+                tagClose = '</p></div></div>';
+                $line = alertInfo.remaining;
+                if ($line.trim() === '') {
+                  skipNextBr = true;
+                }
+              }
+            }
+
+            handledHtml += tagOpen;
+            tagStack.push(tagClose);
+            isRoot = false;
+          }
+          lastLevel = currentLevel;
         }
         // 插入当前行内容
         handledHtml += $line;
       }
       // 标签闭合
-      handledHtml += '</blockquote>'.repeat(lastLevel);
+      while (tagStack.length) {
+        handledHtml += tagStack.pop();
+      }
       return this.getCacheWithSpace(this.pushCache(handledHtml, sign, lineCount), match);
     });
   }

package/src/core/hooks/CodeBlock.js

@@ -584,6 +584,9 @@ export default class CodeBlock extends ParagraphBase {
       if (Prism.languages[lang]) {
         cacheCode = Prism.highlight(cacheCode, Prism.languages[lang], lang);
         cacheCode = this.renderLineNumber(cacheCode);
+      } else if (lang === 'text') {
+        cacheCode = escapeHTMLSpecialChar(cacheCode);
+        cacheCode = this.renderLineNumber(cacheCode);
       } else {
         cacheCode = escapeHTMLSpecialChar(cacheCode);
         Prism.plugins.autoloader.loadLanguages(
@@ -626,7 +629,12 @@ export default class CodeBlock extends ParagraphBase {
   $highlightCodeBlock(code, lang, clazz) {
     const language = lang;
     // 直接使用原始代码，不做 unescapeHTMLSpecialChar，避免破坏代码完整性
-    let cacheCode = Prism.highlight(code, Prism.languages[language], language);
+    let cacheCode;
+    if (Prism.languages[language]) {
+      cacheCode = Prism.highlight(code, Prism.languages[language], language);
+    } else {
+      cacheCode = escapeHTMLSpecialChar(code);
+    }
     cacheCode = this.renderLineNumber(cacheCode);
     cacheCode = this.wrapCode(cacheCode, language);
     const cherry = this.$engine.$cherry;
@@ -801,9 +809,20 @@ export default class CodeBlock extends ParagraphBase {
       }
       // $code = this.$replaceSpecialChar($code);
       $code = $code.replace(/~X/g, '\\`');
+
+      // 判断是否需要异步渲染，如果需要异步渲染则不缓存
+      let effectiveLang = $lang;
+      if (!supportLanguages.includes(effectiveLang)) {
+        effectiveLang = 'text';
+      }
+      const isAsync =
+        !this.customHighlighter && !Prism.languages[effectiveLang] && effectiveLang !== 'text';
+
       cacheCode = this.renderCodeBlock($code, $lang, sign, lines);
       cacheCode = cacheCode.replace(/\\/g, '\\\\');
-      cacheCode = this.$codeCache(sign, cacheCode);
+      if (!isAsync) {
+        cacheCode = this.$codeCache(sign, cacheCode);
+      }
       const result = this.getCacheWithSpace(this.pushCache(cacheCode, sign, lines), match);
       return addBlockQuoteSignToResult(result);
     });

package/src/core/hooks/List.js

@@ -252,7 +252,7 @@ export default class List extends ParagraphBase {
     const ret = {
       begin: '(?:^|\n)(\n*)(([ ]{0,3}([*+-]|\\d+[.]|[a-z]\\.|[I一二三四五六七八九十]+\\.)[ \\t]+)',
       content: '([^\\r]+?)',
-      end: '(~0|\\n{2,}(?=\\S)(?![ \\t]*(?:[*+-]|\\d+[.]|[a-z]\\.|[I一二三四五六七八九十]+\\.)[ \\t]+)))',
+      end: '(~0|(?=\\n[ \\t]*(?::::|\\+\\+))|\\n{2,}(?=\\S)(?![ \\t]*(?:[*+-]|\\d+[.]|[a-z]\\.|[I一二三四五六七八九十]+\\.)[ \\t]+)))',
     };
     ret.reg = new RegExp(ret.begin + ret.content + ret.end, 'gm');
     return ret;

package/examples/scripts/pinyin/README.md

@@ -1,53 +0,0 @@
-https://github.com/liu11hao11/pinyin_js
-
-# pinyin_js
-中文转拼音
-##安装
-```
-npm install
-```
-
-
-##汉字转化成带音节的拼音
-```javascript
-var pinyin=require("pinyin_js");
-console.log(pinyin.pinyin("你好"," "));
-//输出结果是nǐ hǎo 
-```
-
-##汉字转化成不带音节的拼音
-```javascript
-var pinyin=require("pinyin_js");
-console.log(pinyin.pinyinWithOutYin("你好"," "));
-//输出结果是ni hao 
-```
-
-##判断是否是汉字
-```javascript
-var pinyin=require("pinyin_js");
-console.log(pinyin.isChineseWord("你好"));//true
-console.log(pinyin.isChineseWord("!你好",false));//true
-console.log(pinyin.isChineseWord("!你好",true));//第二个参数：true是严格模式，默认为严格模式
-//false
-```
-
-##首字母排序
-
-```javascript
-var pinyin=require("pinyin_js");
-var users = [
-    { 'user': '张三丰',   'age': 40 },
-    { 'user': '123',   'age': 48 },
-    { 'user': '张三',   'age': 48 },
-    { 'user': '李四', 'age': 36 },  
-    { 'user': '张三炮', 'age': 34 }
-];
-var sortResult = pinyin.sort(users, "user");
-console.log(sortResult)
-/*[ { user: '123', age: 48 },
-    { user: '李四', age: 36 },
-    { user: '张三', age: 48 },
-    { user: '张三丰', age: 40 },
-    { user: '张三炮', age: 34 } ]*/
-    
-```

package/tools/README.md

@@ -1,3 +0,0 @@
-# Emoji处理
-
-数据来源：[gemoji](https://github.com/github/gemoji/tree/master/db)