Merge pull request #314 from noverby/compiler-fix-import-map

compiler: properly handle import map subdirs

Author: ije

compiler/src/import_map.rs

@@ -36,19 +36,20 @@ impl ImportMap {
     let mut imports = IndexMap::new();
     let mut scopes = IndexMap::new();
     for (k, v) in map.imports.iter() {
-      if v.starts_with("./") {
-        imports.insert(
-          k.into(),
+      let alias = if v.starts_with("./") {
+        let path = if v.ends_with("/") {
           RelativePath::new(v)
             .normalize()
-            .to_path(Path::new("/"))
-            .to_slash()
-            .unwrap()
-            .into(),
-        );
+            .to_relative_path_buf()
+            .join("/")
+        } else {
+          RelativePath::new(v).normalize().to_relative_path_buf()
+        };
+        format!("/{}", path)
       } else {
-        imports.insert(k.into(), v.into());
-      }
+        v.into()
+      };
+      imports.insert(k.into(), alias);
     }
     for (k, v) in map.scopes.iter() {
       let mut map = IndexMap::new();
@@ -118,6 +119,8 @@ mod tests {
     let mut scope_imports: SpecifierHashMap = HashMap::new();
     imports.insert("@/".into(), "./".into());
     imports.insert("~/".into(), "./".into());
+    imports.insert("comps/".into(), "./components/".into());
+    imports.insert("lib".into(), "./lib/mod.ts".into());
     imports.insert("react".into(), "https://esm.sh/react".into());
     imports.insert("react-dom/".into(), "https://esm.sh/react-dom/".into());
     imports.insert(
@@ -135,6 +138,11 @@ mod tests {
       import_map.resolve("/pages/index.tsx", "~/components/logo.tsx"),
       "/components/logo.tsx"
     );
+    assert_eq!(
+      import_map.resolve("/pages/index.tsx", "comps/logo.tsx"),
+      "/components/logo.tsx"
+    );
+    assert_eq!(import_map.resolve("/pages/index.tsx", "lib"), "/lib/mod.ts");
     assert_eq!(
       import_map.resolve("/app.tsx", "react"),
       "https://esm.sh/react"