feat(cli): add -f/--force flag

Author: amrbashir

.changes/force-flag.md

@@ -0,0 +1,7 @@
+---
+"create-tauri-app": "patch"
+"create-tauri-app-js": "patch"
+---
+
+Add `-f/--force` flag to force creating directory even if it is empty.
+

packages/cli/src/cli.rs

@@ -14,6 +14,7 @@ pub struct Args {
     pub manager: Option<PackageManager>,
     pub template: Option<Template>,
     pub skip: bool,
+    pub force: bool,
     pub alpha: bool,
     pub mobile: Option<bool>,
 }
@@ -25,6 +26,7 @@ impl Default for Args {
             manager: Some(PackageManager::Npm),
             template: Some(Template::Vanilla),
             skip: false,
+            force: false,
             alpha: false,
             mobile: Some(false),
         }
@@ -51,6 +53,7 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
   {GREEN}-m{RESET}, {GREEN}--manager <MANAGER>{RESET}       Specify preferred package manager [{managers}]
   {GREEN}-t{RESET}, {GREEN}--template <TEMPLATE>{RESET}     Specify the UI template to use [{fragments}]
   {GREEN}-y{RESET}, {GREEN}--yes{RESET}                     Skip prompts and use defaults where applicable
+  {GREEN}-f{RESET}, {GREEN}--force{RESET}                   Force create the directory even if it is not empty.
                     {GREEN}--alpha{RESET}                   Bootstraps a project using tauri@2.0-alpha
                     {GREEN}--mobile{RESET}                  Bootstraps a mobile project too. Only availabe with `--alpha` option.
   {GREEN}-h{RESET}, {GREEN}--help{RESET}                    Prints help information
@@ -84,6 +87,7 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
         manager: pargs.opt_value_from_str(["-m", "--manager"])?,
         template: pargs.opt_value_from_str(["-t", "--template"])?,
         skip: pargs.contains(["-y", "--yes"]),
+        force: pargs.contains(["-f", "--force"]),
         alpha: pargs.contains("--alpha"),
         mobile: if pargs.contains("--mobile") {
             Some(true)

packages/cli/src/lib.rs

@@ -71,6 +71,7 @@ where
         manager,
         project_name,
         template,
+        force,
     } = args;
     let cwd = std::env::current_dir()?;
 
@@ -133,7 +134,9 @@ where
 
     // Confirm deleting the target project directory if not empty
     if target_dir.exists() && target_dir.read_dir()?.next().is_some() {
-        let overrwite = if skip {
+        let overwrite = if force {
+            true
+        } else if skip {
             false
         } else {
             Confirm::with_theme(&ColorfulTheme::default())
@@ -152,18 +155,17 @@ where
                 .default(false)
                 .interact()?
         };
-        if !overrwite {
-            eprintln!("{BOLD}{RED}✘{RESET} Operation Cancelled");
+        if !overwrite {
+            eprintln!("{BOLD}{RED}✘{RESET} Directory is not empty, Operation Cancelled");
             exit(1);
         }
     };
 
-    // Prompt for category if a package manger is not passed on the command line
-    let category = if manager.is_none() && !skip {
+    // Detect category if a package manger is not passed on the command line
+    let category = if manager.is_none() {
         // Filter managers if a template is passed on the command line
         let managers = PackageManager::ALL.to_vec();
-        let managers = args
-            .template
+        let managers = template
             .map(|t| {
                 managers
                     .iter()
@@ -193,8 +195,8 @@ where
                 )
         });
 
-        // If only one category is detected, skip prompt
-        if categories.len() == 1 {
+        // Skip prompt, if only one category is detected or explicit skip requested by `-y/--yes` flag
+        if categories.len() == 1 || skip {
             Some(categories[0])
         } else {
             let index = Select::with_theme(&ColorfulTheme::default())
@@ -213,11 +215,7 @@ where
     let pkg_manager = match manager {
         Some(manager) => manager,
         None => {
-            if skip {
-                defaults.manager.context("default manager not set")?
-            } else {
-                let category = category.context("category shouldn't be None at this point")?;
-
+            if let Some(category) = category {
                 let mut managers = category.package_managers().to_owned();
                 // sort managers so the auto-detected package manager is selected first
                 managers.sort_by(|a, b| {
@@ -226,8 +224,8 @@ where
                         .unwrap_or(false)
                         .cmp(&detected_manager.map(|p| p == *a).unwrap_or(false))
                 });
-                // If only one package manager is detected, skip prompt
-                if managers.len() == 1 {
+                // Skip prompt, if only one package manager is detected or explicit skip requested by `-y/--yes` flag
+                if managers.len() == 1 || skip {
                     managers[0]
                 } else {
                     let index = Select::with_theme(&ColorfulTheme::default())
@@ -237,6 +235,8 @@ where
                         .interact()?;
                     managers[index]
                 }
+            } else {
+                defaults.manager.context("default manager not set")?
             }
         }
     };