combine __setupedGlobalTypes, __setupedGlobalTypesAbsolutePath

Author: johnsoncodehk

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

@@ -56,9 +56,11 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
 	const ctx = createScriptCodegenContext(options);
 
 	if (options.vueCompilerOptions.__setupedGlobalTypes) {
-		if (options.vueCompilerOptions.__setupedGlobalTypesAbsolutePath) {
-			yield `/// <reference types="${options.vueCompilerOptions.__setupedGlobalTypesAbsolutePath}" />${newLine}`;
-		} else {
+		const { absolutePath } = options.vueCompilerOptions.__setupedGlobalTypes;
+		if (absolutePath) {
+			yield `/// <reference types="${absolutePath}" />${newLine}`;
+		}
+		else {
 			yield `/// <reference types=".vue-global-types/${options.vueCompilerOptions.lib}_${options.vueCompilerOptions.target}_${options.vueCompilerOptions.strictTemplates}.d.ts" />${newLine}`;
 		}
 	}

packages/language-core/lib/types.ts

@@ -55,8 +55,9 @@ export interface VueCompilerOptions {
 	experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
 
 	// internal
-	__setupedGlobalTypes?: boolean;
-	__setupedGlobalTypesAbsolutePath?: string;
+	__setupedGlobalTypes?: {
+		absolutePath?: string;
+	};
 	__test?: boolean;
 }
 

packages/language-core/lib/utils/ts.ts

@@ -36,12 +36,13 @@ export function createParsedCommandLineByJson(
 
 	const resolvedVueOptions = resolveVueCompilerOptions(vueOptions);
 	if (skipGlobalTypesSetup) {
-		resolvedVueOptions.__setupedGlobalTypes = true;
+		resolvedVueOptions.__setupedGlobalTypes = {};
 	}
 	else {
-		const setupResult = setupGlobalTypes(rootDir, resolvedVueOptions, parseConfigHost);
-		resolvedVueOptions.__setupedGlobalTypes = setupResult.done;
-		resolvedVueOptions.__setupedGlobalTypesAbsolutePath = setupResult.absolutePath;
+		const absolutePath = setupGlobalTypes(rootDir, resolvedVueOptions, parseConfigHost);
+		if (absolutePath) {
+			resolvedVueOptions.__setupedGlobalTypes = { absolutePath };
+		}
 	}
 	const parsed = ts.parseJsonConfigFileContent(
 		json,
@@ -93,12 +94,13 @@ export function createParsedCommandLine(
 
 		const resolvedVueOptions = resolveVueCompilerOptions(vueOptions);
 		if (skipGlobalTypesSetup) {
-			resolvedVueOptions.__setupedGlobalTypes = true;
+			resolvedVueOptions.__setupedGlobalTypes = {};
 		}
 		else {
-			const setupResult = setupGlobalTypes(path.dirname(tsConfigPath), resolvedVueOptions, parseConfigHost);
-			resolvedVueOptions.__setupedGlobalTypes = setupResult.done;
-			resolvedVueOptions.__setupedGlobalTypesAbsolutePath = setupResult.absolutePath;
+			const absolutePath = setupGlobalTypes(path.dirname(tsConfigPath), resolvedVueOptions, parseConfigHost);
+			if (absolutePath) {
+				resolvedVueOptions.__setupedGlobalTypes = { absolutePath };
+			}
 		}
 		const parsed = ts.parseJsonSourceFileConfigFileContent(
 			config,
@@ -285,9 +287,9 @@ export function resolveVueCompilerOptions(vueOptions: Partial<VueCompilerOptions
 export function setupGlobalTypes(rootDir: string, vueOptions: VueCompilerOptions, host: {
 	fileExists(path: string): boolean;
 	writeFile?(path: string, data: string): void;
-}): { done: boolean; absolutePath?: string; } {
+}) {
 	if (!host.writeFile) {
-		return { done: false };
+		return;
 	}
 	try {
 		let dir = rootDir;
@@ -301,8 +303,6 @@ export function setupGlobalTypes(rootDir: string, vueOptions: VueCompilerOptions
 		const globalTypesPath = path.join(dir, 'node_modules', '.vue-global-types', `${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
 		const globalTypesContents = `// @ts-nocheck\nexport {};\n` + generateGlobalTypes(vueOptions.lib, vueOptions.target, vueOptions.strictTemplates);
 		host.writeFile(globalTypesPath, globalTypesContents);
-		return { done: true, absolutePath: globalTypesPath };
-	} catch {
-		return { done: false };
-	}
+		return globalTypesPath;
+	} catch { }
 }

packages/tsc/tests/dts.spec.ts

@@ -33,9 +33,10 @@ describe('vue-tsc-dts', () => {
 		}
 		else {
 			vueOptions = vue.resolveVueCompilerOptions({ extensions: ['.vue', '.cext'] });
-			const globalTypesInfo = vue.setupGlobalTypes(workspace.replace(windowsPathReg, '/'), vueOptions, ts.sys);
-			vueOptions.__setupedGlobalTypes = globalTypesInfo.done;
-			vueOptions.__setupedGlobalTypesAbsolutePath = globalTypesInfo.absolutePath;
+			const absolutePath = vue.setupGlobalTypes(workspace.replace(windowsPathReg, '/'), vueOptions, ts.sys);
+			if (absolutePath) {
+				vueOptions.__setupedGlobalTypes = { absolutePath };
+			}
 		}
 		const vueLanguagePlugin = vue.createVueLanguagePlugin<string>(
 			ts,