wip

Author: johnsoncodehk

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

@@ -12,7 +12,7 @@ export interface StyleCodegenOptions {
 	usedCssModule: boolean;
 	styles: Sfc['styles'];
 	templateRefNames: Set<string>;
-	destructuredPropNames: Set<string>;
+	rawBindingNames: Set<string>;
 	setupBindingNames: Set<string>;
 }
 
@@ -21,7 +21,7 @@ export { generate as generateStyle };
 function* generate(options: StyleCodegenOptions) {
 	const ctx = createTemplateCodegenContext(options.setupBindingNames);
 	const endScope = ctx.startScope();
-	ctx.declare(...options.destructuredPropNames);
+	ctx.declare(...options.rawBindingNames);
 	yield* generateStyleScopedClasses(options);
 	yield* generateStyleModules(options, ctx);
 	yield* generateCssVars(options, ctx);

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

@@ -31,7 +31,7 @@ export function* generateComponent(
 	const tagOffsets = getElementTagOffsets(node, options.template);
 	const failGeneratedExpressions: FailGeneratedExpression[] = [];
 	const possibleOriginalNames = getPossibleOriginalComponentNames(node.tag, true);
-	const matchImportName = possibleOriginalNames.find(name => options.scriptSetupImportComponentNames.has(name));
+	const matchImportName = possibleOriginalNames.find(name => options.rawBindingNames.has(name));
 	const componentOriginalVar = matchImportName ?? ctx.getInternalVariable();
 	const componentFunctionalVar = ctx.getInternalVariable();
 	const componentVNodeVar = ctx.getInternalVariable();

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

@@ -13,10 +13,9 @@ export interface TemplateCodegenOptions {
 	compilerOptions: ts.CompilerOptions;
 	vueCompilerOptions: VueCompilerOptions;
 	template: NonNullable<Sfc['template']>;
-	destructuredPropNames: Set<string>;
+	rawBindingNames: Set<string>;
 	setupBindingNames: Set<string>;
 	templateRefNames: Set<string>;
-	scriptSetupImportComponentNames: Set<string>;
 	hasDefineSlots?: boolean;
 	propsAssignName?: string;
 	slotsAssignName?: string;
@@ -47,7 +46,7 @@ function* generateWorker(
 	ctx: TemplateCodegenContext,
 ): Generator<Code> {
 	const endScope = ctx.startScope();
-	ctx.declare(...options.destructuredPropNames);
+	ctx.declare(...options.rawBindingNames);
 	const {
 		slotsAssignName,
 		propsAssignName,

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

@@ -107,7 +107,10 @@ function useCodegen(
 			return newNames;
 		}
 		for (const { range } of scriptSetupRanges.bindings) {
-			newNames.add(sfc.scriptSetup.content.slice(range.start, range.end));
+			const name = sfc.scriptSetup.content.slice(range.start, range.end);
+			if (!getImportComponentNames().has(name)) {
+				newNames.add(name);
+			}
 		}
 		const scriptRanges = getScriptRanges();
 		if (sfc.script && scriptRanges) {
@@ -118,31 +121,34 @@ function useCodegen(
 		return newNames;
 	});
 
-	const getSetupImportComponentNames = computedSet(() => {
-		const newNames = new Set<string>();
-		const bindings = getScriptSetupRanges()?.bindings;
-		if (sfc.scriptSetup && bindings) {
-			for (const { range, moduleName, isDefaultImport, isNamespace } of bindings) {
+	const getImportComponentNames = computedSet(() => {
+		const names = new Set<string>();
+		const scriptSetupRanges = getScriptSetupRanges();
+		if (sfc.scriptSetup && scriptSetupRanges) {
+			for (const { range, moduleName, isDefaultImport, isNamespace } of scriptSetupRanges.bindings) {
 				if (
 					moduleName
 					&& isDefaultImport
 					&& !isNamespace
 					&& ctx.vueCompilerOptions.extensions.some(ext => moduleName.endsWith(ext))
 				) {
-					newNames.add(sfc.scriptSetup.content.slice(range.start, range.end));
+					names.add(sfc.scriptSetup.content.slice(range.start, range.end));
 				}
 			}
 		}
-		return newNames;
+		return names;
 	});
 
 	const getDestructuredPropNames = computedSet(() => {
-		const newNames = new Set(getScriptSetupRanges()?.defineProps?.destructured?.keys());
+		const names = new Set([
+			...getScriptSetupRanges()?.defineProps?.destructured?.keys() ?? [],
+			...getImportComponentNames(),
+		]);
 		const rest = getScriptSetupRanges()?.defineProps?.destructuredRest;
 		if (rest) {
-			newNames.add(rest);
+			names.add(rest);
 		}
-		return newNames;
+		return names;
 	});
 
 	const getSetupTemplateRefNames = computedSet(() => {
@@ -197,10 +203,9 @@ function useCodegen(
 			compilerOptions: ctx.compilerOptions,
 			vueCompilerOptions: getResolvedOptions(),
 			template: sfc.template,
-			destructuredPropNames: getDestructuredPropNames(),
+			rawBindingNames: getDestructuredPropNames(),
 			setupBindingNames: getSetupBindingNames(),
 			templateRefNames: getSetupTemplateRefNames(),
-			scriptSetupImportComponentNames: getSetupImportComponentNames(),
 			hasDefineSlots: setupHasDefineSlots(),
 			propsAssignName: getSetupPropsAssignName(),
 			slotsAssignName: getSetupSlotsAssignName(),
@@ -248,7 +253,7 @@ function useCodegen(
 			vueCompilerOptions: getResolvedOptions(),
 			usedCssModule: usedCssModule(),
 			styles: sfc.styles,
-			destructuredPropNames: getDestructuredPropNames(),
+			rawBindingNames: getDestructuredPropNames(),
 			templateRefNames: getSetupTemplateRefNames(),
 			setupBindingNames: getSetupBindingNames(),
 		});