wip

Author: johnsoncodehk

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

@@ -11,7 +11,7 @@ export interface StyleCodegenOptions {
 	vueCompilerOptions: VueCompilerOptions;
 	styles: Sfc['styles'];
 	templateRefNames: Set<string>;
-	rawBindingNames: Set<string>;
+	directAccessNames: Set<string>;
 	setupBindingNames: Set<string>;
 }
 
@@ -20,7 +20,7 @@ export { generate as generateStyle };
 function* generate(options: StyleCodegenOptions) {
 	const ctx = createTemplateCodegenContext(options.setupBindingNames);
 	const endScope = ctx.startScope();
-	ctx.declare(...options.rawBindingNames);
+	ctx.declare(...options.directAccessNames);
 	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.rawBindingNames.has(name));
+	const matchImportName = possibleOriginalNames.find(name => options.directAccessNames.has(name));
 	const componentOriginalVar = matchImportName ?? ctx.getInternalVariable();
 	const componentFunctionalVar = ctx.getInternalVariable();
 	const componentVNodeVar = ctx.getInternalVariable();

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

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

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

@@ -135,12 +135,13 @@ function useCodegen(
 		return names;
 	});
 
-	const getRawBindingNames = computedSet(() => {
+	const getDirectAccessNames = computedSet(() => {
+		const scriptSetupRanges = getScriptSetupRanges();
 		const names = new Set([
-			...getScriptSetupRanges()?.defineProps?.destructured?.keys() ?? [],
+			...scriptSetupRanges?.defineProps?.destructured?.keys() ?? [],
 			...getImportComponentNames(),
 		]);
-		const rest = getScriptSetupRanges()?.defineProps?.destructuredRest;
+		const rest = scriptSetupRanges?.defineProps?.destructuredRest;
 		if (rest) {
 			names.add(rest);
 		}
@@ -199,7 +200,7 @@ function useCodegen(
 			compilerOptions: ctx.compilerOptions,
 			vueCompilerOptions: getResolvedOptions(),
 			template: sfc.template,
-			rawBindingNames: getRawBindingNames(),
+			directAccessNames: getDirectAccessNames(),
 			setupBindingNames: getSetupBindingNames(),
 			templateRefNames: getTemplateRefNames(),
 			hasDefineSlots: hasDefineSlots(),
@@ -246,7 +247,7 @@ function useCodegen(
 			ts,
 			vueCompilerOptions: getResolvedOptions(),
 			styles: sfc.styles,
-			rawBindingNames: getRawBindingNames(),
+			directAccessNames: getDirectAccessNames(),
 			templateRefNames: getTemplateRefNames(),
 			setupBindingNames: getSetupBindingNames(),
 		});