fix: compatible with TS 5.1.3 (#3277)

Author: johnsoncodehk

package.json

@@ -23,7 +23,7 @@
 	"devDependencies": {
 		"@types/node": "latest",
 		"@volar/language-service": "1.7.4",
-		"typescript": "~5.0.4",
+		"typescript": "latest",
 		"vite": "latest",
 		"vitest": "latest"
 	},

packages/vue-language-core/src/generators/template.ts

@@ -912,9 +912,11 @@ export function generate(
 						{
 							...capabilitiesPresets.attrReference,
 							rename: {
+								// @click-outside -> onClickOutside
 								normalize(newName) {
 									return camelize('on-' + newName);
 								},
+								// onClickOutside -> @click-outside
 								apply(newName) {
 									const hName = hyphenate(newName);
 									if (hyphenate(newName).startsWith('on-')) {
@@ -1137,15 +1139,15 @@ export function generate(
 					continue;
 				}
 
-				const isStatic = !prop.arg || (prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic);
-				const propName = isStatic
+				let camelized = false;
+
+				if (
+					(!prop.arg || (prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic)) // isStatic
 					&& hyphenate(attrNameText) === attrNameText
 					&& !vueCompilerOptions.htmlAttributes.some(pattern => minimatch(attrNameText!, pattern))
-					? camelize(attrNameText)
-					: attrNameText;
-
-				if (vueCompilerOptions.strictTemplates) {
-					attrNameText = propName;
+				) {
+					attrNameText = camelize(attrNameText);
+					camelized = true;
 				}
 
 				// camelize name
@@ -1168,14 +1170,14 @@ export function generate(
 				else if (prop.exp?.constType === CompilerDOM.ConstantTypes.CAN_STRINGIFY) {
 					codes.push(
 						...createObjectPropertyCode([
-							propName,
+							attrNameText,
 							'template',
 							[prop.arg.loc.start.offset, prop.arg.loc.start.offset + attrNameText.length], // patch style attr,
 							{
 								...caps_attr,
 								rename: {
 									normalize: camelize,
-									apply: getRenameApply(attrNameText),
+									apply: camelized ? hyphenate : noEditApply,
 								},
 							},
 						], (prop.loc as any).name_2 ?? ((prop.loc as any).name_2 = {})),
@@ -1184,14 +1186,14 @@ export function generate(
 				else {
 					codes.push(
 						...createObjectPropertyCode([
-							propName,
+							attrNameText,
 							'template',
 							[prop.arg.loc.start.offset, prop.arg.loc.end.offset],
 							{
 								...caps_attr,
 								rename: {
 									normalize: camelize,
-									apply: getRenameApply(attrNameText),
+									apply: camelized ? hyphenate : noEditApply,
 								},
 							},
 						], (prop.loc as any).name_2 ?? ((prop.loc as any).name_2 = {})),
@@ -1230,41 +1232,6 @@ export function generate(
 					caps_diagnosticOnly,
 				]);
 				codes.push(', ');
-				// original name
-				if (prop.arg && attrNameText !== propName) {
-					codes.push(
-						...createObjectPropertyCode([
-							attrNameText,
-							'template',
-							[prop.arg.loc.start.offset, prop.arg.loc.end.offset],
-							{
-								...caps_attr,
-								rename: {
-									normalize: camelize,
-									apply: getRenameApply(attrNameText),
-								},
-							},
-						], (prop.loc as any).name_1 ?? ((prop.loc as any).name_1 = {}))
-					);
-					codes.push(': (');
-					if (prop.exp) {
-						codes.push(
-							...createInterpolationCode(
-								prop.exp.loc.source,
-								prop.exp.loc,
-								undefined,
-								undefined,
-								'(',
-								')',
-							),
-						);
-					}
-					else {
-						codes.push('undefined');
-					}
-					codes.push(')');
-					codes.push(', ');
-				}
 			}
 			else if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE) {
 

packages/vue-language-core/src/utils/directorySharedTypes.ts

@@ -7,20 +7,20 @@ export function getTypesCode(vueCompilerOptions: VueCompilerOptions) {
 	return `
 // @ts-nocheck
 
-type __VLS_IntrinsicElements = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.IntrinsicElements & {}, __VLS_PickNotAny<JSX.IntrinsicElements, Record<string, any>>>;
-type __VLS_Element = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.Element & {}, JSX.Element>;
+type __VLS_IntrinsicElements = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.IntrinsicElements, __VLS_PickNotAny<JSX.IntrinsicElements, Record<string, any>>>;
+type __VLS_Element = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.Element, JSX.Element>;
 
 type __VLS_IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+type __VLS_PickNotAny<A, B> = __VLS_IsAny<A & {}> extends true ? B : A; // & {} for https://github.com/microsoft/TypeScript/issues/54630
 
 type __VLS_Prettify<T> = {
 	[K in keyof T]: T[K];
 } & {};
 
 type __VLS_GlobalComponents =
-	__VLS_PickNotAny<import('vue').GlobalComponents & {}, {}>
-	& __VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents & {}, {}>
-	& __VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents & {}, {}>
+	__VLS_PickNotAny<import('vue').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>
+	& __VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>
 	& Pick<typeof import('${vueCompilerOptions.lib}'),
 		'Transition'
 		| 'TransitionGroup'