added support for plural/singular detection by default

Author: ndbroadbent

renamify-cli/src/cli/args.rs

@@ -67,6 +67,10 @@ pub struct StyleArgs {
     /// Ignore mixed-case/ambiguous identifiers that don't match standard patterns
     #[arg(long)]
     pub ignore_ambiguous: bool,
+
+    /// Disable automatic singular/plural variants for matching identifiers
+    #[arg(long = "no-plural-variants")]
+    pub no_plural_variants: bool,
 }
 
 /// Common path filtering arguments
@@ -344,6 +348,10 @@ pub enum Commands {
         #[arg(long)]
         dry_run: bool,
 
+        /// Disable automatic singular/plural variants
+        #[arg(long = "no-plural-variants")]
+        no_plural_variants: bool,
+
         /// Skip confirmation prompt and apply immediately
         #[arg(short = 'y', long = "yes")]
         yes: bool,

renamify-cli/src/main.rs

@@ -135,6 +135,7 @@ fn main() {
                 output,
                 quiet,
                 styles.ignore_ambiguous,
+                !styles.no_plural_variants,
                 false, // regex flag - not used in Plan command
             )
         },
@@ -206,6 +207,7 @@ fn main() {
                 output,
                 quiet,
                 styles.ignore_ambiguous,
+                !styles.no_plural_variants,
                 false, // regex flag - not used in Search command
             )
         },
@@ -278,6 +280,7 @@ fn main() {
                 styles.exclude_styles,
                 styles.include_styles,
                 styles.only_styles,
+                !styles.no_plural_variants,
                 styles.ignore_ambiguous,
                 exclude_match,
                 exclude_matching_lines,
@@ -313,6 +316,7 @@ fn main() {
             commit,
             large,
             force_with_conflicts,
+            no_plural_variants,
             dry_run,
             yes,
             output,
@@ -336,6 +340,7 @@ fn main() {
                 commit,
                 large,
                 force_with_conflicts,
+                !no_plural_variants,
                 dry_run,
                 yes || cli.yes,
                 use_color,

renamify-cli/src/plan.rs

@@ -34,6 +34,7 @@ pub fn handle_plan(
     output: OutputFormat,
     quiet: bool,
     ignore_ambiguous: bool,
+    enable_plural_variants: bool,
     _regex: bool, // TODO: Implement regex mode
 ) -> Result<()> {
     // Error if both preview and JSON output are specified
@@ -110,6 +111,7 @@ pub fn handle_plan(
         include_acronyms,
         exclude_acronyms,
         only_acronyms,
+        enable_plural_variants,
         ignore_ambiguous,
         None, // working_dir
         Some(&atomic_config),

renamify-cli/src/rename.rs

@@ -17,6 +17,7 @@ pub fn handle_rename(
     exclude_styles: Vec<StyleArg>,
     include_styles: Vec<StyleArg>,
     only_styles: Vec<StyleArg>,
+    enable_plural_variants: bool,
     ignore_ambiguous: bool,
     exclude_match: Vec<String>,
     exclude_matching_lines: Option<String>,
@@ -87,6 +88,7 @@ pub fn handle_rename(
         &exclude_styles,
         &include_styles,
         &only_styles,
+        enable_plural_variants,
         ignore_ambiguous,
         &exclude_match,
         exclude_matching_lines.as_ref(),

renamify-cli/src/replace.rs

@@ -22,6 +22,7 @@ pub fn handle_replace(
     commit: bool,
     large: bool,
     force_with_conflicts: bool,
+    enable_plural_variants: bool,
     dry_run: bool,
     yes: bool,
     use_color: bool,
@@ -48,6 +49,7 @@ pub fn handle_replace(
         plan_out: PathBuf::from(".renamify/plan.json"),
         coerce_separators: renamify_core::scanner::CoercionMode::Off,
         atomic_config: None, // Replace doesn't use atomic mode
+        enable_plural_variants,
     };
 
     // Create the plan using simple regex/literal replacement

renamify-cli/src/search.rs

@@ -29,6 +29,7 @@ pub fn handle_search(
     output: OutputFormat,
     quiet: bool,
     ignore_ambiguous: bool,
+    enable_plural_variants: bool,
 ) -> Result<()> {
     // Convert CLI style args to core Style enum
     let exclude_styles: Vec<Style> = exclude_styles.into_iter().map(Into::into).collect();
@@ -80,6 +81,7 @@ pub fn handle_search(
         include_acronyms,
         exclude_acronyms,
         only_acronyms,
+        enable_plural_variants,
         ignore_ambiguous,
         None, // working_dir
         None, // atomic_config

renamify-cli/tests/cli_tests.rs

@@ -95,6 +95,7 @@ fn test_plan_command_basic() {
         vec![],                     // include_acronyms
         vec![],                     // exclude_acronyms
         vec![],                     // only_acronyms
+        true,                       // enable_plural_variants
         false,                      // ignore_ambiguous
         Some(temp_dir.path()),      // working_dir
         None,                       // atomic_config
@@ -143,6 +144,7 @@ fn test_plan_command_with_styles() {
         vec![],                // include_acronyms
         vec![],                // exclude_acronyms
         vec![],                // only_acronyms
+        true,                  // enable_plural_variants
         false,                 // ignore_ambiguous
         Some(temp_dir.path()), // working_dir
         None,                  // atomic_config
@@ -187,6 +189,7 @@ fn test_plan_command_with_styles() {
         vec![],                        // include_acronyms
         vec![],                        // exclude_acronyms
         vec![],                        // only_acronyms
+        true,                          // enable_plural_variants
         false,                         // ignore_ambiguous
         Some(temp_dir.path()),         // working_dir
         None,                          // atomic_config
@@ -201,6 +204,97 @@ fn test_plan_command_with_styles() {
     );
 }
 
+#[test]
+fn test_plan_command_plural_variant_toggle() {
+    let temp_dir = TempDir::new().unwrap();
+    let test_file = temp_dir.child("sample.ts");
+    test_file
+        .write_str(
+            "type DeployRequest = {}\n\
+type DeployRequestList = DeployRequest[];\n\
+export const load = (): Promise<DeployRequestList> => Promise.resolve([]);\n",
+        )
+        .unwrap();
+
+    let (enabled_result, _) = plan_operation(
+        "DeployRequests",
+        "DeployApprovalRequests",
+        vec![PathBuf::from(".")], // paths
+        vec![],                   // include
+        vec![],                   // exclude
+        true,                     // respect_gitignore
+        0,                        // unrestricted_level
+        true,                     // rename_files
+        true,                     // rename_dirs
+        &[],                      // exclude_styles
+        &[],                      // include_styles
+        &[],                      // only_styles
+        vec![],                   // exclude_match
+        None,                     // exclude_matching_lines
+        None,                     // plan_out
+        None,                     // preview_format
+        true,                     // dry_run
+        true,                     // fixed_table_width
+        false,                    // use_color
+        false,                    // no_acronyms
+        vec![],                   // include_acronyms
+        vec![],                   // exclude_acronyms
+        vec![],                   // only_acronyms
+        true,                     // enable_plural_variants
+        false,                    // ignore_ambiguous
+        Some(temp_dir.path()),    // working_dir
+        None,                     // atomic_config
+    )
+    .unwrap();
+
+    let plan_enabled = enabled_result
+        .plan
+        .expect("plan result should include plan");
+    assert!(plan_enabled.matches.iter().any(|m| m
+        .line_after
+        .as_deref()
+        .is_some_and(|line| line.contains("DeployApprovalRequestList"))));
+
+    let (disabled_result, _) = plan_operation(
+        "DeployRequests",
+        "DeployApprovalRequests",
+        vec![PathBuf::from(".")],
+        vec![],
+        vec![],
+        true,
+        0,
+        true,
+        true,
+        &[],
+        &[],
+        &[],
+        vec![],
+        None,
+        None,
+        None,
+        true,
+        true,
+        false,
+        false,
+        vec![],
+        vec![],
+        vec![],
+        false, // enable_plural_variants
+        false,
+        Some(temp_dir.path()),
+        None,
+    )
+    .unwrap();
+
+    let plan_disabled = disabled_result
+        .plan
+        .expect("plan result should include plan");
+    assert!(plan_disabled.matches.iter().all(|m| m
+        .line_after
+        .as_deref()
+        .is_none_or(|line| !line.contains("DeployApprovalRequestList"))));
+}
+
 #[test]
 fn test_plan_command_with_includes() {
     let temp_dir = TempDir::new().unwrap();

renamify-cli/tests/train_case_e2e_test.rs

@@ -235,6 +235,7 @@ The Rename-Tool-Based-Solution is working.
         &[],    // exclude_styles
         &[],    // include_styles
         &[],    // only_styles
+        true,   // enable_plural_variants
         false,  // ignore_ambiguous
         &[],    // exclude_match
         None,   // exclude_matching_lines

renamify-core/Cargo.toml

@@ -31,6 +31,7 @@ aho-corasick = "1.1"
 chrono = { version = "0.4", features = ["serde"] }
 toml = "0.9"
 diffy = "0.4.2"
+pluralizer = "0.5"
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2"