fix: static files weren't extracted when running the unbundle (#609)

Author: nyannyacha

cli/src/flags.rs

@@ -380,7 +380,7 @@ fn get_unbundle_command() -> Command {
         .default_value("./"),
     )
     .arg(
-      arg!(--"eszip" <DIR>)
+      arg!(--"eszip" <Path>)
         .help("Path of eszip to extract")
         .required(true),
     )

crates/deno_facade/eszip/mod.rs

@@ -1196,8 +1196,31 @@ pub async fn extract_eszip(payload: ExtractEszipPayload) -> bool {
     if let Some(lowest_path) =
       deno::util::path::find_lowest_path(&file_specifiers)
     {
-      extract_modules(&eszip, &file_specifiers, &lowest_path, &output_folder)
-        .await;
+      let targets = eszip
+        .specifiers()
+        .iter()
+        .filter(|it| it.starts_with("static:"))
+        .cloned()
+        .collect::<Vec<_>>();
+
+      {
+        let mut modules = eszip.eszip.modules.0.lock().unwrap();
+        for asset in targets {
+          let url = Url::parse(&asset).unwrap();
+          modules.insert(
+            format!("file://{}", url.path()),
+            EszipV2Module::Redirect { target: asset },
+          );
+        }
+      }
+
+      extract_modules(
+        &eszip,
+        &extract_file_specifiers(&eszip),
+        &lowest_path,
+        &output_folder,
+      )
+      .await;
       true
     } else {
       panic!("Path seems to be invalid");

crates/deno_facade/lib.rs

@@ -1,3 +1,4 @@
+use std::borrow::Cow;
 use std::fs::File;
 use std::io::Write;
 use std::path::Path;
@@ -35,13 +36,22 @@ fn ensure_unix_relative_path(path: &Path) -> &Path {
   path
 }
 
+fn strip_file_scheme(input: &str) -> Cow<'_, str> {
+  if input.starts_with("file://") {
+    Cow::Owned(input.strip_prefix("file://").unwrap().to_owned())
+  } else {
+    Cow::Borrowed(input)
+  }
+}
+
 async fn create_module_path(
   global_specifier: &str,
   entry_path: &Path,
   output_folder: &Path,
 ) -> PathBuf {
+  let cleaned_specifier = strip_file_scheme(global_specifier);
   let cleaned_specifier =
-    global_specifier.replace(entry_path.to_str().unwrap(), "");
+    cleaned_specifier.replace(entry_path.to_str().unwrap(), "");
   let module_path = PathBuf::from(cleaned_specifier);
 
   if let Some(parent) = module_path.parent() {
@@ -70,7 +80,7 @@ async fn extract_modules(
   lowest_path: &str,
   output_folder: &Path,
 ) {
-  let main_path = PathBuf::from(lowest_path);
+  let main_path = PathBuf::from(&*strip_file_scheme(lowest_path));
   let entry_path = main_path.parent().unwrap();
   for global_specifier in specifiers {
     let module_path =