@vue/language-core 3.0.0-alpha.0 → 3.0.0-alpha.2

package/lib/codegen/globalTypes.js

@@ -114,10 +114,8 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		key: keyof T,
 		index: number,
 	][];
-	// @ts-ignore
-	function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
-	// @ts-ignore
-	function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
+	function __VLS_getSlotParameters<S, D extends S>(slot: S, decl?: D):
+		__VLS_PickNotAny<NonNullable<D>, (...args: any) => any> extends (...args: infer P) => any ? P : any[];
 	function __VLS_asFunctionalDirective<T>(dir: T): T extends import('${lib}').ObjectDirective
 		? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
 		: T extends (...args: any) => any

package/lib/codegen/script/component.js

@@ -111,15 +111,23 @@ function* generateEmitsOption(options, scriptSetupRanges) {
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption, inheritAttrs) {
     const codes = [];
     if (ctx.generatedPropsType) {
-        codes.push({
-            optionExp: [
-                `{} as `,
-                scriptSetupRanges.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
-                `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
-                scriptSetupRanges.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
-            ].join(''),
-            typeOptionExp: `{} as __VLS_PublicProps`,
-        });
+        if (options.vueCompilerOptions.target >= 3.6) {
+            codes.push({
+                optionExp: '{}',
+                typeOptionExp: `{} as __VLS_PublicProps`,
+            });
+        }
+        else {
+            codes.push({
+                optionExp: [
+                    `{} as `,
+                    scriptSetupRanges.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
+                    `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
+                    scriptSetupRanges.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
+                ].join(''),
+                typeOptionExp: `{} as __VLS_PublicProps`,
+            });
+        }
     }
     if (scriptSetupRanges.defineProps?.arg) {
         const { arg } = scriptSetupRanges.defineProps;
@@ -146,6 +154,10 @@ function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasE
     const useTypeOption = options.vueCompilerOptions.target >= 3.5 && codes.every(code => code.typeOptionExp);
     const useOption = !useTypeOption || scriptSetupRanges.withDefaults;
     if (useTypeOption) {
+        if (options.vueCompilerOptions.target >= 3.6
+            && scriptSetupRanges.withDefaults?.arg) {
+            yield `__defaults: __VLS_withDefaultsArg,${utils_1.newLine}`;
+        }
         if (codes.length === 1) {
             yield `__typeProps: `;
             yield codes[0].typeOptionExp;

package/lib/codegen/script/index.js

@@ -27,7 +27,7 @@ function* generateScript(options) {
         }
     }
     else {
-        yield `/* placeholder */`;
+        yield `/// <reference path="./__VLS_fake.d.ts" />`;
     }
     if (options.sfc.script?.src) {
         yield* (0, src_1.generateSrc)(options.sfc.script.src);

package/lib/codegen/script/scriptSetup.js

@@ -78,15 +78,6 @@ function* generateScriptSetup(options, ctx, scriptSetup, scriptSetupRanges) {
 }
 function* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, syntax) {
     let setupCodeModifies = [];
-    for (const { comments } of scriptSetupRanges.defineProp) {
-        if (comments) {
-            setupCodeModifies.push([
-                [``],
-                comments.start,
-                comments.end,
-            ]);
-        }
-    }
     if (scriptSetupRanges.defineProps) {
         const { name, statement, callExp, typeArg } = scriptSetupRanges.defineProps;
         setupCodeModifies.push(...generateDefineWithType(scriptSetup, statement, scriptSetupRanges.withDefaults?.callExp ?? callExp, typeArg, name, `__VLS_props`, `__VLS_Props`));
@@ -405,7 +396,7 @@ function* generateComponentProps(options, ctx, scriptSetup, scriptSetupRanges) {
         for (const defineProp of scriptSetupRanges.defineProp) {
             const [propName, localName] = getPropAndLocalName(scriptSetup, defineProp);
             if (defineProp.comments) {
-                yield (0, utils_1.generateSfcBlockSection)(scriptSetup, defineProp.comments.start, defineProp.comments.end, codeFeatures_1.codeFeatures.all);
+                yield scriptSetup.content.slice(defineProp.comments.start, defineProp.comments.end);
                 yield utils_1.newLine;
             }
             if (defineProp.isModel && !defineProp.name) {

package/lib/codegen/script/styleModulesType.d.ts

@@ -0,0 +1,4 @@
+import type { Code } from '../../types';
+import type { ScriptCodegenContext } from './context';
+import type { ScriptCodegenOptions } from './index';
+export declare function generateStyleModulesType(options: ScriptCodegenOptions, ctx: ScriptCodegenContext): Generator<Code>;

package/lib/codegen/script/styleModulesType.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateStyleModulesType = generateStyleModulesType;
+const codeFeatures_1 = require("../codeFeatures");
+const utils_1 = require("../utils");
+const template_1 = require("./template");
+function* generateStyleModulesType(options, ctx) {
+    const styles = options.sfc.styles.map((style, i) => [style, i]).filter(([style]) => style.module);
+    if (!styles.length && !options.scriptSetupRanges?.useCssModule.length) {
+        return;
+    }
+    yield `type __VLS_StyleModules = {${utils_1.newLine}`;
+    for (const [style, i] of styles) {
+        const { name, offset } = style.module;
+        if (offset) {
+            yield [
+                name,
+                'main',
+                offset + 1,
+                codeFeatures_1.codeFeatures.all
+            ];
+        }
+        else {
+            yield name;
+        }
+        yield `: Record<string, string> & ${ctx.localTypes.PrettifyLocal}<{}`;
+        for (const className of style.classNames) {
+            yield* (0, template_1.generateCssClassProperty)(i, className.text, className.offset, 'string', false);
+        }
+        yield `>${utils_1.endOfLine}`;
+    }
+    yield `}${utils_1.endOfLine}`;
+}
+//# sourceMappingURL=styleModulesType.js.map

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

@@ -1,4 +1,4 @@
-import type * as CompilerDOM from '@vue/compiler-dom';
+import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code, VueCodeInformation } from '../../types';
 import { InlayHintInfo } from '../inlayHints';
 import type { TemplateCodegenOptions } from './index';
@@ -101,6 +101,17 @@ export type TemplateCodegenContext = ReturnType<typeof createTemplateCodegenCont
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
 export declare function createTemplateCodegenContext(options: Pick<TemplateCodegenOptions, 'scriptSetupBindingNames'>): {
+    readonly currentInfo: {
+        ignoreError?: boolean;
+        expectError?: {
+            token: number;
+            node: CompilerDOM.CommentNode;
+        };
+        generic?: {
+            content: string;
+            offset: number;
+        };
+    };
     codeFeatures: {
         all: VueCodeInformation;
         none: VueCodeInformation;
@@ -120,6 +131,7 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
         withoutHighlightAndCompletionAndNavigation: VueCodeInformation;
     };
     resolveCodeFeatures: (features: VueCodeInformation) => VueCodeInformation;
+    inVFor: boolean;
     slots: {
         name: string;
         offset?: number;
@@ -133,10 +145,6 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     }[];
     dollarVars: Set<string>;
     accessExternalVariables: Map<string, Set<number>>;
-    lastGenericComment: {
-        content: string;
-        offset: number;
-    } | undefined;
     blockConditions: string[];
     scopedClasses: {
         source: string;
@@ -150,23 +158,23 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     templateRefs: Map<string, {
         typeExp: string;
         offset: number;
-    }>;
+    }[]>;
     currentComponent: {
         ctxVar: string;
         used: boolean;
     } | undefined;
     singleRootElTypes: string[];
     singleRootNodes: Set<CompilerDOM.ElementNode | null>;
+    addTemplateRef(name: string, typeExp: string, offset: number): void;
     accessExternalVariable(name: string, offset?: number): void;
-    hasLocalVariable: (name: string) => boolean;
-    addLocalVariable: (name: string) => void;
-    removeLocalVariable: (name: string) => void;
-    getInternalVariable: () => string;
-    getHoistVariable: (originalVar: string) => string;
-    generateHoistVariables: () => Generator<string, void, unknown>;
-    generateConditionGuards: () => Generator<string, void, unknown>;
-    ignoreError: () => Generator<Code>;
-    expectError: (prevNode: CompilerDOM.CommentNode) => Generator<Code>;
-    resetDirectiveComments: (endStr: string) => Generator<Code>;
-    generateAutoImportCompletion: () => Generator<Code>;
+    hasLocalVariable(name: string): boolean;
+    addLocalVariable(name: string): void;
+    removeLocalVariable(name: string): void;
+    getInternalVariable(): string;
+    getHoistVariable(originalVar: string): string;
+    generateHoistVariables(): Generator<string, void, unknown>;
+    generateConditionGuards(): Generator<string, void, unknown>;
+    generateAutoImportCompletion(): Generator<Code>;
+    enter(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode): boolean;
+    exit(): Generator<Code>;
 };

package/lib/codegen/template/context.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTemplateCodegenContext = createTemplateCodegenContext;
+const CompilerDOM = require("@vue/compiler-dom");
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
 const wrapWith_1 = require("../utils/wrapWith");
+const commentDirectiveRegex = /^<!--\s*@vue-(?<name>[-\w]+)\b(?<content>[\s\S]*)-->$/;
 /**
  * Creates and returns a Context object used for generating type-checkable TS code
  * from the template section of a .vue file.
@@ -102,13 +104,11 @@ const wrapWith_1 = require("../utils/wrapWith");
  * and additionally how we use that to determine whether to propagate diagnostics back upward.
  */
 function createTemplateCodegenContext(options) {
-    let ignoredError = false;
-    let expectErrorToken;
-    let lastGenericComment;
     let variableId = 0;
     function resolveCodeFeatures(features) {
-        if (features.verification) {
-            if (ignoredError) {
+        if (features.verification && stack.length) {
+            const data = stack[stack.length - 1];
+            if (data.ignoreError) {
                 // We are currently in a region of code covered by a @vue-ignore directive, so don't
                 // even bother performing any type-checking: set verification to false.
                 return {
@@ -116,17 +116,16 @@ function createTemplateCodegenContext(options) {
                     verification: false,
                 };
             }
-            if (expectErrorToken) {
+            if (data.expectError !== undefined) {
                 // We are currently in a region of code covered by a @vue-expect-error directive. We need to
                 // keep track of the number of errors encountered within this region so that we can know whether
                 // we will need to propagate an "unused ts-expect-error" diagnostic back to the original
                 // .vue file or not.
-                const token = expectErrorToken;
                 return {
                     ...features,
                     verification: {
                         shouldReport: () => {
-                            token.errors++;
+                            data.expectError.token++;
                             return false;
                         },
                     },
@@ -148,7 +147,12 @@ function createTemplateCodegenContext(options) {
     const bindingAttrLocs = [];
     const inheritedAttrVars = new Set();
     const templateRefs = new Map();
+    const stack = [];
+    const commentBuffer = [];
     return {
+        get currentInfo() {
+            return stack[stack.length - 1];
+        },
         codeFeatures: new Proxy(codeFeatures_1.codeFeatures, {
             get(target, key) {
                 const data = target[key];
@@ -156,11 +160,11 @@ function createTemplateCodegenContext(options) {
             },
         }),
         resolveCodeFeatures,
+        inVFor: false,
         slots,
         dynamicSlots,
         dollarVars,
         accessExternalVariables,
-        lastGenericComment,
         blockConditions,
         scopedClasses,
         emptyClassOffsets,
@@ -171,6 +175,13 @@ function createTemplateCodegenContext(options) {
         currentComponent: undefined,
         singleRootElTypes: [],
         singleRootNodes: new Set(),
+        addTemplateRef(name, typeExp, offset) {
+            let refs = templateRefs.get(name);
+            if (!refs) {
+                templateRefs.set(name, refs = []);
+            }
+            refs.push({ typeExp, offset });
+        },
         accessExternalVariable(name, offset) {
             let arr = accessExternalVariables.get(name);
             if (!arr) {
@@ -180,26 +191,26 @@ function createTemplateCodegenContext(options) {
                 arr.add(offset);
             }
         },
-        hasLocalVariable: (name) => {
+        hasLocalVariable(name) {
             return !!localVars.get(name);
         },
-        addLocalVariable: (name) => {
+        addLocalVariable(name) {
             localVars.set(name, (localVars.get(name) ?? 0) + 1);
         },
-        removeLocalVariable: (name) => {
+        removeLocalVariable(name) {
             localVars.set(name, localVars.get(name) - 1);
         },
-        getInternalVariable: () => {
+        getInternalVariable() {
             return `__VLS_${variableId++}`;
         },
-        getHoistVariable: (originalVar) => {
+        getHoistVariable(originalVar) {
             let name = hoistVars.get(originalVar);
             if (name === undefined) {
                 hoistVars.set(originalVar, name = `__VLS_${variableId++}`);
             }
             return name;
         },
-        generateHoistVariables: function* () {
+        *generateHoistVariables() {
             // trick to avoid TS 4081 (#5186)
             if (hoistVars.size) {
                 yield `// @ts-ignore${utils_1.newLine}`;
@@ -210,47 +221,12 @@ function createTemplateCodegenContext(options) {
                 yield utils_1.endOfLine;
             }
         },
-        generateConditionGuards: function* () {
+        *generateConditionGuards() {
             for (const condition of blockConditions) {
                 yield `if (!${condition}) return${utils_1.endOfLine}`;
             }
         },
-        ignoreError: function* () {
-            if (!ignoredError) {
-                ignoredError = true;
-                yield `// @vue-ignore start${utils_1.newLine}`;
-            }
-        },
-        expectError: function* (prevNode) {
-            if (!expectErrorToken) {
-                expectErrorToken = {
-                    errors: 0,
-                    node: prevNode,
-                };
-                yield `// @vue-expect-error start${utils_1.newLine}`;
-            }
-        },
-        resetDirectiveComments: function* (endStr) {
-            if (expectErrorToken) {
-                const token = expectErrorToken;
-                yield* (0, wrapWith_1.wrapWith)(expectErrorToken.node.loc.start.offset, expectErrorToken.node.loc.end.offset, {
-                    verification: {
-                        // If no errors/warnings/diagnostics were reported within the region of code covered
-                        // by the @vue-expect-error directive, then we should allow any `unused @ts-expect-error`
-                        // diagnostics to be reported upward.
-                        shouldReport: () => token.errors === 0,
-                    },
-                }, `// @ts-expect-error __VLS_TS_EXPECT_ERROR`);
-                yield `${utils_1.newLine}${utils_1.endOfLine}`;
-                expectErrorToken = undefined;
-                yield `// @vue-expect-error ${endStr}${utils_1.newLine}`;
-            }
-            if (ignoredError) {
-                ignoredError = false;
-                yield `// @vue-ignore ${endStr}${utils_1.newLine}`;
-            }
-        },
-        generateAutoImportCompletion: function* () {
+        *generateAutoImportCompletion() {
             const all = [...accessExternalVariables.entries()];
             if (!all.some(([_, offsets]) => offsets.size)) {
                 return;
@@ -284,7 +260,65 @@ function createTemplateCodegenContext(options) {
                 offsets.clear();
             }
             yield `]${utils_1.endOfLine}`;
-        }
+        },
+        enter(node) {
+            if (node.type === CompilerDOM.NodeTypes.COMMENT) {
+                commentBuffer.push(node);
+                return false;
+            }
+            const data = {};
+            const comments = [...commentBuffer];
+            commentBuffer.length = 0;
+            for (const comment of comments) {
+                const match = comment.loc.source.match(commentDirectiveRegex);
+                if (match) {
+                    const { name, content } = match.groups;
+                    switch (name) {
+                        case 'skip': {
+                            return false;
+                        }
+                        case 'ignore': {
+                            data.ignoreError = true;
+                            break;
+                        }
+                        case 'expect-error': {
+                            data.expectError = {
+                                token: 0,
+                                node: comment,
+                            };
+                            break;
+                        }
+                        case 'generic': {
+                            const text = content.trim();
+                            if (text.startsWith('{') && text.endsWith('}')) {
+                                data.generic = {
+                                    content: text.slice(1, -1),
+                                    offset: comment.loc.start.offset + comment.loc.source.indexOf('{') + 1,
+                                };
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+            stack.push(data);
+            return true;
+        },
+        *exit() {
+            const data = stack.pop();
+            commentBuffer.length = 0;
+            if (data.expectError !== undefined) {
+                yield* (0, wrapWith_1.wrapWith)(data.expectError.node.loc.start.offset, data.expectError.node.loc.end.offset, {
+                    verification: {
+                        // If no errors/warnings/diagnostics were reported within the region of code covered
+                        // by the @vue-expect-error directive, then we should allow any `unused @ts-expect-error`
+                        // diagnostics to be reported upward.
+                        shouldReport: () => data.expectError.token === 0,
+                    },
+                }, `// @ts-expect-error`);
+                yield `${utils_1.newLine}${utils_1.endOfLine}`;
+            }
+        },
     };
 }
 //# sourceMappingURL=context.js.map

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

@@ -2,5 +2,5 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateComponent(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, isVForChild: boolean): Generator<Code>;
-export declare function generateElement(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, isVForChild: boolean): Generator<Code>;
+export declare function generateComponent(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode): Generator<Code>;
+export declare function generateElement(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode): Generator<Code>;

package/lib/codegen/template/element.js

@@ -19,7 +19,7 @@ const propertyAccess_1 = require("./propertyAccess");
 const styleScopedClasses_1 = require("./styleScopedClasses");
 const vSlot_1 = require("./vSlot");
 const colonReg = /:/g;
-function* generateComponent(options, ctx, node, isVForChild) {
+function* generateComponent(options, ctx, node) {
     const tagOffsets = [node.loc.start.offset + options.template.content.slice(node.loc.start.offset).indexOf(node.tag)];
     if (!node.isSelfClosing && options.template.lang === 'html') {
         const endTagOffset = node.loc.start.offset + node.loc.source.lastIndexOf(node.tag);
@@ -168,15 +168,12 @@ function* generateComponent(options, ctx, node, isVForChild) {
         const componentInstanceVar = ctx.getInternalVariable();
         ctx.currentComponent.used = true;
         yield `var ${componentInstanceVar} = {} as (Parameters<NonNullable<typeof ${componentCtxVar}['expose']>>[0] | null)`;
-        if (isVForChild) {
+        if (ctx.inVFor) {
             yield `[]`;
         }
         yield `${utils_1.endOfLine}`;
         if (refName && offset) {
-            ctx.templateRefs.set(refName, {
-                typeExp: `typeof ${ctx.getHoistVariable(componentInstanceVar)}`,
-                offset
-            });
+            ctx.addTemplateRef(refName, `typeof ${ctx.getHoistVariable(componentInstanceVar)}`, offset);
         }
         if (isRootNode) {
             ctx.singleRootElTypes.push(`NonNullable<typeof ${componentInstanceVar}>['$el']`);
@@ -189,19 +186,12 @@ function* generateComponent(options, ctx, node, isVForChild) {
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
     const slotDir = node.props.find(p => p.type === CompilerDOM.NodeTypes.DIRECTIVE && p.name === 'slot');
-    if (slotDir) {
-        yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir);
-    }
-    else {
-        // #932: reference for default slot
-        yield* (0, vSlot_1.generateImplicitDefaultSlot)(ctx, node);
-        yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
-    }
+    yield* (0, vSlot_1.generateVSlot)(options, ctx, node, slotDir);
     if (ctx.currentComponent.used) {
         yield `var ${componentCtxVar}!: __VLS_PickFunctionalComponentCtx<typeof ${componentOriginalVar}, typeof ${componentVNodeVar}>${utils_1.endOfLine}`;
     }
 }
-function* generateElement(options, ctx, node, isVForChild) {
+function* generateElement(options, ctx, node) {
     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)
@@ -221,13 +211,10 @@ function* generateElement(options, ctx, node, isVForChild) {
     const [refName, offset] = yield* generateElementReference(options, ctx, node);
     if (refName && offset) {
         let typeExp = `__VLS_NativeElements['${node.tag}']`;
-        if (isVForChild) {
+        if (ctx.inVFor) {
             typeExp += `[]`;
         }
-        ctx.templateRefs.set(refName, {
-            typeExp,
-            offset
-        });
+        ctx.addTemplateRef(refName, typeExp, offset);
     }
     if (ctx.singleRootNodes.has(node)) {
         ctx.singleRootElTypes.push(`__VLS_NativeElements['${node.tag}']`);
@@ -236,7 +223,7 @@ function* generateElement(options, ctx, node, isVForChild) {
         ctx.inheritedAttrVars.add(`__VLS_elements.${node.tag}`);
     }
     (0, styleScopedClasses_1.collectStyleScopedClassReferences)(options, ctx, node);
-    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node);
+    yield* (0, elementChildren_1.generateElementChildren)(options, ctx, node.children);
 }
 function* generateFailedPropExps(options, ctx, failedPropExps) {
     for (const failedExp of failedPropExps) {
@@ -271,8 +258,8 @@ function* generateCanonicalComponentName(tagText, offset, features) {
     }
 }
 function* generateComponentGeneric(ctx) {
-    if (ctx.lastGenericComment) {
-        const { content, offset } = ctx.lastGenericComment;
+    if (ctx.currentInfo.generic) {
+        const { content, offset } = ctx.currentInfo.generic;
         yield* (0, wrapWith_1.wrapWith)(offset, offset + content.length, ctx.codeFeatures.verification, `<`, [
             content,
             'template',
@@ -280,7 +267,6 @@ function* generateComponentGeneric(ctx) {
             ctx.codeFeatures.all
         ], `>`);
     }
-    ctx.lastGenericComment = undefined;
 }
 function* generateElementReference(options, ctx, node) {
     for (const prop of node.props) {

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

@@ -2,4 +2,4 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateElementChildren(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode): Generator<Code>;
+export declare function generateElementChildren(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, children: (CompilerDOM.TemplateChildNode | CompilerDOM.SimpleExpressionNode)[], enterNode?: boolean): Generator<Code>;

package/lib/codegen/template/elementChildren.js

@@ -2,12 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateElementChildren = generateElementChildren;
 const templateChild_1 = require("./templateChild");
-function* generateElementChildren(options, ctx, node) {
-    yield* ctx.resetDirectiveComments('end of element children start');
-    let prev;
-    for (const childNode of node.children) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, prev);
-        prev = childNode;
+function* generateElementChildren(options, ctx, children, enterNode = true) {
+    yield* ctx.generateAutoImportCompletion();
+    for (const childNode of children) {
+        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, childNode, enterNode);
     }
     yield* ctx.generateAutoImportCompletion();
 }

package/lib/codegen/template/elementDirectives.js

@@ -39,9 +39,7 @@ function* generateElementDirectives(options, ctx, node) {
 function* generateIdentifier(options, ctx, prop) {
     const rawName = 'v-' + prop.name;
     yield* (0, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + rawName.length, ctx.codeFeatures.verification, `__VLS_directives.`, ...(0, camelized_1.generateCamelized)(rawName, 'template', prop.loc.start.offset, ctx.resolveCodeFeatures({
-        ...codeFeatures_1.codeFeatures.withoutHighlight,
-        // fix https://github.com/vuejs/language-tools/issues/1905
-        ...codeFeatures_1.codeFeatures.additionalCompletion,
+        ...codeFeatures_1.codeFeatures.withoutHighlightAndCompletion,
         verification: options.vueCompilerOptions.checkUnknownDirectives && !builtInDirectives.has(prop.name),
     })));
 }

package/lib/codegen/template/elementEvents.js

@@ -108,7 +108,6 @@ function* generateEventExpression(options, ctx, prop) {
         if (_isCompoundExpression) {
             ctx.removeLocalVariable('$event');
             yield utils_1.endOfLine;
-            yield* ctx.generateAutoImportCompletion();
             yield `}`;
         }
     }

package/lib/codegen/template/elementProps.js

@@ -83,7 +83,7 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, enab
             }
             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, wrapWith_1.wrapWith)(prop.loc.start.offset, prop.loc.start.offset + 'v-model'.length, ctx.codeFeatures.withoutHighlightAndCompletion, propName)), `: `, ...generatePropExp(options, ctx, prop, prop.exp, ctx.codeFeatures.all, enableCodeFeatures))];
+                    : (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, ctx.codeFeatures.all, enableCodeFeatures)))];
             if (enableCodeFeatures) {
                 yield* codes;
             }

package/lib/codegen/template/index.js

@@ -32,10 +32,9 @@ function* generateTemplate(options) {
         ctx.dollarVars.add('$el');
     }
     if (options.template.ast) {
-        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, options.template.ast, undefined);
+        yield* (0, templateChild_1.generateTemplateChild)(options, ctx, options.template.ast);
     }
     yield* (0, styleScopedClasses_1.generateStyleScopedClassReferences)(ctx);
-    yield* ctx.generateAutoImportCompletion();
     yield* ctx.generateHoistVariables();
     const speicalTypes = [
         [slotsPropertyName, yield* generateSlots(options, ctx)],
@@ -93,12 +92,26 @@ function* generateInheritedAttrs(options, ctx) {
     return `import('${options.vueCompilerOptions.lib}').ComponentPublicInstance['$attrs'] & Partial<__VLS_InheritedAttrs>`;
 }
 function* generateTemplateRefs(options, ctx) {
-    yield `type __VLS_TemplateRefs = {${utils_1.newLine}`;
-    for (const [name, { typeExp, offset }] of ctx.templateRefs) {
-        yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigationAndCompletion);
-        yield `: ${typeExp},${utils_1.newLine}`;
+    yield `type __VLS_TemplateRefs = {}`;
+    for (const [name, refs] of ctx.templateRefs) {
+        yield `${utils_1.newLine}& `;
+        if (refs.length >= 2) {
+            yield `(`;
+        }
+        for (let i = 0; i < refs.length; i++) {
+            const { typeExp, offset } = refs[i];
+            if (i) {
+                yield ` | `;
+            }
+            yield `{ `;
+            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, name, offset, ctx.codeFeatures.navigation);
+            yield `: ${typeExp} }`;
+        }
+        if (refs.length >= 2) {
+            yield `)`;
+        }
     }
-    yield `}${utils_1.endOfLine}`;
+    yield utils_1.endOfLine;
     return `__VLS_TemplateRefs`;
 }
 function* generateRootEl(ctx) {