remove dtsPath comfig

Signed-off-by: 迷渡 <[email protected]>

Author: justjavac

src/index.ts

@@ -9,12 +9,9 @@ import { parseFromString, resolve, ImportMaps } from "import-maps";
 
 import { Logger } from "./logger";
 import {
-  getGlobalDtsPath,
-  getLocalDtsPath,
-  getDtsPathForVscode,
+  getDenoDtsPath,
   normalizeFilepath,
   pathExistsSync,
-  getWebWorkderDtsPath,
 } from "./utils";
 
 import { universalModuleResolver } from "./module_resolver/universal_module_resolver";
@@ -28,7 +25,6 @@ type DenoPluginConfig = {
   enable: boolean;
   importmap?: string;
   tsconfig?: string;
-  dtsPath?: string;
 };
 
 const config: DenoPluginConfig = {
@@ -242,23 +238,21 @@ module.exports = function init(
           info.languageServiceHost,
         );
 
-        const denoDtsPath = getDtsPathForVscode(info) ||
-          getGlobalDtsPath() ||
-          getLocalDtsPath(info.languageServiceHost);
-
-        if (denoDtsPath) {
-          scriptFileNames.push(denoDtsPath);
+        const libDenoDts = getDenoDtsPath(tsLsHost, "lib.deno.d.ts");
+        if (!libDenoDts) {
+          logger.info(`Can not load lib.deno.d.ts from ${libDenoDts}.`);
+          return scriptFileNames;
         }
+        scriptFileNames.push(libDenoDts);
 
-        const webworkerDtsPath = getWebWorkderDtsPath(info.languageServiceHost);
-        if (webworkerDtsPath) {
-          scriptFileNames.push(webworkerDtsPath);
+        const libWebworkerDts = getDenoDtsPath(tsLsHost, "lib.webworker.d.ts");
+        if (!libWebworkerDts) {
+          logger.info(
+            `Can not load lib.webworker.d.ts from ${libWebworkerDts}.`,
+          );
+          return scriptFileNames;
         }
-
-        logger.info(`dts path:
-          deno: ${denoDtsPath}
-          webworker: ${webworkerDtsPath}
-        `);
+        scriptFileNames.push(libWebworkerDts);
 
         return scriptFileNames;
       };

src/typescript_host.ts

@@ -4,9 +4,8 @@ import merge from "merge-deep";
 import { LanguageServiceHost } from "./language_service_host";
 import { Logger } from "./logger";
 import {
-  getGlobalDtsPath,
-  getLocalDtsPath,
-} from "utils";
+  getDenoDtsPath,
+} from "./utils";
 
 // see https://github.com/denoland/deno/blob/2debbdacb935cfe1eb7bb8d1f40a5063b339d90b/js/compiler.ts#L159-L170
 const OPTIONS: ts_module.CompilerOptions = {
@@ -100,10 +99,7 @@ export class TypeScriptServiceHost implements LanguageServiceHost {
   getScriptFileNames(): string[] {
     const scriptFileNames: string[] = this.tsLsHost.getScriptFileNames();
 
-    const denoDtsPath =
-      //   getDtsPathForVscode(this.tsLsHost) ||
-      getGlobalDtsPath() ||
-        getLocalDtsPath(this.tsLsHost);
+    const denoDtsPath = getDenoDtsPath(this.tsLsHost, "lib.deno.d.ts");
 
     if (denoDtsPath) {
       scriptFileNames.push(denoDtsPath);

src/utils.ts

@@ -2,7 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 import crypto from "crypto";
 
-import ts_module from "typescript/lib/tsserverlibrary";
+import ts from "typescript/lib/tsserverlibrary";
 import { URL } from "url";
 import { statSync } from "fs";
 
@@ -38,54 +38,29 @@ export function getDenoDepsDir(): string {
   return path.join(getDenoDir(), "deps");
 }
 
-export function getGlobalDtsPath(): string | undefined {
-  const denoDir = getDenoDir();
-  const globalDtsPath = path.resolve(denoDir, "lib.deno.d.ts");
-
-  if (fs.existsSync(globalDtsPath)) {
-    return globalDtsPath;
-  }
-
-  return undefined;
-}
-
-export function getWebWorkderDtsPath(
-  tsLsHost: ts_module.LanguageServiceHost,
-): string | undefined {
+export function getPluginPath(
+  tsLsHost: ts.LanguageServiceHost,
+): string {
   return path.resolve(
     tsLsHost.getCurrentDirectory(),
     "node_modules",
     "typescript-deno-plugin",
-    "lib",
-    "lib.webworker.d.ts",
   );
 }
 
-export function getLocalDtsPath(
-  tsLsHost: ts_module.LanguageServiceHost,
+export function getDenoDtsPath(
+  tsLsHost: ts.LanguageServiceHost,
+  specifier: string,
 ): string | undefined {
-  const localDtsPath = path.resolve(
-    tsLsHost.getCurrentDirectory(),
-    "node_modules",
-    "typescript-deno-plugin",
-    "lib",
-    "lib.deno.d.ts",
-  );
+  let file: string = path.resolve(getDenoDir(), specifier);
 
-  if (fs.existsSync(localDtsPath)) {
-    return localDtsPath;
+  if (fs.existsSync(file)) {
+    return file;
   }
 
-  return undefined;
-}
-
-export function getDtsPathForVscode(
-  info: ts_module.server.PluginCreateInfo,
-): string | undefined {
-  const bundledDtsPath = info.config.dtsPath;
-
-  if (bundledDtsPath && fs.existsSync(bundledDtsPath)) {
-    return bundledDtsPath;
+  file = path.resolve(getPluginPath(tsLsHost), "lib", specifier);
+  if (fs.existsSync(file)) {
+    return file;
   }
 
   return undefined;