vuepress-plugin-md-power 1.0.0-rc.107 → 1.0.0-rc.109

package/lib/node/index.d.ts

@@ -103,7 +103,7 @@ interface PDFOptions {
 
 interface PlotOptions {
     /**
-     * 是否启用 `=| |=`  markdown （该标记为非标准标记，脱离插件将不生效）
+     * 是否启用 `!! !!`  markdown （该标记为非标准标记，脱离插件将不生效）
      * @default true
      */
     tag?: boolean;

package/lib/node/index.js

@@ -16,7 +16,7 @@ function resolveAttrs(info) {
   const rawAttrs = info;
   let matched;
   while (matched = info.match(RE_ATTR_VALUE)) {
-    const { attr, value } = matched.groups || {};
+    const { attr, value } = matched.groups;
     attrs2[attr] = value ?? true;
     info = info.slice(matched[0].length);
   }
@@ -1051,10 +1051,10 @@ var definitions = {
 };
 
 // src/node/fileIcons/findIcon.ts
-function getFileIcon(fileName, type2 = "file") {
+function getFileIcon(fileName, type2) {
   const name = getFileIconName(fileName, type2);
   if (!name)
-    return type2 === "file" ? defaultFile : defaultFolder;
+    return type2 !== "folder" ? defaultFile : defaultFolder;
   return name;
 }
 function getFileIconName(fileName, type2 = "file") {
@@ -1069,7 +1069,7 @@ function getFileIconName(fileName, type2 = "file") {
   let icon = definitions.named[fileName] || definitions.files[fileName];
   if (icon)
     return icon;
-  icon = getFileIconTypeFromExtension(fileName);
+  icon = getFileIconTypeFromExtension(fileName) || void 0;
   if (icon)
     return icon;
   for (const [partial, partialIcon] of Object.entries(definitions.partials)) {
@@ -1092,7 +1092,6 @@ function getFileIconTypeFromExtension(fileName) {
       return;
     extension = extension.slice(nextDotIndex);
   }
-  return void 0;
 }
 
 // src/node/utils/stringifyProp.ts
@@ -1141,17 +1140,15 @@ var codeTabs = (md, options = {}) => {
     tabOpenRenderer: ({ index }, tokens, tokenIndex) => {
       let foundFence = false;
       for (let i = tokenIndex; i < tokens.length; i++) {
-        const { block, type: type2 } = tokens[i];
-        if (block) {
-          if (type2 === "code-tabs_tab_close")
-            break;
-          if ((type2 === "fence" || type2 === "import_code") && !foundFence) {
-            foundFence = true;
-            continue;
-          }
-          tokens[i].type = "code_tab_empty";
-          tokens[i].hidden = true;
+        const { type: type2 } = tokens[i];
+        if (type2 === "code-tabs_tab_close")
+          break;
+        if ((type2 === "fence" || type2 === "import_code") && !foundFence) {
+          foundFence = true;
+          continue;
         }
+        tokens[i].type = "code_tab_empty";
+        tokens[i].hidden = true;
       }
       return `<template #tab${index}="{ value, isActive }">`;
     },
@@ -1229,8 +1226,8 @@ function resolveTreeNodeInfo(tokens, current, idx) {
   }
   if (!hasInline)
     return void 0;
-  const children = inline.children?.filter((token) => token.type === "text" && token.content || token.tag === "strong") || [];
-  const filename = children.filter((token) => token.type === "text").map((token) => token.content).join(" ").split(/\s+/)[0] ?? "";
+  const children = inline.children.filter((token) => token.type === "text" && token.content || token.tag === "strong");
+  const filename = children.filter((token) => token.type === "text").map((token) => token.content).join(" ").split(/\s+/)[0];
   const focus = children[0]?.tag === "strong";
   const type2 = hasChildren || filename.endsWith("/") ? "folder" : "file";
   const info = {
@@ -1244,8 +1241,6 @@ function resolveTreeNodeInfo(tokens, current, idx) {
 }
 function updateInlineToken(inline, info, icon) {
   const children = inline.children;
-  if (!children)
-    return;
   const tokens = [];
   const wrapperOpen = new Token("span_open", "span", 1);
   const wrapperClose = new Token("span_close", "span", -1);
@@ -1303,8 +1298,10 @@ function updateInlineToken(inline, info, icon) {
 }
 
 // src/node/container/langRepl.ts
+import { promises as fs2 } from "node:fs";
+import { resolveModule } from "local-pkg";
 import container3 from "markdown-it-container";
-import { fs as fs2, getDirname, path as path2 } from "vuepress/utils";
+import { path as path2 } from "vuepress/utils";
 var RE_INFO = /^(#editable)?(.*)$/;
 function createReplContainer(md, lang) {
   const type2 = `${lang}-repl`;
@@ -1312,7 +1309,7 @@ function createReplContainer(md, lang) {
   const render = (tokens, index) => {
     const token = tokens[index];
     const info = token.info.trim().slice(type2.length).trim() || "";
-    const [, editable, title] = info.match(RE_INFO) ?? [];
+    const [, editable, title] = info.match(RE_INFO);
     if (token.nesting === 1)
       return `<CodeRepl ${editable ? "editable" : ""} title="${title || `${lang} playground`}">`;
     else
@@ -1337,8 +1334,8 @@ async function langReplPlugin(app, md, {
   }
   theme ??= { light: "github-light", dark: "github-dark" };
   const data = { grammars: {} };
-  const themesPath = getDirname(import.meta.resolve("tm-themes"));
-  const grammarsPath = getDirname(import.meta.resolve("tm-grammars"));
+  const themesPath = path2.dirname(resolveModule("tm-themes"));
+  const grammarsPath = path2.dirname(resolveModule("tm-grammars"));
   const readTheme = (theme2) => read(path2.join(themesPath, "themes", `${theme2}.json`));
   const readGrammar = (grammar) => read(path2.join(grammarsPath, "grammars", `${grammar}.json`));
   if (typeof theme === "string") {
@@ -1555,18 +1552,18 @@ var MANAGERS_CONFIG = {
     deno: { cli: "deno install --frozen" }
   }
 };
-function npmToPlugins(md, options) {
+function npmToPlugins(md, options = {}) {
   const type2 = "npm-to";
   const validate = (info) => info.trim().startsWith(type2);
   const opt = isArray(options) ? { tabs: options } : options;
   const defaultTabs = opt.tabs?.length ? opt.tabs : DEFAULT_TABS;
   const render = (tokens, idx) => {
-    const { attrs: attrs2 } = resolveAttrs(tokens[idx].info.slice(type2.length - 1));
+    const { attrs: attrs2 } = resolveAttrs(tokens[idx].info.trim().slice(type2.length));
     const tabs2 = attrs2.tabs ? attrs2.tabs.split(/,\s*/) : defaultTabs;
     if (tokens[idx].nesting === 1) {
       const token = tokens[idx + 1];
       const info = token.info.trim();
-      if (token.type === "fence" && (info.startsWith("sh") || info.startsWith("bash") || info.startsWith("shell"))) {
+      if (token.type === "fence") {
         const content = token.content;
         token.hidden = true;
         token.type = "text";
@@ -1590,21 +1587,19 @@ function resolveNpmTo(lines, info, idx, tabs2) {
       if (config && config[tab3]) {
         const parsed = map[line] ??= parseLine(line);
         const { cli, flags } = config[tab3];
-        if (parsed) {
-          let newLine = `${parsed.env ? `${parsed.env} ` : ""}${cli}`;
-          if (parsed.args && flags) {
-            let args = parsed.args;
-            for (const [key, value] of Object.entries(flags)) {
-              args = args.replaceAll(key, value);
-            }
-            newLine += ` ${args.replace(/\s+-/g, " -").trim()}`;
+        let newLine = `${parsed.env ? `${parsed.env} ` : ""}${cli}`;
+        if (parsed.args && flags) {
+          let args = parsed.args;
+          for (const [key, value] of Object.entries(flags)) {
+            args = args.replaceAll(key, value);
           }
-          if (parsed.cmd)
-            newLine += ` ${parsed.cmd}`;
-          if (parsed.scriptArgs)
-            newLine += ` ${parsed.scriptArgs}`;
-          newLines.push(newLine.trim());
+          newLine += ` ${args.replace(/\s+-/g, " -").trim()}`;
         }
+        if (parsed.cmd)
+          newLine += ` ${parsed.cmd}`;
+        if (parsed.scriptArgs)
+          newLine += ` ${parsed.scriptArgs}`;
+        newLines.push(newLine.trim());
       } else {
         newLines.push(line);
       }
@@ -1627,10 +1622,11 @@ function findConfig(line) {
   return void 0;
 }
 function validateTabs(tabs2) {
+  tabs2 = tabs2.filter((tab3) => ALLOW_LIST.includes(tab3));
   if (tabs2.length === 0) {
     return DEFAULT_TABS;
   }
-  return tabs2.filter((tab3) => ALLOW_LIST.includes(tab3));
+  return tabs2;
 }
 var LINE_REG = /(.*)(npm|npx)\s+(.*)/;
 function parseLine(line) {
@@ -1638,27 +1634,34 @@ function parseLine(line) {
   if (!match)
     return false;
   const [, env, cli, rest] = match;
-  if (cli === "npx")
-    return { env, cli, cmd: "", scriptArgs: rest?.trim() };
-  const idx = rest.indexOf(" ");
+  const idx = rest.trim().indexOf(" ");
+  if (cli === "npx") {
+    let cmd = "";
+    let scriptArgs = "";
+    if (idx !== -1) {
+      cmd = rest.slice(0, idx);
+      scriptArgs = rest.slice(idx + 1).trim();
+    } else {
+      cmd = rest;
+    }
+    return { env, cli, cmd, scriptArgs };
+  }
   if (idx === -1)
     return { env, cli: `${cli} ${rest.trim()}`, cmd: "" };
   return { env, cli: `${cli} ${rest.slice(0, idx)}`, ...parseArgs(rest.slice(idx + 1)) };
 }
 function parseArgs(line) {
   line = line?.trim();
-  if (!line)
-    return { cmd: "" };
   const [npmArgs, scriptArgs] = line.split(/\s+--\s+/);
   let cmd = "";
   let args = "";
   if (npmArgs[0] !== "-") {
     if (npmArgs[0] === '"' || npmArgs[0] === "'") {
       const idx = npmArgs.slice(1).indexOf(npmArgs[0]);
-      cmd = npmArgs.slice(0, idx);
-      args = npmArgs.slice(idx + 1);
+      cmd = npmArgs.slice(0, idx + 2);
+      args = npmArgs.slice(idx + 2);
     } else {
-      const idx = npmArgs.indexOf(" ");
+      const idx = npmArgs.indexOf(" -");
       if (idx === -1) {
         cmd = npmArgs;
       } else {
@@ -1692,9 +1695,9 @@ function parseArgs(line) {
           isNextValue = !isBool;
         }
         if (!isKey && !isNextValue) {
-          cmd += `${value} `;
+          cmd += `${value}`;
         } else {
-          newLine += `${value}${v || ""}`;
+          newLine += `${value}${i !== npmArgs.length - 1 ? v : ""}`;
           if (!isKey && isNextValue) {
             isNextValue = false;
           }
@@ -1706,7 +1709,7 @@ function parseArgs(line) {
     }
     args = newLine;
   }
-  return { cmd, args: args.trim(), scriptArgs };
+  return { cmd: cmd.trim(), args: args.trim(), scriptArgs };
 }
 
 // src/node/container/tabs.ts
@@ -1749,7 +1752,10 @@ async function containerPlugin(app, md, options) {
 
 // src/node/embed/caniuse.ts
 import container5 from "markdown-it-container";
+
+// src/node/utils/nanoid.ts
 import { customAlphabet } from "nanoid";
+var nanoid = customAlphabet("abcdefghijklmnopqrstuvwxyz", 5);
 
 // src/node/embed/createEmbedRuleBlock.ts
 function createEmbedRuleBlock(md, {
@@ -1796,7 +1802,6 @@ function createEmbedRuleBlock(md, {
 }
 
 // src/node/embed/caniuse.ts
-var nanoid = customAlphabet("abcdefghijklmnopqrstuvwxyz", 5);
 var UNDERLINE_RE = /_+/g;
 var caniusePlugin = (md, { mode: defaultMode = "embed" } = {}) => {
   createEmbedRuleBlock(md, {
@@ -1874,7 +1879,7 @@ var codepenPlugin = (md) => {
   createEmbedRuleBlock(md, {
     type: "codepen",
     syntaxPattern: /^@\[codepen([^\]]*)\]\(([^)]*)\)/,
-    meta: ([, info = "", source = ""]) => {
+    meta: ([, info, source]) => {
       const { attrs: attrs2 } = resolveAttrs(info);
       const [user, slash] = source.split("/");
       return {
@@ -1885,7 +1890,7 @@ var codepenPlugin = (md) => {
         title: attrs2.title,
         preview: attrs2.preview,
         editable: attrs2.editable,
-        tab: attrs2.tab ?? "result",
+        tab: attrs2.tab || "result",
         theme: attrs2.theme
       };
     },
@@ -1895,9 +1900,7 @@ var codepenPlugin = (md) => {
       if (meta.editable) {
         params.set("editable", "true");
       }
-      if (meta.tab) {
-        params.set("default-tab", meta.tab);
-      }
+      params.set("default-tab", meta.tab);
       if (meta.theme) {
         params.set("theme-id", meta.theme);
       }
@@ -1914,7 +1917,7 @@ var codeSandboxPlugin = (md) => {
   createEmbedRuleBlock(md, {
     type: "codesandbox",
     syntaxPattern: /^@\[codesandbox(?:\s+(embed|button))?([^\]]*)\]\(([^)]*)\)/,
-    meta([, type2, info = "", source = ""]) {
+    meta([, type2, info, source]) {
       const { attrs: attrs2 } = resolveAttrs(info);
       const [profile, filepath2 = ""] = source.split("#");
       const [user, id] = profile.includes("/") ? profile.split("/") : ["", profile];
@@ -1942,7 +1945,7 @@ var jsfiddlePlugin = (md) => {
   createEmbedRuleBlock(md, {
     type: "jsfiddle",
     syntaxPattern: /^@\[jsfiddle([^\]]*)\]\(([^)]*)\)/,
-    meta([, info = "", source]) {
+    meta([, info, source]) {
       const { attrs: attrs2 } = resolveAttrs(info);
       const [user, id] = source.split("/");
       return {
@@ -1955,7 +1958,7 @@ var jsfiddlePlugin = (md) => {
         theme: attrs2.theme || "dark"
       };
     },
-    content: ({ title = "JS Fiddle", height, width, user, id, tab: tab3, theme }) => {
+    content: ({ title, height, width, user, id, tab: tab3, theme }) => {
       theme = theme === "dark" ? "/dark/" : "";
       const link = `https://jsfiddle.net/${user}/${id}/embedded/${tab3}${theme}`;
       const style = `width:${width};height:${height};margin:16px auto;border:none;border-radius:5px;`;
@@ -1992,7 +1995,7 @@ var pdfPlugin = (md) => {
     type: "pdf",
     // eslint-disable-next-line regexp/no-super-linear-backtracking
     syntaxPattern: /^@\[pdf(?:\s+(\d+))?([^\]]*)\]\(([^)]*)\)/,
-    meta([, page, info = "", src = ""]) {
+    meta([, page, info, src]) {
       const { attrs: attrs2 } = resolveAttrs(info);
       return {
         src,
@@ -2020,7 +2023,7 @@ function timeToSeconds(time) {
     return 0;
   if (Number.parseFloat(time) === Number(time))
     return Number(time);
-  const [s, m, h] = time.split(":").reverse().map((n) => Number(n) || 0);
+  const [s, m, h = 0] = time.split(/\s*:\s*/).reverse().map((n) => Number(n) || 0);
   return s + m * 60 + h * 3600;
 }
 
@@ -2032,13 +2035,13 @@ var bilibiliPlugin = (md) => {
     name: "video_bilibili",
     // eslint-disable-next-line regexp/no-super-linear-backtracking
     syntaxPattern: /^@\[bilibili(?:\s+p(\d+))?([^\]]*)\]\(([^)]*)\)/,
-    meta([, page, info = "", source = ""]) {
+    meta([, page, info, source]) {
       const { attrs: attrs2 } = resolveAttrs(info);
       const ids = source.trim().split(/\s+/);
       const bvid = ids.find((id) => id.startsWith("BV"));
       const [aid, cid] = ids.filter((id) => !id.startsWith("BV"));
       return {
-        page: +page || 1,
+        page: +page,
         bvid,
         aid,
         cid,
@@ -2082,7 +2085,7 @@ var youtubePlugin = (md) => {
     type: "youtube",
     name: "video_youtube",
     syntaxPattern: /^@\[youtube([^\]]*)\]\(([^)]*)\)/,
-    meta([, info = "", id = ""]) {
+    meta([, info, id]) {
       const { attrs: attrs2 } = resolveAttrs(info);
       return {
         id,
@@ -2189,13 +2192,12 @@ function createTokenizer(options) {
     state.posMax = state.pos;
     state.pos = start + 2;
     const [name, opt = ""] = content.split(/\s+/);
-    const [size = options.size, color = options.color] = opt.split("/");
+    const [size, color = options.color] = opt.split("/");
     const icon = state.push("vp_iconify_open", "VPIcon", 1);
     icon.markup = openTag;
-    if (name)
-      icon.attrSet("name", name);
-    if (size)
-      icon.attrSet("size", String(size));
+    icon.attrSet("name", name);
+    if (size || options.size)
+      icon.attrSet("size", String(size || options.size));
     if (color)
       icon.attrSet("color", color);
     const close = state.push("vp_iconify_close", "VPIcon", -1);
@@ -2269,9 +2271,9 @@ function inlineSyntaxPlugin(md, options) {
 
 // src/node/prepareConfigFile.ts
 import { ensureEndingSlash } from "@vuepress/helper";
-import { getDirname as getDirname2, path as path4 } from "vuepress/utils";
+import { getDirname, path as path4 } from "vuepress/utils";
 var { url: filepath } = import.meta;
-var __dirname = getDirname2(filepath);
+var __dirname = getDirname(filepath);
 var CLIENT_FOLDER = ensureEndingSlash(
   path4.resolve(__dirname, "../client")
 );
@@ -2342,7 +2344,7 @@ function markdownPowerPlugin(options = {}) {
     },
     extendsBundlerOptions(bundlerOptions, app) {
       if (options.repl) {
-        addViteOptimizeDepsInclude(bundlerOptions, app, ["shiki/core", "shiki/wasm"]);
+        addViteOptimizeDepsInclude(bundlerOptions, app, ["shiki/core", "shiki/wasm", "shiki/engine/oniguruma"]);
       }
     },
     extendsMarkdown: async (md, app) => {
@@ -2357,3 +2359,4 @@ export {
   markdownPowerPlugin,
   resolveImageSize
 };
+/* istanbul ignore if -- @preserve */

package/lib/shared/index.d.ts

@@ -101,7 +101,7 @@ interface PDFOptions {
 
 interface PlotOptions {
     /**
-     * 是否启用 `=| |=`  markdown （该标记为非标准标记，脱离插件将不生效）
+     * 是否启用 `!! !!`  markdown （该标记为非标准标记，脱离插件将不生效）
      * @default true
      */
     tag?: boolean;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vuepress-plugin-md-power",
   "type": "module",
-  "version": "1.0.0-rc.107",
+  "version": "1.0.0-rc.109",
   "description": "The Plugin for VuePress 2 - markdown power",
   "author": "pengzhanbo <volodymyr@foxmail.com>",
   "license": "MIT",
@@ -32,7 +32,7 @@
   ],
   "peerDependencies": {
     "markdown-it": "^14.0.0",
-    "vuepress": "2.0.0-rc.17"
+    "vuepress": "2.0.0-rc.18"
   },
   "peerDependenciesMeta": {
     "markdown-it": {
@@ -47,15 +47,16 @@
     "@mdit/plugin-sup": "^0.13.1",
     "@mdit/plugin-tab": "^0.13.2",
     "@mdit/plugin-tasklist": "^0.13.1",
-    "@vuepress/helper": "2.0.0-rc.52",
+    "@vuepress/helper": "2.0.0-rc.55",
     "@vueuse/core": "^11.1.0",
     "image-size": "^1.1.1",
+    "local-pkg": "^0.5.0",
     "markdown-it-container": "^4.0.0",
     "nanoid": "^5.0.7",
     "shiki": "^1.22.0",
-    "tm-grammars": "^1.18.0",
-    "tm-themes": "^1.8.7",
-    "vue": "^3.5.11"
+    "tm-grammars": "^1.18.2",
+    "tm-themes": "^1.8.8",
+    "vue": "^3.5.12"
   },
   "devDependencies": {
     "@types/markdown-it": "^14.1.2"