feat: from_graph - ability to make file specifiers relative (#189)

Cargo.toml

@@ -11,8 +11,8 @@ license = "MIT"
 members = ["lib"]
 
 [workspace.dependencies]
-deno_graph = "0.78.0"
-import_map = "0.19.1"
+deno_graph = "0.79.0"
+import_map = "0.20.0"
 serde = "1"
 
 [profile.release]

benches/source_hash_function.rs

@@ -177,12 +177,13 @@ async fn build_eszip(mb: usize) -> EszipV2 {
     )
     .await;
   graph.valid().unwrap();
-  EszipV2::from_graph(
+  EszipV2::from_graph(eszip::FromGraphOptions {
     graph,
-    &analyzer.as_capturing_parser(),
-    TranspileOptions::default(),
-    EmitOptions::default(),
-  )
+    parser: analyzer.as_capturing_parser(),
+    transpile_options: TranspileOptions::default(),
+    emit_options: EmitOptions::default(),
+    relative_file_base: None,
+  })
   .unwrap()
 }
 

lib/lib.rs

@@ -298,7 +298,7 @@ pub async fn build_eszip(
         specifier, content, ..
       } => {
         let import_map = import_map::parse_from_json_with_options(
-          &specifier,
+          specifier.clone(),
           &String::from_utf8(content.to_vec()).unwrap(),
           import_map::ImportMapOptions {
             address_hook: None,
@@ -340,12 +340,13 @@ pub async fn build_eszip(
   graph
     .valid()
     .map_err(|e| js_sys::Error::new(&e.to_string()))?;
-  let mut eszip = eszip::EszipV2::from_graph(
+  let mut eszip = eszip::EszipV2::from_graph(eszip::FromGraphOptions {
     graph,
-    &analyzer.as_capturing_parser(),
-    Default::default(),
-    Default::default(),
-  )
+    parser: analyzer.as_capturing_parser(),
+    transpile_options: Default::default(),
+    emit_options: Default::default(),
+    relative_file_base: None,
+  })
   .map_err(|e| js_sys::Error::new(&e.to_string()))?;
   if let Some((import_map_specifier, import_map_content)) =
     maybe_import_map_data

src/examples/builder.rs

@@ -44,7 +44,7 @@ async fn main() {
         } => {
           let content = String::from_utf8(content.to_vec()).unwrap();
           let import_map =
-            import_map::parse_from_json(&specifier, &content).unwrap();
+            import_map::parse_from_json(specifier.clone(), &content).unwrap();
           (Some(import_map.import_map), Some((specifier, content)))
         }
         _ => unimplemented!(),
@@ -70,12 +70,13 @@ async fn main() {
 
   graph.valid().unwrap();
 
-  let mut eszip = eszip::EszipV2::from_graph(
+  let mut eszip = eszip::EszipV2::from_graph(eszip::FromGraphOptions {
     graph,
-    &analyzer.as_capturing_parser(),
-    TranspileOptions::default(),
-    EmitOptions::default(),
-  )
+    parser: analyzer.as_capturing_parser(),
+    transpile_options: TranspileOptions::default(),
+    emit_options: EmitOptions::default(),
+    relative_file_base: None,
+  })
   .unwrap();
   if let Some((import_map_specifier, import_map_content)) =
     maybe_import_map_data

src/lib.rs

@@ -18,6 +18,7 @@ use v2::EszipV2Modules;
 pub use crate::error::ParseError;
 pub use crate::v1::EszipV1;
 pub use crate::v2::EszipV2;
+pub use crate::v2::FromGraphOptions;
 
 pub use deno_ast;
 pub use deno_graph;