fix: check for template without flavor before, closes #441 (#444)

Author: amrbashir

.changes/template-flag-flavor.md

@@ -0,0 +1,7 @@
+---
+"create-tauri-app": "patch"
+"create-tauri-app-js": "patch"
+---
+
+Fix crash when passing a flavored template like `vue-ts` to the CLI.
+

packages/cli/src/lib.rs

@@ -151,7 +151,7 @@ where
                 managers
                     .iter()
                     .copied()
-                    .filter(|p| p.templates().contains(&t))
+                    .filter(|p| p.templates_no_flavors().contains(&t.without_flavor()))
                     .collect::<Vec<_>>()
             })
             .unwrap_or(managers);
@@ -203,7 +203,7 @@ where
         }
     });
 
-    let templates = pkg_manager.templates();
+    let templates_no_flavors = pkg_manager.templates_no_flavors();
 
     // Template to render
     let template = args.template.unwrap_or_else(|| {
@@ -213,15 +213,15 @@ where
             let index = Select::with_theme(&ColorfulTheme::default())
                 .with_prompt("Choose your UI template")
                 .items(
-                    &templates
+                    &templates_no_flavors
                         .iter()
                         .map(|t| t.select_text())
                         .collect::<Vec<_>>(),
                 )
                 .default(0)
                 .interact()
                 .unwrap();
-            let template = templates[index];
+            let template = templates_no_flavors[index];
 
             // Prompt for flavors if the template has more than one flavor
             let flavors = template.flavors(pkg_manager);
@@ -257,11 +257,11 @@ where
     // If the package manager and the template are specified on the command line
     // then almost all prompts are skipped so we need to make sure that the combination
     // is valid, otherwise, we error and exit
-    if !pkg_manager.templates_all().contains(&template) {
+    if !pkg_manager.templates().contains(&template) {
         eprintln!(
             "{BOLD}{RED}error{RESET}: the {GREEN}{}{RESET} template is not suppported for the {GREEN}{pkg_manager}{RESET} package manager\n       possible templates for {GREEN}{pkg_manager}{RESET} are: [{}]",
             template,
-            templates.iter().map(|e|format!("{GREEN}{e}{RESET}")).collect::<Vec<_>>().join(", ")
+            templates_no_flavors.iter().map(|e|format!("{GREEN}{e}{RESET}")).collect::<Vec<_>>().join(", ")
         );
         exit(1);
     }

packages/cli/src/package_manager.rs

@@ -31,7 +31,7 @@ impl<'a> PackageManager {
 }
 impl PackageManager {
     /// Returns templates without flavors
-    pub const fn templates(&self) -> &[Template] {
+    pub const fn templates_no_flavors(&self) -> &[Template] {
         match self {
             PackageManager::Cargo => &[
                 Template::Vanilla,
@@ -50,7 +50,7 @@ impl PackageManager {
         }
     }
 
-    pub const fn templates_all(&self) -> &[Template] {
+    pub const fn templates(&self) -> &[Template] {
         match self {
             PackageManager::Cargo => &[
                 Template::Vanilla,

packages/cli/src/template.rs

@@ -146,6 +146,17 @@ impl<'a> Template {
         }
     }
 
+    pub fn without_flavor(&self) -> Self {
+        match self {
+            Template::VanillaTs => Template::Vanilla,
+            Template::VueTs => Template::Vue,
+            Template::SvelteTs => Template::Svelte,
+            Template::ReactTs => Template::React,
+            Template::SolidTs => Template::Solid,
+            _ => *self,
+        }
+    }
+
     pub const fn needs_trunk(&self) -> bool {
         matches!(self, Template::Sycamore | Template::Yew | Template::Leptos)
     }