revert: #5214

Author: KazariEX

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

@@ -24,10 +24,9 @@ export function* generateElementEvents(
 	for (const prop of node.props) {
 		if (
 			prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-			&& (
-				prop.name === 'on' && (prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic)
-				|| prop.name === 'model' && (!prop.arg || prop.arg.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION && prop.arg.isStatic)
-			)
+			&& prop.name === 'on'
+			&& prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+			&& prop.arg.isStatic
 		) {
 			ctx.currentComponent!.used = true;
 			if (!emitVar) {
@@ -38,33 +37,21 @@ export function* generateElementEvents(
 				yield `let ${eventsVar}!: __VLS_NormalizeEmits<typeof ${emitVar}>${endOfLine}`;
 				yield `let ${propsVar}!: __VLS_FunctionalComponentProps<typeof ${componentFunctionalVar}, typeof ${componentVNodeVar}>${endOfLine}`;
 			}
-
-			let source = prop.arg?.loc.source ?? 'model-value';
-			let start = prop.arg?.loc.start.offset;
-			let propPrefix = 'on-';
+			let source = prop.arg.loc.source;
+			let start = prop.arg.loc.start.offset;
+			let propPrefix = 'on';
 			let emitPrefix = '';
-			if (prop.name === 'model') {
-				propPrefix = 'onUpdate:';
-				emitPrefix = 'update:';
-			}
-			else if (source.startsWith('vue:')) {
+			if (source.startsWith('vue:')) {
 				source = source.slice('vue:'.length);
-				start = start! + 'vue:'.length;
-				propPrefix = 'onVnode-';
+				start = start + 'vue:'.length;
+				propPrefix = 'onVnode';
 				emitPrefix = 'vnode-';
 			}
-
-			yield `(): __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${eventsVar}, '${camelize(propPrefix + source)}', '${emitPrefix + source}', '${camelize(emitPrefix + source)}'> => ({${newLine}`;
-			if (prop.name === 'on') {
-				yield* generateEventArg(ctx, source, start!, propPrefix.slice(0, -1));
-				yield `: `;
-				yield* generateEventExpression(options, ctx, prop);
-			}
-			else {
-				yield `'${camelize(propPrefix + source)}': `;
-				yield* generateModelEventExpression(options, ctx, prop);
-			}
-			yield `})${endOfLine}`;
+			yield `const ${ctx.getInternalVariable()}: __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${eventsVar}, '${camelize(propPrefix + '-' + source)}', '${emitPrefix}${source}', '${camelize(emitPrefix + source)}'> = {${newLine}`;
+			yield* generateEventArg(ctx, source, start, propPrefix);
+			yield `: `;
+			yield* generateEventExpression(options, ctx, prop);
+			yield `}${endOfLine}`;
 		}
 	}
 }
@@ -172,29 +159,6 @@ export function* generateEventExpression(
 	}
 }
 
-export function* generateModelEventExpression(
-	options: TemplateCodegenOptions,
-	ctx: TemplateCodegenContext,
-	prop: CompilerDOM.DirectiveNode
-): Generator<Code> {
-	if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-		yield `(...[$event]) => (`;
-		yield* generateInterpolation(
-			options,
-			ctx,
-			'template',
-			ctx.codeFeatures.verification,
-			prop.exp.content,
-			prop.exp.loc.start.offset,
-			prop.exp.loc
-		);
-		yield ` = $event)`;
-	}
-	else {
-		yield `() => {}`;
-	}
-}
-
 export function isCompoundExpression(ts: typeof import('typescript'), ast: ts.SourceFile) {
 	let result = true;
 	if (ast.statements.length === 0) {

test-workspace/tsc/passedFixtures/vue3/#4646/parent.vue

@@ -5,7 +5,7 @@ import child from './child.vue';
 import child2 from './child2.vue';
 
 const msg = ref<string | null>('test');
-const other = ref<string | null | undefined>('test2');
+const other = ref<string | null>('test2');
 </script>
 
 <template>

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

@@ -11,7 +11,7 @@ export default defineComponent({
 </script>
 
 <script setup lang="ts">
-let foo!: number | undefined;
+let foo!: number;
 </script>
 
 <template>