refactor: simplify

Author: KazariEX

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

@@ -4,6 +4,7 @@ import type { Code, Sfc, TextRange } from '../../types';
 import { codeFeatures } from '../codeFeatures';
 import { endOfLine, generateSfcBlockSection, identifierRegex, newLine } from '../utils';
 import { generateCamelized } from '../utils/camelized';
+import { generateIntersectMerge } from '../utils/merge';
 import { wrapWith } from '../utils/wrapWith';
 import { generateComponent } from './component';
 import type { ScriptCodegenContext } from './context';
@@ -451,27 +452,15 @@ function* generateComponentProps(
 		yield `}${endOfLine}`;
 	}
 
-	yield `type __VLS_PublicProps = `;
+	const propTypes: Code[] = [];
 	if (scriptSetupRanges.defineSlots && options.vueCompilerOptions.jsxSlots) {
-		if (ctx.generatedPropsType) {
-			yield ` & `;
-		}
-		ctx.generatedPropsType = true;
-		yield `${ctx.localTypes.PropsChildren}<__VLS_Slots>`;
+		propTypes.push(`${ctx.localTypes.PropsChildren}<__VLS_Slots>`);
 	}
 	if (scriptSetupRanges.defineProps?.typeArg) {
-		if (ctx.generatedPropsType) {
-			yield ` & `;
-		}
-		ctx.generatedPropsType = true;
-		yield `__VLS_Props`;
+		propTypes.push(`__VLS_Props`);
 	}
 	if (scriptSetupRanges.defineModel.length) {
-		if (ctx.generatedPropsType) {
-			yield ` & `;
-		}
-		ctx.generatedPropsType = true;
-		yield `{${newLine}`;
+		yield `type __VLS_ModelProps = {${newLine}`;
 		for (const defineModel of scriptSetupRanges.defineModel) {
 			const [propName, localName] = getPropAndLocalName(scriptSetup, defineModel);
 
@@ -502,12 +491,15 @@ function* generateComponentProps(
 				yield `'${modifierName}'?: Partial<Record<${modifierType}, true>>,${newLine}`;
 			}
 		}
-		yield `}`;
+		yield `}${endOfLine}`;
+		propTypes.push(`__VLS_ModelProps`);
 	}
-	if (!ctx.generatedPropsType) {
-		yield `{}`;
+	if (propTypes.length) {
+		ctx.generatedPropsType = true;
+		yield `type __VLS_PublicProps = `;
+		yield* generateIntersectMerge(propTypes);
+		yield endOfLine;
 	}
-	yield endOfLine;
 }
 
 function* generateModelEmit(

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

@@ -20,7 +20,7 @@ export function* generateTemplate(
 	const templateCodegenCtx = createTemplateCodegenContext({
 		scriptSetupBindingNames: new Set(),
 	});
-	yield* generateTemplateCtx(options, ctx);
+	yield* generateTemplateCtx(options);
 	yield* generateTemplateElements();
 	yield* generateTemplateComponents(options);
 	yield* generateTemplateDirectives(options);
@@ -35,10 +35,7 @@ export function* generateTemplate(
 	}
 }
 
-function* generateTemplateCtx(
-	options: ScriptCodegenOptions,
-	ctx: ScriptCodegenContext,
-): Generator<Code> {
+function* generateTemplateCtx(options: ScriptCodegenOptions): Generator<Code> {
 	const exps: Code[] = [];
 
 	if (options.vueCompilerOptions.petiteVueExtensions.some(ext => options.fileName.endsWith(ext))) {
@@ -63,29 +60,25 @@ function* generateTemplateCtx(
 		emitTypes.push(`typeof __VLS_modelEmit`);
 	}
 	if (emitTypes.length) {
-		yield `type __VLS_EmitProps = __VLS_EmitsToProps<__VLS_NormalizeEmits<${emitTypes.join(' & ')}>>${endOfLine};`;
+		yield `type __VLS_EmitProps = __VLS_EmitsToProps<__VLS_NormalizeEmits<${emitTypes.join(' & ')}>>${endOfLine}`;
 		exps.push(`{} as { $emit: ${emitTypes.join(' & ')} }`);
 	}
 
+	const propTypes: string[] = [];
 	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>`
+		: defineProps?.typeArg
+		? withDefaults?.arg
+			? `__VLS_WithDefaultsGlobal<__VLS_Props, typeof __VLS_defaults>`
+			: `__VLS_Props`
 		: undefined;
-
-	const propTypes: string[] = [];
-	if (ctx.generatedPropsType) {
-		if (props) {
-			propTypes.push(`__VLS_SpreadMerge<__VLS_PublicProps, ${props}>`);
-		}
-		else {
-			propTypes.push(`__VLS_PublicProps`);
-		}
-	}
-	else if (props) {
+	if (props) {
 		propTypes.push(props);
 	}
+	if (options.scriptSetupRanges?.defineModel.length) {
+		propTypes.push(`__VLS_ModelProps`);
+	}
 	if (emitTypes.length) {
 		propTypes.push(`__VLS_EmitProps`);
 	}