fix(language-core): improve fallthrough attributes and defineEmit com…

…patibility
vuejs · Aug 27, 2024 · d94bd3c · d94bd3c
1 parent 21205fb
commit d94bd3c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/packages/language-core/lib/codegen/script/component.ts b/packages/language-core/lib/codegen/script/component.ts
@@ -141,8 +141,11 @@ export function* generatePropsOption(
 		const { arg } = scriptSetupRanges.props.define;
 		optionExpCodes.push(generateSfcBlockSection(scriptSetup, arg.start, arg.end, codeFeatures.navigation));
 	}
-	if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size && !hasEmitsOption) {
-		const attrsType = `ReturnType<typeof __VLS_template>['attrs']`;
+	if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
+		let attrsType = `ReturnType<typeof __VLS_template>['attrs']`;
+		if (hasEmitsOption) {
+			attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
+		}
 		const propsType = `__VLS_PickNotAny<${ctx.helperTypes.OmitIndexSignature.name}<${attrsType}>, {}>`;
 		const optionType = `${ctx.helperTypes.TypePropsToOption.name}<${propsType}>`;
 		if (optionExpCodes.length) {