output format new syntax

Author: Olivier D'Ancona

crates/code2prompt-core/src/configuration.rs

@@ -121,7 +121,7 @@ pub struct TomlConfig {
     pub full_directory_tree: bool,
 
     /// Output format
-    pub output_format: Option<String>,
+    pub output_format: Option<OutputFormat>,
 
     /// Sort method
     pub sort_method: Option<FileSortMethod>,
@@ -172,11 +172,7 @@ impl TomlConfig {
             .absolute_path(self.absolute_path)
             .full_directory_tree(self.full_directory_tree);
 
-        if let Some(output_format) = &self.output_format
-            && let Ok(format) = output_format.parse::<OutputFormat>()
-        {
-            builder.output_format(format);
-        }
+        builder.output_format(self.output_format.unwrap_or_default());
 
         builder.sort_method(self.sort_method);
 
@@ -224,7 +220,7 @@ pub fn export_config_to_toml(config: &Code2PromptConfig) -> Result<String, toml:
         line_numbers: config.line_numbers,
         absolute_path: config.absolute_path,
         full_directory_tree: config.full_directory_tree,
-        output_format: Some(config.output_format.to_string()),
+        output_format: Some(config.output_format),
         sort_method: config.sort_method,
         encoding: Some(config.encoding),
         token_format: Some(config.token_format),

crates/code2prompt-core/src/template.rs

@@ -3,8 +3,8 @@
 use anyhow::{Result, anyhow};
 use handlebars::{Handlebars, no_escape};
 use regex::Regex;
+use serde::{Deserialize, Serialize};
 use std::io::Write;
-use std::str::FromStr;
 
 /// Set up the Handlebars template engine with a template string and a template name.
 ///
@@ -85,7 +85,8 @@ pub fn write_to_file(output_path: &str, rendered: &str) -> Result<()> {
 }
 
 /// Enum to represent the output format.
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
+#[derive(Default, Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
 pub enum OutputFormat {
     #[default]
     Markdown,
@@ -102,19 +103,3 @@ impl std::fmt::Display for OutputFormat {
         }
     }
 }
-
-impl FromStr for OutputFormat {
-    type Err = anyhow::Error;
-
-    fn from_str(s: &str) -> Result<Self> {
-        match s.to_lowercase().as_str() {
-            "markdown" | "md" => Ok(OutputFormat::Markdown),
-            "json" => Ok(OutputFormat::Json),
-            "xml" => Ok(OutputFormat::Xml),
-            _ => Err(anyhow!(
-                "Invalid output format: {}. Allowed values: markdown, json, xml",
-                s
-            )),
-        }
-    }
-}

crates/code2prompt/src/args.rs

@@ -45,10 +45,10 @@ pub struct Cli {
     #[clap(
         short = 'F',
         long = "output-format",
-        default_value = "markdown",
-        value_name = "markdown, json, xml"
+        value_name = "markdown, json, xml",
+        value_parser = ValueParser::new(parse_serde::<OutputFormat>)
     )]
-    pub output_format: OutputFormat,
+    pub output_format: Option<OutputFormat>,
 
     /// Optional Path to a custom Handlebars template
     #[clap(short, long, value_name = "TEMPLATE")]

crates/code2prompt/src/config.rs

@@ -6,8 +6,11 @@
 
 use anyhow::{Context, Result};
 use code2prompt_core::{
-    configuration::Code2PromptConfig, session::Code2PromptSession, sort::FileSortMethod,
-    template::extract_undefined_variables, tokenizer::TokenizerType,
+    configuration::Code2PromptConfig,
+    session::Code2PromptSession,
+    sort::FileSortMethod,
+    template::{OutputFormat, extract_undefined_variables},
+    tokenizer::TokenizerType,
 };
 use inquire::Text;
 use log::error;
@@ -55,7 +58,6 @@ pub fn build_session(
             expand_comma_separated_patterns(&args.exclude),
         )
     };
-
     configuration
         .include_patterns(include_patterns)
         .exclude_patterns(exclude_patterns);
@@ -64,14 +66,20 @@ pub fn build_session(
     let cfg_line_numbers = cfg.map(|c| c.line_numbers).unwrap_or(false);
     let cfg_absolute = cfg.map(|c| c.absolute_path).unwrap_or(false);
     let cfg_full_tree = cfg.map(|c| c.full_directory_tree).unwrap_or(false);
-
     configuration
         .line_numbers(args.line_numbers || cfg_line_numbers)
         .absolute_path(args.absolute_paths || cfg_absolute)
         .full_directory_tree(args.full_directory_tree || cfg_full_tree);
 
-    // Output format: CLI value
-    configuration.output_format(args.output_format.clone());
+    // Output format: CLI overrides config
+    let output_format = if let Some(output_format_str) = args.output_format {
+        output_format_str
+    } else if let Some(c) = cfg {
+        c.output_format.unwrap_or(OutputFormat::Markdown)
+    } else {
+        OutputFormat::Markdown
+    };
+    configuration.output_format(output_format);
 
     // Sort method: CLI overrides config
     let sort_method = if let Some(sort_str) = args.sort {
@@ -81,9 +89,9 @@ pub fn build_session(
     } else {
         FileSortMethod::NameAsc
     };
-
     configuration.sort_method(sort_method);
 
+    // Tokenizer settings: CLI overrides config
     let tokenizer_type = if let Some(encoding) = args.encoding {
         encoding
     } else if let Some(c) = cfg {
@@ -92,6 +100,7 @@ pub fn build_session(
         TokenizerType::Cl100kBase
     };
 
+    // Token format: CLI overrides config
     let token_format = if let Some(format) = args.token_format {
         format
     } else if let Some(c) = cfg {

crates/code2prompt/tests/config_test.rs

@@ -7,6 +7,7 @@ mod common;
 
 use assert_cmd::Command;
 use code2prompt_core::sort::FileSortMethod;
+use code2prompt_core::template::OutputFormat;
 use common::*;
 use predicates::prelude::*;
 use predicates::str::contains;
@@ -53,7 +54,7 @@ author = "ODAncona"
     assert!(config.line_numbers);
     assert!(!config.absolute_path);
     assert!(!config.full_directory_tree);
-    assert_eq!(config.output_format, Some("markdown".to_string()));
+    assert_eq!(config.output_format, Some(OutputFormat::Markdown));
     assert_eq!(config.sort_method, Some(FileSortMethod::NameAsc));
     assert_eq!(
         config.encoding,