feat: support external type definitions with '/// <reference types=ht…

…tps://raw.githubusercontent.com/date-fns/date-fns/master/typings.d.ts />'. ref: #35
axetroy · Feb 10, 2020 · f7affb2 · f7affb2
1 parent b33ea3c
commit f7affb2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 deletions.
diff --git a/typescript-deno-plugin/src/module_resolver.ts b/typescript-deno-plugin/src/module_resolver.ts
@@ -187,9 +187,9 @@ function trimQueryAndHashFromPath(moduleName: string): string {
 }
 
 function trimExtensionName(moduleName: string): string {
-  if (/\.(t|j)sx?$/.test(moduleName) === false) {
+  if (/(\.d)?\.(t|j)sx?$/.test(moduleName) === false) {
     return moduleName;
   }
-  const name = moduleName.replace(/\.(t|j)sx?$/, "");
+  const name = moduleName.replace(/(\.d)?\.(t|j)sx?$/, "");
   return name;
 }
diff --git a/typescript-deno-plugin/src/plugin.ts b/typescript-deno-plugin/src/plugin.ts
@@ -75,6 +75,11 @@ export class DenoPlugin implements ts_module.server.PluginModule {
         info.languageService
       );
 
+    const resolveTypeReferenceDirectives = info.languageServiceHost
+      .resolveTypeReferenceDirectives?.bind(
+        info.languageServiceHost
+      );
+
     info.languageServiceHost.getCompilationSettings = () => {
       const projectConfig = getCompilationSettings();
 
@@ -118,6 +123,39 @@ export class DenoPlugin implements ts_module.server.PluginModule {
       return scriptFileNames;
     };
 
+    if (resolveTypeReferenceDirectives) {
+      info.languageServiceHost.resolveTypeReferenceDirectives = (
+        typeDirectiveNames: string[],
+        containingFile: string,
+        redirectedReference: ts_module.ResolvedProjectReference | undefined,
+        options: ts_module.CompilerOptions
+      ) => {
+        if (!this.configurationManager.config.enable) {
+          return resolveTypeReferenceDirectives(
+            typeDirectiveNames,
+            containingFile,
+            redirectedReference,
+            options
+          );
+        }
+
+        const resolver = new ModuleResolver(
+          containingFile,
+          this.logger,
+          info.project.getCurrentDirectory()
+        );
+
+        const modules = resolver.resolveModuleNames(typeDirectiveNames);
+
+        return resolveTypeReferenceDirectives(
+          modules.map(v => v.module),
+          containingFile,
+          redirectedReference,
+          options
+        );
+      };
+    }
+
     info.languageService.getSemanticDiagnostics = (filename: string) => {
       const diagnostics = getSemanticDiagnostics(filename);