Merge pull request #198 from tauri-apps/feat/json-output2

Feat: add `json` subcommand
tauri-apps · Sep 15, 2023 · b9660fa · b9660fa
2 parents c59ba49 + 8514300
commit b9660fa
Show file tree

Hide file tree

Showing 15 changed files with 1,173 additions and 58 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
         with:
           components: clippy
       - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --workspace -- -Dclippy::all -Dclippy::pedantic
+      - run: cargo clippy --workspace --features unstable -- -Dclippy::all -Dclippy::pedantic
 
   rustfmt:
     name: Rustfmt

diff --git a/Cargo.toml b/Cargo.toml
@@ -33,6 +33,8 @@ serde = "1.0.188"
 quote = "1.0.33"
 proc-macro2 = "1.0.67"
 syn = "2.0.33"
+schemars = "0.8.12"
+serde_json = "1.0"
 tauri = "2.0.0-alpha.14"
 
 [dependencies]
@@ -48,6 +50,7 @@ miette.workspace = true
 env_logger = "0.10.0"
 log.workspace = true
 clap_complete = "4.4.1"
+serde_json.workspace = true
 
 [features]
 unstable = ["dep:tauri-bindgen-gen-markdown"]

diff --git a/crates/gen-guest-js/src/lib.rs b/crates/gen-guest-js/src/lib.rs
@@ -63,8 +63,8 @@ pub struct JavaScript {
 impl JavaScript {
     fn print_function(&self, intf_name: &str, func: &Function) -> String {
         let docs = self.print_docs(func);
-        let ident = func.ident.to_lower_camel_case();
-        let name = func.ident.to_snake_case();
+        let ident = func.id.to_lower_camel_case();
+        let name = func.id.to_snake_case();
         let params = print_function_params(&func.params);
 
         let deserialize_result = func
@@ -109,7 +109,8 @@ export async function {ident} ({params}) {{
                 let docs = self.print_docs(func);
                 let mod_ident = mod_ident.to_snake_case();
                 let resource_ident = ident.to_snake_case();
-                let ident = func.ident.to_lower_camel_case();
+                let ident = func.id.to_lower_camel_case();
+
                 let params = print_function_params(&func.params);
 
                 let deserialize_result = func

diff --git a/crates/gen-guest-rust/src/lib.rs b/crates/gen-guest-rust/src/lib.rs
@@ -83,7 +83,7 @@ impl RustWasm {
             &BorrowMode::Owned,
         );
 
-        let ident = func.ident.to_snake_case();
+        let ident = func.id.to_snake_case();
 
         let param_idents = func
             .params
@@ -157,7 +157,7 @@ impl RustGenerator for RustWasm {
             );
 
             let mod_ident = format!("{mod_ident}::resource::{}", ident.to_string().to_snake_case());
-            let ident = func.ident.to_snake_case();
+            let ident = func.id.to_snake_case();
 
             let param_idents = func
                 .params

diff --git a/crates/gen-guest-ts/src/lib.rs b/crates/gen-guest-ts/src/lib.rs
@@ -72,8 +72,8 @@ impl TypeScript {
     pub fn print_function(&self, intf_name: &str, func: &Function) -> String {
         let docs = print_docs(&func.docs);
 
-        let ident = func.ident.to_lower_camel_case();
-        let name = func.ident.to_snake_case();
+        let ident = func.id.to_lower_camel_case();
+        let name = func.id.to_snake_case();
 
         let params = self.print_function_params(&func.params);
 
@@ -221,7 +221,7 @@ export async function {ident} ({params}) : {result} {{
             .iter()
             .map(|field| {
                 let docs = print_docs(&field.docs);
-                let ident = field.ident.to_lower_camel_case();
+                let ident = field.id.to_lower_camel_case();
                 let ty = self.print_type(&field.ty);
 
                 format!("{docs}\n{ident}: {ty},\n")
@@ -237,7 +237,7 @@ export async function {ident} ({params}) : {result} {{
             .enumerate()
             .map(|(i, field)| {
                 let docs = print_docs(&field.docs);
-                let ident = field.ident.to_upper_camel_case();
+                let ident = field.id.to_upper_camel_case();
                 let value: u64 = 2 << i;
 
                 format!("{docs}\n{ident} = {value},\n")
@@ -253,7 +253,7 @@ export async function {ident} ({params}) : {result} {{
             .enumerate()
             .map(|(i, case)| {
                 let docs = print_docs(&case.docs);
-                let case_ident = case.ident.to_upper_camel_case();
+                let case_ident = case.id.to_upper_camel_case();
                 let value = case
                     .ty
                     .as_ref()
@@ -271,7 +271,7 @@ export async function {ident} ({params}) : {result} {{
             .iter()
             .map(|case| {
                 let docs = print_docs(&case.docs);
-                let case_ident = case.ident.to_upper_camel_case();
+                let case_ident = case.id.to_upper_camel_case();
 
                 format!("{docs}\n{ident}{case_ident}")
             })
@@ -286,7 +286,7 @@ export async function {ident} ({params}) : {result} {{
             .iter()
             .map(|case| {
                 let docs = print_docs(&case.docs);
-                let ident = case.ident.to_upper_camel_case();
+                let ident = case.id.to_upper_camel_case();
 
                 format!("{docs}\n{ident},\n")
             })
@@ -321,9 +321,10 @@ export async function {ident} ({params}) : {result} {{
             .iter()
             .map(|func| {
                 let docs = print_docs(&func.docs);
+
                 let mod_ident = mod_ident.to_snake_case();
                 let resource_ident = ident.to_snake_case();
-                let ident = func.ident.to_lower_camel_case();
+                let ident = func.id.to_lower_camel_case();
 
                 let params = self.print_function_params(&func.params);
                 let result = func

diff --git a/crates/gen-host/src/lib.rs b/crates/gen-host/src/lib.rs
@@ -311,7 +311,7 @@ impl Host {
     }
 
     fn print_router_fn_definition(&self, mod_name: &str, func: &Function) -> TokenStream {
-        let func_name = func.ident.to_snake_case();
+        let func_name = func.id.to_snake_case();
         let func_ident = format_ident!("{}", func_name);
 
         let param_decl = match func.params.len() {
@@ -378,7 +378,7 @@ impl Host {
         resource_name: &str,
         method: &Function,
     ) -> TokenStream {
-        let func_name = method.ident.to_snake_case();
+        let func_name = method.id.to_snake_case();
         let func_ident = format_ident!("{}", func_name);
 
         let param_decl = method

diff --git a/crates/gen-js/src/lib.rs b/crates/gen-js/src/lib.rs
@@ -135,7 +135,7 @@ pub trait JavaScriptGenerator {
         let fields = fields
             .iter()
             .map(|field| {
-                let ident = field.ident.to_lower_camel_case();
+                let ident = field.id.to_lower_camel_case();
 
                 format!("{ident}: {}", self.print_deserialize_ty(&field.ty))
             })
@@ -177,7 +177,7 @@ pub trait JavaScriptGenerator {
                     .as_ref()
                     .map_or("null".to_string(), |ty| self.print_deserialize_ty(ty));
 
-                let ident = case.ident.to_upper_camel_case();
+                let ident = case.id.to_upper_camel_case();
 
                 format!(
                     "case {tag}:
@@ -205,7 +205,7 @@ pub trait JavaScriptGenerator {
             .iter()
             .enumerate()
             .map(|(tag, case)| {
-                let ident = case.ident.to_upper_camel_case();
+                let ident = case.id.to_upper_camel_case();
                 format!(
                     "case {tag}:
     return \"{ident}\"
@@ -346,7 +346,7 @@ pub trait JavaScriptGenerator {
     fn print_serialize_record(&self, ident: &str, fields: &[RecordField]) -> String {
         let inner = fields
             .iter()
-            .map(|field| self.print_serialize_ty(&format!("val.{}", field.ident), &field.ty))
+            .map(|field| self.print_serialize_ty(&format!("val.{}", field.id), &field.ty))
             .collect::<Vec<_>>()
             .join(",\n");
 
@@ -378,7 +378,7 @@ pub trait JavaScriptGenerator {
             .iter()
             .enumerate()
             .map(|(tag, case)| {
-                let prop_access = format!("val.{}", case.ident.to_upper_camel_case());
+                let prop_access = format!("val.{}", case.id.to_upper_camel_case());
 
                 let inner = case.ty.as_ref().map_or(String::new(), |ty| {
                     self.print_serialize_ty(&prop_access, ty)
@@ -409,7 +409,7 @@ pub trait JavaScriptGenerator {
             .iter()
             .enumerate()
             .map(|(tag, case)| {
-                let ident = case.ident.to_upper_camel_case();
+                let ident = case.id.to_upper_camel_case();
                 format!(
                     "case \"{ident}\":
     serializeU32(out, {tag})

diff --git a/crates/gen-markdown/src/lib.rs b/crates/gen-markdown/src/lib.rs
@@ -88,7 +88,7 @@ impl Markdown {
                     .map(|field| {
                         format!(
                             "#### {ident}: `{ty}`\n{docs}\n",
-                            ident = field.ident,
+                            ident = field.id,
                             ty = self.print_ty(&field.ty),
                             docs = field.docs
                         )
@@ -103,7 +103,7 @@ impl Markdown {
                     .map(|field| {
                         format!(
                             "#### {ident}\n{docs}\n",
-                            ident = field.ident,
+                            ident = field.id,
                             docs = field.docs
                         )
                     })
@@ -117,7 +117,7 @@ impl Markdown {
                     .map(|case| {
                         format!(
                             "#### {ident}{ty}\n{docs}\n",
-                            ident = case.ident,
+                            ident = case.id,
                             ty = case
                                 .ty
                                 .as_ref()
@@ -134,11 +134,7 @@ impl Markdown {
                 let cases = cases
                     .iter()
                     .map(|case| {
-                        format!(
-                            "#### {ident}\n{docs}\n",
-                            ident = case.ident,
-                            docs = case.docs
-                        )
+                        format!("#### {ident}\n{docs}\n", ident = case.id, docs = case.docs)
                     })
                     .collect::<String>();
 
@@ -164,7 +160,7 @@ impl Markdown {
                     .map(|func| {
                         format!(
                             "### Method {ident}\n\n`func {ident} ({params}){result}`\n\n{docs}",
-                            ident = func.ident,
+                            ident = func.id,
                             params = self.print_named_types(&func.params),
                             result = func
                                 .result
@@ -184,7 +180,7 @@ impl Markdown {
     fn print_function(&self, func: &Function) -> String {
         format!(
             "### Function {ident}\n\n` func {ident} ({params}){result}`\n\n{docs}",
-            ident = func.ident,
+            ident = func.id,
             params = self.print_named_types(&func.params),
             result = func
                 .result

diff --git a/crates/gen-rust/src/lib.rs b/crates/gen-rust/src/lib.rs
@@ -224,7 +224,7 @@ pub trait RustGenerator {
         let borrow_attr = self
             .needs_borrow(&field.ty, mode)
             .then_some(quote! { #[serde(borrow)] });
-        let ident = format_ident!("{}", field.ident.to_snake_case());
+        let ident = format_ident!("{}", field.id.to_snake_case());
         let ty = self.print_ty(&field.ty, mode);
 
         quote! {
@@ -248,7 +248,7 @@ pub trait RustGenerator {
         let fields = fields
             .iter()
             .enumerate()
-            .map(|(i, FlagsField { docs, ident })| {
+            .map(|(i, FlagsField { docs, id: ident })| {
                 let docs = self.print_docs(docs);
                 let ident = format_ident!("{}", ident.TO_SHOUTY_SNEK_CASE());
                 let i = Literal::usize_unsuffixed(i);
@@ -295,7 +295,7 @@ pub trait RustGenerator {
 
     fn print_variant_case(&self, case: &VariantCase, mode: &BorrowMode) -> TokenStream {
         let docs = self.print_docs(&case.docs);
-        let ident = format_ident!("{}", case.ident.to_upper_camel_case());
+        let ident = format_ident!("{}", case.id.to_upper_camel_case());
 
         let payload = case.ty.as_ref().map(|ty| {
             let ty = self.print_ty(ty, mode);
@@ -332,7 +332,7 @@ pub trait RustGenerator {
 
     fn print_enum_case(&self, case: &EnumCase) -> TokenStream {
         let docs = self.print_docs(&case.docs);
-        let ident = format_ident!("{}", case.ident.to_upper_camel_case());
+        let ident = format_ident!("{}", case.id.to_upper_camel_case());
 
         quote! {
             #docs
@@ -383,7 +383,7 @@ pub trait RustGenerator {
         results_mode: &BorrowMode,
     ) -> TokenStream {
         let docs = self.print_docs(&sig.func.docs);
-        let ident = format_ident!("{}", sig.func.ident.to_snake_case());
+        let ident = format_ident!("{}", sig.func.id.to_snake_case());
 
         let pub_ = (!sig.private).then_some(quote! { pub });
         let unsafe_ = sig.unsafe_.then_some(quote! { unsafe });

diff --git a/crates/wit-parser/Cargo.toml b/crates/wit-parser/Cargo.toml
@@ -13,6 +13,10 @@ id-arena = "2.2.1"
 miette.workspace = true
 distance = "0.4.0"
 log.workspace = true
+serde = { workspace = true, features = ["derive"] }
+schemars.workspace = true
 
 [dev-dependencies]
 pretty_assertions = "1.4.0"
+schemars = { version = "0.8.12", features = ["impl_json_schema"] }
+serde_json.workspace = true