Merge pull request #68 from golemcloud/vigoo/type-annotated-value-json

TypeAnnotatedValue JSON format

wasm-rpc-stubgen/Cargo.toml

@@ -23,7 +23,7 @@ cargo-component-core = "=0.13.2"
 cargo-component = "=0.13.2"
 dir-diff = "0.3.3"
 fs_extra = "1.3.0"
-golem-wasm-ast = "0.3.0"
+golem-wasm-ast = "0.4.0"
 golem-wasm-rpc = { path = "../wasm-rpc", version = "0.0.0" }
 heck = "0.5.0"
 id-arena = "2.2.1"

wasm-rpc-stubgen/src/lib.rs

@@ -426,8 +426,9 @@ pub fn compose(args: ComposeArgs) -> anyhow::Result<()> {
             .map_err(|err| anyhow!(err))?;
 
         let state = AnalysisContext::new(stub_component);
-        let stub_exports = state.get_top_level_exports().map_err(|err| match err {
-            AnalysisFailure::Failed(msg) => anyhow!(msg),
+        let stub_exports = state.get_top_level_exports().map_err(|err| {
+            let AnalysisFailure { reason } = err;
+            anyhow!(reason)
         })?;
 
         for export in stub_exports {

wasm-rpc/Cargo.toml

@@ -21,13 +21,11 @@ async-recursion = { version = "1.1.1", optional = true }
 async-trait = { version = "0.1.77", optional = true }
 bigdecimal = { version = "0.4.5", optional = true }
 bincode = { version = "2.0.0-rc.3", optional = true }
-golem-wasm-ast = { version = "0.3.0", features = [
-    "analysis",
-    "wave",
-], optional = true }
-serde = { version = "1.0.203", optional = true }
-serde_json = { version = "1.0.117", optional = true }
-prost = { version = "0.12.6", optional = true }
+golem-wasm-ast = { version = "0.4.0", optional = true }
+poem-openapi = { version = "5.0", optional = true }
+serde = { version = "1.0", optional = true }
+serde_json = { version = "1.0", optional = true }
+prost = { version = "0.12", optional = true }
 wasmtime = { version = "=21.0.1", features = [
     "component-model",
 ], optional = true }
@@ -40,6 +38,7 @@ proptest-arbitrary-interop = "0.1.0"
 
 [build-dependencies]
 prost-build = "0.12.6"
+cargo_metadata = "0.18.1"
 
 [features]
 default = ["host"]
@@ -48,20 +47,22 @@ host = [
     "arbitrary",
     "bincode",
     "json",
+    "poem_openapi",
     "protobuf",
     "serde",
     "text",
     "typeinfo",
     "wasmtime",
 ]
 arbitrary = ["dep:arbitrary"]
-bincode = ["dep:bincode"]
-json = ["dep:serde", "dep:serde_json", "dep:bigdecimal", "typeinfo"]
+bincode = ["dep:bincode", "golem-wasm-ast/bincode"]
+json = ["dep:serde", "dep:serde_json", "dep:bigdecimal", "typeinfo", "golem-wasm-ast/json"]
+poem_openapi = ["dep:poem-openapi", "json", "typeinfo", "golem-wasm-ast/poem_openapi"]
 protobuf = ["dep:bincode", "dep:serde", "dep:prost"]
 serde = ["dep:serde"]
 stub = []
-text = ["wasmtime", "dep:wasm-wave"]
-typeinfo = ["dep:golem-wasm-ast"]
+text = ["wasmtime", "dep:wasm-wave", "golem-wasm-ast/wave"]
+typeinfo = ["dep:golem-wasm-ast", "golem-wasm-ast/analysis", "golem-wasm-ast/protobuf", "protobuf"]
 wasmtime = ["dep:wasmtime", "dep:wasmtime-wasi", "dep:async-recursion", "typeinfo"]
 
 

wasm-rpc/build.rs

@@ -1,20 +1,32 @@
+use cargo_metadata::MetadataCommand;
 use std::io::Result;
 
 fn main() -> Result<()> {
+    let wasm_ast_root = find_package_root("golem-wasm-ast");
+
     let mut config = prost_build::Config::new();
+    config.extern_path(".wasm.ast", "::golem_wasm_ast::analysis::protobuf");
     config.type_attribute(".", "#[cfg(feature = \"protobuf\")]");
     config.type_attribute(
         ".",
-        "#[derive(bincode::Encode, bincode::Decode, serde::Serialize, serde::Deserialize)]",
+        "#[cfg_attr(feature=\"bincode\", derive(bincode::Encode, bincode::Decode))]",
     );
     config.compile_protos(
         &[
-            "proto/wasm/rpc/type.proto",
             "proto/wasm/rpc/val.proto",
             "proto/wasm/rpc/witvalue.proto",
             "proto/wasm/rpc/type_annotated_value.proto",
         ],
-        &["proto/"],
+        &[&format!("{wasm_ast_root}/proto"), &"proto".to_string()],
     )?;
     Ok(())
 }
+
+fn find_package_root(name: &str) -> String {
+    let metadata = MetadataCommand::new()
+        .manifest_path("./Cargo.toml")
+        .exec()
+        .unwrap();
+    let package = metadata.packages.iter().find(|p| p.name == name).unwrap();
+    package.manifest_path.parent().unwrap().to_string()
+}

wasm-rpc/proto/wasm/rpc/type_annotated_value.proto

@@ -1,7 +1,8 @@
 syntax = "proto3";
 
 package wasm.rpc;
-import "wasm/rpc/type.proto";
+
+import "wasm/ast/type.proto";
 
 message TypeAnnotatedValue {
     oneof type_annotated_value {
@@ -31,17 +32,17 @@ message TypeAnnotatedValue {
 }
 
 message TypedList {
-    Type typ = 1;
+    wasm.ast.Type typ = 1;
     repeated TypeAnnotatedValue values = 2;
 }
 
 message TypedTuple {
-    repeated Type typ = 1;
+    repeated wasm.ast.Type typ = 1;
     repeated TypeAnnotatedValue value = 2;
 }
 
 message TypedRecord {
-    repeated NameTypePair typ = 1;
+    repeated wasm.ast.NameTypePair typ = 1;
     repeated NameValuePair value = 2;
 }
 
@@ -51,7 +52,7 @@ message TypedFlags {
 }
 
 message TypedVariant {
-    TypeVariant typ = 1;
+    wasm.ast.TypeVariant typ = 1;
     string case_name = 2;
     TypeAnnotatedValue case_value = 3;
 }
@@ -62,21 +63,21 @@ message TypedEnum {
 }
 
 message TypedOption {
-    Type typ = 1;
+    wasm.ast.Type typ = 1;
     optional TypeAnnotatedValue value = 2;
 }
 
 message TypedResult {
-    Type ok = 1;
-    Type error = 2;
+    wasm.ast.Type ok = 1;
+    wasm.ast.Type error = 2;
     oneof result_value {
         TypeAnnotatedValue ok_value = 3;
         TypeAnnotatedValue error_value = 4;
     }
 }
 
 message TypedHandle {
-    TypeHandle typ = 1;
+    wasm.ast.TypeHandle typ = 1;
     string uri = 2;
     uint64 resource_id = 3;
 }