wip

Author: johnsoncodehk

packages/language-core/lib/codegen/script/scriptSetup.ts

@@ -191,10 +191,13 @@ export function* generateSetupFunction(
 				yield `(`;
 			}),
 		);
+		const type = options.styleCodegen?.generatedTypes.has(names.StyleModules)
+			? names.StyleModules
+			: `{}`;
 		if (arg) {
 			transforms.push(
 				insert(callExp.end, function*() {
-					yield ` as Omit<${names.StyleModules}, '$style'>[`;
+					yield ` as Omit<${type}, '$style'>[`;
 					yield* generateSfcBlockSection(scriptSetup, arg.start, arg.end, codeFeatures.withoutSemantic);
 					yield `])`;
 				}),
@@ -206,7 +209,7 @@ export function* generateSetupFunction(
 		else {
 			transforms.push(
 				insert(callExp.end, function*() {
-					yield ` as ${names.StyleModules}[`;
+					yield ` as ${type}[`;
 					const token = yield* startBoundary(scriptSetup.name, exp.start, codeFeatures.verification);
 					yield `'$style'`;
 					yield endBoundary(token, exp.end);

packages/language-core/lib/codegen/style/index.ts

@@ -9,7 +9,6 @@ import { endOfLine } from '../utils';
 export interface StyleCodegenOptions {
 	ts: typeof import('typescript');
 	vueCompilerOptions: VueCompilerOptions;
-	usedCssModule: boolean;
 	styles: Sfc['styles'];
 	templateRefNames: Set<string>;
 	rawBindingNames: Set<string>;

packages/language-core/lib/codegen/style/modules.ts

@@ -7,11 +7,11 @@ import type { StyleCodegenOptions } from '.';
 import { generateClassProperty, generateStyleImports } from './common';
 
 export function* generateStyleModules(
-	{ styles, usedCssModule, vueCompilerOptions }: StyleCodegenOptions,
+	{ styles, vueCompilerOptions }: StyleCodegenOptions,
 	ctx: TemplateCodegenContext,
 ): Generator<Code> {
 	const styleModules = styles.filter(style => style.module);
-	if (!styleModules.length && !usedCssModule) {
+	if (!styleModules.length) {
 		return;
 	}
 	ctx.generatedTypes.add(names.StyleModules);

packages/language-core/lib/plugins/vue-tsx.ts

@@ -238,16 +238,13 @@ function useCodegen(
 		});
 	});
 
-	const usedCssModule = computed(() => !!getScriptSetupRanges()?.useCssModule.length);
-
 	const getGeneratedStyle = computed(() => {
 		if (!sfc.styles.length) {
 			return;
 		}
 		const generation = generateStyle({
 			ts,
 			vueCompilerOptions: getResolvedOptions(),
-			usedCssModule: usedCssModule(),
 			styles: sfc.styles,
 			rawBindingNames: getRawBindingNames(),
 			templateRefNames: getTemplateRefNames(),