valaxy 1.0.0-rc.7 → 1.0.0-rc.9

package/dist/node/cli/index.mjs

@@ -2,7 +2,7 @@ import 'node:path';
 import 'node:process';
 import 'yargs';
 import 'yargs/helpers';
-export { c as createCli, J as registerDevCommand, Y as run, _ as startValaxyDev } from '../../shared/valaxy.BA1nryio.mjs';
+export { c as createCli, J as registerDevCommand, Y as run, _ as startValaxyDev } from '../../shared/valaxy.Cb_HdczD.mjs';
 import 'node:os';
 import 'consola';
 import 'consola/utils';
@@ -38,7 +38,6 @@ import 'vitepress-plugin-group-icons';
 import 'p-map';
 import 'node:buffer';
 import 'minisearch';
-import 'markdown-it-async';
 import '@shikijs/transformers';
 import 'shiki';
 import 'css-i18n';

package/dist/node/index.d.mts

@@ -9,15 +9,12 @@ import { VitePluginConfig } from 'unocss/vite';
 import Components from 'unplugin-vue-components/vite';
 import Markdown from 'unplugin-vue-markdown/vite';
 import Layouts from 'vite-plugin-vue-layouts-next';
-import { groupIconVitePlugin } from 'vitepress-plugin-group-icons';
 import { EditableTreeNode } from 'vue-router/unplugin';
 import Router from 'vue-router/vite';
 import { MarkdownEnv } from 'unplugin-vue-markdown/types';
 import { Argv } from 'yargs';
 import { KatexOptions } from 'katex';
-import MarkdownIt from 'markdown-it';
-import anchorPlugin from 'markdown-it-anchor';
-import { Options, MarkdownItAsync } from 'markdown-it-async';
+import MarkdownIt, { MarkdownItOptions, Env, MarkdownIt as MarkdownIt$1, StateCore, Token } from 'markdown-it';
 import { ThemeRegistration, BuiltinTheme, LanguageInput, ShikiTransformer, Highlighter } from 'shiki';
 import { Header } from '@valaxyjs/utils';
 export { CreateCliOptions, createCli, registerDevCommand, run, startValaxyDev } from './cli/index.mjs';
@@ -298,6 +295,23 @@ interface TocPluginOptions {
   linkClass?: string;
 }
 
+type MarkdownItPresetName = 'default' | 'zero' | 'commonmark';
+type AsyncHighlighter = (str: string, lang: string, attrs: string) => string | Promise<string>;
+interface MarkdownItAsyncOptions extends Omit<MarkdownItOptions, 'highlight'> {
+    highlight?: AsyncHighlighter | null;
+    /** Emit a warning when an async renderer is called through render(). */
+    warnOnSyncRender?: boolean;
+}
+declare class MarkdownItAsync extends MarkdownIt {
+    private readonly pendingHighlights;
+    private readonly warnOnSyncRender;
+    private disableSyncRenderWarning;
+    constructor(presetName: MarkdownItPresetName, options?: MarkdownItAsyncOptions);
+    constructor(options?: MarkdownItAsyncOptions);
+    render(src: string, env?: Env): string;
+    renderAsync(src: string, env?: Env): Promise<string>;
+}
+
 interface BlockItem {
     text?: string;
     icon?: string;
@@ -319,11 +333,31 @@ type ThemeOptions = ThemeRegistration | BuiltinTheme | {
     light: ThemeRegistration | BuiltinTheme;
     dark: ThemeRegistration | BuiltinTheme;
 };
+interface MarkdownAnchorPermalinkOptions {
+    class?: string;
+    symbol?: string;
+    renderHref?: (slug: string, state: StateCore) => string;
+    renderAttrs?: (slug: string, state: StateCore) => Record<string, string | number>;
+}
+type MarkdownAnchorPermalinkGenerator = (slug: string, options: MarkdownAnchorPermalinkOptions, state: StateCore, index: number) => void;
+interface MarkdownAnchorOptions {
+    level?: number | number[];
+    slugify?: (value: string) => string;
+    slugifyWithState?: (value: string, state: StateCore) => string;
+    getTokensText?: (tokens: Token[]) => string;
+    uniqueSlugStartIndex?: number;
+    permalink?: MarkdownAnchorPermalinkGenerator;
+    callback?: (token: Token, info: {
+        slug: string;
+        title: string;
+    }) => void;
+    tabIndex?: number | false;
+}
 /**
  * Extend Markdown options
  * @zh 扩展 Markdown 配置，包含代码高亮、Markdown-it 和插件配置
  */
-interface MarkdownOptions extends Options {
+interface MarkdownOptions extends MarkdownItAsyncOptions {
     /**
      * Setup markdown-it instance before applying plugins
      */
@@ -331,12 +365,12 @@ interface MarkdownOptions extends Options {
     /**
      * markdown-it options
      */
-    options?: MarkdownIt['options'];
+    options?: MarkdownIt$1['options'];
     /**
      * config markdown-it
      */
     config?: (md: MarkdownItAsync) => void;
-    anchor?: anchorPlugin.AnchorOptions;
+    anchor?: MarkdownAnchorOptions;
     attrs?: {
         leftDelimiter?: string;
         rightDelimiter?: string;
@@ -644,6 +678,14 @@ interface CdnModule {
      */
     exports?: string[];
 }
+type GroupIconValue = string | {
+    dark: string;
+    light: string;
+};
+interface GroupIconOptions {
+    customIcon?: Record<string, GroupIconValue>;
+    defaultLabels?: string[];
+}
 type ValaxyNodeConfig<ThemeConfig = DefaultTheme.Config> = ValaxyConfig<ThemeConfig> & ValaxyExtendConfig;
 type UserValaxyNodeConfig<ThemeConfig = DefaultTheme.Config> = PartialDeep<ValaxyNodeConfig<ThemeConfig>>;
 /**
@@ -853,7 +895,7 @@ interface ValaxyExtendConfig {
     /**
      * @see https://github.com/yuyinws/vitepress-plugin-group-icons
      */
-    groupIcons?: Partial<NonNullable<Parameters<typeof groupIconVitePlugin>[0]>>;
+    groupIcons?: GroupIconOptions;
     /**
      * unocss presets
      * @see https://unocss.dev/guide/presets
@@ -1210,4 +1252,4 @@ declare function resolveImportPath(importName: string, ensure?: true): Promise<s
 declare function resolveImportPath(importName: string, ensure?: boolean): Promise<string | undefined>;
 
 export { $t, ALL_ROUTE, EXCERPT_SEPARATOR, GLOBAL_STATE, PATHNAME_PROTOCOL_RE, StateManager, ViteValaxyPlugins, build, createMemoryReleasePlugin, createServer, createValaxyPlugin, customElements, defaultSiteConfig, defaultValaxyConfig, defaultViteConfig, defineAddon, defineConfig, defineContentLoader, defineSiteConfig, defineTheme, defineUnoSetup, defineValaxyAddon, defineValaxyConfig, defineValaxyTheme, encryptContent, generateClientRedirects, getGitTimestamp, getIndexHtml, getServerInfoText, isExternal, isInstalledGlobally, isKatexEnabled, isKatexPluginNeeded, isMathJaxEnabled, isPath, loadConfigFromFile, mergeValaxyConfig, mergeViteConfigs, postProcessForSSG, processValaxyOptions, resolveAddonsConfig, resolveImportPath, resolveImportUrl, resolveOptions, resolveSiteConfig, resolveSiteConfigFromRoot, resolveThemeConfigFromRoot, resolveThemeValaxyConfig, resolveUserThemeConfig, resolveValaxyConfig, resolveValaxyConfigFromRoot, ssgBuild, toAtFS, transformObject, version };
-export type { CdnModule, ContentItem, ContentLoader, ContentLoaderContext, HookResult, LoadConfigFromFileOptions, MdAfterRenderContext, ResolvedConfig, ResolvedValaxyOptions, UnoSetup, UserInputConfig, UserValaxyNodeConfig, ValaxyAddonCliContext, ValaxyAddonExport, ValaxyAddonExtendCli, ValaxyAddonFn, ValaxyAddonLike, ValaxyAddonResolver, ValaxyAddons, ValaxyApp, ValaxyConfigExport, ValaxyConfigExtendKey, ValaxyConfigFn, ValaxyEntryOptions, ValaxyExtendConfig, ValaxyFileInfo, ValaxyHooks, ValaxyNode, ValaxyNodeAddon, ValaxyNodeConfig, ValaxyPickConfig, ValaxyServerOptions, ValaxyTheme };
+export type { CdnModule, ContentItem, ContentLoader, ContentLoaderContext, GroupIconOptions, GroupIconValue, HookResult, LoadConfigFromFileOptions, MdAfterRenderContext, ResolvedConfig, ResolvedValaxyOptions, UnoSetup, UserInputConfig, UserValaxyNodeConfig, ValaxyAddonCliContext, ValaxyAddonExport, ValaxyAddonExtendCli, ValaxyAddonFn, ValaxyAddonLike, ValaxyAddonResolver, ValaxyAddons, ValaxyApp, ValaxyConfigExport, ValaxyConfigExtendKey, ValaxyConfigFn, ValaxyEntryOptions, ValaxyExtendConfig, ValaxyFileInfo, ValaxyHooks, ValaxyNode, ValaxyNodeAddon, ValaxyNodeConfig, ValaxyPickConfig, ValaxyServerOptions, ValaxyTheme };

package/dist/node/index.mjs

@@ -1,4 +1,4 @@
-export { A as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, S as StateManager, V as ViteValaxyPlugins, b as build, c as createCli, a as createMemoryReleasePlugin, d as createServer, e as createValaxyPlugin, f as customElements, g as defaultSiteConfig, h as defaultValaxyConfig, i as defaultViteConfig, j as defineAddon, k as defineConfig, l as defineSiteConfig, m as defineTheme, n as defineValaxyAddon, o as defineValaxyConfig, p as defineValaxyTheme, q as encryptContent, r as generateClientRedirects, s as getGitTimestamp, t as getIndexHtml, u as getServerInfoText, v as isExternal, w as isInstalledGlobally, x as isKatexEnabled, y as isKatexPluginNeeded, z as isMathJaxEnabled, B as isPath, C as loadConfigFromFile, D as mergeValaxyConfig, F as mergeViteConfigs, H as postProcessForSSG, I as processValaxyOptions, J as registerDevCommand, K as resolveAddonsConfig, L as resolveImportPath, M as resolveImportUrl, N as resolveOptions, O as resolveSiteConfig, Q as resolveSiteConfigFromRoot, R as resolveThemeConfigFromRoot, T as resolveThemeValaxyConfig, U as resolveUserThemeConfig, W as resolveValaxyConfig, X as resolveValaxyConfigFromRoot, Y as run, Z as ssgBuild, _ as startValaxyDev, $ as toAtFS, a0 as transformObject, a1 as version } from '../shared/valaxy.BA1nryio.mjs';
+export { A as ALL_ROUTE, E as EXCERPT_SEPARATOR, G as GLOBAL_STATE, P as PATHNAME_PROTOCOL_RE, S as StateManager, V as ViteValaxyPlugins, b as build, c as createCli, a as createMemoryReleasePlugin, d as createServer, e as createValaxyPlugin, f as customElements, g as defaultSiteConfig, h as defaultValaxyConfig, i as defaultViteConfig, j as defineAddon, k as defineConfig, l as defineSiteConfig, m as defineTheme, n as defineValaxyAddon, o as defineValaxyConfig, p as defineValaxyTheme, q as encryptContent, r as generateClientRedirects, s as getGitTimestamp, t as getIndexHtml, u as getServerInfoText, v as isExternal, w as isInstalledGlobally, x as isKatexEnabled, y as isKatexPluginNeeded, z as isMathJaxEnabled, B as isPath, C as loadConfigFromFile, D as mergeValaxyConfig, F as mergeViteConfigs, H as postProcessForSSG, I as processValaxyOptions, J as registerDevCommand, K as resolveAddonsConfig, L as resolveImportPath, M as resolveImportUrl, N as resolveOptions, O as resolveSiteConfig, Q as resolveSiteConfigFromRoot, R as resolveThemeConfigFromRoot, T as resolveThemeValaxyConfig, U as resolveUserThemeConfig, W as resolveValaxyConfig, X as resolveValaxyConfigFromRoot, Y as run, Z as ssgBuild, _ as startValaxyDev, $ as toAtFS, a0 as transformObject, a1 as version } from '../shared/valaxy.Cb_HdczD.mjs';
 import 'node:path';
 import 'consola';
 import 'fs-extra';
@@ -38,7 +38,6 @@ import 'vitepress-plugin-group-icons';
 import 'p-map';
 import 'node:buffer';
 import 'minisearch';
-import 'markdown-it-async';
 import '@shikijs/transformers';
 import 'shiki';
 import 'css-i18n';

package/dist/shared/{valaxy.BA1nryio.mjs → valaxy.Cb_HdczD.mjs}

@@ -37,7 +37,6 @@ import { groupIconMdPlugin, groupIconVitePlugin } from 'vitepress-plugin-group-i
 import pMap from 'p-map';
 import { Buffer as Buffer$1 } from 'node:buffer';
 import MiniSearch from 'minisearch';
-import { createMarkdownItAsync } from 'markdown-it-async';
 import { transformerNotationDiff, transformerNotationFocus, transformerNotationHighlight, transformerNotationErrorLevel, transformerCompactLineOptions } from '@shikijs/transformers';
 import { createHighlighter, addClassToHast, isSpecialLang } from 'shiki';
 import { cssI18nContainer } from 'css-i18n';
@@ -1552,6 +1551,77 @@ function sendText(res, content, headOnly) {
   }
 }
 
+const placeholderRE = /<pre><!--::valaxy-markdown-async::(\w+)::--><code>[\s\S]*?<\/code><\/pre>/g;
+let placeholderId = 0;
+class MarkdownItAsync extends MarkdownIt {
+  pendingHighlights;
+  warnOnSyncRender;
+  disableSyncRenderWarning = false;
+  constructor(presetOrOptions, options) {
+    const pendingHighlights = /* @__PURE__ */ new Map();
+    const asyncOptions = typeof presetOrOptions === "string" ? options : presetOrOptions;
+    if (typeof presetOrOptions === "string")
+      super(presetOrOptions, wrapOptions(options, pendingHighlights));
+    else if (presetOrOptions)
+      super(wrapOptions(presetOrOptions, pendingHighlights));
+    else
+      super();
+    this.pendingHighlights = pendingHighlights;
+    this.warnOnSyncRender = asyncOptions?.warnOnSyncRender ?? false;
+  }
+  render(src, env) {
+    if (this.warnOnSyncRender && !this.disableSyncRenderWarning)
+      console.warn("[valaxy] Use renderAsync() when Markdown highlighting can be asynchronous.");
+    return super.render(src, env);
+  }
+  async renderAsync(src, env) {
+    this.disableSyncRenderWarning = true;
+    let html;
+    try {
+      html = this.render(src, env);
+    } finally {
+      this.disableSyncRenderWarning = false;
+    }
+    const replacements = [];
+    for (const match of html.matchAll(placeholderRE)) {
+      const id = match[1];
+      const pending = this.pendingHighlights.get(id);
+      if (!pending)
+        throw new Error(`Unknown async highlight placeholder: ${id}`);
+      const highlighted = await pending.promise || "";
+      replacements.push(highlighted.startsWith("<pre") ? highlighted : `<pre><code class="language-${pending.lang}">${highlighted}</code></pre>`);
+      this.pendingHighlights.delete(id);
+    }
+    let index = 0;
+    return html.replace(placeholderRE, () => replacements[index++] || "");
+  }
+}
+function createMarkdownItAsync(presetOrOptions, options) {
+  return typeof presetOrOptions === "string" ? new MarkdownItAsync(presetOrOptions, options) : new MarkdownItAsync(presetOrOptions);
+}
+function wrapOptions(options, pendingHighlights) {
+  if (!options)
+    return void 0;
+  const { highlight, warnOnSyncRender: _, ...markdownItOptions } = options;
+  if (!highlight)
+    return markdownItOptions;
+  return {
+    ...markdownItOptions,
+    highlight(str, lang, attrs) {
+      const result = highlight(str, lang, attrs);
+      if (typeof result === "string")
+        return result;
+      const id = (++placeholderId).toString(36);
+      pendingHighlights.set(id, { lang, promise: result });
+      const code = str.endsWith("\n") ? str.slice(0, -1) : str;
+      return `<pre><!--::valaxy-markdown-async::${id}::--><code>${escapeHtml(code)}</code></pre>`;
+    }
+  };
+}
+function escapeHtml(value) {
+  return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
+
 const POOL_SIZE_MULTIPLIER = 128;
 let pool, poolOffset;
 
@@ -1826,6 +1896,74 @@ function disposeSharedHighlighter() {
   highlighterCache.clear();
 }
 
+//#region src/constants.ts
+const TAG_NAME_SCRIPT = "script";
+const TAG_NAME_STYLE = "style";
+const TAG_NAME_TEMPLATE = "template";
+
+//#endregion
+//#region src/sfc-regexp.ts
+const SCRIPT_SETUP_TAG_OPEN_REGEXP = /^<script\s+.*?\bsetup\b.*?>$/is;
+/**
+* Generate RegExp for sfc blocks
+*/
+const createSfcRegexp = ({ customBlocks }) => {
+	const sfcTags = Array.from(new Set([
+		TAG_NAME_SCRIPT,
+		TAG_NAME_STYLE,
+		...customBlocks
+	])).join("|");
+	return new RegExp(`^\\s*(?<content>(?<tagOpen><(?<type>${sfcTags})\\s?.*?>)(?<contentStripped>.*)(?<tagClose><\\/\\k<type>\\s*>))\\s*$`, "is");
+};
+
+//#endregion
+//#region src/sfc-plugin.ts
+/**
+* Get Vue SFC blocks
+*
+* Extract them into env and avoid rendering them
+*/
+const sfcPlugin = (md, { customBlocks = [] } = {}) => {
+	const sfcRegexp = createSfcRegexp({ customBlocks });
+	const render = md.render.bind(md);
+	md.render = (src, env = {}) => {
+		env.sfcBlocks = {
+			template: null,
+			script: null,
+			scriptSetup: null,
+			scripts: [],
+			styles: [],
+			customBlocks: []
+		};
+		const rendered = render(src, env);
+		env.sfcBlocks.template = {
+			type: TAG_NAME_TEMPLATE,
+			content: `<${TAG_NAME_TEMPLATE}>${rendered}</${TAG_NAME_TEMPLATE}>`,
+			contentStripped: rendered,
+			tagOpen: `<${TAG_NAME_TEMPLATE}>`,
+			tagClose: `</${TAG_NAME_TEMPLATE}>`
+		};
+		return rendered;
+	};
+	const htmlBlockRule = md.renderer.rules.html_block;
+	md.renderer.rules.html_block = (tokens, idx, options, env, self) => {
+		/* istanbul ignore if -- @preserve */
+		if (!env.sfcBlocks) return htmlBlockRule(tokens, idx, options, env, self);
+		const token = tokens[idx];
+		const content = token.content;
+		const match = content.match(sfcRegexp);
+		if (!match) return htmlBlockRule(tokens, idx, options, env, self);
+		const sfcBlock = match.groups;
+		if (sfcBlock.type === TAG_NAME_SCRIPT) {
+			env.sfcBlocks.scripts.push(sfcBlock);
+			if (SCRIPT_SETUP_TAG_OPEN_REGEXP.test(sfcBlock.tagOpen)) env.sfcBlocks.scriptSetup = sfcBlock;
+			else env.sfcBlocks.script = sfcBlock;
+		} else if (sfcBlock.type === TAG_NAME_STYLE) env.sfcBlocks.styles.push(sfcBlock);
+		else env.sfcBlocks.customBlocks.push(sfcBlock);
+		return "";
+	};
+};
+
 //#region src/html-escape.ts
 const htmlEscapeMap = {
 	"&": "&amp;",
@@ -1917,113 +2055,6 @@ const rCombining = /[\u0300-\u036F]/g;
 */
 const slugify = (str) => str.normalize("NFKD").replace(rCombining, "").replace(rControl, "").replace(rSpecial, "-").replace(/-{2,}/g, "-").replace(/^-+|-+$/g, "").replace(/^(\d)/, "_$1").toLowerCase();
 
-//#region src/headers-plugin.ts
-/**
-* Get markdown headers info
-*
-* Extract them into env
-*/
-const headersPlugin = (md, { level = [2, 3], shouldAllowNested = false, slugify: slugify$1 = slugify, format } = {}) => {
-	const render = md.renderer.render.bind(md.renderer);
-	md.renderer.render = (tokens, options, env) => {
-		env.headers = resolveHeadersFromTokens(tokens, {
-			level,
-			shouldAllowHtml: false,
-			shouldAllowNested,
-			shouldEscapeText: false,
-			slugify: slugify$1,
-			format
-		});
-		return render(tokens, options, env);
-	};
-};
-
-//#region src/constants.ts
-const TAG_NAME_SCRIPT = "script";
-const TAG_NAME_STYLE = "style";
-const TAG_NAME_TEMPLATE = "template";
-
-//#endregion
-//#region src/sfc-regexp.ts
-const SCRIPT_SETUP_TAG_OPEN_REGEXP = /^<script\s+.*?\bsetup\b.*?>$/is;
-/**
-* Generate RegExp for sfc blocks
-*/
-const createSfcRegexp = ({ customBlocks }) => {
-	const sfcTags = Array.from(new Set([
-		TAG_NAME_SCRIPT,
-		TAG_NAME_STYLE,
-		...customBlocks
-	])).join("|");
-	return new RegExp(`^\\s*(?<content>(?<tagOpen><(?<type>${sfcTags})\\s?.*?>)(?<contentStripped>.*)(?<tagClose><\\/\\k<type>\\s*>))\\s*$`, "is");
-};
-
-//#endregion
-//#region src/sfc-plugin.ts
-/**
-* Get Vue SFC blocks
-*
-* Extract them into env and avoid rendering them
-*/
-const sfcPlugin = (md, { customBlocks = [] } = {}) => {
-	const sfcRegexp = createSfcRegexp({ customBlocks });
-	const render = md.render.bind(md);
-	md.render = (src, env = {}) => {
-		env.sfcBlocks = {
-			template: null,
-			script: null,
-			scriptSetup: null,
-			scripts: [],
-			styles: [],
-			customBlocks: []
-		};
-		const rendered = render(src, env);
-		env.sfcBlocks.template = {
-			type: TAG_NAME_TEMPLATE,
-			content: `<${TAG_NAME_TEMPLATE}>${rendered}</${TAG_NAME_TEMPLATE}>`,
-			contentStripped: rendered,
-			tagOpen: `<${TAG_NAME_TEMPLATE}>`,
-			tagClose: `</${TAG_NAME_TEMPLATE}>`
-		};
-		return rendered;
-	};
-	const htmlBlockRule = md.renderer.rules.html_block;
-	md.renderer.rules.html_block = (tokens, idx, options, env, self) => {
-		/* istanbul ignore if -- @preserve */
-		if (!env.sfcBlocks) return htmlBlockRule(tokens, idx, options, env, self);
-		const token = tokens[idx];
-		const content = token.content;
-		const match = content.match(sfcRegexp);
-		if (!match) return htmlBlockRule(tokens, idx, options, env, self);
-		const sfcBlock = match.groups;
-		if (sfcBlock.type === TAG_NAME_SCRIPT) {
-			env.sfcBlocks.scripts.push(sfcBlock);
-			if (SCRIPT_SETUP_TAG_OPEN_REGEXP.test(sfcBlock.tagOpen)) env.sfcBlocks.scriptSetup = sfcBlock;
-			else env.sfcBlocks.script = sfcBlock;
-		} else if (sfcBlock.type === TAG_NAME_STYLE) env.sfcBlocks.styles.push(sfcBlock);
-		else env.sfcBlocks.customBlocks.push(sfcBlock);
-		return "";
-	};
-};
-
-//#region src/title-plugin.ts
-/**
-* Get markdown page title info
-*
-* Extract it into env
-*/
-const titlePlugin = (md) => {
-	const render = md.renderer.render.bind(md.renderer);
-	md.renderer.render = (tokens, options, env) => {
-		const tokenIdx = tokens.findIndex((token) => token.tag === "h1");
-		env.title = tokenIdx > -1 ? resolveTitleFromToken(tokens[tokenIdx + 1], {
-			shouldAllowHtml: false,
-			shouldEscapeText: false
-		}) : "";
-		return render(tokens, options, env);
-	};
-};
-
 //#region src/create-render-headers.ts
 const createRenderHeaders = ({ listTag, listClass, itemClass, linkTag, linkClass }) => {
 	const listTagString = htmlEscape(listTag);
@@ -2130,7 +2161,8 @@ function imagePlugin(md) {
   const imageRule = md.renderer.rules.image;
   md.renderer.rules.image = (tokens, idx, options, env, self) => {
     const token = tokens[idx];
-    let url = token.attrGet("src");
+    const src = token.attrGet("src");
+    let url = src === null ? null : String(src);
     if (url && !EXTERNAL_URL_RE.test(url)) {
       if (!/^\.?\//.test(url))
         url = `./${url}`;
@@ -2147,29 +2179,28 @@ function linkPlugin(md, externalAttrs, resolveBase) {
     const hrefIndex = token.attrIndex("href");
     if (hrefIndex >= 0) {
       const hrefAttr = token.attrs[hrefIndex];
-      const url = hrefAttr[1];
+      let url = String(hrefAttr[1]);
       const isExternal = EXTERNAL_URL_RE.test(url);
       if (isExternal) {
         Object.entries(externalAttrs).forEach(([key, val]) => {
           token.attrSet(key, val);
         });
-        hrefAttr[1] = url.replace(PATHNAME_PROTOCOL_RE, "");
+        url = url.replace(PATHNAME_PROTOCOL_RE, "");
       } else {
         if (
           // internal anchor links
           !url.startsWith("#") && !url.startsWith("mailto:") && !/\.(?!html|md)\w+($|[?#])/i.test(url)
         ) {
-          normalizeHref(hrefAttr, env);
+          url = normalizeHref(url, env ?? {});
         }
-        if (hrefAttr[1].startsWith("/"))
-          hrefAttr[1] = `${resolveBase()}${hrefAttr[1]}`.replace(/\/+/g, "/");
+        if (url.startsWith("/"))
+          url = `${resolveBase()}${url}`.replace(/\/+/g, "/");
       }
-      hrefAttr[1] = hrefAttr[1].replace(/\bimport\.meta/g, "import%2Emeta").replace(/\bprocess\.env/g, "process%2Eenv");
+      hrefAttr[1] = url.replace(/\bimport\.meta/g, "import%2Emeta").replace(/\bprocess\.env/g, "process%2Eenv");
     }
     return self.renderToken(tokens, idx, options);
   };
-  function normalizeHref(hrefAttr, env) {
-    let url = hrefAttr[1];
+  function normalizeHref(url, env) {
     const indexMatch = url.match(indexRE);
     if (indexMatch) {
       const [, path, hash] = indexMatch;
@@ -2191,7 +2222,7 @@ function linkPlugin(md, externalAttrs, resolveBase) {
     if (!url.startsWith("/") && !/^\.\//.test(url))
       url = `./${url}`;
     pushLink(url.replace(/\.html$/, ""), env);
-    hrefAttr[1] = decodeURI(url);
+    return decodeURI(url);
   }
   function pushLink(link, env) {
     const links = env.links || (env.links = []);
@@ -2224,7 +2255,7 @@ function preWrapperPlugin(md, options) {
     token.info = token.info.replace(/ active$/, "").replace(/ active /, " ");
     const lang = extractLang(token.info);
     const rawCode = fence(...args);
-    const codeHeightLimitClass = getCodeHeightLimitStyle(options, env);
+    const codeHeightLimitClass = getCodeHeightLimitStyle(options, env ?? {});
     const wrap = (code) => `<div class="language-${lang}${active}${codeHeightLimitClass}"><button title="${options.codeCopyButtonTitle || "Copy code"}" class="copy"></button><span class="lang">${lang}</span>${code}<button class="code-block-unfold-btn"></button></div>`;
     return isPromiseLike(rawCode) ? rawCode.then(wrap) : wrap(rawCode);
   });
@@ -2646,7 +2677,7 @@ function findRegion(lines, regionName) {
   }
   return null;
 }
-function snippetPlugin(md, srcDir) {
+function snippetPlugin(md, srcDir = "") {
   const parser = (state, startLine, endLine, silent) => {
     const CH = "<".charCodeAt(0);
     const pos = state.bMarks[startLine] + state.tShift[startLine];
@@ -2668,7 +2699,7 @@ function snippetPlugin(md, srcDir) {
     const token = state.push("fence", "code", 0);
     token.info = `${lang || extension}${lines ? `{${lines}}` : ""}${title ? `[${title}]` : ""}`;
     const { realPath, path: _path } = state.env;
-    const resolvedPath = path$1.resolve(path$1.dirname(realPath ?? _path), filepath);
+    const resolvedPath = path$1.resolve(path$1.dirname(realPath ?? _path ?? "."), filepath);
     token.src = [resolvedPath, region.slice(1)];
     token.markup = "```";
     token.map = [startLine, startLine + 1];
@@ -2676,7 +2707,8 @@ function snippetPlugin(md, srcDir) {
   };
   const fence = md.renderer.rules.fence;
   md.renderer.rules.fence = (...args) => {
-    const [tokens, idx, , { includes }] = args;
+    const [tokens, idx, , env] = args;
+    const { includes } = env ?? {};
     const token = tokens[idx];
     const [src, regionName] = token.src ?? [];
     if (!src)
@@ -2706,22 +2738,51 @@ function snippetPlugin(md, srcDir) {
 }
 
 const defaultCodeTheme = { light: "github-light", dark: "github-dark" };
+const sfcPluginV15 = sfcPlugin;
+const tocPluginV15 = tocPlugin;
+const anchorPluginV15 = anchorPlugin;
+function setupMarkdownPageMetadata(md, options) {
+  const mdOptions = options?.config.markdown || {};
+  const headersOptions = typeof mdOptions.headers === "boolean" ? {} : mdOptions.headers || {};
+  const {
+    level = [2, 3, 4, 5, 6],
+    shouldAllowNested = false,
+    slugify: headersSlugify = slugify,
+    format
+  } = headersOptions;
+  md.core.ruler.push("valaxy_page_metadata", (state) => {
+    const tokens = state.tokens;
+    state.env.headers = resolveHeadersFromTokens(tokens, {
+      level,
+      shouldAllowHtml: false,
+      shouldAllowNested,
+      shouldEscapeText: false,
+      slugify: headersSlugify,
+      format
+    });
+    const titleTokenIndex = state.tokens.findIndex((token) => token.tag === "h1");
+    state.env.title = titleTokenIndex > -1 ? resolveTitleFromToken(state.tokens[titleTokenIndex + 1], {
+      shouldAllowHtml: false,
+      shouldEscapeText: false
+    }) : "";
+  });
+}
 async function setupMarkdownPlugins(md, options, base = options?.config.vite?.base || "/") {
   const mdOptions = options?.config.markdown || {};
-  const theme = mdOptions.theme ?? defaultCodeTheme;
   const siteConfig = options?.config.siteConfig || {};
+  const languages = siteConfig.languages?.filter((language) => Boolean(language));
   const resolveBase = createMarkdownBaseResolver(base);
   if (mdOptions.preConfig)
     mdOptions.preConfig(md);
-  md.use(highlightLinePlugin).use(preWrapperPlugin, { theme, siteConfig }).use(snippetPlugin, options?.userRoot).use(containerPlugin, {
-    languages: siteConfig.languages,
+  md.use(highlightLinePlugin).use(preWrapperPlugin, { siteConfig }).use(snippetPlugin, options?.userRoot ?? "").use(containerPlugin, {
+    languages,
     ...mdOptions?.container,
     blocks: {
       ...mdOptions.blocks,
       ...mdOptions.container?.blocks
     }
   }).use(cssI18nContainer, {
-    languages: options?.config.siteConfig.languages
+    languages
   }).use(
     linkPlugin,
     {
@@ -2735,12 +2796,12 @@ async function setupMarkdownPlugins(md, options, base = options?.config.vite?.ba
   if (!mdOptions.attrs?.disable)
     md.use(attrsPlugin, mdOptions.attrs);
   md.use(full).use(footnotePlugin).use(footnoteTooltipPlugin);
-  md.use(anchorPlugin, {
+  md.use(anchorPluginV15, {
     slugify,
     getTokensText: (tokens) => {
       return tokens.filter((t) => !["html_inline", "emoji"].includes(t.type)).map((t) => t.content).join("");
     },
-    permalink: anchorPlugin.permalink.linkInsideHeader({
+    permalink: anchorPluginV15.permalink.linkInsideHeader({
       symbol: "&ZeroWidthSpace;",
       renderAttrs: (slug, state) => {
         const idx = state.tokens.findIndex((token) => {
@@ -2756,13 +2817,9 @@ async function setupMarkdownPlugins(md, options, base = options?.config.vite?.ba
     }),
     ...mdOptions.anchor
   });
-  md.use(headersPlugin, {
-    level: [2, 3, 4, 5, 6],
-    slugify,
-    ...typeof mdOptions.headers === "boolean" ? void 0 : mdOptions.headers
-  }).use(sfcPlugin, {
+  md.use(sfcPluginV15, {
     ...mdOptions.sfc
-  }).use(titlePlugin).use(tocPlugin, {
+  }).use(tocPluginV15, {
     slugify,
     ...mdOptions.toc
   });
@@ -2849,7 +2906,7 @@ async function setupMarkdownPlugins(md, options, base = options?.config.vite?.ba
   return md;
 }
 
-const version = "1.0.0-rc.7";
+const version = "1.0.0-rc.9";
 
 const GLOBAL_STATE = {
   valaxyApp: void 0,
@@ -2962,7 +3019,11 @@ async function createMarkdownPlugin(options, base, state = Valaxy.state) {
   const [highlight, dispose] = mdOptions.highlight ? [mdOptions.highlight, () => {
   }] : await getSharedHighlighter(theme, mdOptions, logger);
   state.onDispose(dispose);
-  const { transforms: userTransforms, ...restMdOptions } = mdOptions;
+  const {
+    transforms: userTransforms,
+    markdownItSetup: userMarkdownItSetup,
+    ...restMdOptions
+  } = mdOptions;
   return Markdown({
     include: [/\.md$/],
     wrapperClasses: "",
@@ -2991,15 +3052,19 @@ async function createMarkdownPlugin(options, base, state = Valaxy.state) {
     async markdownItSetup(mdIt) {
       mdIt.linkify.set({ fuzzyLink: false });
       await setupMarkdownPlugins(mdIt, options, base);
-      options?.config.markdown?.markdownItSetup?.(mdIt);
+      await userMarkdownItSetup?.(mdIt);
+      setupMarkdownPageMetadata(mdIt, options);
       function initEnv(md) {
         md.core.ruler.push("valaxy_md_env", (mdState) => {
+          const env = mdState.env;
+          if (!env.id)
+            return;
           state.set({
-            id: mdState.env.id,
-            title: mdState.env.title,
-            links: mdState.env.links,
-            headers: mdState.env.headers,
-            frontmatter: mdState.env.frontmatter
+            id: env.id,
+            title: env.title ?? "",
+            links: env.links ?? [],
+            headers: env.headers ?? [],
+            frontmatter: env.frontmatter ?? {}
           });
         });
       }
@@ -3043,6 +3108,7 @@ async function createMarkdownRenderer(options, base) {
   await mdOptions.markdownItSetup?.(
     md
   );
+  setupMarkdownPageMetadata(md, options);
   return md;
 }
 async function createLightMarkdownRenderer(options, base) {
@@ -3059,6 +3125,7 @@ async function createLightMarkdownRenderer(options, base) {
   });
   md.linkify.set({ fuzzyLink: false });
   await setupMarkdownPlugins(md, options, base);
+  setupMarkdownPageMetadata(md, options);
   return md;
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "valaxy",
   "type": "module",
-  "version": "1.0.0-rc.7",
+  "version": "1.0.0-rc.9",
   "description": "📄 Vite & Vue powered static blog generator.",
   "author": {
     "email": "me@yunyoujun.cn",
@@ -60,7 +60,7 @@
     "node": ">=22.12.0"
   },
   "peerDependencies": {
-    "vue": "^3.5.0",
+    "vue": "^3.5.41",
     "vue-router": "^5.0.0"
   },
   "dependencies": {
@@ -100,12 +100,11 @@
     "js-yaml": "^4.3.0",
     "katex": "^0.16.47",
     "lru-cache": "^11.5.1",
-    "markdown-it": "^14.3.0",
-    "markdown-it-anchor": "^9.2.0",
-    "markdown-it-async": "^2.2.0",
-    "markdown-it-attrs": "^4.5.0",
+    "markdown-it": "^15.0.1",
+    "markdown-it-anchor": "^9.2.1",
+    "markdown-it-attrs": "^5.0.1",
     "markdown-it-container": "^4.0.0",
-    "markdown-it-emoji": "^3.0.0",
+    "markdown-it-emoji": "^3.1.0",
     "markdown-it-footnote": "^4.0.0",
     "markdown-it-image-figures": "^2.1.1",
     "markdown-it-table-of-contents": "^1.2.0",
@@ -136,11 +135,11 @@
     "vite-plugin-vue-devtools": "^8.1.5",
     "vite-plugin-vue-layouts-next": "^2.1.0",
     "vite-ssg-sitemap": "^0.10.0",
-    "vitepress-plugin-group-icons": "^1.7.5",
+    "vitepress-plugin-group-icons": "^1.7.6",
     "vue-i18n": "^11.4.6",
     "yargs": "^18.0.0",
-    "@valaxyjs/devtools": "1.0.0-rc.7",
-    "@valaxyjs/utils": "1.0.0-rc.7"
+    "@valaxyjs/devtools": "1.0.0-rc.9",
+    "@valaxyjs/utils": "1.0.0-rc.9"
   },
   "devDependencies": {
     "@mdit-vue/plugin-component": "^3.0.2",
@@ -155,8 +154,6 @@
     "@types/gh-pages": "^6.1.0",
     "@types/html-to-text": "^9.0.4",
     "@types/js-yaml": "^4.0.9",
-    "@types/markdown-it": "^14.1.2",
-    "@types/markdown-it-footnote": "^3.0.4",
     "@types/nprogress": "^0.2.3",
     "@types/pascalcase": "^1.0.3",
     "@types/qrcode": "^1.5.6",
@@ -166,7 +163,7 @@
     "nanoid": "^5.1.16",
     "rollup-plugin-visualizer": "^7.0.1",
     "unbuild": "^3.6.1",
-    "vue": "3.5.22",
+    "vue": "^3.5.41",
     "vue-router": "^5.1.0"
   },
   "scripts": {

package/types/markdown-it-container.d.ts

@@ -1,12 +1,10 @@
 /**
  * Type augmentation for markdown-it-container
  *
- * The official @types/markdown-it-container@2.0.11 depends on @types/markdown-it@13.0.9,
- * but we use @types/markdown-it@14.1.2. This file provides compatible type definitions.
+ * Local definitions keep the plugin compatible with markdown-it's bundled v15 types.
  */
 declare module 'markdown-it-container' {
-  import type MarkdownIt from 'markdown-it'
-  import type Token from 'markdown-it/lib/token.mjs'
+  import type { MarkdownIt, RendererRule } from 'markdown-it'
 
   interface ContainerOptions {
     /**
@@ -17,7 +15,7 @@ declare module 'markdown-it-container' {
     /**
      * Renderer for opening/closing tokens.
      */
-    render?: (tokens: Token[], idx: number, options: any, env: any, self: any) => string
+    render?: RendererRule
 
     /**
      * Character to use in delimiter, default is ":"

package/types/markdown-it-plugins.d.ts

@@ -0,0 +1,22 @@
+declare module 'markdown-it-emoji' {
+  import type { MarkdownIt } from 'markdown-it'
+
+  export interface EmojiOptions {
+    defs: Record<string, string>
+    enabled: string[]
+    shortcuts: Record<string, string | string[]>
+  }
+
+  export type EmojiPlugin = (md: MarkdownIt, options?: Partial<EmojiOptions>) => void
+
+  export const bare: EmojiPlugin
+  export const full: EmojiPlugin
+  export const light: EmojiPlugin
+}
+
+declare module 'markdown-it-footnote' {
+  import type { MarkdownIt } from 'markdown-it'
+
+  const footnotePlugin: (md: MarkdownIt) => void
+  export default footnotePlugin
+}