Merge branch 'main' of github.com:mufeedvh/code2prompt

Author: Olivier D'Ancona

.github/workflows/release.yml

@@ -125,7 +125,7 @@ jobs:
 
       - name: Create GitHub Release and upload assets
         if: startsWith(github.ref, 'refs/tags/')
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           tag_name: ${{ github.ref }}
           name: Release ${{ github.ref }}

Cargo.lock

@@ -16,7 +16,7 @@ codegen-units = 1
 anyhow = "1.0.98"
 ansi_term = "0.12.1"
 arboard = { version = "3.6.0" }
-bracoxide = "0.1.6"
+bracoxide = "0.1.8"
 colored = "3.0.0"
 csv = "1.4.0"
 chrono = { version = "0.4", features = ["serde"] }
@@ -39,7 +39,7 @@ git2 = { version = "0.21.0", default-features = false, features = [
     "vendored-openssl",
 ] }
 globset = "0.4.15"
-handlebars = "6.3.2"
+handlebars = "6.4.0"
 once_cell = "1.19.0"
 pyo3 = { version = "0.28.3", features = ["extension-module", "abi3-py312"] }
 ratatui = "0.30.1"

Cargo.toml

@@ -74,7 +74,7 @@ code2prompt .
 **Save to file**:
 
 ```sh
-code2prompt path/to/project --output prompt.txt
+code2prompt path/to/project --output-file prompt.txt
 ```
 
 ## 🌐 Ecosystem

README.md

@@ -54,7 +54,7 @@ section = "utility"
 assets = [["target/release/code2prompt_core", "/usr/bin/", "755"]]
 
 [dev-dependencies]
-tempfile = "3.20"
+tempfile = "3.24"
 assert_cmd = "2.1.1"
 predicates = "3.1"
 env_logger = "0.11.3"

crates/code2prompt-core/Cargo.toml

@@ -85,6 +85,9 @@ pub struct Code2PromptConfig {
     /// (parallelized during file I/O). This flag only controls whether the breakdown
     /// is shown to users in the final output.
     pub token_map_enabled: bool,
+
+    /// If true, starts with all files deselected.
+    pub deselected: bool,
 }
 
 impl Code2PromptConfig {
@@ -148,6 +151,9 @@ pub struct TomlConfig {
 
     /// Token map
     pub token_map_enabled: bool,
+
+    /// Initial selection state
+    pub deselected: bool,
 }
 
 impl TomlConfig {
@@ -208,7 +214,8 @@ impl TomlConfig {
 
         builder
             .user_variables(self.user_variables.clone())
-            .token_map_enabled(self.token_map_enabled);
+            .token_map_enabled(self.token_map_enabled)
+            .deselected(self.deselected);
 
         builder.build().unwrap_or_default()
     }
@@ -249,6 +256,7 @@ pub fn export_config_to_toml(config: &Code2PromptConfig) -> Result<String, toml:
         },
         user_variables: config.user_variables.clone(),
         token_map_enabled: config.token_map_enabled,
+        deselected: config.deselected,
     };
 
     toml_config.to_string()

crates/code2prompt-core/src/configuration.rs

@@ -10,7 +10,11 @@ Source Tree:
 {{#if code}}
 `{{path}}`:
 
+{{#unless ../no_codeblock}}```{{extension}}
 {{code}}
+```{{else}}
+{{code}}
+{{/unless}}
 
 {{/if}}
 {{/each}}

crates/code2prompt-core/src/default_template_md.hbs

@@ -8,7 +8,9 @@
   {{#each files}}
     {{#if code}}
       <file path="{{path}}">
-        {{code}}
+        {{#unless ../no_codeblock}}```{{extension}}
+        {{/unless}}{{code}}{{#unless ../no_codeblock}}
+        ```{{/unless}}
       </file>
     {{/if}}
   {{/each}}

crates/code2prompt-core/src/default_template_xml.hbs

@@ -247,7 +247,7 @@ fn process_single_file(file_info: &FileToProcess, config: &Code2PromptConfig) ->
     };
 
     // Wrap code block
-    let code_block = wrap_code_block(&code, extension, config.line_numbers, config.no_codeblock);
+    let code_block = wrap_code_block(&code, config.line_numbers);
 
     // Filter empty or invalid files
     if code.trim().is_empty() || code.contains(char::REPLACEMENT_CHARACTER) {
@@ -331,41 +331,23 @@ pub fn display_name<P: AsRef<Path>>(p: P) -> String {
     ".".to_string()
 }
 
-/// Wraps the code block with a delimiter and adds line numbers if required.
+/// Adds line numbers to a code block if required.
 ///
 /// # Arguments
 ///
-/// * `code` - The code block to wrap.
-/// * `extension` - The file extension of the code block.
-/// * `line_numbers` - Whether to add line numbers to the code.
-/// * `no_codeblock` - Whether to not wrap the code block with a delimiter.
+/// * `code` - The code to process.
+/// * `line_numbers` - Whether to add line numbers.
 ///
 /// # Returns
 ///
-/// * `String` - The wrapped code block.
-pub fn wrap_code_block(
-    code: &str,
-    extension: &str,
-    line_numbers: bool,
-    no_codeblock: bool,
-) -> String {
-    let delimiter = "`".repeat(3);
-    let mut code_with_line_numbers = String::new();
-
+/// * `String` - The processed code.
+pub fn wrap_code_block(code: &str, line_numbers: bool) -> String {
     if line_numbers {
-        for (line_number, line) in code.lines().enumerate() {
-            code_with_line_numbers.push_str(&format!("{:4} | {}\n", line_number + 1, line));
-        }
-    } else {
-        code_with_line_numbers = code.to_string();
-    }
-
-    if no_codeblock {
-        code_with_line_numbers
+        code.lines()
+            .enumerate()
+            .map(|(i, line)| format!("{:4} | {}\n", i + 1, line))
+            .collect()
     } else {
-        format!(
-            "{}{}\n{}\n{}",
-            delimiter, extension, code_with_line_numbers, delimiter
-        )
+        code.to_string()
     }
 }

crates/code2prompt-core/src/path.rs

@@ -37,15 +37,23 @@ pub struct SelectionEngine {
 
     /// Cache for performance
     cache: HashMap<PathBuf, bool>,
+
+    /// Default behavior when no patterns or user actions match
+    deselected_by_default: bool,
 }
 
 impl SelectionEngine {
     /// Create a new SelectionEngine with base patterns
-    pub fn new(include_patterns: Vec<String>, exclude_patterns: Vec<String>) -> Self {
+    pub fn new(
+        include_patterns: Vec<String>,
+        exclude_patterns: Vec<String>,
+        deselected_by_default: bool,
+    ) -> Self {
         Self {
             filter_engine: FilterEngine::new(&include_patterns, &exclude_patterns),
             user_actions: Vec::new(),
             cache: HashMap::new(),
+            deselected_by_default,
         }
     }
 
@@ -74,9 +82,12 @@ impl SelectionEngine {
             // If there are include patterns, use them
             self.filter_engine.matches_patterns(path)
         } else {
-            // No include patterns: default behavior is to include all files
-            // (unless excluded by exclude patterns)
-            !self.filter_engine.is_excluded(path)
+            // No include patterns: default behavior depends on deselected_by_default
+            if self.deselected_by_default {
+                false
+            } else {
+                !self.filter_engine.is_excluded(path)
+            }
         }
     }
 
@@ -241,6 +252,12 @@ impl SelectionEngine {
     pub fn filter_engine(&self) -> &FilterEngine {
         &self.filter_engine
     }
+
+    /// Set whether the engine should default to deselected
+    pub fn set_deselected_by_default(&mut self, value: bool) {
+        self.deselected_by_default = value;
+        self.cache.clear();
+    }
 }
 
 impl std::fmt::Debug for SelectionEngine {
@@ -249,6 +266,7 @@ impl std::fmt::Debug for SelectionEngine {
             .field("filter_engine", &self.filter_engine)
             .field("user_actions", &self.user_actions)
             .field("cache_size", &self.cache.len())
+            .field("deselected_by_default", &self.deselected_by_default)
             .finish()
     }
 }
@@ -259,7 +277,7 @@ mod tests {
 
     #[test]
     fn test_specificity_calculation() {
-        let engine = SelectionEngine::new(vec![], vec![]);
+        let engine = SelectionEngine::new(vec![], vec![], false);
 
         assert_eq!(engine.calculate_specificity(Path::new("file.rs")), 1);
         assert_eq!(engine.calculate_specificity(Path::new("src/main.rs")), 2);
@@ -271,7 +289,7 @@ mod tests {
 
     #[test]
     fn test_precedence_rules() {
-        let mut engine = SelectionEngine::new(vec![], vec![]);
+        let mut engine = SelectionEngine::new(vec![], vec![], false);
 
         // Add less specific action first
         engine.exclude_file(PathBuf::from("src"));
@@ -286,7 +304,7 @@ mod tests {
 
     #[test]
     fn test_recent_wins_over_old() {
-        let mut engine = SelectionEngine::new(vec![], vec![]);
+        let mut engine = SelectionEngine::new(vec![], vec![], false);
 
         // First action
         engine.exclude_file(PathBuf::from("main.rs"));
@@ -296,4 +314,18 @@ mod tests {
         engine.include_file(PathBuf::from("main.rs"));
         assert!(engine.is_selected(Path::new("main.rs")));
     }
+
+    #[test]
+    fn test_deselected_by_default() {
+        let mut engine = SelectionEngine::new(vec![], vec![], true);
+
+        // By default everything is deselected
+        assert!(!engine.is_selected(Path::new("main.rs")));
+        assert!(!engine.is_selected(Path::new("src/lib.rs")));
+
+        // User action should still work
+        engine.include_file(PathBuf::from("main.rs"));
+        assert!(engine.is_selected(Path::new("main.rs")));
+        assert!(!engine.is_selected(Path::new("src/lib.rs")));
+    }
 }