support combining SDKs with multiple WIT worlds

This adds two new features:

- Multiple `--world` options are accepted, in which case the worlds will be
  merged into a single world for building, testing, or bindings generation.

- In addition to any worlds and/or WIT paths specified explicitly via CLI
  options, `componentize-go` will use `go list` to scan the current module and
  its dependencies, looking for files named `componentize-go.toml` in their
  source trees.  For each such file found, any worlds and/or WIT paths
  referenced therein will be added to the respective lists.  This behavior can
  be disabled using the `--ignore-toml-files` option if desired.

In combination, these options make it easier to use multiple SDKs or other
libraries which contain `wit-bindgen-go`-generated code.

Note that I've also removed the `wat` dependency because `go build` always
generates a binary Wasm file, so no need to check for or parse WAT.

Fixes #28

Author: dicej

Cargo.lock

@@ -37,7 +37,8 @@ allow_attributes_without_reason = 'warn'
 anyhow = { workspace = true}
 clap = { version = "4.5.60", features = ["derive"] }
 regex = "1.12.3"
-wat = { version = "1.245.1"}
+serde = { version = "1.0.228", features = ["derive"] }
+toml = "1.1.0"
 wit-bindgen-go = { git = "https://github.com/bytecodealliance/wit-bindgen", rev = "3ee9fe20a5bce398360d5d291e81a4224a6d7c76" }
 wit-component = "0.245.1"
 wit-parser = "0.245.1"

Cargo.toml

@@ -4,16 +4,17 @@ use std::path::{Path, PathBuf};
 
 #[allow(clippy::too_many_arguments)]
 pub fn generate_bindings(
-    wit_path: &[impl AsRef<Path>],
-    world: Option<&str>,
+    paths: &[impl AsRef<Path>],
+    worlds: &[String],
+    ignore_toml_files: bool,
     features: &[String],
     all_features: bool,
     generate_stubs: bool,
     should_format: bool,
     output: Option<&Path>,
     pkg_name: Option<String>,
 ) -> Result<()> {
-    let (mut resolve, world) = parse_wit(wit_path, world, features, all_features)?;
+    let (mut resolve, world) = parse_wit(paths, worlds, ignore_toml_files, features, all_features)?;
     let mut files = Default::default();
 
     let format = if should_format {

src/cmd_bindings.rs

@@ -28,12 +28,29 @@ pub struct WitOpts {
     ///
     /// These paths can be either directories containing `*.wit` files, `*.wit`
     /// files themselves, or `*.wasm` files which are wasm-encoded WIT packages.
+    ///
+    /// Note that, unless `--ignore-toml-files` is specified, `componentize-go`
+    /// will also use `go list` to scan the current Go module and its
+    /// dependencies to find any `componentize-go.toml` files.  The WIT
+    /// documents referenced by any such files will be added to this list
+    /// automatically.
     #[arg(long, short = 'd')]
     pub wit_path: Vec<PathBuf>,
 
-    /// Name of world to target (or default world if `None`).
+    /// Name of world to target (or default world if not specified).
+    ///
+    /// This may be specified more than once, in which case the worlds will be
+    /// merged.
+    ///
+    /// Note that, unless `--ignore-toml-files` is specified, `componentize-go`
+    /// will also use `go list` to scan the current Go module and its
+    /// dependencies to find any `componentize-go.toml` files.  The WIT worlds
+    /// referenced by any such files will be added to this list automatically.
     #[arg(long, short = 'w')]
-    pub world: Option<String>,
+    pub world: Vec<String>,
+
+    #[arg(long)]
+    pub ignore_toml_files: bool,
 
     /// Whether or not to activate all WIT features when processing WIT files.
     ///
@@ -164,13 +181,14 @@ fn build(wit_opts: WitOpts, build: Build) -> Result<()> {
         embed_wit(
             &module,
             &wit_opts.wit_path,
-            wit_opts.world.as_deref(),
+            &wit_opts.world,
+            wit_opts.ignore_toml_files,
             &wit_opts.features,
             wit_opts.all_features,
         )?;
 
         // Update the wasm module to use the current component model ABI.
-        module_to_component(&module, &build.adapt)?;
+        module_to_component(&module, build.adapt.as_deref())?;
     }
 
     Ok(())
@@ -190,13 +208,14 @@ fn test(wit_opts: WitOpts, test: Test) -> Result<()> {
             embed_wit(
                 &module,
                 &wit_opts.wit_path,
-                wit_opts.world.as_deref(),
+                &wit_opts.world,
+                wit_opts.ignore_toml_files,
                 &wit_opts.features,
                 wit_opts.all_features,
             )?;
 
             // Update the wasm module to use the current component model ABI.
-            module_to_component(&module, &test.adapt)?;
+            module_to_component(&module, test.adapt.as_deref())?;
         }
     }
 
@@ -205,8 +224,9 @@ fn test(wit_opts: WitOpts, test: Test) -> Result<()> {
 
 fn bindings(wit_opts: WitOpts, bindings: Bindings) -> Result<()> {
     generate_bindings(
-        wit_opts.wit_path.as_ref(),
-        wit_opts.world.as_deref(),
+        &wit_opts.wit_path,
+        &wit_opts.world,
+        wit_opts.ignore_toml_files,
         &wit_opts.features,
         wit_opts.all_features,
         bindings.generate_stubs,