@vue/language-core 3.0.0-beta.2 → 3.0.0-beta.4

package/lib/codegen/codeFeatures.d.ts

@@ -6,7 +6,6 @@ declare const raw: {
         semantic: true;
         navigation: true;
     };
-    none: {};
     verification: {
         verification: true;
     };
@@ -50,6 +49,11 @@ declare const raw: {
         completion: true;
         semantic: true;
     };
+    semanticWithoutHighlight: {
+        semantic: {
+            shouldHighlight: () => false;
+        };
+    };
     withoutHighlight: {
         semantic: {
             shouldHighlight: () => false;

package/lib/codegen/codeFeatures.js

@@ -8,7 +8,6 @@ const raw = {
         semantic: true,
         navigation: true,
     },
-    none: {},
     verification: {
         verification: true,
     },
@@ -46,6 +45,9 @@ const raw = {
         completion: true,
         semantic: true,
     },
+    semanticWithoutHighlight: {
+        semantic: { shouldHighlight: () => false },
+    },
     withoutHighlight: {
         semantic: { shouldHighlight: () => false },
         verification: true,

package/lib/codegen/globalTypes.js

@@ -28,15 +28,15 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	const __VLS_placeholder: any;
 
 	type __VLS_NativeElements = __VLS_SpreadMerge<SVGElementTagNameMap, HTMLElementTagNameMap>;
-	type __VLS_IntrinsicElements = ${(target >= 3.3
+	type __VLS_IntrinsicElements = ${target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.IntrinsicElements;`
-        : `globalThis.JSX.IntrinsicElements;`)}
-	type __VLS_Element = ${(target >= 3.3
+        : `globalThis.JSX.IntrinsicElements;`}
+	type __VLS_Element = ${target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.Element;`
-        : `globalThis.JSX.Element;`)}
-	type __VLS_GlobalComponents = ${(target >= 3.5
+        : `globalThis.JSX.Element;`}
+	type __VLS_GlobalComponents = ${target >= 3.5
         ? `import('${lib}').GlobalComponents;`
-        : `import('${lib}').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`)}
+        : `import('${lib}').GlobalComponents & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`}
 	type __VLS_GlobalDirectives = import('${lib}').GlobalDirectives;
 	type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
 	type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
@@ -117,13 +117,15 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 	type __VLS_ResolveEmits<
 		Comp,
 		Emits,
-		TypeEmits = ${target >= 3.6 ? `Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('${lib}').ShortEmitsToObject<T> : {}` : `{}`},
+		TypeEmits = ${target >= 3.6
+        ? `Comp extends { __typeEmits?: infer T } ? unknown extends T ? {} : import('${lib}').ShortEmitsToObject<T> : {}`
+        : `{}`},
 		NormalizedEmits = __VLS_NormalizeEmits<Emits> extends infer E ? string extends keyof E ? {} : E : never,
 	> = __VLS_SpreadMerge<NormalizedEmits, TypeEmits>;
 	type __VLS_ResolveDirectives<T> = {
 		[K in Exclude<keyof T, keyof __VLS_GlobalDirectives> & string as \`v\${Capitalize<K>}\`]: T[K];
 	};
-	type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_PrettifyGlobal<T> = { [K in keyof T as K]: T[K]; } & {};
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
@@ -160,5 +162,4 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 `;
     return text;
 }
-;
 //# sourceMappingURL=globalTypes.js.map

package/lib/codegen/localTypes.js

@@ -16,7 +16,7 @@ type __VLS_WithDefaults<P, D> = {
 		: P[K]
 };
 `.trimStart());
-    const PrettifyLocal = defineHelper(`__VLS_PrettifyLocal`, () => `type __VLS_PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {}${utils_1.endOfLine}`);
+    const PrettifyLocal = defineHelper(`__VLS_PrettifyLocal`, () => `type __VLS_PrettifyLocal<T> = { [K in keyof T as K]: T[K]; } & {}${utils_1.endOfLine}`);
     const WithSlots = defineHelper(`__VLS_WithSlots`, () => `
 type __VLS_WithSlots<T, S> = T & {
 	new(): {
@@ -63,13 +63,27 @@ type __VLS_TypePropsToOption<T> = {
         getUsedNames() {
             return used;
         },
-        get PrettifyLocal() { return PrettifyLocal.name; },
-        get OmitKeepDiscriminatedUnion() { return OmitKeepDiscriminatedUnion.name; },
-        get WithDefaults() { return WithDefaults.name; },
-        get WithSlots() { return WithSlots.name; },
-        get PropsChildren() { return PropsChildren.name; },
-        get TypePropsToOption() { return TypePropsToOption.name; },
-        get OmitIndexSignature() { return OmitIndexSignature.name; },
+        get PrettifyLocal() {
+            return PrettifyLocal.name;
+        },
+        get OmitKeepDiscriminatedUnion() {
+            return OmitKeepDiscriminatedUnion.name;
+        },
+        get WithDefaults() {
+            return WithDefaults.name;
+        },
+        get WithSlots() {
+            return WithSlots.name;
+        },
+        get PropsChildren() {
+            return PropsChildren.name;
+        },
+        get TypePropsToOption() {
+            return TypePropsToOption.name;
+        },
+        get OmitIndexSignature() {
+            return OmitIndexSignature.name;
+        },
     };
     function* generate(names) {
         const generated = new Set();

package/lib/codegen/script/component.js

@@ -7,7 +7,8 @@ exports.generatePropsOption = generatePropsOption;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
-    if (options.sfc.script && options.scriptRanges?.exportDefault && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
+    if (options.sfc.script && options.scriptRanges?.exportDefault
+        && options.scriptRanges.exportDefault.expression.start !== options.scriptRanges.exportDefault.args.start) {
         // use defineComponent() from user space code if it exist
         yield (0, utils_1.generateSfcBlockSection)(options.sfc.script, options.scriptRanges.exportDefault.expression.start, options.scriptRanges.exportDefault.args.start, codeFeatures_1.codeFeatures.all);
         yield `{${utils_1.newLine}`;

package/lib/codegen/script/scriptSetup.js

@@ -135,11 +135,11 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             setupCodeModifies.push([
                 [`(`],
                 callExp.start,
-                callExp.start
+                callExp.start,
             ], [
                 [` as typeof __VLS_dollars.$attrs)`],
                 callExp.end,
-                callExp.end
+                callExp.end,
             ]);
         }
     }
@@ -147,25 +147,27 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
         setupCodeModifies.push([
             [`(`],
             callExp.start,
-            callExp.start
+            callExp.start,
         ], [
-            arg ? [
-                ` as Omit<__VLS_StyleModules, '$style'>[`,
-                (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
-                `])`
-            ] : [
-                ` as __VLS_StyleModules[`,
-                ...(0, wrapWith_1.wrapWith)(exp.start, exp.end, scriptSetup.name, codeFeatures_1.codeFeatures.verification, `'$style'`),
-                `])`
-            ],
+            arg
+                ? [
+                    ` as Omit<__VLS_StyleModules, '$style'>[`,
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.all),
+                    `])`,
+                ]
+                : [
+                    ` as __VLS_StyleModules[`,
+                    ...(0, wrapWith_1.wrapWith)(exp.start, exp.end, scriptSetup.name, codeFeatures_1.codeFeatures.verification, `'$style'`),
+                    `])`,
+                ],
+            callExp.end,
             callExp.end,
-            callExp.end
         ]);
         if (arg) {
             setupCodeModifies.push([
                 [`__VLS_placeholder`],
                 arg.start,
-                arg.end
+                arg.end,
             ]);
         }
     }
@@ -174,11 +176,11 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             setupCodeModifies.push([
                 [`(`],
                 callExp.start,
-                callExp.start
+                callExp.start,
             ], [
                 [` as typeof __VLS_dollars.$slots)`],
                 callExp.end,
-                callExp.end
+                callExp.end,
             ]);
         }
     }
@@ -188,7 +190,7 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
             ? [
                 `__VLS_TemplateRefs[`,
                 (0, utils_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, codeFeatures_1.codeFeatures.withoutSemantic),
-                `]`
+                `]`,
             ]
             : [`unknown`];
         if (isTs) {
@@ -196,32 +198,32 @@ function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, sy
                 [
                     `<`,
                     ...templateRefType,
-                    `>`
+                    `>`,
                 ],
                 exp.end,
-                exp.end
+                exp.end,
             ]);
         }
         else {
             setupCodeModifies.push([
                 [`(`],
                 callExp.start,
-                callExp.start
+                callExp.start,
             ], [
                 [
                     ` as __VLS_UseTemplateRef<`,
                     ...templateRefType,
-                    `>)`
+                    `>)`,
                 ],
                 callExp.end,
-                callExp.end
+                callExp.end,
             ]);
         }
         if (arg) {
             setupCodeModifies.push([
                 [`__VLS_placeholder`],
                 arg.start,
-                arg.end
+                arg.end,
             ]);
         }
     }
@@ -277,11 +279,15 @@ function* generateMacros(options, ctx) {
 }
 function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name, defaultName, typeName) {
     if (typeArg) {
-        yield [[
+        yield [
+            [
                 `type ${typeName} = `,
                 (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.start, typeArg.end, codeFeatures_1.codeFeatures.all),
                 utils_1.endOfLine,
-            ], statement.start, statement.start];
+            ],
+            statement.start,
+            statement.start,
+        ];
         yield [[typeName], typeArg.start, typeArg.end];
     }
     if (!name) {
@@ -289,25 +295,37 @@ function* generateDefineWithType(scriptSetup, statement, callExp, typeArg, name,
             yield [[`const ${defaultName} = `], callExp.start, callExp.start];
         }
         else if (typeArg) {
-            yield [[
+            yield [
+                [
                     `const ${defaultName} = `,
-                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, codeFeatures_1.codeFeatures.all)
-                ], statement.start, typeArg.start];
-            yield [[
+                    (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, typeArg.start, codeFeatures_1.codeFeatures.all),
+                ],
+                statement.start,
+                typeArg.start,
+            ];
+            yield [
+                [
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, typeArg.end, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
-                    defaultName
-                ], typeArg.end, callExp.end];
+                    defaultName,
+                ],
+                typeArg.end,
+                callExp.end,
+            ];
         }
         else {
-            yield [[
+            yield [
+                [
                     `const ${defaultName} = `,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, callExp.start, callExp.end, codeFeatures_1.codeFeatures.all),
                     utils_1.endOfLine,
                     (0, utils_1.generateSfcBlockSection)(scriptSetup, statement.start, callExp.start, codeFeatures_1.codeFeatures.all),
-                    defaultName
-                ], statement.start, callExp.end];
+                    defaultName,
+                ],
+                statement.start,
+                callExp.end,
+            ];
         }
     }
 }
@@ -415,7 +433,7 @@ function* generateDefineModelType(scriptSetup, propName, localName, defineModel)
         yield getRangeText(scriptSetup, defineModel.type);
     }
     else if (defineModel.runtimeType && localName) {
-        // Infer from actual prop declaration code 
+        // Infer from actual prop declaration code
         yield `typeof ${localName}['value']`;
     }
     else if (defineModel.defaultValue && propName) {

package/lib/codegen/script/template.js

@@ -103,7 +103,6 @@ function* generateTemplateBody(options, templateCodegenCtx) {
         yield* options.templateCodegen.codes;
     }
     else {
-        yield `// no template${utils_1.newLine}`;
         if (!options.scriptSetupRanges?.defineSlots) {
             yield `type __VLS_Slots = {}${utils_1.endOfLine}`;
         }

package/lib/codegen/style/classProperty.js

@@ -10,7 +10,7 @@ function* generateClassProperty(styleIndex, classNameWithDot, offset, propertyTy
         classNameWithDot.slice(1),
         'style_' + styleIndex,
         offset + 1,
-        utils_1.combineLastMapping
+        utils_1.combineLastMapping,
     ], `'`);
     yield `: ${propertyType}`;
     yield ` }`;

package/lib/codegen/style/imports.js

@@ -6,7 +6,7 @@ const wrapWith_1 = require("../utils/wrapWith");
 function* generateStyleImports(style) {
     const features = {
         navigation: true,
-        verification: true
+        verification: true,
     };
     if (typeof style.src === 'object') {
         yield `${utils_1.newLine} & typeof import(`;
@@ -19,7 +19,7 @@ function* generateStyleImports(style) {
             text,
             style.name,
             offset,
-            features
+            features,
         ];
         yield `').default`;
     }

package/lib/codegen/style/scopedClasses.js

@@ -23,7 +23,7 @@ function* generateStyleScopedClasses(options, ctx) {
                 ctx.scopedClasses.push({
                     source: 'style_' + i,
                     className: className.text.slice(1),
-                    offset: className.offset + 1
+                    offset: className.offset + 1,
                 });
                 continue;
             }

package/lib/codegen/template/context.d.ts

@@ -100,7 +100,7 @@ export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenCont
  * an error/diagnostic was encountered for a region of code covered by a `@vue-expect-error` directive,
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
-export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>): {
+export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>, templateAst?: CompilerDOM.RootNode): {
     readonly currentInfo: {
         ignoreError?: boolean;
         expectError?: {
@@ -114,7 +114,6 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     };
     codeFeatures: {
         all: VueCodeInformation;
-        none: VueCodeInformation;
         verification: VueCodeInformation;
         completion: VueCodeInformation;
         additionalCompletion: VueCodeInformation;
@@ -125,6 +124,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         navigationAndAdditionalCompletion: VueCodeInformation;
         navigationAndVerification: VueCodeInformation;
         withoutNavigation: VueCodeInformation;
+        semanticWithoutHighlight: VueCodeInformation;
         withoutHighlight: VueCodeInformation;
         withoutHighlightAndNavigation: VueCodeInformation;
         withoutHighlightAndCompletion: VueCodeInformation;
@@ -132,6 +132,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         withoutSemantic: VueCodeInformation;
     };
     resolveCodeFeatures: (features: VueCodeInformation) => VueCodeInformation;
+    inlineTsAsts: Map<string, import("typescript").SourceFile> | undefined;
     inVFor: boolean;
     slots: {
         name: string;

package/lib/codegen/template/context.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTemplateCodegenContext = createTemplateCodegenContext;
 const CompilerDOM = require("@vue/compiler-dom");
+const computedSfc_1 = require("../../virtualFile/computedSfc");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
@@ -103,7 +104,7 @@ const commentDirectiveRegex = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)
  * an error/diagnostic was encountered for a region of code covered by a `@vue-expect-error` directive,
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
-function createTemplateCodegenContext(options) {
+function createTemplateCodegenContext(options, templateAst) {
     let variableId = 0;
     function resolveCodeFeatures(features) {
         if (features.verification && stack.length) {
@@ -160,6 +161,7 @@ function createTemplateCodegenContext(options) {
             },
         }),
         resolveCodeFeatures,
+        inlineTsAsts: templateAst && computedSfc_1.templateInlineTsAsts.get(templateAst),
         inVFor: false,
         slots,
         dynamicSlots,
@@ -243,7 +245,7 @@ function createTemplateCodegenContext(options) {
                             offset,
                             {
                                 ...codeFeatures_1.codeFeatures.additionalCompletion,
-                                ...codeFeatures_1.codeFeatures.withoutHighlightAndCompletionAndNavigation,
+                                ...codeFeatures_1.codeFeatures.semanticWithoutHighlight,
                             },
                         ];
                     }

package/lib/codegen/template/element.js

@@ -55,7 +55,6 @@ function* generateComponent(options, ctx, node) {
                 dynamicTagInfo = {
                     tag: prop.exp.content,
                     offsets: [prop.exp.loc.start.offset],
-                    astHolder: prop.exp.loc,
                 };
                 props = props.filter(p => p !== prop);
                 break;
@@ -67,7 +66,6 @@ function* generateComponent(options, ctx, node) {
         dynamicTagInfo = {
             tag: node.tag,
             offsets: tagOffsets,
-            astHolder: node.loc,
         };
     }
     if (matchImportName) {
@@ -93,10 +91,10 @@ function* generateComponent(options, ctx, node) {
     }
     else if (dynamicTagInfo) {
         yield `const ${componentOriginalVar} = (`;
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, dynamicTagInfo.tag, dynamicTagInfo.offsets[0], dynamicTagInfo.astHolder, `(`, `)`);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, dynamicTagInfo.tag, dynamicTagInfo.offsets[0], `(`, `)`);
         if (dynamicTagInfo.offsets[1] !== undefined) {
             yield `,`;
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.withoutCompletion, dynamicTagInfo.tag, dynamicTagInfo.offsets[1], dynamicTagInfo.astHolder, `(`, `)`);
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.withoutCompletion, dynamicTagInfo.tag, dynamicTagInfo.offsets[1], `(`, `)`);
         }
         yield `)${utils_1.endOfLine}`;
     }
@@ -151,7 +149,7 @@ function* generateComponent(options, ctx, node) {
                 // https://typescript.tv/errors/#ts6133
                 return String(code) !== '6133';
             },
-        }
+        },
     }), componentVNodeVar);
     yield ` = ${componentFunctionalVar}`;
     yield* generateComponentGeneric(ctx);
@@ -163,7 +161,8 @@ function* generateComponent(options, ctx, node) {
     yield* (0, elementDirectives_1.generateElementDirectives)(options, ctx, node);
     const [refName, offset] = yield* generateElementReference(options, ctx, node);
     const tag = (0, shared_2.hyphenateTag)(node.tag);
-    const isRootNode = ctx.singleRootNodes.has(node) && !options.vueCompilerOptions.fallthroughComponentNames.includes(tag);
+    const isRootNode = ctx.singleRootNodes.has(node)
+        && !options.vueCompilerOptions.fallthroughComponentNames.includes(tag);
     if (refName || isRootNode) {
         const componentInstanceVar = ctx.getInternalVariable();
         ctx.currentComponent.used = true;
@@ -192,7 +191,8 @@ function* generateComponent(options, ctx, node) {
     }
 }
 function* generateElement(options, ctx, node) {
-    const startTagOffset = node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
+    const startTagOffset = node.loc.start.offset
+        + options.template.content.slice(node.loc.start.offset).indexOf(node.tag);
     const endTagOffset = !node.isSelfClosing && options.template.lang === 'html'
         ? node.loc.start.offset + node.loc.source.lastIndexOf(node.tag)
         : undefined;
@@ -231,7 +231,7 @@ function* generateElement(options, ctx, node) {
 }
 function* generateFailedPropExps(options, ctx, failedPropExps) {
     for (const failedExp of failedPropExps) {
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, failedExp.node.loc.source, failedExp.node.loc.start.offset, failedExp.node.loc, failedExp.prefix, failedExp.suffix);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, failedExp.node.loc.source, failedExp.node.loc.start.offset, failedExp.prefix, failedExp.suffix);
         yield utils_1.endOfLine;
     }
 }
@@ -268,7 +268,7 @@ function* generateComponentGeneric(ctx) {
             content,
             'template',
             offset,
-            ctx.codeFeatures.all
+            ctx.codeFeatures.all,
         ], `>`);
     }
 }
@@ -280,7 +280,7 @@ function* generateElementReference(options, ctx, node) {
             const [content, startOffset] = (0, utils_1.normalizeAttributeValue)(prop.value);
             // navigation support for `const foo = ref()`
             yield `/** @type {typeof __VLS_ctx`;
-            yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, content, startOffset, ctx.codeFeatures.navigation, prop.value.loc);
+            yield* (0, propertyAccess_1.generatePropertyAccess)(options, ctx, content, startOffset, ctx.codeFeatures.navigation);
             yield `} */${utils_1.endOfLine}`;
             if (utils_1.identifierRegex.test(content) && !options.templateRefNames.has(content)) {
                 ctx.accessExternalVariable(content, startOffset);
@@ -291,8 +291,8 @@ function* generateElementReference(options, ctx, node) {
     return [];
 }
 function hasVBindAttrs(options, ctx, node) {
-    return options.vueCompilerOptions.fallthroughAttributes && ((options.inheritAttrs && ctx.singleRootNodes.has(node)) ||
-        node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
+    return options.vueCompilerOptions.fallthroughAttributes && ((options.inheritAttrs && ctx.singleRootNodes.has(node))
+        || node.props.some(prop => prop.type === CompilerDOM.NodeTypes.DIRECTIVE
             && prop.name === 'bind'
             && prop.exp?.loc.source === '$attrs'));
 }

package/lib/codegen/template/elementDirectives.js

@@ -53,7 +53,7 @@ function* generateArg(options, ctx, prop) {
         yield* (0, stringLiteralKey_1.generateStringLiteralKey)(arg.content, startOffset, ctx.codeFeatures.all);
     }
     else {
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, arg.content, startOffset, arg.loc, `(`, `)`);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.all, arg.content, startOffset, `(`, `)`);
     }
     yield `, `;
 }

package/lib/codegen/template/elementEvents.js

@@ -45,7 +45,7 @@ function* generateElementEvents(options, ctx, node, componentOriginalVar, compon
             const propName = (0, shared_1.camelize)(propPrefix + source);
             const emitName = emitPrefix + source;
             const camelizedEmitName = (0, shared_1.camelize)(emitName);
-            yield `(): __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${emitsVar}, '${propName}', '${emitName}', '${camelizedEmitName}'> => (${utils_1.newLine}`;
+            yield `const ${ctx.getInternalVariable()}: __VLS_NormalizeComponentEvent<typeof ${propsVar}, typeof ${emitsVar}, '${propName}', '${emitName}', '${camelizedEmitName}'> = (${utils_1.newLine}`;
             if (prop.name === 'on') {
                 yield `{ `;
                 yield* generateEventArg(ctx, source, start, emitPrefix.slice(0, -1), ctx.codeFeatures.navigation);
@@ -86,17 +86,17 @@ function* generateEventExpression(options, ctx, prop) {
         let prefix = `(`;
         let suffix = `)`;
         let isFirstMapping = true;
-        const ast = (0, utils_1.createTsAst)(options.ts, prop.exp, prop.exp.content);
-        const _isCompoundExpression = isCompoundExpression(options.ts, ast);
-        if (_isCompoundExpression) {
-            yield `(...[$event]) => {${utils_1.newLine}`;
+        const ast = (0, utils_1.createTsAst)(options.ts, ctx.inlineTsAsts, prop.exp.content);
+        const isCompound = isCompoundExpression(options.ts, ast);
+        if (isCompound) {
             ctx.addLocalVariable('$event');
+            yield `(...[$event]) => {${utils_1.newLine}`;
             yield* ctx.generateConditionGuards();
             prefix = ``;
             suffix = ``;
         }
         yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', offset => {
-            if (_isCompoundExpression && isFirstMapping) {
+            if (isCompound && isFirstMapping) {
                 isFirstMapping = false;
                 ctx.inlayHints.push({
                     blockName: 'template',
@@ -112,8 +112,8 @@ function* generateEventExpression(options, ctx, prop) {
                 });
             }
             return ctx.codeFeatures.all;
-        }, prop.exp.content, prop.exp.loc.start.offset, prop.exp.loc, prefix, suffix);
-        if (_isCompoundExpression) {
+        }, prop.exp.content, prop.exp.loc.start.offset, prefix, suffix);
+        if (isCompound) {
             ctx.removeLocalVariable('$event');
             yield utils_1.endOfLine;
             yield* ctx.generateAutoImportCompletion();
@@ -128,7 +128,7 @@ function* generateModelEventExpression(options, ctx, prop) {
     if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
         yield `(...[$event]) => {${utils_1.newLine}`;
         yield* ctx.generateConditionGuards();
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.verification, prop.exp.content, prop.exp.loc.start.offset, prop.exp.loc);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', ctx.codeFeatures.verification, prop.exp.content, prop.exp.loc.start.offset);
         yield ` = $event${utils_1.endOfLine}`;
         yield `}`;
     }

package/lib/codegen/template/elementProps.js

@@ -82,7 +82,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
                 yield `...{ `;
             }
             const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, ...(prop.arg
-                    ? (0, objectProperty_1.generateObjectProperty)(options, ctx, propName, prop.arg.loc.start.offset, codeInfo, prop.loc.name_2 ??= {}, shouldCamelize)
+                    ? (0, objectProperty_1.generateObjectProperty)(options, ctx, propName, prop.arg.loc.start.offset, codeInfo, shouldCamelize)
                     : (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, ctx.codeFeatures.withoutHighlightAndCompletion, propName)), `: `, ...(0, wrapWith_1.wrapWith)(prop.arg?.loc.start.offset ?? prop.loc.start.offset, prop.arg?.loc.end.offset ?? prop.loc.end.offset, ctx.codeFeatures.verification, ...generatePropExp(options, ctx, prop, prop.exp, enableCodeFeatures)))];
             if (enableCodeFeatures) {
                 yield* codes;
@@ -97,7 +97,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             if (isComponent && prop.name === 'model' && prop.modifiers.length) {
                 const propertyName = prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
                     ? !prop.arg.isStatic
-                        ? `[__VLS_tryAsConstant(\`$\{${prop.arg.content}\}Modifiers\`)]`
+                        ? `[__VLS_tryAsConstant(\`\${${prop.arg.content}}Modifiers\`)]`
                         : (0, shared_1.camelize)(propName) + `Modifiers`
                     : `modelModifiers`;
                 const codes = [...(0, elementDirectives_1.generateModifiers)(options, ctx, prop, propertyName)];
@@ -120,7 +120,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             if (shouldSpread) {
                 yield `...{ `;
             }
-            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, ...(0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, codeInfo, prop.loc.name_1 ??= {}, shouldCamelize), `: `, ...(prop.value
+            const codes = [...(0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.end.offset, ctx.codeFeatures.verification, ...(0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, codeInfo, shouldCamelize), `: `, ...(prop.value
                     ? generateAttrValue(prop.value, ctx.codeFeatures.withoutNavigation)
                     : [`true`]))];
             if (enableCodeFeatures) {
@@ -163,7 +163,7 @@ function* generatePropExp(options, ctx, prop, exp, enableCodeFeatures = true) {
         : ctx.codeFeatures.all;
     if (exp && exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY) { // style='z-index: 2' will compile to {'z-index':'2'}
         if (!isShorthand) { // vue 3.4+
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', features, exp.loc.source, exp.loc.start.offset, exp.loc, `(`, `)`);
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, 'template', features, exp.loc.source, exp.loc.start.offset, `(`, `)`);
         }
         else {
             const propVariableName = (0, shared_1.camelize)(exp.loc.source);