feat: implement data-target-path for rust

ctron · ctron · commit a90a264f4d2e · 2024-02-29T10:20:11.000+01:00
diff --git a/examples/target-path/index.html b/examples/target-path/index.html
@@ -12,7 +12,7 @@
 </head>
 <body>
 
-<link data-trunk rel="rust" href="Cargo.toml" data-wasm-opt="z" data-bin="vanilla-example"/>
+<link data-trunk rel="rust" href="Cargo.toml" data-wasm-opt="z" data-bin="vanilla-example" data-target-path="static"/>
 
 <link data-trunk rel="copy-dir" href="assets" data-target-path="static"/>
 <link data-trunk rel="copy-file" href="more-assets/rustacean-flat-happy.svg" data-target-path="static"/>
@@ -31,13 +31,13 @@
 
   <tr>
     <td><code>copy-dir</code></td>
-    <td><img src="static/rustacean-flat-happy.png" width="128"/></td>
+    <td><img src="static/rustacean-flat-happy.png" width="128" alt="Ferris the Crab"/></td>
     <td>Should see PNG image</td>
   </tr>
 
   <tr>
     <td><code>copy-file</code></td>
-    <td><img src="static/rustacean-flat-happy.svg" width="128"/></td>
+    <td><img src="static/rustacean-flat-happy.svg" width="128" alt="Ferris the Crab"/></td>
     <td>Should see SVG image</td>
   </tr>
 </table>
diff --git a/src/common.rs b/src/common.rs
@@ -239,3 +239,10 @@ pub fn dist_relative(dist: &Path, target_file: &Path) -> Result<String> {
         .to_string_lossy()
         .to_string())
 }
+
+pub fn apply_data_target_path(path: impl Into<String>, target_path: &Option<PathBuf>) -> String {
+    match target_path {
+        Some(target_path) => format!("{}/{}", target_path.display(), path.into()),
+        None => path.into(),
+    }
+}
diff --git a/src/pipelines/css.rs b/src/pipelines/css.rs
@@ -52,9 +52,7 @@ impl Css {
         let asset = AssetFile::new(&html_dir, path).await?;
 
         let integrity = IntegrityType::from_attrs(&attrs, &cfg)?;
-
         let minify = attrs.get(ATTR_MINIFY).is_none();
-
         let target_path = data_target_path(&attrs)?;
 
         Ok(Self {
diff --git a/src/pipelines/rust/mod.rs b/src/pipelines/rust/mod.rs
@@ -7,11 +7,14 @@ mod wasm_opt;
 
 pub use output::RustAppOutput;
 
-use super::{Attrs, TrunkAssetPipelineOutput, ATTR_HREF, SNIPPETS_DIR};
-use crate::pipelines::rust::sri::{SriBuilder, SriOptions, SriType};
+use super::{data_target_path, Attrs, TrunkAssetPipelineOutput, ATTR_HREF, SNIPPETS_DIR};
 use crate::{
-    common::{self, check_target_not_found_err, copy_dir_recursive, path_exists},
+    common::{
+        self, apply_data_target_path, check_target_not_found_err, copy_dir_recursive, path_exists,
+        target_path,
+    },
     config::{CargoMetadata, CrossOrigin, Features, RtcBuild},
+    pipelines::rust::sri::{SriBuilder, SriOptions, SriType},
     processing::{
         integrity::{IntegrityType, OutputDigest},
         minify::minify_js,
@@ -46,7 +49,7 @@ pub struct RustApp {
     cfg: Arc<RtcBuild>,
     /// The configuration of the features passed to cargo.
     cargo_features: Features,
-    /// Is this module main or a worker.
+    /// Is this module main or a worker?
     app_type: RustAppType,
     /// All metadata associated with the target Cargo project.
     manifest: CargoMetadata,
@@ -57,6 +60,8 @@ pub struct RustApp {
     bin: Option<String>,
     /// An optional filter for finding the target artifact.
     target_name: Option<String>,
+    /// Optional target path inside the dist dir.
+    target_path: Option<PathBuf>,
     /// An option to instruct wasm-bindgen to preserve debug info in the final WASM output, even
     /// for `--release` mode.
     keep_debug: bool,
@@ -231,6 +236,8 @@ impl RustApp {
                 }
             });
 
+        let target_path = data_target_path(&attrs)?;
+
         // done
 
         Ok(Self {
@@ -256,6 +263,7 @@ impl RustApp {
             import_bindings,
             import_bindings_name,
             initializer,
+            target_path,
         })
     }
 
@@ -302,6 +310,7 @@ impl RustApp {
             import_bindings: true,
             import_bindings_name: None,
             initializer: None,
+            target_path: None,
         }))
     }
 
@@ -330,7 +339,7 @@ impl RustApp {
         // evaluate wasm integrity after all processing
         self.final_digest(&mut output)
             .await
-            .context("finalizing digest")?;
+            .with_context(|| format!("finalizing digest for '{}'", output.wasm_output))?;
 
         // now the build is complete
         tracing::debug!("rust build complete");
@@ -513,6 +522,10 @@ impl RustApp {
             args.push("--no-typescript");
         }
 
+        // the final base
+        let target_path =
+            target_path(&self.cfg.staging_dist, self.target_path.as_deref(), None).await?;
+
         // Invoke wasm-bindgen.
         tracing::debug!("calling wasm-bindgen for {}", self.name);
         common::run_command(wasm_bindgen_name, &wasm_bindgen, &args)
@@ -522,22 +535,25 @@ impl RustApp {
         // Copy the generated WASM & JS loader to the dist dir.
         tracing::debug!("copying generated wasm-bindgen artifacts");
         let hashed_name = self.hashed_wasm_base(wasm_path).await?;
-        let hashed_wasm_name = format!("{hashed_name}_bg.wasm");
+        let hashed_wasm_name =
+            apply_data_target_path(format!("{hashed_name}_bg.wasm"), &self.target_path);
 
         let js_name = format!("{}.js", self.name);
-        let hashed_js_name = format!("{}.js", hashed_name);
+        let hashed_js_name =
+            apply_data_target_path(format!("{}.js", hashed_name), &self.target_path);
         let ts_name = format!("{}.d.ts", self.name);
-        let hashed_ts_name = format!("{}.d.ts", hashed_name);
+        let hashed_ts_name =
+            apply_data_target_path(format!("{}.d.ts", hashed_name), &self.target_path);
 
         let js_loader_path = bindgen_out.join(&js_name);
         let js_loader_path_dist = self.cfg.staging_dist.join(&hashed_js_name);
         let wasm_name = format!("{}_bg.wasm", self.name);
         let wasm_path = bindgen_out.join(&wasm_name);
         let wasm_path_dist = self.cfg.staging_dist.join(&hashed_wasm_name);
 
-        let hashed_loader_name = self
-            .loader_shim
-            .then(|| format!("{}_loader.js", hashed_name));
+        let hashed_loader_name = self.loader_shim.then(|| {
+            apply_data_target_path(format!("{}_loader.js", hashed_name), &self.target_path)
+        });
         let loader_shim_path = hashed_loader_name
             .as_ref()
             .map(|m| self.cfg.staging_dist.join(m));
@@ -610,7 +626,7 @@ impl RustApp {
         // Check for any snippets, and copy them over.
         let snippets_dir_src = bindgen_out.join(SNIPPETS_DIR);
         let snippets = if path_exists(&snippets_dir_src).await? {
-            let snippets_dir_dest = self.cfg.staging_dist.join(SNIPPETS_DIR);
+            let snippets_dir_dest = target_path.join(SNIPPETS_DIR);
             tracing::debug!(
                 "recursively copying from '{snippets_dir_src}' to '{}'",
                 snippets_dir_dest.display()
@@ -757,7 +773,7 @@ impl RustApp {
             return false;
         }
 
-        // if we have a --bin argument
+        // if we have the --bin argument
         if let Some(bin) = &self.bin {
             // it must match
             if bin != &art.target.name {
diff --git a/src/pipelines/rust/sri.rs b/src/pipelines/rust/sri.rs
@@ -71,7 +71,7 @@ impl SriBuilder {
             let name = name.into();
             let digest = OutputDigest::generate_async(self.r#type, source).await?;
             tracing::debug!(
-                "Recording SRI record - type: {:?}. name: {name}, value: {digest:?}",
+                "recording SRI record - type: {:?}. name: {name}, value: {digest:?}",
                 self.r#type,
             );
             self.result
