fix: importmap not work when set to a relative path. close #103

axetroy · Mar 27, 2020 · 0e8398f · 0e8398f
1 parent 1809e70
commit 0e8398f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 1 deletion.
diff --git a/__test__/import_maps/import_map.json b/__test__/import_maps/import_map.json
@@ -1,5 +1,6 @@
 {
  "imports": {
- "demo/": "https://example.com/demo/"
+ "demo/": "https://example.com/demo/",
+ "core": "./src/relative/path/to"
  }
 }
diff --git a/__test__/import_maps/src/relative/path/to/mod.ts b/__test__/import_maps/src/relative/path/to/mod.ts
diff --git a/core/import_map.test.ts b/core/import_map.test.ts
@@ -12,6 +12,7 @@ test("core / import_map", async () => {
 
  expect(ImportMap.create(validImportMapFilepath).toJSON()).toEqual({
  "demo/": "https://example.com/demo/",
+ core: "./src/relative/path/to",
  });
 
  expect(
@@ -22,6 +23,12 @@ test("core / import_map", async () => {
  ImportMap.create(validImportMapFilepath).resolveModule("demo1/mod.ts")
  ).toEqual("demo1/mod.ts");
 
+ expect(
+ ImportMap.create(validImportMapFilepath).resolveModule("core/mod.ts")
+ ).toEqual(
+ path.join(mockWorkspaceDir, "src", "relative", "path", "to", "mod.ts")
+ );
+
  expect(ImportMap.create(invalidImportMapFilepath).toJSON()).toEqual({});
 
  const importMap = await ImportMap.create(validImportMapFilepath);

diff --git a/core/import_map.ts b/core/import_map.ts
@@ -55,6 +55,15 @@ export class ImportMap implements ImportMapInterface {
  const reg = new RegExp("^" + escapeRegExp(prefix));
  if (reg.test(moduleName)) {
  moduleName = moduleName.replace(reg, mapModule);
+
+ // if module name is a relative path
+ if (moduleName.startsWith(".") && this.filepath) {
+ moduleName = path.resolve(
+ path.dirname(this.filepath),
+ normalizeFilepath(moduleName)
+ );
+ }
+
  return moduleName;
  }
  }