refactor: add extension support for resolvedModule

axetroy · Apr 7, 2020 · 5ea1d19 · 5ea1d19
1 parent 90f4ad2
commit 5ea1d19
Show file tree

Hide file tree

Showing 8 changed files with 99 additions and 7 deletions.
diff --git a/core/deno_cache.ts b/core/deno_cache.ts
@@ -6,9 +6,11 @@ import { getDenoDepsDir } from "./deno";
 import { HashMeta } from "./hash_meta";
 import { pathExistsSync, isHttpURL, hashURL, normalizeFilepath } from "./util";
 import { Logger } from "./logger";
+import { Extension } from "./extension";
 
 export interface DenoCacheModule {
   filepath: string;
+  extension: Extension;
   url: URL;
   resolveModule(moduleName: string): DenoCacheModule | void;
 }
@@ -37,12 +39,13 @@ export class CacheModule implements DenoCacheModule {
       return;
     }
 
-    return new CacheModule(filepath, meta.url, logger);
+    return new CacheModule(filepath, meta.url, meta.extension, logger);
   }
 
   constructor(
     public filepath: string,
     public url: URL,
+    public extension: Extension,
     private logger?: Logger
   ) {
     filepath = normalizeFilepath(filepath);

diff --git a/core/extension.test.ts b/core/extension.test.ts
@@ -0,0 +1,12 @@
+import { getExtensionFromFile } from "./extension";
+
+test("core / extension: getExtensionFromFile", async () => {
+  expect(getExtensionFromFile("./foo.ts")).toBe(".ts");
+  expect(getExtensionFromFile("./foo.tsx")).toBe(".tsx");
+  expect(getExtensionFromFile("./foo.js")).toBe(".js");
+  expect(getExtensionFromFile("./foo.jsx")).toBe(".jsx");
+  expect(getExtensionFromFile("./foo.d.ts")).toBe(".d.ts");
+  expect(getExtensionFromFile("./foo.json")).toBe(".json");
+  expect(getExtensionFromFile("./foo.wasm")).toBe(".wasm");
+  expect(getExtensionFromFile("./foo")).toBe("");
+});
diff --git a/core/extension.ts b/core/extension.ts
@@ -0,0 +1,23 @@
+import * as path from "path";
+
+export type Extension =
+  | ".ts"
+  | ".tsx"
+  | ".d.ts"
+  | ".js"
+  | ".jsx"
+  | ".json"
+  | ".wasm"
+  | "";
+
+export function getExtensionFromFile(filename: string): Extension {
+  const extName = path.extname(filename);
+
+  if (extName === ".ts") {
+    if (/\.d\.ts$/.test(filename)) {
+      return ".d.ts";
+    }
+  }
+
+  return extName as Extension;
+}
diff --git a/core/hash_meta.test.ts b/core/hash_meta.test.ts
@@ -25,6 +25,7 @@ test("core / hash_meta", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.TypeScript);
+  expect(meta.extension).toEqual(".ts");
   expect(meta.url.href).toEqual("https://example.com/demo/mod.ts");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });
@@ -42,6 +43,7 @@ test("core / hash_meta with javascript file", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.JavaScript);
+  expect(meta.extension).toEqual(".js");
   expect(meta.url.href).toEqual("https://example.com/demo.js");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });
@@ -59,6 +61,7 @@ test("core / hash_meta with json file", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.JSON);
+  expect(meta.extension).toEqual(".json");
   expect(meta.url.href).toEqual("https://example.com/demo.json");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });
@@ -76,6 +79,7 @@ test("core / hash_meta without extension name", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.PlainText);
+  expect(meta.extension).toEqual("");
   expect(meta.url.href).toEqual("https://example.com/without-extension-name");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });
@@ -93,6 +97,7 @@ test("core / hash_meta if have content-type", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.JavaScript);
+  expect(meta.extension).toEqual(".js");
   expect(meta.url.href).toEqual("https://example.com/content-type");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });
@@ -110,6 +115,7 @@ test("core / hash_meta if have content-type typescript", () => {
   expect(meta).not.toBe(undefined);
   expect(meta.filepath).toEqual(cacheFilepath + ".metadata.json");
   expect(meta.type).toEqual(Type.TypeScript);
+  expect(meta.extension).toEqual(".ts");
   expect(meta.url.href).toEqual("https://example.com/content-type-typescript");
   expect(meta.destinationFilepath).toEqual(cacheFilepath);
 });

diff --git a/core/hash_meta.ts b/core/hash_meta.ts
@@ -2,6 +2,7 @@ import * as fs from "fs";
 import * as path from "path";
 
 import { pathExistsSync, normalizeFilepath } from "./util";
+import { Extension } from "./extension";
 
 type HTTPHeaders = { [key: string]: string };
 
@@ -99,6 +100,29 @@ export class HashMeta implements HashMetaInterface {
 
     return Type.PlainText;
   }
+  get extension(): Extension {
+    const type = this.type;
+
+    switch (type) {
+      case Type.JavaScript:
+        return ".js";
+      /* istanbul ignore next */
+      case Type.JavaScriptReact:
+        return ".jsx";
+      case Type.TypeScript:
+        return ".ts";
+      /* istanbul ignore next */
+      case Type.TypeScriptReact:
+        return ".tsx";
+      case Type.JSON:
+        return ".json";
+      /* istanbul ignore next */
+      case Type.WebAssembly:
+        return ".wasm";
+    }
+
+    return "";
+  }
   get destinationFilepath(): string {
     return this.filepath.replace(/\.metadata\.json$/, "");
   }

diff --git a/core/module_resolver.test.ts b/core/module_resolver.test.ts
@@ -33,6 +33,7 @@ test("core / module_resolver: resolve module from Deno cache", () => {
     ])
   ).toEqual([
     {
+      extension: ".ts",
       origin: "./sub/mod.ts",
       filepath: path.join(
         path.dirname(cacheFilepath),
@@ -44,6 +45,7 @@ test("core / module_resolver: resolve module from Deno cache", () => {
       ),
     },
     {
+      extension: ".ts",
       origin: "/esm/mod.ts",
       filepath: path.join(
         path.dirname(cacheFilepath),
@@ -55,6 +57,7 @@ test("core / module_resolver: resolve module from Deno cache", () => {
       ),
     },
     {
+      extension: ".ts",
       origin: "https://example.com/esm/mod.ts",
       filepath: path.join(
         path.dirname(cacheFilepath),
@@ -88,16 +91,19 @@ test("core / module_resolver: resolve module from local", () => {
     ])
   ).toEqual([
     {
+      extension: ".ts",
       origin: "./deno.ts",
       filepath: path.join(__dirname, "deno.ts"),
       module: path.join(__dirname, "deno.ts").replace(/\.ts$/, ""),
     },
     {
+      extension: ".json",
       origin: "../package.json",
       filepath: path.join(__dirname, "..", "package.json"),
       module: path.join(__dirname, "..", "package.json"),
     },
     {
+      extension: ".ts",
       origin: "https://example.com/esm/mod.ts",
       filepath: path.join(
         path.dirname(cacheFilepath),
@@ -109,6 +115,7 @@ test("core / module_resolver: resolve module from local", () => {
       ),
     },
     {
+      extension: ".ts",
       origin: "demo/mod.ts",
       filepath: path.join(
         path.dirname(cacheFilepath),
@@ -120,6 +127,7 @@ test("core / module_resolver: resolve module from local", () => {
       ),
     },
     {
+      extension: ".ts",
       origin: "https://another.example.com/path/mod.ts?foo=bar",
       filepath: path.join(
         denoDir,
@@ -139,6 +147,7 @@ test("core / module_resolver: resolve module from local", () => {
     undefined,
     undefined,
     {
+      extension: ".ts",
       origin: "https://example.com/x-typescript-types",
       filepath: path.join(
         denoDir,
@@ -172,6 +181,7 @@ test("core / module_resolver: resolve module if redirect", () => {
     ])
   ).toEqual([
     {
+      extension: ".ts",
       origin: "https://example.com/redirect",
       filepath: path.join(
         denoDir,
@@ -189,6 +199,7 @@ test("core / module_resolver: resolve module if redirect", () => {
       ),
     },
     {
+      extension: ".ts",
       origin: "https://example.com/redirect_to_absolute",
       filepath: path.join(
         denoDir,

diff --git a/core/module_resolver.ts b/core/module_resolver.ts
@@ -8,11 +8,13 @@ import { ImportMap } from "./import_map";
 import { HashMeta } from "./hash_meta";
 import { pathExistsSync, isHttpURL, hashURL, normalizeFilepath } from "./util";
 import { Logger } from "./logger";
+import { Extension, getExtensionFromFile } from "./extension";
 
 export type ResolvedModule = {
   origin: string; // the origin resolve module
   filepath: string; // full file name path. May be relative or absolute
   module: string; // final resolve module. It may not have an extension
+  extension: Extension;
 };
 
 export interface ModuleResolverInterface {
@@ -125,6 +127,7 @@ export class ModuleResolver implements ModuleResolverInterface {
       origin: origin,
       filepath: moduleFilepath,
       module: moduleFilepath,
+      extension: meta.extension,
     };
   }
 
@@ -148,7 +151,8 @@ export class ModuleResolver implements ModuleResolverInterface {
     return {
       origin: originModuleName,
       filepath: moduleFilepath,
-      module: moduleFilepath.replace(/(\.d)?\.(t|j)sx?$/, ""), // "./foo.ts" -> "./foo"
+      module: moduleFilepath.replace(/(\.d)?\.(t|j)sx?$/, ""), // "./foo.ts" -> "./foo",
+      extension: getExtensionFromFile(moduleFilepath),
     };
   }
 
@@ -178,6 +182,7 @@ export class ModuleResolver implements ModuleResolverInterface {
             origin: moduleName,
             filepath: moduleCacheFile.filepath,
             module: moduleCacheFile.filepath,
+            extension: moduleCacheFile.extension,
           });
         } else {
           resolvedModules.push(undefined);

diff --git a/typescript-deno-plugin/src/plugin.ts b/typescript-deno-plugin/src/plugin.ts
@@ -175,6 +175,7 @@ export class DenoPlugin implements ts_module.server.PluginModule {
         for (const typeDirectiveName of typeDirectiveNames) {
           const [resolvedModule] = resolver.resolveModules([typeDirectiveName]);
 
+          // if module found. then return the module file
           if (resolvedModule) {
             const target: ts_module.ResolvedTypeReferenceDirective = {
               primary: false,
@@ -185,6 +186,7 @@ export class DenoPlugin implements ts_module.server.PluginModule {
             continue;
           }
 
+          // If the module does not exist, then apply the native reference method
           const [target] = resolveTypeReferenceDirectives(
             [typeDirectiveName],
             containingFile,
@@ -293,8 +295,8 @@ export class DenoPlugin implements ts_module.server.PluginModule {
               // text is always unix style
               const text = source.text;
 
-              const absoluteFilepath = path.posix.resolve(
-                path.dirname(fileName),
+              const absoluteFilepath = path.resolve(
+                normalizeFilepath(path.dirname(fileName)),
                 normalizeFilepath(text)
               );
 
@@ -321,7 +323,11 @@ export class DenoPlugin implements ts_module.server.PluginModule {
         moduleNames: string[],
         containingFile: string,
         ...rest
-      ): (ts_module.ResolvedModule | undefined)[] => {
+      ): (
+        | ts_module.ResolvedModule
+        | ts_module.ResolvedModuleFull
+        | undefined
+      )[] => {
         if (!this.configurationManager.config.enable) {
           return resolveModuleNames(moduleNames, containingFile, ...rest);
         }
@@ -415,11 +421,13 @@ export class DenoPlugin implements ts_module.server.PluginModule {
                 path.isAbsolute(moduleFilepath) &&
                 pathExistsSync(moduleFilepath)
               ) {
-                return {
-                  extension: this.typescript.Extension.Js,
+                const result: ts_module.ResolvedModuleFull = {
+                  extension: cacheModule.extension,
                   isExternalLibraryImport: false,
                   resolvedFileName: moduleFilepath,
                 } as ts_module.ResolvedModuleFull;
+
+                return result;
               }
             }
           }