@vue/language-core 2.1.4 → 2.1.6-patch.1

package/lib/codegen/common.d.ts

@@ -6,7 +6,7 @@ export declare const combineLastMapping: VueCodeInformation;
 export declare const variableNameRegex: RegExp;
 export declare function conditionWrapWith(condition: boolean, startOffset: number, endOffset: number, features: VueCodeInformation, ...wrapCodes: Code[]): Generator<Code>;
 export declare function wrapWith(startOffset: number, endOffset: number, features: VueCodeInformation, ...wrapCodes: Code[]): Generator<Code>;
-export declare function collectVars(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile, results?: string[], includesRest?: boolean): string[];
-export declare function collectIdentifiers(ts: typeof import('typescript'), node: ts.Node, results?: ts.Identifier[], includesRest?: boolean): ts.Identifier[];
+export declare function collectVars(ts: typeof import('typescript'), node: ts.Node, ast: ts.SourceFile, results?: string[]): string[];
+export declare function collectIdentifiers(ts: typeof import('typescript'), node: ts.Node, results?: [id: ts.Identifier, isRest: boolean][], isRest?: boolean): [id: ts.Identifier, isRest: boolean][];
 export declare function createTsAst(ts: typeof import('typescript'), astHolder: any, text: string): ts.SourceFile;
 export declare function generateSfcBlockSection(block: SfcBlock, start: number, end: number, features: VueCodeInformation): Code;

package/lib/codegen/common.js

@@ -33,33 +33,31 @@ function* wrapWith(startOffset, endOffset, features, ...wrapCodes) {
     }
     yield ['', 'template', endOffset, { __combineOffsetMapping: offset }];
 }
-function collectVars(ts, node, ast, results = [], includesRest = true) {
-    const identifiers = collectIdentifiers(ts, node, [], includesRest);
-    for (const id of identifiers) {
+function collectVars(ts, node, ast, results = []) {
+    const identifiers = collectIdentifiers(ts, node, []);
+    for (const [id] of identifiers) {
         results.push((0, scriptSetupRanges_1.getNodeText)(ts, id, ast));
     }
     return results;
 }
-function collectIdentifiers(ts, node, results = [], includesRest = true) {
+function collectIdentifiers(ts, node, results = [], isRest = false) {
     if (ts.isIdentifier(node)) {
-        results.push(node);
+        results.push([node, isRest]);
     }
     else if (ts.isObjectBindingPattern(node)) {
         for (const el of node.elements) {
-            if (includesRest || !el.dotDotDotToken) {
-                collectIdentifiers(ts, el.name, results, includesRest);
-            }
+            collectIdentifiers(ts, el.name, results, !!el.dotDotDotToken);
         }
     }
     else if (ts.isArrayBindingPattern(node)) {
         for (const el of node.elements) {
             if (ts.isBindingElement(el)) {
-                collectIdentifiers(ts, el.name, results, includesRest);
+                collectIdentifiers(ts, el.name, results, !!el.dotDotDotToken);
             }
         }
     }
     else {
-        ts.forEachChild(node, node => collectIdentifiers(ts, node, results, includesRest));
+        ts.forEachChild(node, node => collectIdentifiers(ts, node, results, false));
     }
     return results;
 }

package/lib/codegen/globalTypes.d.ts

@@ -1 +1 @@
-export declare function generateGlobalTypes(mode: 'global' | 'local', lib: string, target: number, strictTemplates: boolean): string;
+export declare function generateGlobalTypes(lib: string, target: number, strictTemplates: boolean): string;

package/lib/codegen/globalTypes.js

@@ -2,140 +2,138 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateGlobalTypes = generateGlobalTypes;
 const shared_1 = require("../utils/shared");
-const common_1 = require("./common");
-function generateGlobalTypes(mode, lib, target, strictTemplates) {
+function generateGlobalTypes(lib, target, strictTemplates) {
     const fnPropsType = `(K extends { $props: infer Props } ? Props : any)${strictTemplates ? '' : ' & Record<string, unknown>'}`;
-    let str = '';
-    let globalComponentsType;
-    if (mode === 'global') {
-        str += `// @ts-nocheck${common_1.newLine}`;
-        str += `export {}${common_1.endOfLine}`;
-        str += `declare module '${lib}' {${common_1.newLine}`;
-        str += `	export interface GlobalComponents { }${common_1.newLine}`;
-        str += `}${common_1.newLine}`;
-        str += `declare global {${common_1.newLine}`;
-        globalComponentsType = `import('${lib}').GlobalComponents`;
+    let text = ``;
+    if (target < 3.5) {
+        text += `
+; declare module '${lib}' {
+	export interface GlobalComponents { }
+	export interface GlobalDirectives { }
+}`;
     }
-    else {
-        str += `const __VLS_globalComponents = { ...{} as import('${lib}').GlobalComponents }${common_1.endOfLine}`;
-        globalComponentsType = `void extends typeof __VLS_globalComponents ? {} : typeof __VLS_globalComponents`;
-    }
-    str += `
-const __VLS_intrinsicElements: __VLS_IntrinsicElements;
-const __VLS_directiveBindingRestFields = { instance: null, oldValue: null, modifiers: null as any, dir: null as any };
+    text += `
+; declare global {
+	const __VLS_intrinsicElements: __VLS_IntrinsicElements;
+	const __VLS_directiveBindingRestFields: { instance: null, oldValue: null, modifiers: any, dir: any };
+	const __VLS_unref: typeof import('${lib}').unref;
+
+	const __VLS_nativeElements = {
+		...{} as SVGElementTagNameMap,
+		...{} as 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
+	type __VLS_Element = ${(target >= 3.3
         ? `import('${lib}/jsx-runtime').JSX.Element;`
         : `globalThis.JSX.Element;`)}
-type __VLS_GlobalComponents = ${(target >= 3.5
-        ? globalComponentsType
-        : `(${globalComponentsType}) & Pick<typeof import('${lib}'), 'Transition' | 'TransitionGroup' | 'KeepAlive' | 'Suspense' | 'Teleport'>;`)}
-type __VLS_IsAny<T> = 0 extends 1 & T ? true : false;
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
-type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
-type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
-	N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
-	N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
-	N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
-	N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
-	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] } :
-	${strictTemplates ? '{}' : '{ [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_IsFunction<T, K> = K extends keyof T
-	? __VLS_IsAny<T[K]> extends false
-	? unknown extends T[K]
-	? false
-	: true
-	: false
-	: false;
-// fix https://github.com/vuejs/language-tools/issues/926
-type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
-type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
-	? U extends T
-	? never
-	: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
-	: never;
-type __VLS_OverloadUnion<T> = Exclude<
-	__VLS_OverloadUnionInner<(() => never) & T>,
-	T extends () => never ? never : () => never
->;
-type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
-	? F extends (event: infer E, ...args: infer A) => any
-	? { [K in E & string]: (...args: A) => void; }
-	: never
-	: never;
-type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
-	__VLS_UnionToIntersection<
-		__VLS_ConstructorOverloads<T> & {
-			[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
-		}
-	>
->;
-type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
+	type __VLS_GlobalComponents = ${(target >= 3.5
+        ? `import('${lib}').GlobalComponents;`
+        : `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;
+	type __VLS_unknownDirective = (arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown) => void;
+	type __VLS_WithComponent<N0 extends string, LocalComponents, N1 extends string, N2 extends string, N3 extends string> =
+		N1 extends keyof LocalComponents ? N1 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N1] } :
+		N2 extends keyof LocalComponents ? N2 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N2] } :
+		N3 extends keyof LocalComponents ? N3 extends N0 ? Pick<LocalComponents, N0 extends keyof LocalComponents ? N0 : never> : { [K in N0]: LocalComponents[N3] } :
+		N1 extends keyof __VLS_GlobalComponents ? N1 extends N0 ? Pick<__VLS_GlobalComponents, N0 extends keyof __VLS_GlobalComponents ? N0 : never> : { [K in N0]: __VLS_GlobalComponents[N1] } :
+		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] } :
+		${strictTemplates ? '{}' : '{ [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_IsFunction<T, K> = K extends keyof T
+		? __VLS_IsAny<T[K]> extends false
+		? unknown extends T[K]
+		? false
+		: true
+		: false
+		: false;
+	// fix https://github.com/vuejs/language-tools/issues/926
+	type __VLS_UnionToIntersection<U> = (U extends unknown ? (arg: U) => unknown : never) extends ((arg: infer P) => unknown) ? P : never;
+	type __VLS_OverloadUnionInner<T, U = unknown> = U & T extends (...args: infer A) => infer R
+		? U extends T
+		? never
+		: __VLS_OverloadUnionInner<T, Pick<T, keyof T> & U & ((...args: A) => R)> | ((...args: A) => R)
+		: never;
+	type __VLS_OverloadUnion<T> = Exclude<
+		__VLS_OverloadUnionInner<(() => never) & T>,
+		T extends () => never ? never : () => never
+	>;
+	type __VLS_ConstructorOverloads<T> = __VLS_OverloadUnion<T> extends infer F
+		? F extends (event: infer E, ...args: infer A) => any
+		? { [K in E & string]: (...args: A) => void; }
+		: never
+		: never;
+	type __VLS_NormalizeEmits<T> = __VLS_PrettifyGlobal<
+		__VLS_UnionToIntersection<
+			__VLS_ConstructorOverloads<T> & {
+				[K in keyof T]: T[K] extends any[] ? { (...args: T[K]): void } : never
+			}
+		>
+	>;
+	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
+	>>;
 
-function __VLS_getVForSourceType(source: number): [number, number, number][];
-function __VLS_getVForSourceType(source: string): [string, number, number][];
-function __VLS_getVForSourceType<T extends any[]>(source: T): [
-	item: T[number],
-	key: number,
-	index: number,
-][];
-function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
-	item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
-	key: number,
-	index: undefined,
-][];
-// #3845
-function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
-	item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
-	key: number,
-	index: undefined,
-][];
-function __VLS_getVForSourceType<T>(source: T): [
-	item: T[keyof T],
-	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_directiveAsFunction<T extends import('${lib}').Directive>(dir: T): T extends (...args: any) => any
-	? T | __VLS_unknownDirective
-	: NonNullable<(T & Record<string, __VLS_unknownDirective>)['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>;
-function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
-function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
-function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
-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
-	} & { props?: ${fnPropsType}; expose?(exposed: K): void; } }
-	: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
-	: T extends (...args: any) => any ? T
-	: (_: {}${strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${strictTemplates ? '' : ' & Record<string, unknown>'} } };
-function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T${strictTemplates ? '' : ' & Record<string, unknown>'}) => void;
-function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
-function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: 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
->>;
-function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
-function __VLS_tryAsConstant<const T>(t: T): T;
+	function __VLS_getVForSourceType(source: number): [number, number, number][];
+	function __VLS_getVForSourceType(source: string): [string, number, number][];
+	function __VLS_getVForSourceType<T extends any[]>(source: T): [
+		item: T[number],
+		key: number,
+		index: number,
+	][];
+	function __VLS_getVForSourceType<T extends { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: T extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never, 
+		key: number,
+		index: undefined,
+	][];
+	// #3845
+	function __VLS_getVForSourceType<T extends number | { [Symbol.iterator](): Iterator<any> }>(source: T): [
+		item: number | (Exclude<T, number> extends { [Symbol.iterator](): Iterator<infer T1> } ? T1 : never), 
+		key: number,
+		index: undefined,
+	][];
+	function __VLS_getVForSourceType<T>(source: T): [
+		item: T[keyof T],
+		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_directiveAsFunction<T extends import('${lib}').Directive>(dir: T): T extends (...args: any) => any
+		? T | __VLS_unknownDirective
+		: NonNullable<(T & Record<string, __VLS_unknownDirective>)['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>;
+	function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
+	function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
+	function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
+	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
+		} & { props?: ${fnPropsType}; expose?(exposed: K): void; } }
+		: T extends () => any ? (props: {}, ctx?: any) => ReturnType<T>
+		: T extends (...args: any) => any ? T
+		: (_: {}${strictTemplates ? '' : ' & Record<string, unknown>'}, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {}${strictTemplates ? '' : ' & Record<string, unknown>'} } };
+	function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T${strictTemplates ? '' : ' & Record<string, unknown>'}) => void;
+	function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
+	function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
+	function __VLS_tryAsConstant<const T>(t: T): T;
+}
 `;
-    if (mode === 'global') {
-        str += `}${common_1.newLine}`;
-    }
-    return str;
+    return text;
 }
 ;
 //# sourceMappingURL=globalTypes.js.map

package/lib/codegen/script/component.js

@@ -37,7 +37,10 @@ function* generateComponent(options, ctx, scriptSetup, scriptSetupRanges) {
         yield (0, common_1.generateSfcBlockSection)(options.sfc.script, args.start + 1, args.end - 1, index_1.codeFeatures.all);
     }
     if (options.vueCompilerOptions.target >= 3.5 && scriptSetupRanges.templateRefs.length) {
-        yield `__typeRefs: {} as __VLS_Refs,${common_1.newLine}`;
+        yield `__typeRefs: {} as __VLS_TemplateResult['refs'],${common_1.newLine}`;
+    }
+    if (options.vueCompilerOptions.target >= 3.5 && options.templateCodegen?.singleRootElType) {
+        yield `__typeEl: {} as __VLS_TemplateResult['rootEl'],${common_1.newLine}`;
     }
     yield `})`;
 }
@@ -104,66 +107,69 @@ function* generateEmitsOption(options, scriptSetup, scriptSetupRanges) {
     }
 }
 function* generatePropsOption(options, ctx, scriptSetup, scriptSetupRanges, hasEmitsOption, inheritAttrs) {
-    const optionExpCodes = [];
-    const typeOptionExpCodes = [];
+    const codes = [];
     if (ctx.generatedPropsType) {
-        optionExpCodes.push([
-            `{} as `,
-            scriptSetupRanges.props.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
-            `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
-            scriptSetupRanges.props.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
-        ].join(''));
-        typeOptionExpCodes.push(`{} as __VLS_PublicProps`);
+        codes.push({
+            optionExp: [
+                `{} as `,
+                scriptSetupRanges.props.withDefaults?.arg ? `${ctx.localTypes.WithDefaults}<` : '',
+                `${ctx.localTypes.TypePropsToOption}<__VLS_PublicProps>`,
+                scriptSetupRanges.props.withDefaults?.arg ? `, typeof __VLS_withDefaultsArg>` : '',
+            ].join(''),
+            typeOptionExp: `{} as __VLS_PublicProps`,
+        });
     }
     if (scriptSetupRanges.props.define?.arg) {
         const { arg } = scriptSetupRanges.props.define;
-        optionExpCodes.push((0, common_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation));
+        codes.push({
+            optionExp: (0, common_1.generateSfcBlockSection)(scriptSetup, arg.start, arg.end, index_1.codeFeatures.navigation),
+            typeOptionExp: undefined,
+        });
     }
     if (inheritAttrs && options.templateCodegen?.inheritedAttrVars.size) {
-        let attrsType = `typeof __VLS_templateResult['attrs']`;
+        let attrsType = `__VLS_TemplateResult['attrs']`;
         if (hasEmitsOption) {
             attrsType = `Omit<${attrsType}, \`on\${string}\`>`;
         }
         const propsType = `__VLS_PickNotAny<${ctx.localTypes.OmitIndexSignature}<${attrsType}>, {}>`;
         const optionType = `${ctx.localTypes.TypePropsToOption}<${propsType}>`;
-        if (optionExpCodes.length) {
-            optionExpCodes.unshift(`{} as ${optionType}`);
-        }
-        else {
-            // workaround for https://github.com/vuejs/core/pull/7419
-            optionExpCodes.unshift(`{} as keyof ${propsType} extends never ? never: ${optionType}`);
-        }
-        typeOptionExpCodes.unshift(`{} as ${attrsType}`);
+        codes.unshift({
+            optionExp: codes.length
+                ? `{} as ${optionType}`
+                // workaround for https://github.com/vuejs/core/pull/7419
+                : `{} as keyof ${propsType} extends never ? never: ${optionType}`,
+            typeOptionExp: `{} as ${attrsType}`,
+        });
     }
-    const useTypeOption = options.vueCompilerOptions.target >= 3.5 && typeOptionExpCodes.length;
-    const useOption = (!useTypeOption || scriptSetupRanges.props.withDefaults) && optionExpCodes.length;
+    const useTypeOption = options.vueCompilerOptions.target >= 3.5 && codes.every(code => code.typeOptionExp);
+    const useOption = !useTypeOption || scriptSetupRanges.props.withDefaults;
     if (useTypeOption) {
-        if (typeOptionExpCodes.length === 1) {
+        if (codes.length === 1) {
             yield `__typeProps: `;
-            yield typeOptionExpCodes[0];
+            yield codes[0].typeOptionExp;
             yield `,${common_1.newLine}`;
         }
-        else if (typeOptionExpCodes.length >= 2) {
+        else if (codes.length >= 2) {
             yield `__typeProps: {${common_1.newLine}`;
-            for (const code of typeOptionExpCodes) {
+            for (const { typeOptionExp } of codes) {
                 yield `...`;
-                yield code;
+                yield typeOptionExp;
                 yield `,${common_1.newLine}`;
             }
             yield `},${common_1.newLine}`;
         }
     }
     if (useOption) {
-        if (optionExpCodes.length === 1) {
+        if (codes.length === 1) {
             yield `props: `;
-            yield optionExpCodes[0];
+            yield codes[0].optionExp;
             yield `,${common_1.newLine}`;
         }
-        else if (optionExpCodes.length >= 2) {
+        else if (codes.length >= 2) {
             yield `props: {${common_1.newLine}`;
-            for (const code of optionExpCodes) {
+            for (const { optionExp } of codes) {
                 yield `...`;
-                yield code;
+                yield optionExp;
                 yield `,${common_1.newLine}`;
             }
             yield `},${common_1.newLine}`;

package/lib/codegen/script/{internalComponent.d.ts → componentSelf.d.ts}

@@ -2,4 +2,4 @@ import type { Code } from '../../types';
 import type { TemplateCodegenContext } from '../template/context';
 import type { ScriptCodegenContext } from './context';
 import { type ScriptCodegenOptions } from './index';
-export declare function generateInternalComponent(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, templateCodegenCtx: TemplateCodegenContext): Generator<Code>;
+export declare function generateComponentSelf(options: ScriptCodegenOptions, ctx: ScriptCodegenContext, templateCodegenCtx: TemplateCodegenContext): Generator<Code>;

package/lib/codegen/script/{internalComponent.js → componentSelf.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateInternalComponent = generateInternalComponent;
+exports.generateComponentSelf = generateComponentSelf;
 const common_1 = require("../common");
 const component_1 = require("./component");
 const index_1 = require("./index");
 const template_1 = require("./template");
-function* generateInternalComponent(options, ctx, templateCodegenCtx) {
+function* generateComponentSelf(options, ctx, templateCodegenCtx) {
     if (options.sfc.scriptSetup && options.scriptSetupRanges) {
-        yield `const __VLS_internalComponent = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({${common_1.newLine}`;
         yield `setup() {${common_1.newLine}`;
         yield `return {${common_1.newLine}`;
         if (ctx.bypassDefineComponent) {
@@ -54,10 +54,10 @@ function* generateInternalComponent(options, ctx, templateCodegenCtx) {
         yield `})${common_1.endOfLine}`; // defineComponent {
     }
     else if (options.sfc.script) {
-        yield `let __VLS_internalComponent!: typeof import('./${options.fileBaseName}').default${common_1.endOfLine}`;
+        yield `let __VLS_self!: typeof import('./${options.fileBaseName}').default${common_1.endOfLine}`;
     }
     else {
-        yield `const __VLS_internalComponent = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${common_1.endOfLine}`;
+        yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${common_1.endOfLine}`;
     }
 }
-//# sourceMappingURL=internalComponent.js.map
+//# sourceMappingURL=componentSelf.js.map

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

@@ -25,6 +25,7 @@ export interface ScriptCodegenOptions {
         codes: Code[];
     } | undefined;
     edited: boolean;
+    appendGlobalTypes: boolean;
     getGeneratedLength: () => number;
     linkedCodeMappings: Mapping[];
 }

package/lib/codegen/script/index.js

@@ -3,11 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.codeFeatures = void 0;
 exports.generateScript = generateScript;
 const common_1 = require("../common");
+const globalTypes_1 = require("../globalTypes");
 const context_1 = require("./context");
+const componentSelf_1 = require("./componentSelf");
 const scriptSetup_1 = require("./scriptSetup");
 const src_1 = require("./src");
+const styleModulesType_1 = require("./styleModulesType");
 const template_1 = require("./template");
-const globalTypes_1 = require("../globalTypes");
 exports.codeFeatures = {
     all: {
         verification: true,
@@ -32,7 +34,7 @@ exports.codeFeatures = {
 };
 function* generateScript(options) {
     const ctx = (0, context_1.createScriptCodegenContext)(options);
-    if (options.vueCompilerOptions.__setupedGlobalTypes?.()) {
+    if (options.vueCompilerOptions.__setupedGlobalTypes) {
         yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${common_1.newLine}`;
     }
     else {
@@ -91,7 +93,8 @@ function* generateScript(options) {
             else {
                 yield (0, common_1.generateSfcBlockSection)(options.sfc.script, 0, classBlockEnd, exports.codeFeatures.all);
                 yield `__VLS_template = () => {`;
-                yield* (0, template_1.generateTemplate)(options, ctx, true);
+                const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx, true);
+                yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
                 yield `},${common_1.newLine}`;
                 yield (0, common_1.generateSfcBlockSection)(options.sfc.script, classBlockEnd, options.sfc.script.content.length, exports.codeFeatures.all);
             }
@@ -112,14 +115,19 @@ function* generateScript(options) {
     }
     yield common_1.newLine;
     if (!ctx.generatedTemplate) {
-        yield* (0, template_1.generateTemplate)(options, ctx, false);
+        yield `function __VLS_template() {${common_1.newLine}`;
+        const templateCodegenCtx = yield* (0, template_1.generateTemplate)(options, ctx, false);
+        yield `}${common_1.endOfLine}`;
+        yield* (0, componentSelf_1.generateComponentSelf)(options, ctx, templateCodegenCtx);
     }
+    // #4788
+    yield* (0, styleModulesType_1.generateStyleModulesType)(options, ctx);
     if (options.edited) {
         yield `type __VLS_IntrinsicElementsCompletion = __VLS_IntrinsicElements${common_1.endOfLine}`;
     }
     yield* ctx.localTypes.generate([...ctx.localTypes.getUsedNames()]);
-    if (!options.vueCompilerOptions.__setupedGlobalTypes?.()) {
-        yield (0, globalTypes_1.generateGlobalTypes)('local', options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
+    if (options.appendGlobalTypes) {
+        yield (0, globalTypes_1.generateGlobalTypes)(options.vueCompilerOptions.lib, options.vueCompilerOptions.target, options.vueCompilerOptions.strictTemplates);
     }
     if (options.sfc.scriptSetup) {
         yield ['', 'scriptSetup', options.sfc.scriptSetup.content.length, exports.codeFeatures.verification];