Merge pull request #34 from jamesstocktonj1/feat/adapt-option

feat: add adapt option for build and test commands

Author: asteurer

src/command.rs

@@ -80,6 +80,10 @@ pub struct Build {
     /// The path to the Go binary (or look for binary in PATH if `None`).
     #[arg(long)]
     pub go: Option<PathBuf>,
+
+    /// The path to the snapshot adapter to convert a wasip1 module to a component (or use the embedded snapshot if `None`).
+    #[arg(long)]
+    pub adapt: Option<PathBuf>,
 }
 
 #[derive(Parser)]
@@ -109,6 +113,10 @@ pub struct Test {
     /// The path to the Go binary (or look for binary in PATH if `None`).
     #[arg(long)]
     pub go: Option<PathBuf>,
+
+    /// The path to the snapshot adapter to convert a wasip1 module to a component (or use the embedded snapshot if `None`).
+    #[arg(long)]
+    pub adapt: Option<PathBuf>,
 }
 
 #[derive(Parser)]
@@ -162,7 +170,7 @@ fn build(wit_opts: WitOpts, build: Build) -> Result<()> {
         )?;
 
         // Update the wasm module to use the current component model ABI.
-        module_to_component(&module)?;
+        module_to_component(&module, &build.adapt)?;
     }
 
     Ok(())
@@ -188,7 +196,7 @@ fn test(wit_opts: WitOpts, test: Test) -> Result<()> {
             )?;
 
             // Update the wasm module to use the current component model ABI.
-            module_to_component(&module)?;
+            module_to_component(&module, &test.adapt)?;
         }
     }
 

src/utils.rs

@@ -5,6 +5,10 @@ use std::{
 };
 use wit_parser::{PackageId, Resolve, WorldId};
 
+// In the rare case the snapshot needs to be updated, the latest version
+// can be found here: https://github.com/bytecodealliance/wasmtime/releases
+const WASIP1_SNAPSHOT_ADAPT: &[u8] = include_bytes!("wasi_snapshot_preview1.reactor.wasm");
+
 pub fn parse_wit(
     paths: &[impl AsRef<Path>],
     world: Option<&str>,
@@ -73,15 +77,18 @@ pub fn embed_wit(
 }
 
 /// Update the wasm module to use the current component model ABI.
-pub fn module_to_component(wasm_file: &PathBuf) -> Result<()> {
-    // In the rare case the snapshot needs to be updated, the latest version
-    // can be found here: https://github.com/bytecodealliance/wasmtime/releases
-    const WASIP1_SNAPSHOT: &[u8] = include_bytes!("wasi_snapshot_preview1.reactor.wasm");
+pub fn module_to_component(wasm_file: &PathBuf, adapt_file: &Option<PathBuf>) -> Result<()> {
     let wasm: Vec<u8> = wat::Parser::new().parse_file(wasm_file)?;
 
     let mut encoder = wit_component::ComponentEncoder::default().validate(true);
     encoder = encoder.module(&wasm)?;
-    encoder = encoder.adapter("wasi_snapshot_preview1", WASIP1_SNAPSHOT)?;
+    let adapt_bytes = if let Some(adapt) = adapt_file {
+        std::fs::read(adapt)
+            .with_context(|| format!("failed to read adapt file '{}'", adapt.display()))?
+    } else {
+        WASIP1_SNAPSHOT_ADAPT.to_vec()
+    };
+    encoder = encoder.adapter("wasi_snapshot_preview1", &adapt_bytes)?;
 
     let bytes = encoder
         .encode()