refactor(typescript-plugin): return string in getImportPathForFile

Author: johnsoncodehk

packages/language-service/lib/plugins/vue-document-drop.ts

@@ -55,7 +55,7 @@ export function create(
 					const lastImportNode = getLastImportNode(ts, script.ast);
 					const incomingFileName = URI.parse(importUri).fsPath.replace(/\\/g, '/');
 
-					let importPath: string | undefined;
+					let importPath: string | null | undefined;
 
 					const serviceScript = info.script.generated.languagePlugin.typescript?.getServiceScript(info.root);
 					if (serviceScript) {
@@ -66,13 +66,11 @@ export function create(
 							serviceScript.code.snapshot,
 						);
 						const preferences = await getUserPreferences(context, tsDocument);
-						importPath = (
-							await getImportPathForFile(
-								info.root.fileName,
-								incomingFileName,
-								preferences,
-							) ?? {}
-						).path;
+						importPath = await getImportPathForFile(
+							info.root.fileName,
+							incomingFileName,
+							preferences,
+						);
 					}
 
 					if (!importPath) {

packages/typescript-plugin/lib/requests/getImportPathForFile.ts

@@ -7,11 +7,11 @@ export function getImportPathForFile(
 	fileName: string,
 	incomingFileName: string,
 	preferences: ts.UserPreferences,
-): { path?: string } {
+): string | undefined {
 	const incomingFile = program.getSourceFile(incomingFileName);
 	const sourceFile = program.getSourceFile(fileName);
 	if (!program || !sourceFile || !incomingFile) {
-		return {};
+		return;
 	}
 
 	const getModuleSpecifiersWithCacheInfo: (
@@ -36,7 +36,5 @@ export function getImportPathForFile(
 		preferences,
 	);
 
-	return {
-		path: moduleSpecifiers[0],
-	};
+	return moduleSpecifiers[0];
 }