feat: support As expression for script setup

close #1882
vuejs · Oct 9, 2022 · a750a0b · a750a0b
1 parent 4e750f8
commit a750a0b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/vue-language-tools/vue-language-core/src/generators/script.ts b/vue-language-tools/vue-language-core/src/generators/script.ts
@@ -386,7 +386,11 @@ export function generate(
 
 			codeGen.push(`};\n`);
 			codeGen.push(`return await __VLS_setup();\n`);
-			codeGen.push(`})();`);
+			codeGen.push(`})()`);
+			if (sfc.script && scriptRanges?.exportDefault?.args) {
+				addVirtualCode('script', scriptRanges.exportDefault.expression.end, scriptRanges.exportDefault.end);
+			}
+			codeGen.push(`;`);
 			// fix https://github.com/johnsoncodehk/volar/issues/1127
 			codeGen.push([
 				'',

diff --git a/vue-language-tools/vue-language-core/src/parsers/scriptRanges.ts b/vue-language-tools/vue-language-core/src/parsers/scriptRanges.ts
@@ -17,8 +17,15 @@ export function parseScriptRanges(ts: typeof import('typescript/lib/tsserverlibr
 
 	const bindings = hasScriptSetup ? parseBindingRanges(ts, ast, false) : [];
 
-	ast.forEachChild(node => {
-		if (ts.isExportAssignment(node)) {
+	ast.forEachChild(raw => {
+
+		if (ts.isExportAssignment(raw)) {
+
+			let node: ts.AsExpression | ts.ExportAssignment = raw;
+			if (ts.isAsExpression(node.expression)) { // fix https://github.com/johnsoncodehk/volar/issues/1882
+				node = node.expression;
+			}
+
 			let obj: ts.ObjectLiteralExpression | undefined;
 			if (ts.isObjectLiteralExpression(node.expression)) {
 				obj = node.expression;