Move module resolution to own package

Matsuuu · Nov 12, 2023 · 961a960 · 961a960
1 parent 03110ff
commit 961a960
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/lib/custom-elements-languageserver-core/src/handlers/diagnostics/import-diagnostics.ts b/lib/custom-elements-languageserver-core/src/handlers/diagnostics/import-diagnostics.ts
@@ -10,6 +10,7 @@ import { CODE_ACTIONS } from "../enum/code-actions.js";
 import { getPathAsDtsFile, getPathAsJsFile, getPathAsTsFile } from "../../ts/filepath-transformers.js";
 import { CustomElementsLanguageServiceRequest } from "../../request.js";
 import { normalizePath } from "../../interop.js";
+import { resolveModule } from "../../ts/modules.js";
 
 export function getImportDiagnostics(request: CustomElementsLanguageServiceRequest): tss.Diagnostic[] {
     const { filePath, document, htmlLanguageService, projectBasePath, project } = request;
@@ -48,7 +49,7 @@ export function getImportDiagnostics(request: CustomElementsLanguageServiceReque
 
         const cemInstanceRef = definition.cem;
         const fullImportPath = normalizePath(`${cemInstanceRef.cemSourcePath}/${definition.path}`);
-        const moduleResolution = ts.resolveModuleName(`${cemInstanceRef.cemSourceFolderPath}/${definition.path}`, filePath, project.getCompilerOptions(), project.projectService.host);
+        const moduleResolution = resolveModule(`${cemInstanceRef.cemSourceFolderPath}/${definition.path}`, filePath, project);
         const resolvedModuleFileName = moduleResolution.resolvedModule?.resolvedFileName;
 
         if (!resolvedModuleFileName || !associatedFiles.includes(resolvedModuleFileName)) {

diff --git a/lib/custom-elements-languageserver-core/src/ts/modules.ts b/lib/custom-elements-languageserver-core/src/ts/modules.ts
@@ -0,0 +1,6 @@
+import ts from "typescript";
+import tss from "typescript/lib/tsserverlibrary";
+
+export function resolveModule(modulePath: string, sourceFilePath: string, project: tss.server.Project) {
+    return ts.resolveModuleName(modulePath, sourceFilePath, project.getCompilerOptions(), project.projectService.host);
+}
diff --git a/lib/custom-elements-languageserver-core/src/ts/sourcefile.ts b/lib/custom-elements-languageserver-core/src/ts/sourcefile.ts
@@ -5,6 +5,7 @@ import * as path from "path";
 import * as fs from "fs";
 import { getPathAsDtsFile, getPathAsJsFile, getPathAsTsFile } from "./filepath-transformers.js";
 import { normalizePath } from "../interop.js";
+import { resolveModule } from "./modules.js";
 
 export function getSourceFile(baseOrFullPath: string, classPath: string | undefined, project: tss.server.Project) {
     const fullClassPath = classPath === undefined ?
@@ -43,7 +44,7 @@ export function getAllFilesAssociatedWithSourceFile(sourceFile: ts.SourceFile, b
         const imports = fileInfo.importedFiles;
 
         for (const importReference of imports) {
-            const moduleResolution = ts.resolveModuleName(importReference.fileName, currentSourceFile.fileName, project.getCompilerOptions(), project.projectService.host);
+            const moduleResolution = resolveModule(importReference.fileName, currentSourceFile.fileName, project);
             // TODO: for node modules, cache the found connections
             const importFilePath = moduleResolution.resolvedModule?.resolvedFileName ?? importReference.fileName
             // No need for this anymore?