cherry-muse 1.0.1 → 1.0.3

package/dist/cherry-markdown.js

@@ -28888,17 +28888,13 @@
 	  }, {
 	    key: "$highlightCodeBlock",
 	    value: function $highlightCodeBlock(code, lang, clazz) {
-	      var language = lang;
-	      var cacheCode = prismCore.highlight(unescapeHTMLSpecialChar(code), prismCore.languages[language], language);
+	      var language = lang; // 直接使用原始代码，不做 unescapeHTMLSpecialChar，避免破坏代码完整性
+
+	      var cacheCode = prismCore.highlight(code, prismCore.languages[language], language);
 	      cacheCode = this.renderLineNumber(cacheCode);
 	      cacheCode = this.wrapCode(cacheCode, language);
-	      var cherry = this.$engine.$cherry; // 查找指定id
-
-	      setTimeout$1(function () {
-	        console.log(clazz, cherry.wrapperDom.querySelectorAll(clazz), document.querySelectorAll(clazz));
-	      }, 20000);
-
-	      this.$waitElement(clazz, 0, function (elements) {
+	      var cherry = this.$engine.$cherry;
+	      this.$waitElement(cherry.wrapperDom, clazz, 0, function (elements) {
 	        forEach$5(elements).call(elements, function (codeBlock) {
 	          codeBlock.innerHTML = cacheCode;
 	        });
@@ -28906,22 +28902,24 @@
 	    }
 	  }, {
 	    key: "$waitElement",
-	    value: function $waitElement(clazz, times, cb) {
-	      var that = this;
+	    value: function $waitElement(container, clazz, times, cb) {
+	      var _this2 = this;
 
 	      if (times > 100) {
 	        var _context21;
 
-	        console.warn(concat$1(_context21 = "times ".concat(times, " milliseconds, clazz ")).call(_context21, clazz, " not found"));
+	        console.warn(concat$1(_context21 = "".concat(clazz, " not found after ")).call(_context21, times, " retries"));
 	        return;
 	      }
 
-	      if (document.querySelectorAll(clazz).length === 0) {
+	      var elements = container.querySelectorAll(clazz);
+
+	      if (elements.length === 0) {
 	        setTimeout$1(function () {
-	          that.$waitElement(clazz, times + 1, cb);
+	          _this2.$waitElement(container, clazz, times + 1, cb);
 	        }, 500);
 	      } else {
-	        cb(document.querySelectorAll(clazz));
+	        cb(elements);
 	      }
 	    }
 	    /**
@@ -28946,7 +28944,7 @@
 	  }, {
 	    key: "$getIndentCodeBlock",
 	    value: function $getIndentCodeBlock(str) {
-	      var _this2 = this;
+	      var _this3 = this;
 
 	      if (!this.indentedCodeBlock) {
 	        return str;
@@ -28957,12 +28955,12 @@
 
 	        var lineCount = (match.match(/\n/g) || []).length;
 
-	        var sign = _this2.$engine.md5(match);
+	        var sign = _this3.$engine.md5(match);
 
 	        var html = concat$1(_context22 = concat$1(_context23 = "<pre data-sign=\"".concat(sign, "\" data-lines=\"")).call(_context23, lineCount, "\"><code>")).call(_context22, escapeHTMLSpecialChar(code.replace(/\n( {4}|\t)/g, '\n')), "</code></pre>"); // return this.getCacheWithSpace(this.pushCache(html), match, true);
 
 
-	        return prependLineFeedForParagraph(match, _this2.pushCache(html, sign, lineCount));
+	        return prependLineFeedForParagraph(match, _this3.pushCache(html, sign, lineCount));
 	      });
 	    }
 	    /**
@@ -29035,7 +29033,7 @@
 	  }, {
 	    key: "beforeMakeHtml",
 	    value: function beforeMakeHtml(str, sentenceMakeFunc, markdownParams) {
-	      var _this3 = this;
+	      var _this4 = this;
 
 	      var $str = str;
 
@@ -29063,21 +29061,21 @@
 
 	        var $code = code;
 
-	        var _this3$computeLines = _this3.computeLines(match, leadingContent, code),
-	            sign = _this3$computeLines.sign,
-	            lines = _this3$computeLines.lines; // 从缓存中获取html
+	        var _this4$computeLines = _this4.computeLines(match, leadingContent, code),
+	            sign = _this4$computeLines.sign,
+	            lines = _this4$computeLines.lines; // 从缓存中获取html
 
 
-	        var cacheCode = _this3.$codeCache(sign);
+	        var cacheCode = _this4.$codeCache(sign);
 
 	        if (cacheCode && cacheCode !== '') {
 	          // 别忘了把 ">"（引用块）加回来
-	          var _result = _this3.getCacheWithSpace(_this3.pushCache(cacheCode, sign, lines), match);
+	          var _result = _this4.getCacheWithSpace(_this4.pushCache(cacheCode, sign, lines), match);
 
 	          return addBlockQuoteSignToResult(_result);
 	        }
 
-	        $code = _this3.$recoverCodeInIndent($code);
+	        $code = _this4.$recoverCodeInIndent($code);
 	        $code = $code.replace(/~D/g, '$');
 	        $code = $code.replace(/~T/g, '~');
 	        /** 处理缩进 - start: 当首行反引号前存在多个空格缩进时，代码内容要相应去除相同数量的空格 */
@@ -29102,7 +29100,7 @@
 	        var $lang = trim$2(lang).call(lang); // 如果是公式关键字，则直接返回
 
 
-	        if (/^(math|katex|latex)$/i.test($lang) && !_this3.isInternalCustomLangCovered($lang)) {
+	        if (/^(math|katex|latex)$/i.test($lang) && !_this4.isInternalCustomLangCovered($lang)) {
 	          var _context25;
 
 	          var prefix = match.match(/^\s*/g); // ~D为经编辑器中间转义后的$，code结尾包含结束```前的所有换行符，所以不需要补换行
@@ -29111,27 +29109,27 @@
 	        } // 自定义语言渲染，可覆盖内置的自定义语言逻辑
 
 
-	        if (indexOf(_context26 = _this3.customLang).call(_context26, $lang.toLowerCase()) !== -1) {
-	          cacheCode = _this3.parseCustomLanguage($lang, $code, {
+	        if (indexOf(_context26 = _this4.customLang).call(_context26, $lang.toLowerCase()) !== -1) {
+	          cacheCode = _this4.parseCustomLanguage($lang, $code, {
 	            lines: lines,
 	            sign: sign
 	          });
 
 	          if (cacheCode && cacheCode !== '') {
-	            _this3.$codeCache(sign, cacheCode);
+	            _this4.$codeCache(sign, cacheCode);
 
-	            return _this3.getCacheWithSpace(_this3.pushCache(cacheCode, sign, lines), match);
+	            return _this4.getCacheWithSpace(_this4.pushCache(cacheCode, sign, lines), match);
 	          } // 渲染出错则按正常code进行渲染
 
 	        } // $code = this.$replaceSpecialChar($code);
 
 
 	        $code = $code.replace(/~X/g, '\\`');
-	        cacheCode = _this3.renderCodeBlock($code, $lang, sign, lines);
+	        cacheCode = _this4.renderCodeBlock($code, $lang, sign, lines);
 	        cacheCode = cacheCode.replace(/\\/g, '\\\\');
-	        cacheCode = _this3.$codeCache(sign, cacheCode);
+	        cacheCode = _this4.$codeCache(sign, cacheCode);
 
-	        var result = _this3.getCacheWithSpace(_this3.pushCache(cacheCode, sign, lines), match);
+	        var result = _this4.getCacheWithSpace(_this4.pushCache(cacheCode, sign, lines), match);
 
 	        return addBlockQuoteSignToResult(result);
 	      }); // 表格里处理行内代码，让一个td里的行内代码语法生效，让跨td的行内代码语法失效
@@ -29140,7 +29138,7 @@
 	        var _context27;
 
 	        return map$7(_context27 = whole.split('|')).call(_context27, function (oneTd) {
-	          return _this3.makeInlineCode(oneTd);
+	          return _this4.makeInlineCode(oneTd);
 	        }).join('|').replace(/`/g, '\\`');
 	      }); // 为了避免InlineCode被HtmlBlock转义，需要在这里提前缓存
 	      // InlineBlock只需要在afterMakeHtml还原即可
@@ -29153,7 +29151,7 @@
 	  }, {
 	    key: "makeInlineCode",
 	    value: function makeInlineCode(str) {
-	      var _this4 = this;
+	      var _this5 = this;
 
 	      var $str = str;
 
@@ -29165,11 +29163,11 @@
 	          }
 
 	          var $code = code.replace(/~~not~inlineCode/g, '\\`');
-	          $code = _this4.$replaceSpecialChar($code);
+	          $code = _this5.$replaceSpecialChar($code);
 	          $code = $code.replace(/\\/g, '\\\\');
 	          var html = "<code>".concat(escapeHTMLSpecialChar($code), "</code>");
 
-	          var sign = _this4.$engine.md5(html);
+	          var sign = _this5.$engine.md5(html);
 
 	          CodeBlock.inlineCodeCache[sign] = html;
 	          return "~~CODE".concat(sign, "$");
@@ -68582,7 +68580,7 @@
 	  });
 	}
 
-	var VERSION = "1.0.0-fc945743";
+	var VERSION = "1.0.2-62696535";
 	var CherryStatic = /*#__PURE__*/function () {
 	  // for type check only
 	  // TODO: fix this error