fix: file protocol import statement not work. close #146

axetroy · Apr 29, 2020 · 67897bc · 67897bc
1 parent 2ba8078
commit 67897bc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 0 deletions.
diff --git a/core/module_resolver.test.ts b/core/module_resolver.test.ts
@@ -76,6 +76,9 @@ test("core / module_resolver: resolve module from local", () => {
       "./module_not_exist.ts",
       "https://module.not.exist.com/mod.ts",
       "https://example.com/x-typescript-types",
+      `file://${path.join(__dirname, "cache.ts")}`,
+      `file://./cache.ts`,
+      `file://../client/src/extension.ts`,
     ])
   ).toEqual([
     {
@@ -128,6 +131,22 @@ test("core / module_resolver: resolve module from local", () => {
         "7617203222d94a074bea3e57a893d74af5546f17c1f90760f37f46299faf0cb0"
       ),
     },
+    {
+      extension: ".ts",
+      origin:
+        "file:///Users/axetroy/gpm/github.com/axetroy/vscode-deno/core/cache.ts",
+      filepath: path.join(__dirname, "cache.ts"),
+    },
+    {
+      extension: ".ts",
+      origin: "file://./cache.ts",
+      filepath: path.join(__dirname, "cache.ts"),
+    },
+    {
+      extension: ".ts",
+      origin: "file://../client/src/extension.ts",
+      filepath: path.join(__dirname, "..", "client", "src", "extension.ts"),
+    },
   ] as ResolvedModule[]);
 });
 

diff --git a/core/module_resolver.ts b/core/module_resolver.ts
@@ -136,6 +136,14 @@ export class ModuleResolver implements ModuleResolverInterface {
       return this.resolveFromRemote(moduleName, originModuleName);
     }
 
+    if (moduleName.startsWith("file://")) {
+      // file protocol is always a unix style path
+      // eg: file:///Users/deno/project/mod.ts in MacOS
+      // eg: file:///Home/deno/project/mod.ts in Linux
+      // eg: file://d:/project/mod.ts in Window
+      moduleName = moduleName.replace(/^file:\/\//, "");
+    }
+
     const moduleFilepath = path.resolve(
       path.dirname(this.containingFile),
       normalizeFilepath(moduleName)