fix(import-map): add support for import maps in user workers (#626)

* feat(import-map): add support for import maps in user workers

* chore: deno fmt

* chore: cargo clippy

* chore: update dependency

* stamp: polishing

---------

Co-authored-by: Nyannyacha <meow@nnc.gg>

Author: 0x5457

Cargo.lock

@@ -517,6 +517,11 @@ where
         let base_dir_path =
           std::env::current_dir().map(|p| p.join(&service_path))?;
 
+        let maybe_import_map_path = context
+          .get("importMapPath")
+          .and_then(|it| it.as_str())
+          .map(str::to_string);
+
         let eszip = if let Some(eszip_payload) = maybe_eszip {
           eszip_payload
         } else {
@@ -585,7 +590,9 @@ where
           if let Some(module_url) = main_module_url.as_ref() {
             builder.set_entrypoint(Some(module_url.to_file_path().unwrap()));
           }
-          builder.set_no_npm(no_npm);
+          builder
+            .set_no_npm(no_npm)
+            .set_import_map_path(maybe_import_map_path.clone());
 
           emitter_factory.set_deno_options(builder.build()?);
 
@@ -634,10 +641,6 @@ where
           .get("sourceMap")
           .and_then(serde_json::Value::as_bool)
           .unwrap_or_default();
-        let maybe_import_map_path = context
-          .get("importMapPath")
-          .and_then(|it| it.as_str())
-          .map(str::to_string);
 
         let rt_provider = create_module_loader_for_standalone_from_eszip_kind(
           eszip,

crates/base/src/runtime/mod.rs

@@ -0,0 +1,3 @@
+export function getHelperMessage(): string {
+  return "import map works!";
+}

crates/base/test_cases/user-worker-with-import-map/helper.ts

@@ -0,0 +1,5 @@
+{
+  "imports": {
+    "helper-from-import-map": "./helper.ts"
+  }
+}

crates/base/test_cases/user-worker-with-import-map/import_map.json

@@ -0,0 +1,40 @@
+import * as path from "jsr:@std/path";
+
+Deno.serve(async (req: Request) => {
+  const basePath = "test_cases/user-worker-with-import-map";
+  const url = new URL(req.url);
+  const { pathname } = url;
+
+  const userWorkerPath = path.join(basePath, "user_worker");
+  if (pathname === "/import_map") {
+    const worker = await EdgeRuntime.userWorkers.create({
+      servicePath: userWorkerPath,
+      forceCreate: true,
+      context: {
+        importMapPath: path.join(basePath, "import_map.json"),
+      },
+    });
+    return worker.fetch(req);
+  }
+  if (pathname === "/inline_import_map") {
+    const inlineImportMap = {
+      imports: {
+        "helper-from-import-map": `./${path.join(basePath, "helper.ts")}`,
+      },
+    };
+    const importMapPath = `data:${
+      encodeURIComponent(JSON.stringify(inlineImportMap))
+    }`;
+
+    const worker = await EdgeRuntime.userWorkers.create({
+      servicePath: userWorkerPath,
+      forceCreate: true,
+      context: {
+        importMapPath: importMapPath,
+      },
+    });
+    return worker.fetch(req);
+  }
+
+  return new Response("Not Found", { status: 404 });
+});

crates/base/test_cases/user-worker-with-import-map/index.ts

@@ -0,0 +1,16 @@
+import { getHelperMessage } from "helper-from-import-map";
+
+Deno.serve((_req: Request) => {
+  return new Response(
+    JSON.stringify({
+      message: getHelperMessage(),
+      success: true,
+    }),
+    {
+      headers: {
+        "Content-Type": "application/json",
+        Connection: "keep-alive",
+      },
+    },
+  );
+});

crates/base/test_cases/user-worker-with-import-map/user_worker/index.ts

@@ -25,13 +25,13 @@ use base::server::ServerEvent;
 use base::server::ServerFlags;
 use base::server::ServerHealth;
 use base::server::Tls;
+use base::utils::test_utils;
 use base::utils::test_utils::create_test_user_worker;
 use base::utils::test_utils::ensure_npm_package_installed;
 use base::utils::test_utils::test_user_runtime_opts;
 use base::utils::test_utils::test_user_worker_pool_policy;
 use base::utils::test_utils::TestBed;
 use base::utils::test_utils::TestBedBuilder;
-use base::utils::test_utils::{self};
 use base::worker;
 use base::worker::TerminationToken;
 use base::WorkerKind;
@@ -4176,6 +4176,54 @@ directory."
   }
 }
 
+#[tokio::test]
+#[serial]
+async fn test_user_worker_with_import_map() {
+  let assert_fn = |resp: Result<Response, reqwest::Error>| async {
+    let res = resp.unwrap();
+    let status = res.status().as_u16();
+
+    let body_bytes = res.bytes().await.unwrap();
+    let body_str = String::from_utf8_lossy(&body_bytes);
+
+    assert_eq!(
+      status, 200,
+      "Expected 200, got {} with body: {}",
+      status, body_str
+    );
+
+    assert!(
+      body_str.contains("import map works!"),
+      "Expected import map works!, got: {}",
+      body_str
+    );
+  };
+  {
+    integration_test!(
+      "./test_cases/user-worker-with-import-map",
+      NON_SECURE_PORT,
+      "import_map",
+      None,
+      None,
+      None,
+      (assert_fn),
+      TerminationToken::new()
+    );
+  }
+  {
+    integration_test!(
+      "./test_cases/user-worker-with-import-map",
+      NON_SECURE_PORT,
+      "inline_import_map",
+      None,
+      None,
+      None,
+      (assert_fn),
+      TerminationToken::new()
+    );
+  }
+}
+
 #[derive(Deserialize)]
 struct ErrorResponsePayload {
   msg: String,

crates/base/tests/integration_tests.rs

@@ -39,7 +39,6 @@ thiserror.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 url.workspace = true
-urlencoding.workspace = true
 
 dashmap = "5.5.3"
 hashlink = "0.8"

crates/deno_facade/Cargo.toml

@@ -15,7 +15,6 @@ mod eszip;
 
 pub mod errors;
 pub mod graph;
-pub mod import_map;
 pub mod jsr;
 pub mod metadata;
 pub mod module_loader;

crates/deno_facade/lib.rs

@@ -77,6 +77,7 @@ thiserror.workspace = true
 tokio.workspace = true
 tokio-util.workspace = true
 twox-hash.workspace = true
+urlencoding.workspace = true
 
 bincode = "=1.3.3"
 dissimilar = "=1.0.4"