Draft: Symmetric ABI tracking and minor side functionality

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "tests/codegen/wasi-clocks"]
 	path = tests/codegen/wasi-clocks
 	url = https://github.com/WebAssembly/wasi-clocks
+[submodule "crates/cpp/tests/wasm-micro-runtime"]
+	path = crates/cpp/tests/wasm-micro-runtime
+	url = https://github.com/bytecodealliance/wasm-micro-runtime.git

Cargo.toml

@@ -22,7 +22,7 @@ repository = "https://github.com/bytecodealliance/wit-bindgen"
 [workspace.dependencies]
 anyhow = "1.0.72"
 bitflags = "2.3.3"
-heck = { version = "0.5" }
+heck =  { version = "0.5" }
 pulldown-cmark = { version = "0.9", default-features = false }
 serde = { version = "1.0.218", features = ["derive"] }
 clap = { version = "4.3.19", features = ["derive"] }
@@ -31,13 +31,13 @@ prettyplease = "0.2.20"
 syn = { version = "2.0.89", features = ["printing"] }
 futures = "0.3.31"
 
-wat = "1.234.0"
-wasmparser = "0.234.0"
-wasm-encoder = "0.234.0"
-wasm-metadata = { version = "0.234.0", default-features = false }
-wit-parser = "0.234.0"
-wit-component = "0.234.0"
-wasm-compose = "0.234.0"
+wat = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
+wasmparser = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
+wasm-encoder = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
+wasm-metadata = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric", default-features = false }
+wit-parser = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
+wit-component = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
+wasm-compose = { git = "https://github.com/cpetig/wasm-tools", branch = "symmetric" }
 
 wit-bindgen-core = { path = 'crates/core', version = '0.42.1' }
 wit-bindgen-c = { path = 'crates/c', version = '0.42.1' }
@@ -49,6 +49,8 @@ wit-bindgen-moonbit = { path = 'crates/moonbit', version = '0.42.1' }
 wit-bindgen = { path = 'crates/guest-rust', version = '0.42.1', default-features = false }
 wit-bindgen-test = { path = 'crates/test', version = '0.42.1' }
 
+wit-bindgen-bridge = { path = 'crates/bridge', version = '0.1.0' }
+
 [[bin]]
 name = "wit-bindgen"
 
@@ -65,6 +67,7 @@ wit-bindgen-csharp = { workspace = true, features = ['clap'], optional = true }
 wit-bindgen-test = { workspace = true }
 wit-component = { workspace = true }
 wasm-encoder = { workspace = true }
+wit-bindgen-bridge = { workspace = true, features = ['clap'], optional = true }
 env_logger = "0.11.7"
 
 [features]
@@ -75,9 +78,11 @@ default = [
   'go',
   'csharp',
   'cpp',
+  'bridge',
   'moonbit',
   'async',
 ]
+bridge = ['dep:wit-bindgen-bridge']
 c = ['dep:wit-bindgen-c']
 cpp = ['dep:wit-bindgen-cpp']
 rust = ['dep:wit-bindgen-rust']

README.md

@@ -393,6 +393,9 @@ WIT types.
 
 This relies on wasi-SDK for guest compilation.
 
+A separate subcommand (cpp-host) will generate C++ host code for 
+WebAssembly micro runtime.
+
 ### Guest: MoonBit
 
 MoonBit can be compiled to WebAssembly using [its toolchain](https://moonbitlang.com/download):
@@ -485,6 +488,8 @@ components:
   generate Python source code to interact with the component using an embedding
   of Wasmtime for its core WebAssembly support.
 
+- C++-17+: see above chapter for WAMR host code generation.
+
 - Ruby: the [`wasmtime-rb`](https://github.com/bytecodealliance/wasmtime-rb)
   project has initial support for components since
   [v27](https://github.com/bytecodealliance/wasmtime-rb/releases/tag/v27.0.0).

TODO.md

@@ -58,3 +58,10 @@
 
 * Imported handle types show up as `any` in TS, unsure how to plumb through
   actual types to get that actually typed.
+
+# Cpp
+
+* Nested lists
+* Host: Strings inside records
+* Strings test: return-unicode should get out parameter
+

crates/bridge/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "wit-bindgen-bridge"
+authors = ["Christof Petig <[email protected]>"]
+version = "0.1.0"
+edition.workspace = true
+repository = 'https://github.com/cpetig/wit-bindgen'
+license = "Apache-2.0 WITH LLVM-exception"
+description = """
+Bridge binding (forwarding) generator for WIT and the component model, targeting w2c2 and wamr.
+"""
+
+[lib]
+doctest = false
+test = false
+
+[dependencies]
+wit-bindgen-core = { workspace = true }
+wit-component = { workspace = true }
+anyhow = { workspace = true }
+heck = { workspace = true }
+clap = { workspace = true, optional = true }
+
+#[dev-dependencies]
+#test-helpers = { path = '../test-helpers' }