compiler: properly handle import map files

Author: noverby

compiler/dist/wasm-checksum.js

@@ -1,5 +1 @@
-<<<<<<< HEAD
-export const checksum = "7ae5ad874d024de2aa74d70607950875e8454ba5";
-=======
-export const checksum = "28cae3200e5875b6d03667a2dfe4c446ff29c15e";
->>>>>>> Build compiler wasm
+export const checksum = "7ae5ad874d024de2aa74d70607950875e8454ba5";

compiler/dist/wasm.js

@@ -36,21 +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(),
-          format!(
-            "/{}",
-            RelativePath::new(v)
-              .normalize()
-              .to_relative_path_buf()
-              .join("/")
-              .to_string()
-          ),
-        );
+      let alias = if v.starts_with("./") {
+        let path = if v.ends_with("/") {
+          RelativePath::new(v)
+            .normalize()
+            .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();
@@ -121,6 +120,7 @@ mod tests {
     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(
@@ -142,6 +142,7 @@ mod tests {
       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"