refactor: remove duplicated code

Author: depressedX

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

@@ -39,8 +39,9 @@ export function createParsedCommandLineByJson(
 		resolvedVueOptions.__setupedGlobalTypes = true;
 	}
 	else {
-		resolvedVueOptions.__setupedGlobalTypes = setupGlobalTypes(rootDir, resolvedVueOptions, parseConfigHost);
-		resolvedVueOptions.__setupedGlobalTypesAbsolutePath = getSetupedGlobalTypesAbsolutePath(rootDir, resolvedVueOptions, parseConfigHost);
+		const setupResult = setupGlobalTypes(rootDir, resolvedVueOptions, parseConfigHost);
+		resolvedVueOptions.__setupedGlobalTypes = setupResult.done;
+		resolvedVueOptions.__setupedGlobalTypesAbsolutePath = setupResult.absolutePath;
 	}
 	const parsed = ts.parseJsonConfigFileContent(
 		json,
@@ -95,8 +96,9 @@ export function createParsedCommandLine(
 			resolvedVueOptions.__setupedGlobalTypes = true;
 		}
 		else {
-			resolvedVueOptions.__setupedGlobalTypes = setupGlobalTypes(path.dirname(tsConfigPath), resolvedVueOptions, parseConfigHost);
-			resolvedVueOptions.__setupedGlobalTypesAbsolutePath = getSetupedGlobalTypesAbsolutePath(path.dirname(tsConfigPath), resolvedVueOptions, parseConfigHost);
+			const setupResult = setupGlobalTypes(path.dirname(tsConfigPath), resolvedVueOptions, parseConfigHost);
+			resolvedVueOptions.__setupedGlobalTypes = setupResult.done;
+			resolvedVueOptions.__setupedGlobalTypesAbsolutePath = setupResult.absolutePath;
 		}
 		const parsed = ts.parseJsonSourceFileConfigFileContent(
 			config,
@@ -283,9 +285,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 false;
+		return { done: false };
 	}
 	try {
 		let dir = rootDir;
@@ -299,32 +301,8 @@ 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 true;
+		return { done: true, absolutePath: globalTypesPath };
 	} catch {
-		return false;
-	}
-}
-
-function getSetupedGlobalTypesAbsolutePath(rootDir: string, vueOptions: VueCompilerOptions, host: {
-	fileExists(path: string): boolean;
-	writeFile?(path: string, data: string): void;
-}) {
-	try {
-		let dir = rootDir;
-
-		while (!host.fileExists(path.posix.join(dir, 'node_modules', vueOptions.lib, 'package.json'))) {
-
-			const parentDir = path.posix.dirname(dir);
-			if (dir === parentDir) {
-				throw 0;
-			}
-			dir = parentDir;
-		}
-		const globalTypesPath = path.posix.join(dir, 'node_modules', '.vue-global-types', `${vueOptions.lib}_${vueOptions.target}_${vueOptions.strictTemplates}.d.ts`);
-
-		return globalTypesPath;
-	}
-	catch {
-		return '';
+		return { done: false };
 	}
 }

packages/tsc/tests/dts.spec.ts

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