fix: withDefaults and bypass boolean casting

Author: KazariEX

packages/language-core/lib/codegen/globalTypes.ts

@@ -136,6 +136,11 @@ export function generateGlobalTypes(options: VueCompilerOptions) {
 		[K in Exclude<keyof T, keyof __VLS_GlobalDirectives> & string as \`v\${Capitalize<K>}\`]: T[K];
 	};
 	type __VLS_PrettifyGlobal<T> = { [K in keyof T as K]: T[K]; } & {};
+	type __VLS_WithDefaultsGlobal<P, D> = {
+		[K in keyof P as K extends keyof D ? K : never]-?: P[K];
+	} & {
+		[K in keyof P as K extends keyof D ? never : K]: P[K];
+	};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 	type __VLS_ProxyRefs<T> = import('${lib}').ShallowUnwrapRef<T>;
 

packages/language-core/lib/codegen/localTypes.ts

@@ -5,11 +5,11 @@ import { endOfLine } from './utils';
 export function getLocalTypesGenerator(vueCompilerOptions: VueCompilerOptions) {
 	const used = new Set<string>();
 
-	const WithDefaults = defineHelper(
-		`__VLS_WithDefaults`,
+	const WithDefaultsLocal = defineHelper(
+		`__VLS_WithDefaultsLocal`,
 		() =>
 			`
-type __VLS_WithDefaults<P, D> = {
+type __VLS_WithDefaultsLocal<P, D> = {
 	[K in keyof Pick<P, keyof P>]: K extends keyof D
 		? ${PrettifyLocal.name}<P[K] & { default: D[K] }>
 		: P[K]
@@ -69,7 +69,7 @@ type __VLS_TypePropsToOption<T> = {
 	);
 	const helpers = {
 		[PrettifyLocal.name]: PrettifyLocal,
-		[WithDefaults.name]: WithDefaults,
+		[WithDefaultsLocal.name]: WithDefaultsLocal,
 		[WithSlots.name]: WithSlots,
 		[PropsChildren.name]: PropsChildren,
 		[TypePropsToOption.name]: TypePropsToOption,
@@ -85,8 +85,8 @@ type __VLS_TypePropsToOption<T> = {
 		get PrettifyLocal() {
 			return PrettifyLocal.name;
 		},
-		get WithDefaults() {
-			return WithDefaults.name;
+		get WithDefaultsLocal() {
+			return WithDefaultsLocal.name;
 		},
 		get WithSlots() {
 			return WithSlots.name;

packages/language-core/lib/codegen/script/component.ts

@@ -142,7 +142,7 @@ export function* generatePropsOption(
 				const propsType = `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`;
 				return `{} as ` + (
 					scriptSetupRanges.withDefaults?.arg
-						? `${ctx.localTypes.WithDefaults}<${propsType}, typeof __VLS_withDefaultsArg>`
+						? `${ctx.localTypes.WithDefaultsLocal}<${propsType}, typeof __VLS_defaults>`
 						: propsType
 				);
 			});
@@ -163,7 +163,7 @@ export function* generatePropsOption(
 			options.vueCompilerOptions.target >= 3.6
 			&& scriptSetupRanges.withDefaults?.arg
 		) {
-			yield `__defaults: __VLS_withDefaultsArg,${newLine}`;
+			yield `__defaults: __VLS_defaults,${newLine}`;
 		}
 		yield `__typeProps: `;
 		yield* generateSpreadMerge(typeOptionCodes);

packages/language-core/lib/codegen/script/scriptSetup.ts

@@ -301,7 +301,7 @@ function* generateSetupFunction(
 
 	if (scriptSetupRanges.defineProps?.typeArg && scriptSetupRanges.withDefaults?.arg) {
 		// fix https://github.com/vuejs/language-tools/issues/1187
-		yield `const __VLS_withDefaultsArg = (function <T>(t: T) { return t })(`;
+		yield `const __VLS_defaults = (function <T>(t: T) { return t })(`;
 		yield generateSfcBlockSection(
 			scriptSetup,
 			scriptSetupRanges.withDefaults.arg.start,
@@ -437,7 +437,7 @@ function* generateComponentProps(
 	scriptSetupRanges: ScriptSetupRanges,
 ): Generator<Code> {
 	if (scriptSetupRanges.defineModel.length) {
-		yield `const __VLS_defaults = {${newLine}`;
+		yield `const __VLS_defaultModels = {${newLine}`;
 		for (const defineModel of scriptSetupRanges.defineModel) {
 			if (!defineModel.defaultValue) {
 				continue;
@@ -546,7 +546,7 @@ function* generateDefineModelType(
 	}
 	else if (defineModel.defaultValue && propName) {
 		// Infer from defineModel({default: T})
-		yield `typeof __VLS_defaults['${propName}']`;
+		yield `typeof __VLS_defaultModels['${propName}']`;
 	}
 	else {
 		yield `any`;

packages/language-core/lib/codegen/script/template.ts

@@ -67,13 +67,24 @@ function* generateTemplateCtx(
 		exps.push(`{} as { $emit: ${emitTypes.join(' & ')} }`);
 	}
 
+	const { defineProps, withDefaults } = options.scriptSetupRanges ?? {};
+	const props = defineProps?.arg
+		? `typeof ${defineProps.name ?? `__VLS_props`}`
+		: defineProps?.typeArg && withDefaults?.arg
+		? `__VLS_WithDefaultsGlobal<__VLS_Props, typeof __VLS_defaults>`
+		: undefined;
+
 	const propTypes: string[] = [];
-	if (options.scriptSetupRanges?.defineProps) {
-		const { defineProps } = options.scriptSetupRanges;
-		propTypes.push(`__VLS_SpreadMerge<__VLS_PublicProps, typeof ${defineProps.name ?? `__VLS_props`}>`);
+	if (ctx.generatedPropsType) {
+		if (props) {
+			propTypes.push(`__VLS_SpreadMerge<__VLS_PublicProps, ${props}>`);
+		}
+		else {
+			propTypes.push(`__VLS_PublicProps`);
+		}
 	}
-	else if (ctx.generatedPropsType) {
-		propTypes.push(`__VLS_PublicProps`);
+	else if (props) {
+		propTypes.push(props);
 	}
 	if (emitTypes.length) {
 		propTypes.push(`__VLS_EmitProps`);

test-workspace/tsc/passedFixtures/vue3/#3779/main.vue

@@ -6,5 +6,5 @@ defineProps<{
 </script>
 
 <template>
-	<h1>{{ exactType(optionalBoolean, {} as boolean) }}</h1>
+	<h1>{{ exactType(optionalBoolean, {} as boolean | undefined) }}</h1>
 </template>

test-workspace/tsc/passedFixtures/vue3/#3779/named.vue

@@ -6,5 +6,5 @@ defineProps<{
 </script>
 
 <template>
-	<h1>{{ exactType(optionalBoolean, {} as boolean) }}</h1>
+	<h1>{{ exactType(optionalBoolean, {} as boolean | undefined) }}</h1>
 </template>