Add bin target for trustfall_stubgen and ensure deterministic stubs.

obi1kenobi · Jun 28, 2023 · bee9693 · bee9693
1 parent 97809b6
commit bee9693
Show file tree

Hide file tree

Showing 14 changed files with 464 additions and 236 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/trustfall_stubgen/Cargo.toml b/trustfall_stubgen/Cargo.toml
@@ -11,6 +11,14 @@ authors.workspace = true
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
+[[bin]]
+name = "trustfall_stubgen"
+required-features = ["cli"]
+
+[features]
+default = []
+cli = ["dep:clap"]
+
 [dependencies]
 quote = "1.0"
 syn = "2.0"
@@ -23,6 +31,7 @@ anyhow = "1.0.71"
 serde = { version = "1.0.164", features = ["derive"] }
 prettyplease = "0.2.6"
 regex = "1.8.4"
+clap = { version = "4.0.0", features = ["derive"], optional = true }
 
 [dev-dependencies]
 glob = "0.3.1"

diff --git a/trustfall_stubgen/src/adapter_creator.rs b/trustfall_stubgen/src/adapter_creator.rs
@@ -135,18 +135,20 @@ fn emit_property_handling(
         "zero".into() => 0,
     };
 
-    #[derive(Debug, serde::Deserialize)]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, serde::Deserialize)]
     struct ResultRow {
         name: String,
     }
 
     let mut arms = proc_macro2::TokenStream::new();
-    let rows = trustfall::execute_query(querying_schema, adapter, query, variables)
+    let mut rows: Vec<_> = trustfall::execute_query(querying_schema, adapter, query, variables)
         .expect("invalid query")
         .map(|x| {
             x.try_into_struct::<ResultRow>()
                 .expect("invalid conversion")
-        });
+        })
+        .collect();
+    rows.sort_unstable();
     for row in rows {
         let name = &row.name;
         let ident = syn::Ident::new(
@@ -198,18 +200,20 @@ fn emit_edge_handling(
         "zero".into() => 0,
     };
 
-    #[derive(Debug, serde::Deserialize)]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, serde::Deserialize)]
     struct ResultRow {
         name: String,
     }
 
     let mut arms = proc_macro2::TokenStream::new();
-    let rows = trustfall::execute_query(querying_schema, adapter, query, variables)
+    let mut rows: Vec<_> = trustfall::execute_query(querying_schema, adapter, query, variables)
         .expect("invalid query")
         .map(|x| {
             x.try_into_struct::<ResultRow>()
                 .expect("invalid conversion")
-        });
+        })
+        .collect();
+    rows.sort_unstable();
     for row in rows {
         let name = &row.name;
         let ident = syn::Ident::new(

diff --git a/trustfall_stubgen/src/edges_creator.rs b/trustfall_stubgen/src/edges_creator.rs
@@ -36,22 +36,24 @@ pub(super) fn make_edges_file(
         "zero".into() => 0,
     };
 
-    #[derive(Debug, serde::Deserialize)]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, serde::Deserialize)]
     struct ResultRow {
         name: String,
         edge_name: Vec<String>,
         parameter_name: Vec<Vec<String>>,
         parameter_type: Vec<Vec<String>>,
     }
 
-    let rows = trustfall::execute_query(querying_schema, adapter, query, variables)
+    let mut rows: Vec<_> = trustfall::execute_query(querying_schema, adapter, query, variables)
         .expect("invalid query")
         .map(|x| {
             x.try_into_struct::<ResultRow>()
                 .expect("invalid conversion")
-        });
+        })
+        .collect();
+    rows.sort_unstable();
     for row in rows {
-        let edges: Vec<(String, Vec<(String, String)>)> = row
+        let mut edges: Vec<(String, Vec<(String, String)>)> = row
             .edge_name
             .into_iter()
             .zip(
@@ -61,6 +63,7 @@ pub(super) fn make_edges_file(
             )
             .map(|(edge, (param, ty))| (edge, param.into_iter().zip(ty.into_iter()).collect()))
             .collect();
+        edges.sort_unstable();
 
         let (type_edge_resolver_fn, type_edge_mod) = make_type_edge_resolver(&row.name, edges);
         edges_file.top_level_items.push(type_edge_resolver_fn);

diff --git a/trustfall_stubgen/src/entrypoints_creator.rs b/trustfall_stubgen/src/entrypoints_creator.rs
@@ -32,19 +32,21 @@ pub(super) fn make_entrypoints_file(
 }"#;
     let variables: BTreeMap<Arc<str>, String> = btreemap! {};
 
-    #[derive(Debug, serde::Deserialize)]
+    #[derive(Debug, PartialEq, Eq, PartialOrd, Ord, serde::Deserialize)]
     struct ResultRow {
         name: String,
         parameter_name: Vec<String>,
         parameter_type: Vec<String>,
     }
 
-    let rows = trustfall::execute_query(querying_schema, adapter, query, variables)
+    let mut rows: Vec<_> = trustfall::execute_query(querying_schema, adapter, query, variables)
         .expect("invalid query")
         .map(|x| {
             x.try_into_struct::<ResultRow>()
                 .expect("invalid conversion")
-        });
+        })
+        .collect();
+    rows.sort_unstable();
     for row in rows {
         let parameters: Vec<_> = row
             .parameter_name