chore: backport and bump scaffodling 0.3000.0 dev.13 (holochain#306)

* fix: poorly formatted rust code (holochain#288) * fix: poorly formatted code in coordinator zome * document add_newlines * clearn up coordinators module * clean up integrity module * refactor utils * fix add_newlines * update integrity comments * fix map file calls * fix add_newlines * make add_newlines public/private function agnostic * refactor link-type coordinator * fix remove link handler * fix collection coordinator * clean up entry-type coordinator * fix clippy warnings * refactor link-type coordinator * fix bug scaffolding entry-type with linked_from * fix target_hash_variable * remove unnecessary format usage * remove unnecessary clone * fix validate_delete_result * move comment * fix entry from rcord error message * rename unparse function to unparse_pretty; * feat: add long disable fast track option to hc scaffold web-app (holochain#293) * add fix to prevent accumulation of dist.zip content (holochain#300) * chore: bump version --------- Co-authored-by: matthme <[email protected]>
c12i · Jun 6, 2024 · 1ffc9eb · 1ffc9eb
1 parent 341d6a4
commit 1ffc9eb
Show file tree

Hide file tree

Showing 16 changed files with 1,033 additions and 823 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "holochain_scaffolding_cli"
-version = "0.3000.0-dev.12"
+version = "0.3000.0-dev.13"
 description = "CLI to easily generate and modify holochain apps"
 license = "CAL-1.0"
 homepage = "https://developer.holochain.org"

diff --git a/flake.lock b/flake.lock
diff --git a/src/cli.rs b/src/cli.rs
@@ -73,7 +73,7 @@ pub enum HcScaffoldCommand {
         holo_enabled: bool,
 
         /// Whether to skip setting up an initial DNA and it's zome(s) after the web app is scaffolded
-        #[structopt(short = "F")]
+        #[structopt(long = "disable-fast-track", short = "F")]
         disable_fast_track: bool,
     },
     /// Manage custom templates

diff --git a/src/file_tree.rs b/src/file_tree.rs
@@ -8,7 +8,7 @@ use std::fs;
 use std::path::{Path, PathBuf};
 
 use crate::error::{ScaffoldError, ScaffoldResult};
-use crate::utils::unparse;
+use crate::utils::unparse_pretty;
 
 pub type FileTree = FileSystemTree<OsString, String>;
 
@@ -194,10 +194,10 @@ pub fn map_rust_files<F: Fn(PathBuf, syn::File) -> ScaffoldResult<syn::File> + C
                 let original_file: syn::File = syn::parse_str(&contents)
                     .map_err(|e| ScaffoldError::MalformedFile(file_path.clone(), e.to_string()))?;
                 let new_file = map_fn(file_path, original_file.clone())?;
-                // Only reformat the file via unparse if the contents of the newly modified
+                // Only reformat the file via unparse_pretty if the contents of the newly modified
                 // file are different from the original
                 if new_file != original_file {
-                    return Ok(unparse(&new_file));
+                    return Ok(unparse_pretty(&new_file));
                 }
             }
         }