temporary solution for the broken concat

Author: wasm-forge

Cargo.lock

@@ -25,10 +25,10 @@ env_logger = "0.11.8"
 
 syn = "2.0.103"
 quote = "1.0"
-candid_parser = "0.1.4"
+candid_parser = "0.2.1"
 #ic-cdk-bindgen = { path = "../cdk-rs/src/ic-cdk-bindgen" }
 #wf-cdk-bindgen = { path = "../wf-cdk-bindgen" }
-wf-cdk-bindgen = "0.1.6"
+wf-cdk-bindgen = "0.1.7"
 
 prettyplease = "0.2.34"
 serde_json = { version = "1.0", features = ["preserve_order"] }
@@ -54,7 +54,7 @@ dialoguer = { version = "0.11.0", features = ["fuzzy-select"] }
 alloy = { version = "1.0.23", features = ["full"], optional = true }
 alloy-node-bindings = { version = "1.0.23", optional = true }
 
-candid = "0.10"
+candid = "0.10.16"
 pocket-ic = "9.0.2"
 ic-agent = "0.40.0"
 

Cargo.toml

@@ -79,7 +79,7 @@ pub fn generate_bindings(setup: &mut IcpTestSetup) -> Result<(), Error> {
 
             config.set_canister_wasm_path(wasm_path.to_string_lossy().to_string());
 
-            let (env, actor) =
+            let (env, actor, _) =
                 candid_parser::typing::pretty_check_file(&expand_path(Path::new(&candid_path)))
                     .unwrap();
 

src/generator/candid_to_rust.rs

@@ -25,6 +25,16 @@ static KEYWORDS: [&str; 51] = [
     "override", "priv", "typeof", "unsized", "virtual", "yield", "try",
 ];
 
+/// temporary replacement for the older function contact, that is now broken
+pub fn concat<'a, D>(docs: D, sep: &'a str) -> RcDoc<'a>
+where
+    D: Iterator<Item = RcDoc<'a>> + Clone,
+{
+    RcDoc::intersperse(docs.clone().map(|d| d.append(sep)), RcDoc::line()).flat_alt(
+        RcDoc::intersperse(docs, RcDoc::text(sep).append(RcDoc::line())),
+    )
+}
+
 fn ident_<'a>(id: &'a str, case: Option<Case<'a>>) -> (RcDoc<'a>, bool) {
     if id.is_empty()
         || id.starts_with(|c: char| !c.is_ascii_alphabetic() && c != '_')
@@ -718,7 +728,7 @@ mod tests {
         let type_path = Path::new(type_path);
         let value_path = Path::new(value_path);
 
-        let (env, actor) = candid_parser::typing::pretty_check_file(type_path).unwrap();
+        let (env, actor, _) = candid_parser::typing::pretty_check_file(type_path).unwrap();
 
         let candid_value = std::fs::read_to_string(value_path).unwrap();
 
@@ -730,7 +740,7 @@ mod tests {
     fn get_generated(type_path: &str, candid_value: &str) -> String {
         let type_path = Path::new(type_path);
 
-        let (env, actor) = candid_parser::typing::pretty_check_file(type_path).unwrap();
+        let (env, actor, _) = candid_parser::typing::pretty_check_file(type_path).unwrap();
 
         if !candid_value.is_empty() {
             let arg_value = candid_parser::parse_idl_args(candid_value).unwrap();
@@ -743,7 +753,7 @@ mod tests {
 
     fn rust_check(rust: &str) {
         // patterns that we do not like:
-        let bad_patterns = [r"\w+todo!", r"::::", r",\s*,", r"::\s*\{"];
+        let bad_patterns = [r"\w+todo!", r"::::", r"^\s*,", r"::\s*\{"];
 
         for pattern in bad_patterns {
             let re = Regex::new(pattern).unwrap();
@@ -794,10 +804,14 @@ mod tests {
     }
 
     #[test]
-    fn test_no_args_types() {
+    fn test_no_args() {
         let rust = get_generated("tests/no_args.did", "");
 
         rust_check(&rust);
+
+        let rust = get_generated("tests/no_args2.did", "");
+
+        rust_check(&rust);
     }
 
     #[test]

src/generator/candid_value_to_rust.rs

@@ -1,4 +1,4 @@
-service : () -> {
+service : ( ) -> {
   basic_fs_test : () -> ();
   compute_file_hash : (text) -> (text);
   do_fs_test : () -> (text);

tests/no_args.did

@@ -0,0 +1,13 @@
+service : {
+  basic_fs_test : () -> ();
+  compute_file_hash : (text) -> (text);
+  do_fs_test : () -> (text);
+  generate_random_fs : (nat64, nat64, nat64) -> (nat64);
+  get_log : () -> (text) query;
+  greet : (text) -> (text) query;
+  read_file : (text) -> (text);
+  scan_directory : (text) -> (text);
+  test_create_dir_all : (text) -> ();
+  test_read_dir : (text) -> (vec text);
+  write_file : (text, text) -> ();
+}