fix: import map with trailing slash (#142)

* fix import map with trailing slash

* fix test

* fix test

* fix test

* add tests for trailing slash order

* ensure order of trailing slash imports

* add comment for test

Co-authored-by: 艾斯特洛 <axetroy.dev@gmail.com>

__test__/import_maps/import_map_with_trailing_slash.json

@@ -0,0 +1,10 @@
+{
+ "imports": {
+ "demo": "https://example.com/demo/",
+ "haha": "https://example.com/haha",
+ "demo/": "https://example.com/demo/",
+ "haha/": "https://example.com/haha",
+ "hoho": "https://example.com/hoho/mod.ts",
+ "hoho/": "https://example.com/hoho/"
+ }
+}

core/import_map.test.ts

@@ -75,3 +75,39 @@ test("core / import_map if imports field not an Object", async () => {
 
  expect(importMap.toJSON()).toEqual({});
 });
+
+test("core / import_map if imports field ends with a trailing slash", async () => {
+ const mockWorkspaceDir = path.join(TEST_DIR, "import_maps");
+
+ const filepath = path.join(
+ mockWorkspaceDir,
+ "import_map_with_trailing_slash.json"
+ );
+
+ const importMap = ImportMap.create(filepath);
+
+ const imports = importMap.toJSON();
+
+ // invalid entries should be filtered
+ expect(imports).toEqual({
+ "demo/": "https://example.com/demo/",
+ "hoho/": "https://example.com/hoho/",
+ haha: "https://example.com/haha",
+ hoho: "https://example.com/hoho/mod.ts",
+ });
+
+ // keys with trailing slash must be sorted at front
+ expect(Object.keys(imports)).toEqual(["demo/", "hoho/", "haha", "hoho"]);
+
+ expect(importMap.resolveModule("hoho")).toEqual(
+ "https://example.com/hoho/mod.ts"
+ );
+
+ expect(importMap.resolveModule("hoho/mod.ts")).toEqual(
+ "https://example.com/hoho/mod.ts"
+ );
+
+ expect(importMap.resolveModule("hoho/hoho.ts")).toEqual(
+ "https://example.com/hoho/hoho.ts"
+ );
+});

core/import_map.ts

@@ -54,6 +54,17 @@ export class ImportMap implements ImportMapInterface {
  }
  }
 
+ const imports = Object.entries(importMap.imports)
+ .filter(
+ ([key, val]) =>
+ (key.endsWith("/") && val.endsWith("/")) ||
+ (!key.endsWith("/") && !val.endsWith("/"))
+ )
+ .sort(([key1], [key2]) => key2.lastIndexOf("/") - key1.lastIndexOf("/"))
+ .reduce((imports, [key, value]) => ({ ...imports, [key]: value }), {});
+
+ importMap.imports = imports;
+
  return new ImportMap(importMap, importMapFilepath);
  }
  toJSON() {