feat: make defineExpose(...) equivalent to setup() { return ... }

Author: johnsoncodehk

packages/vscode-vue-languageservice/src/services/hover.ts

@@ -1,13 +1,10 @@
 import * as vscode from 'vscode-languageserver';
 import type { ApiLanguageServiceContext } from '../types';
 import { HtmlSourceMap } from '../utils/sourceMaps';
-import { register as registerFindDefinitions } from './definition';
 import * as shared from '@volar/shared';
 
 export function register({ sourceFiles, htmlLs, pugLs, getCssLs, getTsLs, vueHost }: ApiLanguageServiceContext) {
 
-	const findDefinitions = registerFindDefinitions(arguments[0]);
-
 	return async (uri: string, position: vscode.Position) => {
 
 		const tsResult = onTs(uri, position);

packages/vscode-vue-languageservice/src/sourceFile.ts

@@ -126,7 +126,6 @@ export function createSourceFile(
 		sfcTemplateCompileResult,
 		computed(() => sfcStyles.textDocuments.value),
 		context.compilerOptions.experimentalCompatMode === 2,
-		!!context.compilerOptions.experimentalExposeScriptSetupContext,
 	);
 	const sfcScriptForScriptLs = useSfcScriptGen(
 		'script',
@@ -139,7 +138,6 @@ export function createSourceFile(
 		sfcTemplateCompileResult,
 		computed(() => sfcStyles.textDocuments.value),
 		context.compilerOptions.experimentalCompatMode === 2,
-		!!context.compilerOptions.experimentalExposeScriptSetupContext,
 	);
 	const sfcEntryForTemplateLs = useSfcEntryForTemplateLs(
 		uri,

packages/vscode-vue-languageservice/src/types.ts

@@ -61,7 +61,6 @@ export interface VueCompilerOptions {
 	experimentalCompatMode?: 2 | 3;
 	experimentalTemplateCompilerOptions?: CompilerDOM.CompilerOptions;
 	experimentalTemplateCompilerOptionsRequirePath?: string;
-	experimentalExposeScriptSetupContext?: boolean;
 }
 
 export type LanguageServiceContextBase = {

packages/vscode-vue-languageservice/src/use/useSfcScriptGen.ts

@@ -19,7 +19,6 @@ export function useSfcScriptGen<T extends 'template' | 'script'>(
 	sfcTemplateCompileResult: ReturnType<(typeof import('./useSfcTemplateCompileResult'))['useSfcTemplateCompileResult']>,
 	sfcStyles: ReturnType<(typeof import('./useSfcStyles'))['useSfcStyles']>['textDocuments'],
 	isVue2: boolean,
-	exposeScriptSetupContext: boolean,
 ) {
 
 	let version = 0;
@@ -34,7 +33,7 @@ export function useSfcScriptGen<T extends 'template' | 'script'>(
 			lsType,
 			vueUri,
 			script.value ?? undefined,
-			scriptSetup.value ? { content: scriptSetup.value.content, exposeContext: exposeScriptSetupContext } : undefined,
+			scriptSetup.value ?? undefined,
 			scriptRanges.value,
 			scriptSetupRanges.value,
 			() => htmlGen.value,

packages/vue-code-gen/src/generators/script.ts

@@ -16,7 +16,6 @@ export function generate(
 	},
 	scriptSetup: undefined | {
 		content: string,
-		exposeContext: boolean,
 	},
 	scriptRanges: ScriptRanges | undefined,
 	scriptSetupRanges: ScriptSetupRanges | undefined,
@@ -270,17 +269,29 @@ export function generate(
 					vueTag: 'script',
 				});
 			}
+
 			codeGen.addText(`setup() {\n`);
-			if (lsType === 'script' && !scriptSetup.exposeContext) {
-				codeGen.addText(`return () => {\n`);
+
+			if (lsType === 'script') {
+				codeGen.addText(`() => {\n`);
 				for (const bindText of getStyleBindTexts()) {
 					codeGen.addText('// @ts-ignore\n');
 					codeGen.addText(bindText + ';\n');
 				}
 				writeTemplate();
 				codeGen.addText(`};\n`);
+
+				if (scriptSetupRanges.exposeRuntimeArg) {
+					codeGen.addText(`return `);
+					mapSubText('scriptSetup', scriptSetupRanges.exposeRuntimeArg.start, scriptSetupRanges.exposeRuntimeArg.end);
+					codeGen.addText(`;\n`);
+				}
+				else {
+					codeGen.addText(`return { };\n`);
+				};
 			}
-			else {
+
+			if (lsType === 'template') {
 				codeGen.addText(`return {\n`);
 				for (const { bindings, content } of bindingsArr) {
 					for (const expose of bindings) {

packages/vue-code-gen/src/index.ts

@@ -15,7 +15,6 @@ export function generateSFCScriptTypeCheckCode(
 	scriptLang: 'js' | 'jsx' | 'ts' | 'tsx',
 	scriptCode: string | undefined,
 	scriptSetupCode: string | undefined,
-	exposeScriptSetupContext: boolean,
 	templateAst?: CompilerDOM.RootNode,
 	cssVars?: string[],
 	vueLibName = 'vue',
@@ -25,7 +24,7 @@ export function generateSFCScriptTypeCheckCode(
 		'script',
 		'',
 		scriptCode !== undefined ? { content: scriptCode } : undefined,
-		scriptSetupCode !== undefined ? { content: scriptSetupCode, exposeContext: exposeScriptSetupContext } : undefined,
+		scriptSetupCode !== undefined ? { content: scriptSetupCode } : undefined,
 		scriptCode !== undefined ? parseScriptRanges(
 			ts,
 			ts.createSourceFile('dummy.' + scriptLang, scriptCode, ts.ScriptTarget.ESNext),

packages/vue-code-gen/src/parsers/scriptSetupRanges.ts

@@ -10,14 +10,13 @@ export function parseScriptSetupRanges(ts: typeof import('typescript/lib/tsserve
 	let propsTypeArg: TextRange | undefined;
 	let emitsRuntimeArg: TextRange | undefined;
 	let emitsTypeArg: TextRange | undefined;
+	let exposeRuntimeArg: TextRange | undefined;
 	let emitsTypeNums = -1;
 
 	const bindings = parseBindingRanges(ts, ast, false);
 	const typeBindings = parseBindingRanges(ts, ast, true);
 
-	ast.forEachChild(node => {
-		visitNode(node);
-	});
+	ast.forEachChild(visitNode);
 
 	return {
 		bindings,
@@ -28,6 +27,7 @@ export function parseScriptSetupRanges(ts: typeof import('typescript/lib/tsserve
 		emitsRuntimeArg,
 		emitsTypeArg,
 		emitsTypeNums,
+		exposeRuntimeArg,
 	};
 
 	function _getStartEnd(node: ts.Node) {
@@ -39,22 +39,25 @@ export function parseScriptSetupRanges(ts: typeof import('typescript/lib/tsserve
 			&& ts.isIdentifier(node.expression)
 		) {
 			const callText = node.expression.getText(ast);
-			if (callText === 'defineProps' || callText === 'defineEmits') {
+			if (callText === 'defineProps' || callText === 'defineEmits' || callText === 'defineExpose') {
 				if (node.arguments.length) {
 					const runtimeArg = node.arguments[0];
 					if (callText === 'defineProps') {
 						propsRuntimeArg = _getStartEnd(runtimeArg);
 					}
-					else {
+					else if (callText === 'defineEmits') {
 						emitsRuntimeArg = _getStartEnd(runtimeArg);
 					}
+					else if (callText === 'defineExpose') {
+						exposeRuntimeArg = _getStartEnd(runtimeArg);
+					}
 				}
 				else if (node.typeArguments?.length) {
 					const typeArg = node.typeArguments[0];
 					if (callText === 'defineProps') {
 						propsTypeArg = _getStartEnd(typeArg);
 					}
-					else {
+					else if (callText === 'defineEmits') {
 						emitsTypeArg = _getStartEnd(typeArg);
 						if (ts.isTypeLiteralNode(typeArg)) {
 							emitsTypeNums = typeArg.members.length;