chore: merge branch 'main' of github.com:thalo-rs/esdl into feat/synt…

…ax-updates
thalo-rs · Mar 23, 2022 · 80f975e · 80f975e
2 parents 9b33cf7 + 0a7ccb2
commit 80f975e
Show file tree

Hide file tree

Showing 13 changed files with 731 additions and 216 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,14 +20,25 @@ all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
+handlebars = { version = "4.2", optional = true }
 heck = { version = "0.4", optional = true }
 nom = { version = "7.1", features = ["alloc"] }
 nom-supreme = "0.6"
 serde = { version = "1.0", features = ["derive"] }
 thiserror = "1.0"
+wit-parser = { git = "https://github.com/bytecodealliance/wit-bindgen", optional = true }
+wit-bindgen-gen-core = { git = "https://github.com/bytecodealliance/wit-bindgen", optional = true }
+wit-bindgen-gen-rust-wasm = { git = "https://github.com/bytecodealliance/wit-bindgen", optional = true }
 
 [features]
 default = []
 codegen-rust = ["heck"]
+codegen-rust-wasm = [
+  "heck",
+  "handlebars",
+  "wit-parser",
+  "wit-bindgen-gen-core",
+  "wit-bindgen-gen-rust-wasm",
+]
 codegen-typescript = []
 wasm = []
diff --git a/examples/bank-account-wasm/Cargo.lock b/examples/bank-account-wasm/Cargo.lock
diff --git a/examples/bank-account-wasm/Cargo.toml b/examples/bank-account-wasm/Cargo.toml
@@ -15,4 +15,4 @@ serde_json = "1.0"
 wit-bindgen-rust = { git = "https://github.com/bytecodealliance/wit-bindgen.git" }
 
 [build-dependencies]
-esdl = { path = "../..", features = ["codegen-rust", "wasm"] }
+esdl = { path = "../..", features = ["codegen-rust-wasm"] }
diff --git a/examples/bank-account-wasm/build.rs b/examples/bank-account-wasm/build.rs
@@ -3,7 +3,7 @@ use esdl::codegen::{rust::RustCompiler, Compiler};
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     Compiler::new(RustCompiler)
         .add_schema_file("./bank-account.esdl")?
-        .wasm(true)
+        .with_wasm()
         .compile()?;
 
     Ok(())

diff --git a/examples/bank-account-wasm/domain.wit b/examples/bank-account-wasm/domain.wit