Merge branch 'develop' into search-filter-md-pure

Author: Koooooo-7

docs/_navbar.md

@@ -2,8 +2,8 @@
 
 - Translations
 
-  - [:uk: English](/)
-  - [:cn: 简体中文](/zh-cn/)
-  - [:de: Deutsch](/de-de/)
-  - [:es: Español](/es/)
-  - [:ru: Русский](/ru-ru/)
+  - [English](/)
+  - [简体中文](/zh-cn/)
+  - [Deutsch](/de-de/)
+  - [Español](/es/)
+  - [Русский](/ru-ru/)

package-lock.json

@@ -69,7 +69,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "lint-staged": "^15.2.2",
-    "marked": "^12.0.2",
+    "marked": "^13.0.2",
     "npm-run-all": "^4.1.5",
     "postcss-cli": "^11.0.0",
     "postcss-import": "^16.1.0",

package.json

@@ -205,13 +205,14 @@ export class Compiler {
     /**
      * Render anchor tag
      * @link https://github.com/markedjs/marked#overriding-renderer-methods
-     * @param {String} text Text content
-     * @param {Number} level Type of heading (h<level> tag)
+     * @param {String} tokens the content tokens
+     * @param {Number} depth Type of heading (h<level> tag)
      * @returns {String} Heading element
      */
-    origin.heading = renderer.heading = function (text, level) {
+    origin.heading = renderer.heading = function ({ tokens, depth }) {
+      const text = this.parser.parseInline(tokens);
       let { str, config } = getAndRemoveConfig(text);
-      const nextToc = { level, title: str };
+      const nextToc = { depth, title: str };
 
       const { content, ignoreAllSubs, ignoreSubHeading } =
         getAndRemoveDocsifyIgnoreConfig(str);
@@ -229,7 +230,7 @@ export class Compiler {
       // elements after navigation. This is preferred over focusing on the link
       // within the heading because it matches the focus behavior of screen
       // readers when navigating page content.
-      return `<h${level} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${level}>`;
+      return `<h${depth} id="${slug}" tabindex="-1"><a href="${url}" data-id="${slug}" class="anchor"><span>${str}</span></a></h${depth}>`;
     };
 
     origin.code = highlightCodeCompiler({ renderer });

src/core/render/compiler.js

@@ -3,13 +3,13 @@ import Prism from 'prismjs';
 import 'prismjs/components/prism-markup-templating.js';
 
 export const highlightCodeCompiler = ({ renderer }) =>
-  (renderer.code = function (code, lang = 'markup') {
+  (renderer.code = function ({ text, lang = 'markup' }) {
     const langOrMarkup = Prism.languages[lang] || Prism.languages.markup;
-    const text = Prism.highlight(
-      code.replace(/@DOCSIFY_QM@/g, '`'),
+    const code = Prism.highlight(
+      text.replace(/@DOCSIFY_QM@/g, '`'),
       langOrMarkup,
       lang,
     );
 
-    return /* html */ `<pre data-lang="${lang}" class="language-${lang}"><code class="lang-${lang} language-${lang}" tabindex="0">${text}</code></pre>`;
+    return /* html */ `<pre data-lang="${lang}" class="language-${lang}"><code class="lang-${lang} language-${lang}" tabindex="0">${code}</code></pre>`;
   });

src/core/render/compiler/code.js

@@ -2,7 +2,7 @@ import { getAndRemoveConfig } from '../utils.js';
 import { isAbsolutePath, getPath, getParentPath } from '../../router/util.js';
 
 export const imageCompiler = ({ renderer, contentBase, router }) =>
-  (renderer.image = (href, title, text) => {
+  (renderer.image = ({ href, title, text }) => {
     let url = href;
     const attrs = [];
 

src/core/render/compiler/image.js

@@ -8,8 +8,9 @@ export const linkCompiler = ({
   linkRel,
   compilerClass,
 }) =>
-  (renderer.link = (href, title = '', text) => {
+  (renderer.link = function ({ href, title = '', tokens }) {
     const attrs = [];
+    const text = this.parser.parseInline(tokens) || '';
     const { str, config } = getAndRemoveConfig(title);
     linkTarget = config.target || linkTarget;
     linkRel =

src/core/render/compiler/link.js

@@ -1,7 +1,8 @@
 import { helper as helperTpl } from '../tpl.js';
 
 export const paragraphCompiler = ({ renderer }) =>
-  (renderer.paragraph = text => {
+  (renderer.paragraph = function ({ tokens }) {
+    const text = this.parser.parseInline(tokens);
     let result;
 
     if (text.startsWith('!>')) {

src/core/render/compiler/paragraph.js

@@ -1,5 +1,14 @@
 export const taskListCompiler = ({ renderer }) =>
-  (renderer.list = (body, ordered, start) => {
+  (renderer.list = function (token) {
+    const ordered = token.ordered;
+    const start = token.start;
+
+    let body = '';
+    for (let j = 0; j < token.items.length; j++) {
+      const item = token.items[j];
+      body += this.listitem?.(item);
+    }
+
     const isTaskList = /<li class="task-list-item">/.test(
       body.split('class="task-list"')[0],
     );

src/core/render/compiler/taskList.js

@@ -1,5 +1,33 @@
 export const taskListItemCompiler = ({ renderer }) =>
-  (renderer.listitem = text => {
+  (renderer.listitem = function (item) {
+    let text = '';
+    if (item.task) {
+      const checkbox = this.checkbox?.({ checked: !!item.checked });
+      if (item.loose) {
+        if (item.tokens.length > 0 && item.tokens[0].type === 'paragraph') {
+          item.tokens[0].text = checkbox + ' ' + item.tokens[0].text;
+          if (
+            item.tokens[0].tokens &&
+            item.tokens[0].tokens.length > 0 &&
+            item.tokens[0].tokens[0].type === 'text'
+          ) {
+            item.tokens[0].tokens[0].text =
+              checkbox + ' ' + item.tokens[0].tokens[0].text;
+          }
+        } else {
+          item.tokens.unshift({
+            type: 'text',
+            raw: checkbox + ' ',
+            text: checkbox + ' ',
+          });
+        }
+      } else {
+        text += checkbox + ' ';
+      }
+    }
+
+    text += this.parser?.parse(item.tokens, !!item.loose);
+
     const isTaskItem = /^(<input.*type="checkbox"[^>]*>)/.test(text);
     const html = isTaskItem
       ? /* html */ `<li class="task-list-item"><label>${text}</label></li>`

src/core/render/compiler/taskListItem.js

@@ -17,7 +17,7 @@ exports[`Docs Site coverpage renders and is unchanged 1`] = `
 exports[`Docs Site navbar renders and is unchanged 1`] = `
 "<nav class="app-nav" aria-label="secondary"><!-- markdownlint-disable first-line-h1 -->
 
-<ul><li><p>Translations</p><ul><li><a href="#/"><img src="https://github.githubassets.com/images/icons/emoji/unicode/1f1ec-1f1e7.png?v8.png" alt="uk" class="emoji" loading="lazy"> English</a></li><li><a href="#/zh-cn/"><img src="https://github.githubassets.com/images/icons/emoji/unicode/1f1e8-1f1f3.png?v8.png" alt="cn" class="emoji" loading="lazy"> 简体中文</a></li><li><a href="#/de-de/"><img src="https://github.githubassets.com/images/icons/emoji/unicode/1f1e9-1f1ea.png?v8.png" alt="de" class="emoji" loading="lazy"> Deutsch</a></li><li><a href="#/es/"><img src="https://github.githubassets.com/images/icons/emoji/unicode/1f1ea-1f1f8.png?v8.png" alt="es" class="emoji" loading="lazy"> Español</a></li><li><a href="#/ru-ru/"><img src="https://github.githubassets.com/images/icons/emoji/unicode/1f1f7-1f1fa.png?v8.png" alt="ru" class="emoji" loading="lazy"> Русский</a></li></ul></li></ul></nav>"
+<ul><li><p>Translations</p><ul><li><a href="#/">English</a></li><li><a href="#/zh-cn/">简体中文</a></li><li><a href="#/de-de/">Deutsch</a></li><li><a href="#/es/">Español</a></li><li><a href="#/ru-ru/">Русский</a></li></ul></li></ul></nav>"
 `;
 
 exports[`Docs Site sidebar renders and is unchanged 1`] = `