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

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

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

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

@@ -0,0 +1,3 @@
+import { createHighlighterCore } from 'shiki/core';
+export type CodeHighlighterInstance = Awaited<ReturnType<typeof createHighlighterCore>>;
+export declare function createHighlighter(): Promise<import('shiki').HighlighterCore>;

package/dist/code-highlighter/shiki-runtime.js

@@ -0,0 +1,14 @@
+import { createHighlighterCore } from "shiki/core";
+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-runtime.ts
+function createHighlighter() {
+	return createHighlighterCore({
+		themes: [lightTheme, darkTheme],
+		langs: [],
+		engine: createJavaScriptRegexEngine()
+	});
+}
+//#endregion
+export { createHighlighter };

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

@@ -1,15 +1,20 @@
-type LanguageLoader = (lang: string) => Promise<any>;
+import { LanguageInput } from 'shiki';
+export type CodeHighlighterLanguageLoader = (lang: string) => Promise<LanguageInput | null>;
+export interface SetupCodeHighlighterOptions {
+    loadLanguage?: CodeHighlighterLanguageLoader;
+}
 /**
- * 注入自定义语言加载器，覆盖默认内置白名单。
+ * 注入自定义语言加载器。返回 `null` 时回退到默认内置白名单。
  * 建议按需 `import` 语言模块，避免引入全量语言包。
  *
  * @example 按需加载额外语言
  * ```ts
  * import { setupCodeHighlighter } from "@antdv-next/x";
+ * import type { LanguageInput } from "shiki";
  *
  * setupCodeHighlighter({
  *   loadLanguage: async (lang) => {
- *     const loaders: Record<string, () => Promise<{ default: any }>> = {
+ *     const loaders: Record<string, () => Promise<{ default: LanguageInput }>> = {
  *       go: () => import("shiki/dist/langs/go.mjs"),
  *       rust: () => import("shiki/dist/langs/rust.mjs"),
  *     };
@@ -19,11 +24,8 @@ type LanguageLoader = (lang: string) => Promise<any>;
  * });
  * ```
  */
-export declare function setupCodeHighlighter(options: {
-    loadLanguage?: LanguageLoader;
-}): void;
+export declare function setupCodeHighlighter(options?: SetupCodeHighlighterOptions): void;
 export declare function codeToHtml(code: string, options?: {
     lang?: string;
     theme?: string;
 }): Promise<string>;
-export {};

package/dist/code-highlighter/shiki.js

@@ -1,7 +1,3 @@
-import { createHighlighterCore } from "shiki/core";
-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 PLAIN_TEXT_LANGUAGES = new Set([
 	"text",
@@ -31,18 +27,19 @@ var defaultLoader = async (lang) => {
 	const loader = BUILTIN_LANGUAGES[BUILTIN_ALIASES[lang] ?? lang];
 	return loader ? (await loader()).default : null;
 };
-var activeLoader = defaultLoader;
+var customLoader = null;
 /**
-* 注入自定义语言加载器，覆盖默认内置白名单。
+* 注入自定义语言加载器。返回 `null` 时回退到默认内置白名单。
 * 建议按需 `import` 语言模块，避免引入全量语言包。
 *
 * @example 按需加载额外语言
 * ```ts
 * import { setupCodeHighlighter } from "@antdv-next/x";
+* import type { LanguageInput } from "shiki";
 *
 * setupCodeHighlighter({
 *   loadLanguage: async (lang) => {
-*     const loaders: Record<string, () => Promise<{ default: any }>> = {
+*     const loaders: Record<string, () => Promise<{ default: LanguageInput }>> = {
 *       go: () => import("shiki/dist/langs/go.mjs"),
 *       rust: () => import("shiki/dist/langs/rust.mjs"),
 *     };
@@ -52,8 +49,9 @@ var activeLoader = defaultLoader;
 * });
 * ```
 */
-function setupCodeHighlighter(options) {
-	if (options?.loadLanguage) activeLoader = options.loadLanguage;
+function setupCodeHighlighter(options = {}) {
+	customLoader = options.loadLanguage ?? null;
+	failedLangs.clear();
 }
 var highlighter = null;
 var highlighterPromise = null;
@@ -68,11 +66,7 @@ function escapeHtml(str) {
 }
 async function getHighlighter() {
 	if (highlighter) return highlighter;
-	if (!highlighterPromise) highlighterPromise = createHighlighterCore({
-		themes: [lightTheme, darkTheme],
-		langs: [],
-		engine: createJavaScriptRegexEngine()
-	});
+	if (!highlighterPromise) highlighterPromise = import("./shiki-runtime.js").then(({ createHighlighter }) => createHighlighter());
 	highlighter = await highlighterPromise;
 	return highlighter;
 }
@@ -83,7 +77,7 @@ async function loadLang(lang) {
 	if (pendingLoad) return pendingLoad;
 	const loadPromise = (async () => {
 		try {
-			const registration = await activeLoader(lang);
+			const registration = await customLoader?.(lang) ?? await defaultLoader(lang);
 			if (!registration) {
 				failedLangs.add(lang);
 				return false;

package/dist/index.d.ts

@@ -34,7 +34,7 @@ export type { ThoughtChainItemProps, ThoughtChainItemStatus, ThoughtChainItemTyp
 export type { ConversationItemType, ConversationsProps, ConversationsRef, CreationProps, DividerItemType, GroupableProps, } from './conversations';
 export type { SourcesProps } from './sources';
 export type { WelcomeProps, WelcomeRef } from './welcome';
-export type { CodeHighlighterProps, CodeHighlighterRef, CodeHighlighterSemanticType, } from './code-highlighter';
+export type { CodeHighlighterLanguageLoader, CodeHighlighterProps, CodeHighlighterRef, CodeHighlighterSemanticType, SetupCodeHighlighterOptions, } from './code-highlighter';
 export { setupCodeHighlighter } from './code-highlighter';
 export type { SenderProps, SenderRef } from './sender';
 export type { RenderChildrenProps, SuggestionItem, SuggestionProps, } from './suggestion';

package/dist/index.umd.js

@@ -29,6 +29,16 @@
 	var __getOwnPropNames = Object.getOwnPropertyNames;
 	var __getProtoOf = Object.getPrototypeOf;
 	var __hasOwnProp = Object.prototype.hasOwnProperty;
+	var __esmMin = (fn, res) => () => (fn && (res = fn(fn = 0)), res);
+	var __exportAll = (all, no_symbols) => {
+		let target = {};
+		for (var name in all) __defProp(target, name, {
+			get: all[name],
+			enumerable: true
+		});
+		if (!no_symbols) __defProp(target, Symbol.toStringTag, { value: "Module" });
+		return target;
+	};
 	var __copyProps = (to, from, except, desc) => {
 		if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
 			key = keys[i];
@@ -49,7 +59,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.3";
+	var version = "1.1.3-beta.5";
 	//#endregion
 	//#region components/x-provider/context.ts
 	var XProviderContextKey = Symbol("antdv-next-x-provider-context");
@@ -4754,6 +4764,17 @@
 	BubbleWithSub.System = XBubbleSystem;
 	BubbleWithSub.Divider = XBubbleDivider;
 	//#endregion
+	//#region components/code-highlighter/shiki-runtime.ts
+	var shiki_runtime_exports = /* @__PURE__ */ __exportAll({ createHighlighter: () => createHighlighter });
+	function createHighlighter() {
+		return (0, shiki_core.createHighlighterCore)({
+			themes: [shiki_dist_themes_vitesse_light_mjs.default, shiki_dist_themes_vitesse_dark_mjs.default],
+			langs: [],
+			engine: (0, shiki_engine_javascript.createJavaScriptRegexEngine)()
+		});
+	}
+	var init_shiki_runtime = __esmMin((() => {}));
+	//#endregion
 	//#region components/code-highlighter/shiki.ts
 	var PLAIN_TEXT_LANGUAGES = new Set([
 		"text",
@@ -4783,18 +4804,19 @@
 		const loader = BUILTIN_LANGUAGES[BUILTIN_ALIASES[lang] ?? lang];
 		return loader ? (await loader()).default : null;
 	};
-	var activeLoader = defaultLoader;
+	var customLoader = null;
 	/**
-	* 注入自定义语言加载器，覆盖默认内置白名单。
+	* 注入自定义语言加载器。返回 `null` 时回退到默认内置白名单。
 	* 建议按需 `import` 语言模块，避免引入全量语言包。
 	*
 	* @example 按需加载额外语言
 	* ```ts
 	* import { setupCodeHighlighter } from "@antdv-next/x";
+	* import type { LanguageInput } from "shiki";
 	*
 	* setupCodeHighlighter({
 	*   loadLanguage: async (lang) => {
-	*     const loaders: Record<string, () => Promise<{ default: any }>> = {
+	*     const loaders: Record<string, () => Promise<{ default: LanguageInput }>> = {
 	*       go: () => import("shiki/dist/langs/go.mjs"),
 	*       rust: () => import("shiki/dist/langs/rust.mjs"),
 	*     };
@@ -4804,8 +4826,9 @@
 	* });
 	* ```
 	*/
-	function setupCodeHighlighter(options) {
-		if (options?.loadLanguage) activeLoader = options.loadLanguage;
+	function setupCodeHighlighter(options = {}) {
+		customLoader = options.loadLanguage ?? null;
+		failedLangs.clear();
 	}
 	var highlighter = null;
 	var highlighterPromise = null;
@@ -4820,11 +4843,7 @@
 	}
 	async function getHighlighter() {
 		if (highlighter) return highlighter;
-		if (!highlighterPromise) highlighterPromise = (0, shiki_core.createHighlighterCore)({
-			themes: [shiki_dist_themes_vitesse_light_mjs.default, shiki_dist_themes_vitesse_dark_mjs.default],
-			langs: [],
-			engine: (0, shiki_engine_javascript.createJavaScriptRegexEngine)()
-		});
+		if (!highlighterPromise) highlighterPromise = Promise.resolve().then(() => (init_shiki_runtime(), shiki_runtime_exports)).then(({ createHighlighter }) => createHighlighter());
 		highlighter = await highlighterPromise;
 		return highlighter;
 	}
@@ -4835,7 +4854,7 @@
 		if (pendingLoad) return pendingLoad;
 		const loadPromise = (async () => {
 			try {
-				const registration = await activeLoader(lang);
+				const registration = await customLoader?.(lang) ?? await defaultLoader(lang);
 				if (!registration) {
 					failedLangs.add(lang);
 					return false;
@@ -11352,6 +11371,7 @@
 					top: (0, _antdv_next_cssinjs.unit)(calc(iconSize).mul(token.lineHeight).equal())
 				}
 			},
+			[`${componentCls}-node-icon-none`]: { "&:after": { display: "none" } },
 			[`${componentCls}-node-icon-dashed`]: { "&:after": { borderInlineStart: `${(0, _antdv_next_cssinjs.unit)(token.lineWidth)} dashed ${token.colorFillContent}` } },
 			[`${componentCls}-node-icon-dotted`]: { "&:after": { borderInlineStart: `${(0, _antdv_next_cssinjs.unit)(token.lineWidth)} dotted ${token.colorFillContent}` } },
 			[`${componentCls}-node-index-icon`]: {
@@ -11571,17 +11591,13 @@
 				type: Number,
 				required: true
 			},
-			isLast: {
-				type: Boolean,
-				default: false
-			},
 			prefixCls: {
 				type: String,
 				required: true
 			},
 			lineStyle: {
 				type: [Boolean, String],
-				default: "solid"
+				default: true
 			},
 			expanded: {
 				type: Boolean,
@@ -11621,11 +11637,6 @@
 			const configCtx = (0, antdv_next_config_provider_context.useConfig)();
 			const isRtl = (0, vue.computed)(() => configCtx.value.direction === "rtl");
 			const nodePrefixCls = (0, vue.computed)(() => `${props.prefixCls}-node`);
-			const resolvedLineStyle = (0, vue.computed)(() => {
-				if (props.lineStyle === false || props.isLast) return "none";
-				if (props.lineStyle === true) return "solid";
-				return props.lineStyle;
-			});
 			const statusCls = (0, vue.computed)(() => `${props.prefixCls}-status`);
 			const createSharedSlotInfo = (collapsible) => ({
 				item: props.item,
@@ -11651,7 +11662,8 @@
 						props.classes?.itemIcon,
 						{
 							[`${statusCls.value}-${item.status}`]: item.status,
-							[`${nodePrefixCls.value}-icon-${resolvedLineStyle.value}`]: typeof props.lineStyle !== "boolean" && resolvedLineStyle.value !== "none"
+							[`${nodePrefixCls.value}-icon-${props.lineStyle}`]: typeof props.lineStyle === "string",
+							[`${nodePrefixCls.value}-icon-none`]: props.lineStyle === false
 						}
 					],
 					"style": props.styles?.itemIcon
@@ -11805,7 +11817,7 @@
 			},
 			line: {
 				type: [Boolean, String],
-				default: "solid"
+				default: true
 			}
 		},
 		emits: ["update:expandedKeys", "expand"],
@@ -11887,7 +11899,6 @@
 						"key": key,
 						"item": item,
 						"index": index,
-						"isLast": index === items.length - 1,
 						"prefixCls": prefixCls.value,
 						"lineStyle": props.line,
 						"expanded": mergedExpandedKeys.value.includes(key),

package/dist/package.js

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

package/dist/thought-chain/Node.d.ts

@@ -9,17 +9,13 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: NumberConstructor;
         required: true;
     };
-    isLast: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     prefixCls: {
         type: StringConstructor;
         required: true;
     };
     lineStyle: {
         type: PropType<boolean | "solid" | "dashed" | "dotted">;
-        default: string;
+        default: boolean;
     };
     expanded: {
         type: BooleanConstructor;
@@ -62,17 +58,13 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
         type: NumberConstructor;
         required: true;
     };
-    isLast: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
     prefixCls: {
         type: StringConstructor;
         required: true;
     };
     lineStyle: {
         type: PropType<boolean | "solid" | "dashed" | "dotted">;
-        default: string;
+        default: boolean;
     };
     expanded: {
         type: BooleanConstructor;
@@ -115,7 +107,6 @@ declare const _default: import('vue').DefineComponent<import('vue').ExtractPropT
     descriptionRenderSlot: ((info: ThoughtChainDescriptionSlotInfo) => VNodeChild) | undefined;
     iconRenderSlot: ((info: ThoughtChainIconSlotInfo) => VNodeChild) | undefined;
     titleRenderSlot: ((info: ThoughtChainTitleSlotInfo) => VNodeChild) | undefined;
-    isLast: boolean;
     lineStyle: boolean | "dashed" | "dotted" | "solid";
     contentRenderSlot: ((info: ThoughtChainContentSlotInfo) => VNodeChild) | undefined;
     footerRenderSlot: ((info: ThoughtChainFooterSlotInfo) => VNodeChild) | undefined;

package/dist/thought-chain/Node.js

@@ -15,17 +15,13 @@ var Node_default = /* @__PURE__ */ defineComponent({
 			type: Number,
 			required: true
 		},
-		isLast: {
-			type: Boolean,
-			default: false
-		},
 		prefixCls: {
 			type: String,
 			required: true
 		},
 		lineStyle: {
 			type: [Boolean, String],
-			default: "solid"
+			default: true
 		},
 		expanded: {
 			type: Boolean,
@@ -65,11 +61,6 @@ var Node_default = /* @__PURE__ */ defineComponent({
 		const configCtx = useConfig();
 		const isRtl = computed(() => configCtx.value.direction === "rtl");
 		const nodePrefixCls = computed(() => `${props.prefixCls}-node`);
-		const resolvedLineStyle = computed(() => {
-			if (props.lineStyle === false || props.isLast) return "none";
-			if (props.lineStyle === true) return "solid";
-			return props.lineStyle;
-		});
 		const statusCls = computed(() => `${props.prefixCls}-status`);
 		const createSharedSlotInfo = (collapsible) => ({
 			item: props.item,
@@ -95,7 +86,8 @@ var Node_default = /* @__PURE__ */ defineComponent({
 					props.classes?.itemIcon,
 					{
 						[`${statusCls.value}-${item.status}`]: item.status,
-						[`${nodePrefixCls.value}-icon-${resolvedLineStyle.value}`]: typeof props.lineStyle !== "boolean" && resolvedLineStyle.value !== "none"
+						[`${nodePrefixCls.value}-icon-${props.lineStyle}`]: typeof props.lineStyle === "string",
+						[`${nodePrefixCls.value}-icon-none`]: props.lineStyle === false
 					}
 				],
 				"style": props.styles?.itemIcon

package/dist/thought-chain/ThoughtChain.d.ts

@@ -39,7 +39,7 @@ export declare const XThoughtChain: import('vue').DefineComponent<import('vue').
     };
     line: {
         type: PropType<boolean | "solid" | "dashed" | "dotted">;
-        default: string;
+        default: boolean;
     };
 }>, () => import("vue/jsx-runtime").JSX.Element, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, ("expand" | "update:expandedKeys")[], "expand" | "update:expandedKeys", import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
     prefixCls: {
@@ -80,7 +80,7 @@ export declare const XThoughtChain: import('vue').DefineComponent<import('vue').
     };
     line: {
         type: PropType<boolean | "solid" | "dashed" | "dotted">;
-        default: string;
+        default: boolean;
     };
 }>> & Readonly<{
     onExpand?: ((...args: any[]) => any) | undefined;

package/dist/thought-chain/ThoughtChain.js

@@ -54,7 +54,7 @@ var XThoughtChain = /* @__PURE__ */ defineComponent({
 		},
 		line: {
 			type: [Boolean, String],
-			default: "solid"
+			default: true
 		}
 	},
 	emits: ["update:expandedKeys", "expand"],
@@ -136,7 +136,6 @@ var XThoughtChain = /* @__PURE__ */ defineComponent({
 					"key": key,
 					"item": item,
 					"index": index,
-					"isLast": index === items.length - 1,
 					"prefixCls": prefixCls.value,
 					"lineStyle": props.line,
 					"expanded": mergedExpandedKeys.value.includes(key),

package/dist/thought-chain/style/thought-chain.js

@@ -52,6 +52,7 @@ var genThoughtChainStyle = (token) => {
 				top: unit(calc(iconSize).mul(token.lineHeight).equal())
 			}
 		},
+		[`${componentCls}-node-icon-none`]: { "&:after": { display: "none" } },
 		[`${componentCls}-node-icon-dashed`]: { "&:after": { borderInlineStart: `${unit(token.lineWidth)} dashed ${token.colorFillContent}` } },
 		[`${componentCls}-node-icon-dotted`]: { "&:after": { borderInlineStart: `${unit(token.lineWidth)} dotted ${token.colorFillContent}` } },
 		[`${componentCls}-node-index-icon`]: {