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

package/lib/codegen/globalTypes.js

@@ -13,7 +13,7 @@ function getGlobalTypesFileName({ lib, target, checkUnknownProps, checkUnknownEv
     ].map(v => (typeof v === 'boolean' ? Number(v) : v)).join('_') + '.d.ts';
 }
 function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvents, checkUnknownComponents, }) {
-    const fnPropsType = `(K extends { $props: infer Props } ? Props : any)${checkUnknownProps ? '' : ' & Record<string, unknown>'}`;
+    const fnPropsType = `(T extends { $props: infer Props } ? Props : {})${checkUnknownProps ? '' : ' & Record<string, unknown>'}`;
     let text = ``;
     if (target < 3.5) {
         text += `
@@ -51,10 +51,31 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		N2 extends keyof __VLS_GlobalComponents ? N2 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N2] } :
 		N3 extends keyof __VLS_GlobalComponents ? N3 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N3] } :
 		${checkUnknownComponents ? '{}' : '{ [K in N0]: unknown }'};
-	type __VLS_FunctionalComponentProps<T, K> =
-		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
-		: T extends (props: infer P, ...args: any) => any ? P :
-		{};
+	type __VLS_FunctionalComponentCtx<T, K> = __VLS_PickNotAny<'__ctx' extends keyof __VLS_PickNotAny<K, {}>
+		? K extends { __ctx?: infer Ctx } ? NonNullable<Ctx> : never : any
+		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
+	>;
+	type __VLS_FunctionalComponentProps<T, K> = '__ctx' extends keyof __VLS_PickNotAny<K, {}>
+		? K extends { __ctx?: { props?: infer P } } ? NonNullable<P> : never
+		: T extends (props: infer P, ...args: any) => any ? P
+		: {};
+	type __VLS_FunctionalComponent<T> = (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
+		__ctx?: {
+			attrs?: any,
+			slots?: T extends { ${(0, shared_1.getSlotsPropertyName)(target)}: infer Slots } ? Slots : Record<string, any>,
+			emit?: T extends { $emit: infer Emit } ? Emit : {},
+			props?: ${fnPropsType},
+			expose?: (exposed: T) => void,
+		}
+	};
+	type __VLS_NormalizeSlotReturns<S, R = NonNullable<S> extends (...args: any) => infer K ? K : any> = R extends any[] ? {
+		[K in keyof R]: R[K] extends infer V
+			? V extends Element ? V
+			: V extends new (...args: any) => infer R ? ReturnType<__VLS_FunctionalComponent<R>>
+			: V extends (...args: any) => infer R ? R
+			: any
+			: never
+	} : R;
 	type __VLS_IsFunction<T, K> = K extends keyof T
 		? __VLS_IsAny<T[K]> extends false
 		? unknown extends T[K]
@@ -62,13 +83,13 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 		: true
 		: false
 		: false;
-	type __VLS_NormalizeComponentEvent<Props, Events, onEvent extends keyof Props, Event extends keyof Events, CamelizedEvent extends keyof Events> = (
+	type __VLS_NormalizeComponentEvent<Props, Emits, onEvent extends keyof Props, Event extends keyof Emits, CamelizedEvent extends keyof Emits> = (
 		__VLS_IsFunction<Props, onEvent> extends true
 			? Props
-			: __VLS_IsFunction<Events, Event> extends true
-				? { [K in onEvent]?: Events[Event] }
-				: __VLS_IsFunction<Events, CamelizedEvent> extends true
-					? { [K in onEvent]?: Events[CamelizedEvent] }
+			: __VLS_IsFunction<Emits, Event> extends true
+				? { [K in onEvent]?: Emits[Event] }
+				: __VLS_IsFunction<Emits, CamelizedEvent> extends true
+					? { [K in onEvent]?: Emits[CamelizedEvent] }
 					: Props
 	)${checkUnknownEvents ? '' : ' & Record<string, unknown>'};
 	// fix https://github.com/vuejs/language-tools/issues/926
@@ -94,11 +115,16 @@ 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> : {}` : `{}`},
+		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_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
-		'__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
-		, T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
-	>>;
 	type __VLS_UseTemplateRef<T> = Readonly<import('${lib}').ShallowRef<T | null>>;
 
 	function __VLS_getVForSourceType<T extends number | string | any[] | Iterable<any>>(source: T): [
@@ -114,10 +140,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
@@ -125,19 +149,13 @@ function generateGlobalTypes({ lib, target, checkUnknownProps, checkUnknownEvent
 			: (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
 	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
 	function __VLS_asFunctionalComponent<T, K = T extends new (...args: any) => any ? InstanceType<T> : unknown>(t: T, instance?: K):
-		T extends new (...args: any) => any
-		? (props: ${fnPropsType}, ctx?: any) => __VLS_Element & {
-			__ctx?: {
-				attrs?: any;
-				slots?: K extends { ${(0, shared_1.getSlotsPropertyName)(target)}: infer Slots } ? Slots : any;
-				emit?: K extends { $emit: infer Emit } ? Emit : any;
-				expose?(exposed: K): void;
-				props?: ${fnPropsType};
-			}
-		}
+		T extends new (...args: any) => any ? __VLS_FunctionalComponent<K>
 		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		${(target === 2.7
+        ? `: T extends import('vue').AsyncComponent ? (props: {}, ctx?: any) => any`
+        : ``)}
 		: T extends (...args: any) => any ? T
-		: (_: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${checkUnknownProps ? '' : ' & Record<string, unknown>'} } };
+		: __VLS_FunctionalComponent<{}>;
 	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
 	function __VLS_asFunctionalElement<T>(tag: T, endTag?: T): (attrs: T${checkUnknownComponents ? '' : ' & Record<string, unknown>'}) => void;
 	function __VLS_asFunctionalSlot<S>(slot: S): S extends () => infer R ? (props: {}) => R : NonNullable<S>;

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/src.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateSrc = generateSrc;
 const codeFeatures_1 = require("../codeFeatures");
 const utils_1 = require("../utils");
+const wrapWith_1 = require("../utils/wrapWith");
 function* generateSrc(src) {
     if (src === true) {
         return;
@@ -21,10 +22,10 @@ function* generateSrc(src) {
         text = text + '.js';
     }
     yield `export * from `;
-    yield* (0, utils_1.generateSfcBlockAttrValue)(src, text, {
+    yield* (0, wrapWith_1.wrapWith)(src.offset, src.offset + src.text.length, 'main', {
         ...codeFeatures_1.codeFeatures.all,
-        ...text === src.text ? codeFeatures_1.codeFeatures.navigation : codeFeatures_1.codeFeatures.navigationWithoutRename,
-    });
+        ...text !== src.text ? codeFeatures_1.codeFeatures.navigationWithoutRename : {},
+    }, `'`, [text.slice(0, src.text.length), 'main', src.offset, utils_1.combineLastMapping], text.slice(src.text.length), `'`);
     yield utils_1.endOfLine;
     yield `export { default } from '${text}'${utils_1.endOfLine}`;
 }

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/script/template.js

@@ -51,7 +51,7 @@ function* generateTemplateElements() {
     yield `let __VLS_elements!: __VLS_IntrinsicElements${utils_1.endOfLine}`;
 }
 function* generateTemplateComponents(options) {
-    const types = [];
+    const types = [`typeof __VLS_ctx`];
     if (options.sfc.script && options.scriptRanges?.exportDefault?.componentsOption) {
         const { componentsOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_componentsOption = `;
@@ -64,7 +64,6 @@ function* generateTemplateComponents(options) {
         yield utils_1.endOfLine;
         types.push(`typeof __VLS_componentsOption`);
     }
-    types.push(`typeof __VLS_ctx`);
     yield `type __VLS_LocalComponents =`;
     for (const type of types) {
         yield ` & `;
@@ -74,7 +73,7 @@ function* generateTemplateComponents(options) {
     yield `let __VLS_components!: __VLS_LocalComponents & __VLS_GlobalComponents${utils_1.endOfLine}`;
 }
 function* generateTemplateDirectives(options) {
-    const types = [];
+    const types = [`typeof __VLS_ctx`];
     if (options.sfc.script && options.scriptRanges?.exportDefault?.directivesOption) {
         const { directivesOption } = options.scriptRanges.exportDefault;
         yield `const __VLS_directivesOption = `;
@@ -85,9 +84,8 @@ function* generateTemplateDirectives(options) {
             codeFeatures_1.codeFeatures.navigation,
         ];
         yield utils_1.endOfLine;
-        types.push(`typeof __VLS_directivesOption`);
+        types.push(`__VLS_ResolveDirectives<typeof __VLS_directivesOption>`);
     }
-    types.push(`typeof __VLS_ctx`);
     yield `type __VLS_LocalDirectives =`;
     for (const type of types) {
         yield ` & `;

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,24 @@ export declare function createTemplateCodegenContext(options: Pick<TemplateCodeg
     templateRefs: Map<string, {
         typeExp: string;
         offset: number;
-    }>;
+    }[]>;
     currentComponent: {
         ctxVar: string;
+        childTypes: 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>;