@vuepress/markdown 2.0.0-beta.40 → 2.0.0-beta.43

package/lib/plugins/codePlugin/codePlugin.d.ts

@@ -21,9 +21,18 @@ export interface CodePluginOptions {
      */
     preWrapper?: boolean;
     /**
-     * Add `v-pre` directive to `<pre>` tag or not
+     * Add `v-pre` directive or not
      */
-    vPre?: boolean;
+    vPre?: {
+        /**
+         * Add `v-pre` directive to `<pre>` tag of code block or not
+         */
+        block?: boolean;
+        /**
+         * Add `v-pre` directive to `<code>` tag of inline code or not
+         */
+        inline?: boolean;
+    };
 }
 /**
  * Code plugin

package/lib/plugins/codePlugin/codePlugin.js

@@ -8,10 +8,9 @@ const resolveVPre_1 = require("./resolveVPre");
 /**
  * Code plugin
  */
-const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper = true, vPre = true, } = {}) => {
+const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper = true, vPre: { block: vPreBlock = true, inline: vPreInline = true } = {}, } = {}) => {
     // override default fence renderer
     md.renderer.rules.fence = (tokens, idx, options, env, slf) => {
-        var _a, _b, _c;
         const token = tokens[idx];
         // get token info
         const info = token.info ? md.utils.unescapeAll(token.info).trim() : '';
@@ -19,14 +18,14 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
         const language = (0, resolveLanguage_1.resolveLanguage)(info);
         const languageClass = `${options.langPrefix}${language.name}`;
         // try to get highlighted code
-        const code = ((_a = options.highlight) === null || _a === void 0 ? void 0 : _a.call(options, token.content, language.name, '')) ||
+        const code = options.highlight?.(token.content, language.name, '') ||
             md.utils.escapeHtml(token.content);
         // wrap highlighted code with `<pre>` and `<code>`
         let result = code.startsWith('<pre')
             ? code
             : `<pre class="${languageClass}"><code>${code}</code></pre>`;
         // resolve v-pre mark from token info
-        const useVPre = (_b = (0, resolveVPre_1.resolveVPre)(info)) !== null && _b !== void 0 ? _b : vPre;
+        const useVPre = (0, resolveVPre_1.resolveVPre)(info) ?? vPreBlock;
         if (useVPre) {
             result = `<pre v-pre${result.slice('<pre'.length)}`;
         }
@@ -53,9 +52,10 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
             result = `${result}<div class="highlight-lines">${highlightLinesCode}</div>`;
         }
         // resolve line-numbers mark from token info
-        const useLineNumbers = (_c = (0, resolveLineNumbers_1.resolveLineNumbers)(info)) !== null && _c !== void 0 ? _c : (typeof lineNumbers === 'number'
-            ? lines.length >= lineNumbers
-            : lineNumbers);
+        const useLineNumbers = (0, resolveLineNumbers_1.resolveLineNumbers)(info) ??
+            (typeof lineNumbers === 'number'
+                ? lines.length >= lineNumbers
+                : lineNumbers);
         // generate line numbers
         if (useLineNumbers) {
             // generate line numbers code
@@ -67,5 +67,12 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
         result = `<div class="${languageClass} ext-${language.ext}${useLineNumbers ? ' line-numbers-mode' : ''}">${result}</div>`;
         return result;
     };
+    if (vPreInline) {
+        const rawInlineCodeRule = md.renderer.rules.code_inline;
+        md.renderer.rules.code_inline = (tokens, idx, options, env, slf) => {
+            const result = rawInlineCodeRule(tokens, idx, options, env, slf);
+            return `<code v-pre${result.slice('<code'.length)}`;
+        };
+    }
 };
 exports.codePlugin = codePlugin;

package/lib/plugins/codePlugin/resolveLanguage.js

@@ -27,12 +27,11 @@ const getLanguagesMap = () => {
  * Resolve language for highlight from token info
  */
 const resolveLanguage = (info) => {
-    var _a, _b;
     // get user-defined language alias
-    const alias = ((_a = info.match(/^([^ :[{]+)/)) === null || _a === void 0 ? void 0 : _a[1]) || 'text';
+    const alias = info.match(/^([^ :[{]+)/)?.[1] || 'text';
     // if the alias does not have a match in the map
     // fallback to the alias itself
-    return ((_b = getLanguagesMap()[alias]) !== null && _b !== void 0 ? _b : {
+    return (getLanguagesMap()[alias] ?? {
         name: alias,
         ext: alias,
         aliases: [alias],

package/lib/plugins/customComponentPlugin/vueReservedTags.d.ts

@@ -1,6 +1,6 @@
 /**
  * Vue reserved tags
  *
- * @see https://v3.vuejs.org/api/built-in-components.html
+ * @see https://vuejs.org/api/built-in-components.html
  */
 export declare const vueReservedTags: string[];

package/lib/plugins/customComponentPlugin/vueReservedTags.js

@@ -4,7 +4,7 @@ exports.vueReservedTags = void 0;
 /**
  * Vue reserved tags
  *
- * @see https://v3.vuejs.org/api/built-in-components.html
+ * @see https://vuejs.org/api/built-in-components.html
  */
 exports.vueReservedTags = [
     'template',

package/lib/plugins/extractTitlePlugin.js

@@ -25,9 +25,8 @@ const extractTitlePlugin = (md) => {
     // extract title to env
     const render = md.render.bind(md);
     md.render = (src, env = {}) => {
-        var _a, _b;
         const result = render(src, env);
-        env.title = (_b = (_a = env.frontmatter) === null || _a === void 0 ? void 0 : _a.title) !== null && _b !== void 0 ? _b : title;
+        env.title = env.frontmatter?.title ?? title;
         return result;
     };
 };

package/lib/plugins/importCodePlugin/createImportCodeBlockRule.js

@@ -41,7 +41,7 @@ const createImportCodeBlockRule = ({ handleImportPath = (str) => str }) => (stat
     // create a import_code token
     const token = state.push('import_code', 'code', 0);
     // use user specified info, or fallback to file ext
-    token.info = info !== null && info !== void 0 ? info : utils_1.path.extname(meta.importPath).slice(1);
+    token.info = info ?? utils_1.path.extname(meta.importPath).slice(1);
     token.markup = '```';
     token.map = [startLine, startLine + 1];
     // store token meta to be used in renderer rule

package/lib/utils/resolveHeadersFromTokens.js

@@ -26,10 +26,9 @@ const resolveHeadersFromTokens = (tokens, { level, allowHtml, escapeText, slugif
         }
     };
     tokens.forEach((_, idx) => {
-        var _a;
         const token = tokens[idx];
         // if the token type does not match, skip
-        if ((token === null || token === void 0 ? void 0 : token.type) !== 'heading_open') {
+        if (token?.type !== 'heading_open') {
             return;
         }
         // get the level from the tag, h1 -> 1
@@ -50,7 +49,7 @@ const resolveHeadersFromTokens = (tokens, { level, allowHtml, escapeText, slugif
         });
         // the id of the heading anchor is the slugify result of markdown-it-anchor
         // if the id does not exist, slugify the title ourselves
-        const slug = (_a = token.attrGet('id')) !== null && _a !== void 0 ? _a : slugify(title);
+        const slug = token.attrGet('id') ?? slugify(title);
         // push the header to tree
         push({
             level: headerLevel,

package/lib/utils/resolveTitleFromToken.js

@@ -8,9 +8,8 @@ const shared_1 = require("@vuepress/shared");
  * Typically using the next token of `heading_open` token
  */
 const resolveTitleFromToken = (token, { allowHtml, escapeText, }) => {
-    var _a;
     // children of the token contains the parsed result of the heading title
-    const children = (_a = token.children) !== null && _a !== void 0 ? _a : [];
+    const children = token.children ?? [];
     // type of tokens to be included in the heading title
     const titleTokenTypes = ['text', 'emoji', 'code_inline'];
     // include 'html_inline' or not
@@ -18,12 +17,9 @@ const resolveTitleFromToken = (token, { allowHtml, escapeText, }) => {
         titleTokenTypes.push('html_inline');
     }
     // filter the token type to be included in the title
-    const titleTokens = children.filter((item) => {
-        var _a;
-        return titleTokenTypes.includes(item.type) &&
-            // filter permalink symbol that generated by markdown-it-anchor
-            !((_a = item.meta) === null || _a === void 0 ? void 0 : _a.isPermalinkSymbol);
-    });
+    const titleTokens = children.filter((item) => titleTokenTypes.includes(item.type) &&
+        // filter permalink symbol that generated by markdown-it-anchor
+        !item.meta?.isPermalinkSymbol);
     // get title from tokens
     return titleTokens
         .reduce((result, item) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.40",
+  "version": "2.0.0-beta.43",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -23,8 +23,8 @@
   ],
   "dependencies": {
     "@types/markdown-it": "^12.2.3",
-    "@vuepress/shared": "2.0.0-beta.40",
-    "@vuepress/utils": "2.0.0-beta.40",
+    "@vuepress/shared": "2.0.0-beta.43",
+    "@vuepress/utils": "2.0.0-beta.43",
     "markdown-it": "^13.0.0",
     "markdown-it-anchor": "^8.4.1",
     "markdown-it-emoji": "^2.0.0",