refactor

Author: yukukotani

src/index.ts

@@ -1,6 +1,6 @@
 import TsServerLibrary, { CodeFixAction, ScriptElementKind } from 'typescript/lib/tsserverlibrary';
 import * as path from 'path';
-import { getCompletionEntries } from './lib/import';
+import * as namespaceImportPlugin from './lib/import';
 
 declare global {
   namespace ts {
@@ -10,10 +10,6 @@ declare global {
   }
 }
 
-function stripExt(filePath: string) {
-  return filePath.slice(0, filePath.lastIndexOf('.'));
-}
-
 function init({ typescript: ts }: { typescript: typeof TsServerLibrary }) {
   function create(info: ts.server.PluginCreateInfo) {
     const log = (...params: unknown[]) => {
@@ -31,7 +27,7 @@ function init({ typescript: ts }: { typescript: typeof TsServerLibrary }) {
         return original;
       }
 
-      original.entries = [...original.entries, ...getCompletionEntries(info)];
+      original.entries = [...original.entries, ...namespaceImportPlugin.getCompletionEntries(info)];
 
       return original;
     };
@@ -40,34 +36,7 @@ function init({ typescript: ts }: { typescript: typeof TsServerLibrary }) {
     info.languageService.getCompletionEntryDetails = (fileName, position, name, options, source, preferences, data) => {
       log('getCompletionEntryDetails', { fileName, position, name, options, source });
       if (data?.modulePath) {
-        const importPath = path.relative(path.dirname(fileName), data.modulePath);
-        const text = `import * as ${name} from "${stripExt(importPath)}";\n`;
-        const action: CodeFixAction = {
-          fixName: 'namespace-import',
-          description: text,
-          changes: [
-            {
-              fileName: fileName,
-              textChanges: [
-                {
-                  span: {
-                    start: 0,
-                    length: 0,
-                  },
-                  newText: text,
-                },
-              ],
-            },
-          ],
-          commands: [],
-        };
-        return {
-          name: name,
-          kind: ScriptElementKind.alias,
-          kindModifiers: '',
-          displayParts: [],
-          codeActions: [action],
-        };
+        return namespaceImportPlugin.getCompletionEntryDetails(name, fileName, data.modulePath);
       }
 
       return getCompletionEntryDetails(fileName, position, name, options, source, preferences, data);

src/lib/import.ts

@@ -1,13 +1,12 @@
-import ts from 'typescript/lib/tsserverlibrary';
+import ts, { CodeFixAction, ScriptElementKind } from 'typescript/lib/tsserverlibrary';
 import * as path from 'path';
 
 export function getCompletionEntries(info: ts.server.PluginCreateInfo): ts.CompletionEntry[] {
   const currentDir = info.project.getCurrentDirectory();
-  const filePaths = info.project.readDirectory(path.resolve(currentDir, 'src/services'));
+  const filePaths = info.project.readDirectory(path.resolve(currentDir, 'src/services'), ['.ts', '.js']);
 
   return filePaths.map((filePath) => {
-    const ext = path.extname(filePath);
-    const name = path.basename(filePath, ext);
+    const name = getFileNameWithoutExt(filePath);
     return {
       name: name,
       kind: ts.ScriptElementKind.alias,
@@ -22,3 +21,48 @@ export function getCompletionEntries(info: ts.server.PluginCreateInfo): ts.Compl
     };
   });
 }
+
+export function getCompletionEntryDetails(
+  name: string,
+  selfPath: string,
+  modulePath: string,
+): ts.CompletionEntryDetails {
+  const importPath = path.relative(path.dirname(selfPath), modulePath);
+  const text = `import * as ${name} from "${getFilePathWithoutExt(importPath)}";\n`;
+  const action: CodeFixAction = {
+    fixName: 'namespace-import',
+    description: text,
+    changes: [
+      {
+        fileName: selfPath,
+        textChanges: [
+          {
+            span: {
+              start: 0,
+              length: 0,
+            },
+            newText: text,
+          },
+        ],
+      },
+    ],
+    commands: [],
+  };
+  return {
+    name: name,
+    kind: ScriptElementKind.alias,
+    kindModifiers: '',
+    displayParts: [],
+    codeActions: [action],
+  };
+}
+
+function getFileNameWithoutExt(filePath: string): string {
+  const ext = path.extname(filePath);
+  return path.basename(filePath, ext);
+}
+
+function getFilePathWithoutExt(filePath: string): string {
+  const ext = path.extname(filePath);
+  return filePath.slice(0, filePath.length - ext.length);
+}