refactor

Author: yukukotani

src/lib/import.ts

@@ -7,20 +7,20 @@ export type PluginOptions = {
 };
 
 export function getCompletionEntries(info: ts.server.PluginCreateInfo): ts.CompletionEntry[] {
-  const filePaths = getPathsToImport(info.config.options, info.project);
+  const modulePaths = getModulePathsToImport(info.config.options, info.project);
 
-  return filePaths.map((filePath) => {
-    const name = getFileNameWithoutExt(filePath);
+  return modulePaths.map((modulePath) => {
+    const name = getFileNameWithoutExt(modulePath);
     return {
       name: name,
       kind: ts.ScriptElementKind.alias,
-      source: filePath,
+      source: modulePath,
       sortText: name,
       hasAction: true,
       isImportStatementCompletion: true,
       data: {
         exportName: name,
-        modulePath: filePath,
+        modulePath: modulePath,
       },
     };
   });
@@ -69,16 +69,16 @@ export function getCodeFixActionByName(
     return null;
   }
 
-  const filePaths = getPathsToImport(info.config.options, info.project);
-  const modulePath = filePaths.find((filePath) => getFileNameWithoutExt(filePath) === name);
+  const modulePaths = getModulePathsToImport(info.config.options, info.project);
+  const modulePath = modulePaths.find((filePath) => getFileNameWithoutExt(filePath) === name);
   if (modulePath) {
     return getCodeFixActionFromPath(name, selfPath, modulePath, info.project);
   } else {
     return null;
   }
 }
 
-function getPathsToImport(options: PluginOptions, project: ts.server.Project): string[] {
+function getModulePathsToImport(options: PluginOptions, project: ts.server.Project): string[] {
   const currentDir = project.getCurrentDirectory();
 
   return options.paths.flatMap((dirPath) => {
@@ -96,13 +96,17 @@ function getFilePathWithoutExt(filePath: string): string {
   return filePath.slice(0, filePath.length - ext.length);
 }
 
-function transformModulePath(selfPath: string, filePath: string, project: ts.server.Project) {
+function getModuleSpceifier(selfPath: string, modulePath: string, project: ts.server.Project) {
   const compilerOptions = project.getCompilerOptions();
+
+  let specifier: string;
   if (compilerOptions.baseUrl) {
-    return path.relative(compilerOptions.baseUrl, filePath);
+    specifier = path.relative(compilerOptions.baseUrl, modulePath);
   } else {
-    return './' + path.relative(path.dirname(selfPath), filePath);
+    specifier = './' + path.relative(path.dirname(selfPath), modulePath);
   }
+
+  return getFilePathWithoutExt(specifier);
 }
 
 function getCodeFixActionFromPath(
@@ -111,8 +115,8 @@ function getCodeFixActionFromPath(
   modulePath: string,
   project: ts.server.Project,
 ): CodeFixAction {
-  const importPath = transformModulePath(selfPath, modulePath, project);
-  const text = `import * as ${name} from "${getFilePathWithoutExt(importPath)}";\n`;
+  const moduleSpecifier = getModuleSpceifier(selfPath, modulePath, project);
+  const text = `import * as ${name} from "${moduleSpecifier}";\n`;
   return {
     fixName: 'namespace-import',
     description: text,