refactor(language-core): make generateStyle consistent with generateTemplate

Author: johnsoncodehk

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

@@ -34,13 +34,9 @@ export interface ScriptCodegenOptions {
 export { generate as generateScript };
 
 function generate(options: ScriptCodegenOptions) {
-	const context = createScriptCodegenContext(options);
-	const codegen = generateWorker(options, context);
-
-	return {
-		...context,
-		codes: [...codegen],
-	};
+	const ctx = createScriptCodegenContext(options);
+	const codeGenerator = generateWorker(options, ctx);
+	return { ...ctx, codes: [...codeGenerator] };
 }
 
 function* generateWorker(

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

@@ -17,15 +17,29 @@ export interface StyleCodegenOptions {
 
 export { generate as generateStyle };
 
-function* generate(options: StyleCodegenOptions) {
+function generate(options: StyleCodegenOptions) {
 	const ctx = createTemplateCodegenContext(options.setupBindingNames);
+	const codeGenerator = generateWorker(options, ctx);
+	const codes: Code[] = [];
+	for (const code of codeGenerator) {
+		if (typeof code === 'object') {
+			code[3] = ctx.resolveCodeFeatures(code[3]);
+		}
+		codes.push(code);
+	}
+	return { ...ctx, codes };
+}
+
+function* generateWorker(
+	options: StyleCodegenOptions,
+	ctx: TemplateCodegenContext,
+) {
 	const endScope = ctx.startScope();
 	ctx.declare(...options.directAccessNames);
 	yield* generateStyleScopedClasses(options);
 	yield* generateStyleModules(options, ctx);
 	yield* generateCssVars(options, ctx);
 	yield* endScope();
-	return ctx;
 }
 
 function* generateCssVars(

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

@@ -27,18 +27,15 @@ export { generate as generateTemplate };
 
 function generate(options: TemplateCodegenOptions) {
 	const ctx = createTemplateCodegenContext(options.setupBindingNames);
-	const codegen = generateWorker(options, ctx);
+	const codeGenerator = generateWorker(options, ctx);
 	const codes: Code[] = [];
-	for (const code of codegen) {
+	for (const code of codeGenerator) {
 		if (typeof code === 'object') {
 			code[3] = ctx.resolveCodeFeatures(code[3]);
 		}
 		codes.push(code);
 	}
-	return {
-		...ctx,
-		codes,
-	};
+	return { ...ctx, codes };
 }
 
 function* generateWorker(

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

@@ -4,12 +4,11 @@ import * as path from 'path-browserify';
 import { generateScript } from '../codegen/script';
 import { generateStyle } from '../codegen/style';
 import { generateTemplate } from '../codegen/template';
-import type { TemplateCodegenContext } from '../codegen/template/context';
 import { CompilerOptionsResolver } from '../compilerOptions';
 import { parseScriptRanges } from '../parsers/scriptRanges';
 import { parseScriptSetupRanges } from '../parsers/scriptSetupRanges';
 import { parseVueCompilerOptions } from '../parsers/vueCompilerOptions';
-import type { Code, Sfc, VueLanguagePlugin } from '../types';
+import type { Sfc, VueLanguagePlugin } from '../types';
 import { computedArray, computedSet } from '../utils/signals';
 
 export const tsCodegen = new WeakMap<Sfc, ReturnType<typeof useCodegen>>();
@@ -211,6 +210,20 @@ function useCodegen(
 		});
 	});
 
+	const getGeneratedStyle = computed(() => {
+		if (!sfc.styles.length) {
+			return;
+		}
+		return generateStyle({
+			ts,
+			vueCompilerOptions: getResolvedOptions(),
+			styles: sfc.styles,
+			directAccessNames: getDirectAccessNames(),
+			templateRefNames: getTemplateRefNames(),
+			setupBindingNames: getSetupBindingNames(),
+		});
+	});
+
 	const getTemplateComponents = computedArray(() => {
 		return sfc.template?.ast?.components ?? [];
 	});
@@ -239,36 +252,6 @@ function useCodegen(
 		});
 	});
 
-	const getGeneratedStyle = computed(() => {
-		if (!sfc.styles.length) {
-			return;
-		}
-		const generation = generateStyle({
-			ts,
-			vueCompilerOptions: getResolvedOptions(),
-			styles: sfc.styles,
-			directAccessNames: getDirectAccessNames(),
-			templateRefNames: getTemplateRefNames(),
-			setupBindingNames: getSetupBindingNames(),
-		});
-		const codes: Code[] = [];
-		let ctx: TemplateCodegenContext;
-
-		while (true) {
-			const result = generation.next();
-			if (result.done) {
-				ctx = result.value;
-				break;
-			}
-			codes.push(result.value);
-		}
-
-		return {
-			...ctx,
-			codes,
-		};
-	});
-
 	return {
 		getLang,
 		getScriptRanges,