Always enable both TS & TSX in CLI

Author: Hendrik van Antwerpen

languages/tree-sitter-stack-graphs-typescript/rust/bin.rs

@@ -6,56 +6,34 @@
 // ------------------------------------------------------------------------------------------------
 
 use anyhow::anyhow;
-use clap::{Parser, ValueEnum};
+use clap::Parser;
 use tree_sitter_stack_graphs::cli::database::default_user_database_path_for_crate;
 use tree_sitter_stack_graphs::cli::provided_languages::Subcommands;
-use tree_sitter_stack_graphs::loader::{LanguageConfiguration, LoadError};
 use tree_sitter_stack_graphs::NoCancellation;
 
-/// Flag to select the dialect of the language
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
-pub enum Dialect {
-    Typescript,
-    TSX,
-}
-
 fn main() -> anyhow::Result<()> {
     let cli = Cli::parse();
-    let lc = match language_configuration(cli.dialect) {
-        Ok(lc) => lc,
-        Err(err) => {
-            eprintln!("{}", err.display_pretty());
-            return Err(anyhow!("Language configuration error"));
-        }
-    };
-    let default_db_path = default_user_database_path_for_crate(env!("CARGO_PKG_NAME"))?;
-    cli.subcommand.run(default_db_path, vec![lc])
-}
-
-fn language_configuration<'a>(dialect: Dialect) -> Result<LanguageConfiguration, LoadError<'a>> {
-    match dialect {
-        Dialect::Typescript => {
-            tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(
-                &NoCancellation,
-            )
-        }
-        Dialect::TSX => {
-            tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation)
-        }
+    let mut lcs = Vec::new();
+    for r in [
+        tree_sitter_stack_graphs_typescript::try_language_configuration_typescript(&NoCancellation),
+        tree_sitter_stack_graphs_typescript::try_language_configuration_tsx(&NoCancellation),
+    ] {
+        let lc = match r {
+            Ok(lc) => lc,
+            Err(err) => {
+                eprintln!("{}", err.display_pretty());
+                return Err(anyhow!("Language configuration error"));
+            }
+        };
+        lcs.push(lc);
     }
+    let default_db_path = default_user_database_path_for_crate(env!("CARGO_PKG_NAME"))?;
+    cli.subcommand.run(default_db_path, lcs)
 }
 
 #[derive(Parser)]
 #[clap(about, version)]
 pub struct Cli {
-    #[clap(
-        short,
-        long,
-        value_enum,
-        default_value_t = Dialect::Typescript,
-    )]
-    dialect: Dialect,
-
     #[clap(subcommand)]
     subcommand: Subcommands,
 }