refactor(language-core): determine skipTemplateCodegen in advance

so1ve · Sep 2, 2024 · 83562e6 · 83562e6
1 parent 16b1b36
commit 83562e6
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 36 deletions.
diff --git a/packages/language-core/lib/codegen/script/index.ts b/packages/language-core/lib/codegen/script/index.ts
@@ -7,7 +7,7 @@ import { endOfLine, generateSfcBlockSection, newLine } from '../common';
 import { generateGlobalTypes } from '../globalTypes';
 import type { TemplateCodegenContext } from '../template/context';
 import { createScriptCodegenContext, ScriptCodegenContext } from './context';
-import { generateInternalComponent } from './internalComponent';
+import { generateComponentSelf } from './internalComponent';
 import { generateScriptSetup, generateScriptSetupImports } from './scriptSetup';
 import { generateSrc } from './src';
 import { generateStyleModulesType } from './styleModulesType';
@@ -115,9 +115,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 				yield generateSfcBlockSection(options.sfc.script, 0, classBlockEnd, codeFeatures.all);
 				yield `__VLS_template = () => {`;
 				const templateCodegenCtx = yield* generateTemplate(options, ctx, true);
-				if (templateCodegenCtx) {
-					yield* generateInternalComponent(options, ctx, templateCodegenCtx);
-				}
+				yield* generateComponentSelf(options, ctx, templateCodegenCtx);
 				yield `},${newLine}`;
 				yield generateSfcBlockSection(options.sfc.script, classBlockEnd, options.sfc.script.content.length, codeFeatures.all);
 			}
@@ -143,9 +141,7 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 		yield `function __VLS_template() {${newLine}`;
 		const templateCodegenCtx = yield* generateTemplate(options, ctx, false);
 		yield `}${endOfLine}`;
-		if (templateCodegenCtx) {
-			yield* generateInternalComponent(options, ctx, templateCodegenCtx);
-		}
+		yield* generateComponentSelf(options, ctx, templateCodegenCtx);
 	}
 
 	// #4788

diff --git a/packages/language-core/lib/codegen/script/internalComponent.ts b/packages/language-core/lib/codegen/script/internalComponent.ts
@@ -6,7 +6,7 @@ import type { ScriptCodegenContext } from './context';
 import { codeFeatures, type ScriptCodegenOptions } from './index';
 import { getTemplateUsageVars } from './template';
 
-export function* generateInternalComponent(
+export function* generateComponentSelf(
 	options: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 	templateCodegenCtx: TemplateCodegenContext

diff --git a/packages/language-core/lib/codegen/script/scriptSetup.ts b/packages/language-core/lib/codegen/script/scriptSetup.ts
@@ -4,7 +4,7 @@ import { endOfLine, generateSfcBlockSection, newLine } from '../common';
 import { generateComponent, generateEmitsOption } from './component';
 import type { ScriptCodegenContext } from './context';
 import { ScriptCodegenOptions, codeFeatures } from './index';
-import { generateInternalComponent } from './internalComponent';
+import { generateComponentSelf } from './internalComponent';
 import { generateTemplate } from './template';
 
 export function* generateScriptSetupImports(
@@ -290,9 +290,7 @@ function* generateSetupFunction(
 	yield `function __VLS_template() {${newLine}`;
 	const templateCodegenCtx = yield* generateTemplate(options, ctx, false);
 	yield `}${endOfLine}`;
-	if (templateCodegenCtx) {
-		yield* generateInternalComponent(options, ctx, templateCodegenCtx);
-	}
+	yield* generateComponentSelf(options, ctx, templateCodegenCtx);
 	yield `type __VLS_TemplateResult = ReturnType<typeof __VLS_template>${endOfLine}`;
 
 	if (syntax) {

diff --git a/packages/language-core/lib/codegen/script/template.ts b/packages/language-core/lib/codegen/script/template.ts
@@ -91,29 +91,17 @@ export function* generateTemplate(
 	options: ScriptCodegenOptions,
 	ctx: ScriptCodegenContext,
 	isClassComponent: boolean
-): Generator<Code, TemplateCodegenContext | undefined> {
+): Generator<Code, TemplateCodegenContext> {
 	ctx.generatedTemplate = true;
 
-	if (!options.vueCompilerOptions.skipTemplateCodegen) {
-		const templateCodegenCtx = createTemplateCodegenContext({
-			scriptSetupBindingNames: new Set(),
-			edited: options.edited,
-		});
-		yield* generateTemplateCtx(options, isClassComponent);
-		yield* generateTemplateComponents(options);
-		yield* generateTemplateBody(options, templateCodegenCtx);
-		return templateCodegenCtx;
-	}
-	else {
-		const templateUsageVars = [...getTemplateUsageVars(options, ctx)];
-		yield `// @ts-ignore${newLine}`;
-		yield `[${templateUsageVars.join(', ')}]${newLine}`;
-		yield `return {${newLine}`;
-		yield `	slots: {},${newLine}`;
-		yield `	refs: {},${newLine}`;
-		yield `	attrs: {},${newLine}`;
-		yield `}${endOfLine}`;
-	}
+	const templateCodegenCtx = createTemplateCodegenContext({
+		scriptSetupBindingNames: new Set(),
+		edited: options.edited,
+	});
+	yield* generateTemplateCtx(options, isClassComponent);
+	yield* generateTemplateComponents(options);
+	yield* generateTemplateBody(options, templateCodegenCtx);
+	return templateCodegenCtx;
 }
 
 function* generateTemplateBody(

diff --git a/packages/language-core/lib/plugins/vue-tsx.ts b/packages/language-core/lib/plugins/vue-tsx.ts
@@ -84,7 +84,7 @@ function createTsx(
 	);
 	const generatedTemplate = computed(() => {
 
-		if (!_sfc.template) {
+		if (ctx.vueCompilerOptions.skipTemplateCodegen || !_sfc.template) {
 			return;
 		}
 
@@ -158,7 +158,6 @@ function createTsx(
 	const generatedScript = computed(() => {
 		const codes: Code[] = [];
 		const linkedCodeMappings: Mapping[] = [];
-		const _template = generatedTemplate();
 		let generatedLength = 0;
 		const codegen = generateScript({
 			ts,
@@ -167,7 +166,7 @@ function createTsx(
 			lang: lang(),
 			scriptRanges: scriptRanges(),
 			scriptSetupRanges: scriptSetupRanges(),
-			templateCodegen: _template,
+			templateCodegen: generatedTemplate(),
 			compilerOptions: ctx.compilerOptions,
 			vueCompilerOptions: ctx.vueCompilerOptions,
 			edited: ctx.vueCompilerOptions.__test || (fileEditTimes.get(fileName) ?? 0) >= 2,