@antdv-next/x 1.1.3-beta.2 → 1.1.3-beta.3

package/dist/code-highlighter/index.d.ts

@@ -1,3 +1,4 @@
 import { default as CodeHighlighter } from './CodeHighlighter';
+export { setupCodeHighlighter } from './shiki';
 export type { CodeHighlighterHeaderSlotScope, CodeHighlighterProps, CodeHighlighterRef, CodeHighlighterSemanticType, CodeHighlighterSlots, } from './interface';
 export default CodeHighlighter;

package/dist/code-highlighter/index.js

@@ -1,5 +1,6 @@
+import { setupCodeHighlighter } from "./shiki.js";
 import { XCodeHighlighter } from "./CodeHighlighter.js";
 //#region components/code-highlighter/index.tsx
 var code_highlighter_default = XCodeHighlighter;
 //#endregion
-export { code_highlighter_default as default };
+export { code_highlighter_default as default, setupCodeHighlighter };

package/dist/code-highlighter/shiki.d.ts

@@ -1,4 +1,29 @@
+type LanguageLoader = (lang: string) => Promise<any>;
+/**
+ * 注入自定义语言加载器，覆盖默认内置白名单。
+ * 建议按需 `import` 语言模块，避免引入全量语言包。
+ *
+ * @example 按需加载额外语言
+ * ```ts
+ * import { setupCodeHighlighter } from "@antdv-next/x";
+ *
+ * setupCodeHighlighter({
+ *   loadLanguage: async (lang) => {
+ *     const loaders: Record<string, () => Promise<{ default: any }>> = {
+ *       go: () => import("shiki/dist/langs/go.mjs"),
+ *       rust: () => import("shiki/dist/langs/rust.mjs"),
+ *     };
+ *     const loader = loaders[lang];
+ *     return loader ? (await loader()).default : null;
+ *   },
+ * });
+ * ```
+ */
+export declare function setupCodeHighlighter(options: {
+    loadLanguage?: LanguageLoader;
+}): void;
 export declare function codeToHtml(code: string, options?: {
     lang?: string;
     theme?: string;
 }): Promise<string>;
+export {};

package/dist/code-highlighter/shiki.js

@@ -3,40 +3,65 @@ import darkTheme from "shiki/dist/themes/vitesse-dark.mjs";
 import lightTheme from "shiki/dist/themes/vitesse-light.mjs";
 import { createJavaScriptRegexEngine } from "shiki/engine/javascript";
 //#region components/code-highlighter/shiki.ts
-var SUPPORTED_LANG_ALIASES = {
-	ts: "typescript",
-	js: "javascript",
-	py: "python",
-	md: "markdown",
-	yml: "yaml",
-	shell: "bash",
-	zsh: "bash",
-	sh: "bash",
-	vue: "vue"
-};
-var LANG_LOADERS = {
-	javascript: () => import("shiki/dist/langs/javascript.mjs"),
+var PLAIN_TEXT_LANGUAGES = new Set([
+	"text",
+	"plaintext",
+	"txt",
+	"plain"
+]);
+/**
+* 内置热门语言白名单。
+* 使用静态 import 路径，打包时仅生成这几个语言对应的 chunk。
+*/
+var BUILTIN_LANGUAGES = {
 	typescript: () => import("shiki/dist/langs/typescript.mjs"),
-	jsx: () => import("shiki/dist/langs/jsx.mjs"),
-	tsx: () => import("shiki/dist/langs/tsx.mjs"),
+	javascript: () => import("shiki/dist/langs/javascript.mjs"),
+	python: () => import("shiki/dist/langs/python.mjs"),
 	json: () => import("shiki/dist/langs/json.mjs"),
-	bash: () => import("shiki/dist/langs/bash.mjs"),
-	markdown: () => import("shiki/dist/langs/markdown.mjs"),
 	html: () => import("shiki/dist/langs/html.mjs"),
-	css: () => import("shiki/dist/langs/css.mjs"),
-	vue: () => import("shiki/dist/langs/vue.mjs"),
-	"vue-html": () => import("shiki/dist/langs/vue-html.mjs"),
-	python: () => import("shiki/dist/langs/python.mjs"),
-	mermaid: () => import("shiki/dist/langs/mermaid.mjs"),
-	yaml: () => import("shiki/dist/langs/yaml.mjs"),
-	diff: () => import("shiki/dist/langs/diff.mjs")
+	css: () => import("shiki/dist/langs/css.mjs")
+};
+/** 常用别名 -> 基础语言 */
+var BUILTIN_ALIASES = {
+	ts: "typescript",
+	js: "javascript",
+	py: "python"
+};
+var defaultLoader = async (lang) => {
+	const loader = BUILTIN_LANGUAGES[BUILTIN_ALIASES[lang] ?? lang];
+	return loader ? (await loader()).default : null;
 };
+var activeLoader = defaultLoader;
+/**
+* 注入自定义语言加载器，覆盖默认内置白名单。
+* 建议按需 `import` 语言模块，避免引入全量语言包。
+*
+* @example 按需加载额外语言
+* ```ts
+* import { setupCodeHighlighter } from "@antdv-next/x";
+*
+* setupCodeHighlighter({
+*   loadLanguage: async (lang) => {
+*     const loaders: Record<string, () => Promise<{ default: any }>> = {
+*       go: () => import("shiki/dist/langs/go.mjs"),
+*       rust: () => import("shiki/dist/langs/rust.mjs"),
+*     };
+*     const loader = loaders[lang];
+*     return loader ? (await loader()).default : null;
+*   },
+* });
+* ```
+*/
+function setupCodeHighlighter(options) {
+	if (options?.loadLanguage) activeLoader = options.loadLanguage;
+}
 var highlighter = null;
 var highlighterPromise = null;
 var loadedLangs = /* @__PURE__ */ new Set();
+var failedLangs = /* @__PURE__ */ new Set();
+var languageLoadPromises = /* @__PURE__ */ new Map();
 function normalizeLanguage(language) {
-	const input = (language || "text").toLowerCase();
-	return SUPPORTED_LANG_ALIASES[input] || input;
+	return (language || "text").toLowerCase();
 }
 function escapeHtml(str) {
 	return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
@@ -52,14 +77,31 @@ async function getHighlighter() {
 	return highlighter;
 }
 async function loadLang(lang) {
-	const loader = LANG_LOADERS[lang];
-	if (!loader) return false;
 	if (loadedLangs.has(lang)) return true;
-	const instance = await getHighlighter();
-	const mod = await loader();
-	await instance.loadLanguage(mod.default);
-	loadedLangs.add(lang);
-	return true;
+	if (failedLangs.has(lang) || PLAIN_TEXT_LANGUAGES.has(lang)) return false;
+	const pendingLoad = languageLoadPromises.get(lang);
+	if (pendingLoad) return pendingLoad;
+	const loadPromise = (async () => {
+		try {
+			const registration = await activeLoader(lang);
+			if (!registration) {
+				failedLangs.add(lang);
+				return false;
+			}
+			await (await getHighlighter()).loadLanguage(registration);
+			loadedLangs.add(lang);
+			return true;
+		} catch (error) {
+			const loadError = error instanceof Error ? error : new Error(String(error));
+			failedLangs.add(lang);
+			console.warn(`[CodeHighlighter] Failed to load language: ${lang}`, loadError);
+			return false;
+		} finally {
+			languageLoadPromises.delete(lang);
+		}
+	})();
+	languageLoadPromises.set(lang, loadPromise);
+	return loadPromise;
 }
 async function codeToHtml(code, options = {}) {
 	const lang = normalizeLanguage(options.lang);
@@ -70,4 +112,4 @@ async function codeToHtml(code, options = {}) {
 	});
 }
 //#endregion
-export { codeToHtml };
+export { codeToHtml, setupCodeHighlighter };

package/dist/index.d.ts

@@ -35,6 +35,7 @@ export type { ConversationItemType, ConversationsProps, ConversationsRef, Creati
 export type { SourcesProps } from './sources';
 export type { WelcomeProps, WelcomeRef } from './welcome';
 export type { CodeHighlighterProps, CodeHighlighterRef, CodeHighlighterSemanticType, } from './code-highlighter';
+export { setupCodeHighlighter } from './code-highlighter';
 export type { SenderProps, SenderRef } from './sender';
 export type { RenderChildrenProps, SuggestionItem, SuggestionProps, } from './suggestion';
 export type { XProviderProps } from './x-provider';

package/dist/index.js

@@ -10,6 +10,7 @@ import { XBubbleDivider } from "./bubble/Divider.js";
 import { XBubbleSystem } from "./bubble/System.js";
 import { XBubbleList } from "./bubble/BubbleList.js";
 import BubbleWithSub from "./bubble/index.js";
+import { setupCodeHighlighter } from "./code-highlighter/shiki.js";
 import code_highlighter_default from "./code-highlighter/index.js";
 import Creation from "./conversations/Creation.js";
 import ConversationsWithSub from "./conversations/index.js";
@@ -69,4 +70,4 @@ var components_default = {
 	version
 };
 //#endregion
-export { ActionsWithSub as Actions, XActionsAudio as ActionsAudio, XActionsCopy as ActionsCopy, XActionsFeedback as ActionsFeedback, XActionsItem as ActionsItem, XAttachments as Attachments, BubbleWithSub as Bubble, XBubbleDivider as BubbleDivider, XBubbleList as BubbleList, XBubbleSystem as BubbleSystem, code_highlighter_default as CodeHighlighter, ConversationsWithSub as Conversations, Creation as ConversationsCreation, FileCardWithSub as FileCard, XFileCardList as FileCardList, folder_default as Folder, mermaid_default as Mermaid, notification_default as Notification, prompts_default as Prompts, Sender, SenderHeader_default as SenderHeader, SenderSwitch_default as SenderSwitch, sources_default as Sources, suggestion_default as Suggestion, think_default as Think, ThoughtChainWithSub as ThoughtChain, XThoughtChainItem as ThoughtChainItem, XWelcome as Welcome, XNotification, XProvider, components_default as default, version };
+export { ActionsWithSub as Actions, XActionsAudio as ActionsAudio, XActionsCopy as ActionsCopy, XActionsFeedback as ActionsFeedback, XActionsItem as ActionsItem, XAttachments as Attachments, BubbleWithSub as Bubble, XBubbleDivider as BubbleDivider, XBubbleList as BubbleList, XBubbleSystem as BubbleSystem, code_highlighter_default as CodeHighlighter, ConversationsWithSub as Conversations, Creation as ConversationsCreation, FileCardWithSub as FileCard, XFileCardList as FileCardList, folder_default as Folder, mermaid_default as Mermaid, notification_default as Notification, prompts_default as Prompts, Sender, SenderHeader_default as SenderHeader, SenderSwitch_default as SenderSwitch, sources_default as Sources, suggestion_default as Suggestion, think_default as Think, ThoughtChainWithSub as ThoughtChain, XThoughtChainItem as ThoughtChainItem, XWelcome as Welcome, XNotification, XProvider, components_default as default, setupCodeHighlighter, version };

package/dist/index.umd.js

@@ -49,7 +49,7 @@
 	shiki_dist_themes_vitesse_dark_mjs = __toESM(shiki_dist_themes_vitesse_dark_mjs);
 	shiki_dist_themes_vitesse_light_mjs = __toESM(shiki_dist_themes_vitesse_light_mjs);
 	//#region package.json
-	var version = "1.1.3-beta.2";
+	var version = "1.1.3-beta.3";
 	//#endregion
 	//#region components/x-provider/context.ts
 	var XProviderContextKey = Symbol("antdv-next-x-provider-context");
@@ -4755,40 +4755,65 @@
 	BubbleWithSub.Divider = XBubbleDivider;
 	//#endregion
 	//#region components/code-highlighter/shiki.ts
-	var SUPPORTED_LANG_ALIASES = {
-		ts: "typescript",
-		js: "javascript",
-		py: "python",
-		md: "markdown",
-		yml: "yaml",
-		shell: "bash",
-		zsh: "bash",
-		sh: "bash",
-		vue: "vue"
-	};
-	var LANG_LOADERS = {
-		javascript: () => import("shiki/dist/langs/javascript.mjs"),
+	var PLAIN_TEXT_LANGUAGES = new Set([
+		"text",
+		"plaintext",
+		"txt",
+		"plain"
+	]);
+	/**
+	* 内置热门语言白名单。
+	* 使用静态 import 路径，打包时仅生成这几个语言对应的 chunk。
+	*/
+	var BUILTIN_LANGUAGES = {
 		typescript: () => import("shiki/dist/langs/typescript.mjs"),
-		jsx: () => import("shiki/dist/langs/jsx.mjs"),
-		tsx: () => import("shiki/dist/langs/tsx.mjs"),
+		javascript: () => import("shiki/dist/langs/javascript.mjs"),
+		python: () => import("shiki/dist/langs/python.mjs"),
 		json: () => import("shiki/dist/langs/json.mjs"),
-		bash: () => import("shiki/dist/langs/bash.mjs"),
-		markdown: () => import("shiki/dist/langs/markdown.mjs"),
 		html: () => import("shiki/dist/langs/html.mjs"),
-		css: () => import("shiki/dist/langs/css.mjs"),
-		vue: () => import("shiki/dist/langs/vue.mjs"),
-		"vue-html": () => import("shiki/dist/langs/vue-html.mjs"),
-		python: () => import("shiki/dist/langs/python.mjs"),
-		mermaid: () => import("shiki/dist/langs/mermaid.mjs"),
-		yaml: () => import("shiki/dist/langs/yaml.mjs"),
-		diff: () => import("shiki/dist/langs/diff.mjs")
+		css: () => import("shiki/dist/langs/css.mjs")
 	};
+	/** 常用别名 -> 基础语言 */
+	var BUILTIN_ALIASES = {
+		ts: "typescript",
+		js: "javascript",
+		py: "python"
+	};
+	var defaultLoader = async (lang) => {
+		const loader = BUILTIN_LANGUAGES[BUILTIN_ALIASES[lang] ?? lang];
+		return loader ? (await loader()).default : null;
+	};
+	var activeLoader = defaultLoader;
+	/**
+	* 注入自定义语言加载器，覆盖默认内置白名单。
+	* 建议按需 `import` 语言模块，避免引入全量语言包。
+	*
+	* @example 按需加载额外语言
+	* ```ts
+	* import { setupCodeHighlighter } from "@antdv-next/x";
+	*
+	* setupCodeHighlighter({
+	*   loadLanguage: async (lang) => {
+	*     const loaders: Record<string, () => Promise<{ default: any }>> = {
+	*       go: () => import("shiki/dist/langs/go.mjs"),
+	*       rust: () => import("shiki/dist/langs/rust.mjs"),
+	*     };
+	*     const loader = loaders[lang];
+	*     return loader ? (await loader()).default : null;
+	*   },
+	* });
+	* ```
+	*/
+	function setupCodeHighlighter(options) {
+		if (options?.loadLanguage) activeLoader = options.loadLanguage;
+	}
 	var highlighter = null;
 	var highlighterPromise = null;
 	var loadedLangs = /* @__PURE__ */ new Set();
+	var failedLangs = /* @__PURE__ */ new Set();
+	var languageLoadPromises = /* @__PURE__ */ new Map();
 	function normalizeLanguage(language) {
-		const input = (language || "text").toLowerCase();
-		return SUPPORTED_LANG_ALIASES[input] || input;
+		return (language || "text").toLowerCase();
 	}
 	function escapeHtml(str) {
 		return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
@@ -4804,14 +4829,31 @@
 		return highlighter;
 	}
 	async function loadLang(lang) {
-		const loader = LANG_LOADERS[lang];
-		if (!loader) return false;
 		if (loadedLangs.has(lang)) return true;
-		const instance = await getHighlighter();
-		const mod = await loader();
-		await instance.loadLanguage(mod.default);
-		loadedLangs.add(lang);
-		return true;
+		if (failedLangs.has(lang) || PLAIN_TEXT_LANGUAGES.has(lang)) return false;
+		const pendingLoad = languageLoadPromises.get(lang);
+		if (pendingLoad) return pendingLoad;
+		const loadPromise = (async () => {
+			try {
+				const registration = await activeLoader(lang);
+				if (!registration) {
+					failedLangs.add(lang);
+					return false;
+				}
+				await (await getHighlighter()).loadLanguage(registration);
+				loadedLangs.add(lang);
+				return true;
+			} catch (error) {
+				const loadError = error instanceof Error ? error : new Error(String(error));
+				failedLangs.add(lang);
+				console.warn(`[CodeHighlighter] Failed to load language: ${lang}`, loadError);
+				return false;
+			} finally {
+				languageLoadPromises.delete(lang);
+			}
+		})();
+		languageLoadPromises.set(lang, loadPromise);
+		return loadPromise;
 	}
 	async function codeToHtml(code, options = {}) {
 		const lang = normalizeLanguage(options.lang);
@@ -12269,5 +12311,6 @@
 	exports.XNotification = XNotification;
 	exports.XProvider = XProvider;
 	exports.default = components_default;
+	exports.setupCodeHighlighter = setupCodeHighlighter;
 	exports.version = version;
 });

package/dist/package.js

@@ -1,4 +1,4 @@
 //#region package.json
-var version = "1.1.3-beta.2";
+var version = "1.1.3-beta.3";
 //#endregion
 export { version };