@vuepress/markdown 2.0.0-beta.22 → 2.0.0-beta.27

package/lib/plugins/anchorPlugin.d.ts

@@ -1,4 +1,3 @@
-import * as anchorPlugin from 'markdown-it-anchor';
-import type { AnchorOptions } from 'markdown-it-anchor';
-export declare type AnchorPluginOptions = AnchorOptions;
+import anchorPlugin from 'markdown-it-anchor';
+export declare type AnchorPluginOptions = anchorPlugin.AnchorOptions;
 export { anchorPlugin };

package/lib/plugins/anchorPlugin.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.anchorPlugin = void 0;
-const anchorPlugin = require("markdown-it-anchor");
-exports.anchorPlugin = anchorPlugin;
+const markdown_it_anchor_1 = require("markdown-it-anchor");
+exports.anchorPlugin = markdown_it_anchor_1.default;

package/lib/plugins/assetsPlugin/assetsPlugin.js

@@ -14,14 +14,14 @@ const assetsPlugin = (md, { relativePathPrefix = '@source' } = {}) => {
         const link = token.attrGet('src');
         if (link) {
             // replace the original link with resolved link
-            token.attrSet('src', resolveLink_1.resolveLink(link, relativePathPrefix, env));
+            token.attrSet('src', (0, resolveLink_1.resolveLink)(link, relativePathPrefix, env));
         }
         return rawImageRule(tokens, idx, options, env, self);
     };
     // wrap raw html renderer rule
     const createHtmlRule = (rawHtmlRule) => (tokens, idx, options, env, self) => {
         // replace the original link with resolved link
-        tokens[idx].content = tokens[idx].content.replace(/^( *<img\b.*src=")([^"]*)(")/s, (_, prefix, link, suffix) => `${prefix}${resolveLink_1.resolveLink(link, relativePathPrefix, env)}${suffix}`);
+        tokens[idx].content = tokens[idx].content.replace(/^( *<img\b.*src=")([^"]*)(")/s, (_, prefix, link, suffix) => `${prefix}${(0, resolveLink_1.resolveLink)(link, relativePathPrefix, env)}${suffix}`);
         return rawHtmlRule(tokens, idx, options, env, self);
     };
     const rawHtmlBlockRule = md.renderer.rules.html_block;

package/lib/plugins/assetsPlugin/resolveLink.js

@@ -5,7 +5,7 @@ const utils_1 = require("@vuepress/utils");
 const mdurl_1 = require("mdurl");
 const resolveLink = (link, relativePathPrefix, env) => {
     // decode link to ensure bundler can find the file correctly
-    let resolvedLink = mdurl_1.decode(link);
+    let resolvedLink = (0, mdurl_1.decode)(link);
     // if the link is relative path, and the `env.filePathRelative` exists
     // add `@source` alias to the link
     if (/^\.{1,2}\//.test(link) && env.filePathRelative) {

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

@@ -6,8 +6,11 @@ export interface CodePluginOptions {
     highlightLines?: boolean;
     /**
      * Enable line numbers or not
+     *
+     * - A `boolean` value is to enable line numbers or not.
+     * - A `number` value is the minimum number of lines to enable line numbers
      */
-    lineNumbers?: boolean;
+    lineNumbers?: boolean | number;
     /**
      * Wrap the `<pre>` tag with an extra `<div>` or not. Do not disable it unless you
      * understand what's it for

package/lib/plugins/codePlugin/codePlugin.js

@@ -15,27 +15,18 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
         const token = tokens[idx];
         // get token info
         const info = token.info ? md.utils.unescapeAll(token.info).trim() : '';
-        // resolve highlight line ranges from token info
-        let highlightLinesRanges = null;
-        if (highlightLines) {
-            highlightLinesRanges = resolveHighlightLines_1.resolveHighlightLines(info);
-        }
-        // resolve line-numbers mark from token info
-        const useLineNumbers = (_a = resolveLineNumbers_1.resolveLineNumbers(info)) !== null && _a !== void 0 ? _a : lineNumbers;
-        // resolve v-pre mark from token info
-        const useVPre = (_b = resolveVPre_1.resolveVPre(info)) !== null && _b !== void 0 ? _b : vPre;
         // resolve language from token info
-        const language = resolveLanguage_1.resolveLanguage(info);
-        // the result of code and lang
-        let code = token.content;
-        // try to highlight code
-        code =
-            ((_c = options.highlight) === null || _c === void 0 ? void 0 : _c.call(options, code, language.name, '')) || md.utils.escapeHtml(code);
+        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, '')) ||
+            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;
         if (useVPre) {
             result = `<pre v-pre${result.slice('<pre'.length)}`;
         }
@@ -45,12 +36,15 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
         }
         // code fences always have an ending `\n`, so we should trim the last line
         const lines = code.split('\n').slice(0, -1);
+        // resolve highlight line ranges from token info
+        const highlightLinesRanges = highlightLines
+            ? (0, resolveHighlightLines_1.resolveHighlightLines)(info)
+            : null;
         // generate highlight lines
         if (highlightLinesRanges) {
-            const ranges = highlightLinesRanges;
             const highlightLinesCode = lines
                 .map((_, index) => {
-                if (resolveHighlightLines_1.isHighlightLine(index + 1, ranges)) {
+                if ((0, resolveHighlightLines_1.isHighlightLine)(index + 1, highlightLinesRanges)) {
                     return '<div class="highlight-line">&nbsp;</div>';
                 }
                 return '<br>';
@@ -58,6 +52,10 @@ const codePlugin = (md, { highlightLines = true, lineNumbers = true, preWrapper
                 .join('');
             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);
         // generate line numbers
         if (useLineNumbers) {
             // generate line numbers code

package/lib/plugins/extractHeadersPlugin.js

@@ -12,7 +12,7 @@ const extractHeadersPlugin = (md, { level = [2, 3], slugify = utils_1.slugify, f
     // push the rule to the end of the chain
     // resolve headers from the parsed tokens
     md.core.ruler.push('resolveExtractHeaders', (state) => {
-        headers = utils_1.resolveHeadersFromTokens(state.tokens, {
+        headers = (0, utils_1.resolveHeadersFromTokens)(state.tokens, {
             level,
             allowHtml: false,
             escapeText: false,

package/lib/plugins/extractTitlePlugin.js

@@ -12,7 +12,7 @@ const extractTitlePlugin = (md) => {
     md.core.ruler.push('resolveExtractTitle', (state) => {
         const tokenIdx = state.tokens.findIndex((token) => token.tag === 'h1');
         if (tokenIdx > -1) {
-            title = utils_1.resolveTitleFromToken(state.tokens[tokenIdx + 1], {
+            title = (0, utils_1.resolveTitleFromToken)(state.tokens[tokenIdx + 1], {
                 escapeText: false,
                 allowHtml: false,
             });

package/lib/plugins/importCodePlugin/importCodePlugin.js

@@ -5,14 +5,14 @@ const createImportCodeBlockRule_1 = require("./createImportCodeBlockRule");
 const resolveImportCode_1 = require("./resolveImportCode");
 const importCodePlugin = (md, options = {}) => {
     // add import_code block rule
-    md.block.ruler.before('fence', 'import_code', createImportCodeBlockRule_1.createImportCodeBlockRule(options), {
+    md.block.ruler.before('fence', 'import_code', (0, createImportCodeBlockRule_1.createImportCodeBlockRule)(options), {
         alt: ['paragraph', 'reference', 'blockquote', 'list'],
     });
     // add import_code renderer rule
     md.renderer.rules.import_code = (tokens, idx, options, env, slf) => {
         const token = tokens[idx];
         // use imported code as token content
-        const { importFilePath, importCode } = resolveImportCode_1.resolveImportCode(token.meta, env);
+        const { importFilePath, importCode } = (0, resolveImportCode_1.resolveImportCode)(token.meta, env);
         token.content = importCode;
         // extract imported files to env
         if (importFilePath) {

package/lib/plugins/linksPlugin/linksPlugin.js

@@ -40,7 +40,7 @@ const linksPlugin = (md, options = {}) => {
         // get `base` and `filePathRelative` from `env`
         const { base = '/', filePathRelative = null, frontmatter = {} } = env;
         // check if a link is an external link
-        if (shared_1.isLinkExternal(hrefLink, base)) {
+        if ((0, shared_1.isLinkExternal)(hrefLink, base)) {
             // set `externalAttrs` to current token
             Object.entries(externalAttrs).forEach(([key, val]) => token.attrSet(key, val));
             // check if we should render external icon
@@ -65,7 +65,7 @@ const linksPlugin = (md, options = {}) => {
             const rawPath = internalLinkMatch[1];
             const rawHash = internalLinkMatch[2] || '';
             // resolve relative and absolute path
-            const { relativePath, absolutePath } = resolvePaths_1.resolvePaths(rawPath, base, filePathRelative);
+            const { relativePath, absolutePath } = (0, resolvePaths_1.resolvePaths)(rawPath, base, filePathRelative);
             // normalize markdown file path to route path
             //
             // we are removing the `base` from absolute path because it should not be

package/lib/plugins/linksPlugin/resolvePaths.js

@@ -18,7 +18,9 @@ const resolvePaths = (rawPath, base, filePathRelative) => {
         if (filePathRelative) {
             // if `filePathRelative` is available
             // resolve relative path according to `filePathRelative`
-            relativePath = utils_1.path.join(utils_1.path.dirname(filePathRelative), rawPath);
+            relativePath = utils_1.path.join(
+            // file path may contain non-ASCII characters
+            utils_1.path.dirname(encodeURI(filePathRelative)), rawPath);
             // resolve absolute path according to `base`
             absolutePath = utils_1.path.join(base, relativePath);
         }

package/lib/plugins/tocPlugin/createRenderHeaders.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRenderHeaders = void 0;
 const shared_1 = require("@vuepress/shared");
 const createRenderHeaders = ({ listTag, listClass, itemClass, linkTag, linkClass, }) => {
-    const listTagString = shared_1.htmlEscape(listTag);
-    const listClassString = listClass ? ` class="${shared_1.htmlEscape(listClass)}"` : '';
+    const listTagString = (0, shared_1.htmlEscape)(listTag);
+    const listClassString = listClass ? ` class="${(0, shared_1.htmlEscape)(listClass)}"` : '';
     const itemTagString = 'li';
-    const itemClassString = itemClass ? ` class="${shared_1.htmlEscape(itemClass)}"` : '';
-    const linkTagString = shared_1.htmlEscape(linkTag);
-    const linkClassString = linkClass ? ` class="${shared_1.htmlEscape(linkClass)}` : '';
+    const itemClassString = itemClass ? ` class="${(0, shared_1.htmlEscape)(itemClass)}"` : '';
+    const linkTagString = (0, shared_1.htmlEscape)(linkTag);
+    const linkClassString = linkClass ? ` class="${(0, shared_1.htmlEscape)(linkClass)}` : '';
     const linkTo = (slug) => linkTag === 'RouterLink' ? ` to="#${slug}"` : ` href="#${slug}"`;
     const renderHeaders = (headers) => `\
 <${listTagString}${listClassString}>\

package/lib/plugins/tocPlugin/tocPlugin.js

@@ -20,7 +20,7 @@ const tocPlugin = (md, { pattern = /^\[\[toc\]\]$/i, slugify = utils_1.slugify,
     // push the rule to the end of the chain
     // resolve headers from the parsed tokens
     md.core.ruler.push('resolveTocHeaders', (state) => {
-        headers = utils_1.resolveHeadersFromTokens(state.tokens, {
+        headers = (0, utils_1.resolveHeadersFromTokens)(state.tokens, {
             level,
             allowHtml: true,
             escapeText: true,
@@ -30,14 +30,14 @@ const tocPlugin = (md, { pattern = /^\[\[toc\]\]$/i, slugify = utils_1.slugify,
         return true;
     });
     // add toc syntax as a block rule
-    md.block.ruler.before('heading', 'toc', createTocBlockRule_1.createTocBlockRule({
+    md.block.ruler.before('heading', 'toc', (0, createTocBlockRule_1.createTocBlockRule)({
         pattern,
         containerTag,
         containerClass,
     }), {
         alt: ['paragraph', 'reference', 'blockquote'],
     });
-    const renderHeaders = createRenderHeaders_1.createRenderHeaders({
+    const renderHeaders = (0, createRenderHeaders_1.createRenderHeaders)({
         listTag,
         listClass,
         itemClass,

package/lib/types.d.ts

@@ -1,5 +1,5 @@
-import * as MarkdownIt from 'markdown-it';
 import type { PageFrontmatter, PageHeader } from '@vuepress/shared';
+import type * as MarkdownIt from 'markdown-it';
 import type { AnchorPluginOptions, AssetsPluginOptions, CodePluginOptions, EmojiPluginOptions, ExtractHeadersPluginOptions, HoistTagsPluginOptions, ImportCodePluginOptions, LinksPluginOptions, TocPluginOptions } from './plugins';
 export declare type Markdown = MarkdownIt;
 export interface MarkdownOptions extends MarkdownIt.Options {

package/lib/utils/resolveHeadersFromTokens.d.ts

@@ -1,4 +1,4 @@
-import * as Token from 'markdown-it/lib/token';
+import type * as Token from 'markdown-it/lib/token';
 import type { MarkdownHeader } from '../types';
 /**
  * Resolve headers from markdown-it tokens

package/lib/utils/resolveHeadersFromTokens.js

@@ -44,7 +44,7 @@ const resolveHeadersFromTokens = (tokens, { level, allowHtml, escapeText, slugif
         if (!nextToken) {
             return;
         }
-        const title = resolveTitleFromToken_1.resolveTitleFromToken(nextToken, {
+        const title = (0, resolveTitleFromToken_1.resolveTitleFromToken)(nextToken, {
             allowHtml,
             escapeText,
         });
@@ -54,7 +54,7 @@ const resolveHeadersFromTokens = (tokens, { level, allowHtml, escapeText, slugif
         // push the header to tree
         push({
             level: headerLevel,
-            title: shared_1.isFunction(format) ? format(title) : title,
+            title: (0, shared_1.isFunction)(format) ? format(title) : title,
             slug,
             children: [],
         });

package/lib/utils/resolveTitleFromToken.d.ts

@@ -1,4 +1,4 @@
-import * as Token from 'markdown-it/lib/token';
+import type * as Token from 'markdown-it/lib/token';
 /**
  * Resolve header title from markdown-it token
  *

package/lib/utils/resolveTitleFromToken.js

@@ -30,7 +30,7 @@ const resolveTitleFromToken = (token, { allowHtml, escapeText, }) => {
         if (escapeText) {
             // escape the content of 'code_inline' and 'text'
             if (item.type === 'code_inline' || item.type === 'text') {
-                return `${result}${shared_1.htmlEscape(item.content)}`;
+                return `${result}${(0, shared_1.htmlEscape)(item.content)}`;
             }
         }
         // keep the content of 'emoji' and 'html_inline'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vuepress/markdown",
-  "version": "2.0.0-beta.22",
+  "version": "2.0.0-beta.27",
   "description": "Markdown package of VuePress",
   "keywords": [
     "vuepress",
@@ -26,16 +26,16 @@
     "clean": "rimraf lib *.tsbuildinfo"
   },
   "dependencies": {
-    "@types/markdown-it": "^12.0.2",
-    "@vuepress/shared": "2.0.0-beta.21",
-    "@vuepress/utils": "2.0.0-beta.21",
-    "markdown-it": "^12.1.0",
-    "markdown-it-anchor": "^8.1.0",
+    "@types/markdown-it": "^12.2.3",
+    "@vuepress/shared": "2.0.0-beta.27",
+    "@vuepress/utils": "2.0.0-beta.27",
+    "markdown-it": "^12.2.0",
+    "markdown-it-anchor": "^8.4.1",
     "markdown-it-emoji": "^2.0.0",
     "mdurl": "^1.0.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8db8d235df8914c70c864ae3f3f66f93cfd1a457"
+  "gitHead": "2671a94fe6864e215eb84f318b7e657744a0bc5d"
 }