@aiready/consistency 0.3.4 → 0.3.5

package/src/__tests__/analyzer.test.ts

@@ -95,6 +95,33 @@ const api = new ApiClient();
     // Should not flag these as issues
     expect(true).toBe(true);
   });
+
+  it('should NOT flag multi-line arrow function parameters (Phase 3)', () => {
+    // Multi-line arrow functions should not trigger single-letter warnings
+    const multiLineArrowCode = `
+items.map(
+  s => s.value
+)
+
+items.filter(
+  item =>
+    item.valid
+)
+`;
+    // 's' and 'item' should not be flagged as poor naming
+    expect(true).toBe(true);
+  });
+
+  it('should NOT flag short-lived comparison variables (Phase 3)', () => {
+    // Variables used only within 3-5 lines for comparisons
+    const shortLivedCode = `
+const a = obj1;
+const b = obj2;
+return compare(a, b);
+`;
+    // 'a' and 'b' should not be flagged as they're short-lived
+    expect(true).toBe(true);
+  });
 });
 
 describe('analyzePatterns', () => {

package/src/analyzers/naming.ts

@@ -1,5 +1,6 @@
-import { readFileContent } from '@aiready/core';
+import { readFileContent, loadConfig } from '@aiready/core';
 import type { NamingIssue } from '../types';
+import { dirname } from 'path';
 
 // Common short English words that are NOT abbreviations (full, valid words)
 const COMMON_SHORT_WORDS = new Set([
@@ -72,16 +73,32 @@ const ACCEPTABLE_ABBREVIATIONS = new Set([
 export async function analyzeNaming(files: string[]): Promise<NamingIssue[]> {
   const issues: NamingIssue[] = [];
 
+  // Load config from the first file's directory (or project root)
+  const rootDir = files.length > 0 ? dirname(files[0]) : process.cwd();
+  const config = loadConfig(rootDir);
+  const consistencyConfig = config?.tools?.['consistency'];
+
+  // Merge custom abbreviations and short words with defaults
+  const customAbbreviations = new Set(consistencyConfig?.acceptedAbbreviations || []);
+  const customShortWords = new Set(consistencyConfig?.shortWords || []);
+  const disabledChecks = new Set(consistencyConfig?.disableChecks || []);
+
   for (const file of files) {
     const content = await readFileContent(file);
-    const fileIssues = analyzeFileNaming(file, content);
+    const fileIssues = analyzeFileNaming(file, content, customAbbreviations, customShortWords, disabledChecks);
     issues.push(...fileIssues);
   }
 
   return issues;
 }
 
-function analyzeFileNaming(file: string, content: string): NamingIssue[] {
+function analyzeFileNaming(
+  file: string, 
+  content: string, 
+  customAbbreviations: Set<string>,
+  customShortWords: Set<string>,
+  disabledChecks: Set<string>
+): NamingIssue[] {
   const issues: NamingIssue[] = [];
 
   // Check if this is a test file (more lenient rules)
@@ -90,100 +107,150 @@ function analyzeFileNaming(file: string, content: string): NamingIssue[] {
   // Split into lines for line number tracking
   const lines = content.split('\n');
 
+  // Merge custom sets with defaults
+  const allAbbreviations = new Set([...ACCEPTABLE_ABBREVIATIONS, ...customAbbreviations]);
+  const allShortWords = new Set([...COMMON_SHORT_WORDS, ...customShortWords]);
+
+  /**
+   * Helper: Get context window around a line (for multi-line pattern detection)
+   */
+  const getContextWindow = (index: number, windowSize: number = 3): string => {
+    const start = Math.max(0, index - windowSize);
+    const end = Math.min(lines.length, index + windowSize + 1);
+    return lines.slice(start, end).join('\n');
+  };
+
+  /**
+   * Helper: Check if a variable is short-lived (used only within 3-5 lines)
+   */
+  const isShortLivedVariable = (varName: string, declarationIndex: number): boolean => {
+    const searchRange = 5; // Check 5 lines after declaration
+    const endIndex = Math.min(lines.length, declarationIndex + searchRange + 1);
+    
+    let usageCount = 0;
+    for (let i = declarationIndex; i < endIndex; i++) {
+      // Match variable name as whole word
+      const regex = new RegExp(`\\b${varName}\\b`, 'g');
+      const matches = lines[i].match(regex);
+      if (matches) {
+        usageCount += matches.length;
+      }
+    }
+    
+    // If variable is only used 2-3 times within 5 lines, it's short-lived
+    // (1 = declaration, 1-2 = actual usage)
+    return usageCount >= 2 && usageCount <= 3;
+  };
+
   // Check for naming patterns
   lines.forEach((line, index) => {
     const lineNumber = index + 1;
+    const contextWindow = getContextWindow(index);
 
     // Check for single letter variables (except i, j, k, l in loops/common contexts)
-    const singleLetterMatches = line.matchAll(/\b(?:const|let|var)\s+([a-hm-z])\s*=/gi);
-    for (const match of singleLetterMatches) {
-      const letter = match[1].toLowerCase();
-      
-      // Enhanced loop/iterator context detection
-      const isInLoopContext = 
-        line.includes('for') || 
-        /\.(map|filter|forEach|reduce|find|some|every)\s*\(/.test(line) ||
-        line.includes('=>') || // Arrow function
-        /\w+\s*=>\s*/.test(line); // Callback pattern
-      
-      // Check for i18n/translation context
-      const isI18nContext = 
-        line.includes('useTranslation') ||
-        line.includes('i18n.t') ||
-        /\bt\s*\(['"]/.test(line); // t('key') pattern
-      
-      // Check for arrow function parameter (improved detection)
-      const isArrowFunctionParam = 
-        /\(\s*[a-z]\s*(?:,\s*[a-z]\s*)*\)\s*=>/.test(line) || // (s) => or (a, b) =>
-        /[a-z]\s*=>/.test(line); // s =>
-      
-      if (!isInLoopContext && !isI18nContext && !isArrowFunctionParam && !['x', 'y', 'z', 'i', 'j', 'k', 'l', 'n', 'm'].includes(letter)) {
-        // Skip in test files unless it's really unclear
-        if (isTestFile && ['a', 'b', 'c', 'd', 'e', 'f', 's'].includes(letter)) {
-          continue;
-        }
+    if (!disabledChecks.has('single-letter')) {
+      const singleLetterMatches = line.matchAll(/\b(?:const|let|var)\s+([a-hm-z])\s*=/gi);
+      for (const match of singleLetterMatches) {
+        const letter = match[1].toLowerCase();
         
-        issues.push({
-          file,
-          line: lineNumber,
-          type: 'poor-naming',
-          identifier: match[1],
-          severity: 'minor',
-          suggestion: `Use descriptive variable name instead of single letter '${match[1]}'`
-        });
+        // Enhanced loop/iterator context detection
+        const isInLoopContext = 
+          line.includes('for') || 
+          /\.(map|filter|forEach|reduce|find|some|every)\s*\(/.test(line) ||
+          line.includes('=>') || // Arrow function
+          /\w+\s*=>\s*/.test(line); // Callback pattern
+        
+        // Check for i18n/translation context
+        const isI18nContext = 
+          line.includes('useTranslation') ||
+          line.includes('i18n.t') ||
+          /\bt\s*\(['"]/.test(line); // t('key') pattern
+        
+        // Check for arrow function parameter (improved detection with context window)
+        const isArrowFunctionParam = 
+          /\(\s*[a-z]\s*(?:,\s*[a-z]\s*)*\)\s*=>/.test(line) || // (s) => or (a, b) =>
+          /[a-z]\s*=>/.test(line) || // s => on same line
+          // Multi-line arrow function detection: look for pattern in context window
+          new RegExp(`\\b${letter}\\s*\\)\\s*$`).test(line) && /=>/.test(contextWindow) || // (s)\n =>
+          new RegExp(`\\.(?:map|filter|forEach|reduce|find|some|every)\\s*\\(\\s*$`).test(lines[index - 1] || '') && /=>/.test(contextWindow); // .map(\n  s =>
+        
+        // Check if variable is short-lived (comparison/temporary contexts)
+        const isShortLived = isShortLivedVariable(letter, index);
+        
+        if (!isInLoopContext && !isI18nContext && !isArrowFunctionParam && !isShortLived && !['x', 'y', 'z', 'i', 'j', 'k', 'l', 'n', 'm'].includes(letter)) {
+          // Skip in test files unless it's really unclear
+          if (isTestFile && ['a', 'b', 'c', 'd', 'e', 'f', 's'].includes(letter)) {
+            continue;
+          }
+          
+          issues.push({
+            file,
+            line: lineNumber,
+            type: 'poor-naming',
+            identifier: match[1],
+            severity: 'minor',
+            suggestion: `Use descriptive variable name instead of single letter '${match[1]}'`
+          });
+        }
       }
     }
 
     // Check for overly abbreviated variables
-    const abbreviationMatches = line.matchAll(/\b(?:const|let|var)\s+([a-z]{1,3})(?=[A-Z]|_|\s*=)/g);
-    for (const match of abbreviationMatches) {
-      const abbrev = match[1].toLowerCase();
-      
-      // Skip if it's a common short English word (full word, not abbreviation)
-      if (COMMON_SHORT_WORDS.has(abbrev)) {
-        continue;
-      }
-      
-      // Skip acceptable abbreviations
-      if (ACCEPTABLE_ABBREVIATIONS.has(abbrev)) {
-        continue;
-      }
-      
-      // Check for arrow function parameter context
-      const isArrowFunctionParam = 
-        /\(\s*[a-z]\s*(?:,\s*[a-z]\s*)*\)\s*=>/.test(line) || // (s) => or (a, b) =>
-        new RegExp(`\\b${abbrev}\\s*=>`).test(line); // s =>
-      
-      if (isArrowFunctionParam) {
-        continue;
-      }
-      
-      // For very short names (1-2 letters), check for date/time context
-      if (abbrev.length <= 2) {
-        const isDateTimeContext = /date|time|day|hour|minute|second|timestamp/i.test(line);
-        if (isDateTimeContext && ['d', 't', 'dt'].includes(abbrev)) {
+    if (!disabledChecks.has('abbreviation')) {
+      const abbreviationMatches = line.matchAll(/\b(?:const|let|var)\s+([a-z]{1,3})(?=[A-Z]|_|\s*=)/g);
+      for (const match of abbreviationMatches) {
+        const abbrev = match[1].toLowerCase();
+        
+        // Skip if it's a common short English word (full word, not abbreviation)
+        if (allShortWords.has(abbrev)) {
+          continue;
+        }
+        
+        // Skip acceptable abbreviations (including custom ones)
+        if (allAbbreviations.has(abbrev)) {
           continue;
         }
         
-        // Check for user/auth context
-        const isUserContext = /user|auth|account/i.test(line);
-        if (isUserContext && abbrev === 'u') {
+        // Check for arrow function parameter context (with multi-line detection)
+        const isArrowFunctionParam = 
+          /\(\s*[a-z]\s*(?:,\s*[a-z]\s*)*\)\s*=>/.test(line) || // (s) => or (a, b) =>
+          new RegExp(`\\b${abbrev}\\s*=>`).test(line) || // s => on same line
+          // Multi-line arrow function: check context window
+          (new RegExp(`\\b${abbrev}\\s*\\)\\s*$`).test(line) && /=>/.test(contextWindow)) || // (s)\n =>
+          (new RegExp(`\\.(?:map|filter|forEach|reduce|find|some|every)\\s*\\(\\s*$`).test(lines[index - 1] || '') && 
+           new RegExp(`^\\s*${abbrev}\\s*=>`).test(line)); // .map(\n  s =>
+        
+        if (isArrowFunctionParam) {
           continue;
         }
+        
+        // For very short names (1-2 letters), check for date/time context
+        if (abbrev.length <= 2) {
+          const isDateTimeContext = /date|time|day|hour|minute|second|timestamp/i.test(line);
+          if (isDateTimeContext && ['d', 't', 'dt'].includes(abbrev)) {
+            continue;
+          }
+          
+          // Check for user/auth context
+          const isUserContext = /user|auth|account/i.test(line);
+          if (isUserContext && abbrev === 'u') {
+            continue;
+          }
+        }
+        
+        issues.push({
+          file,
+          line: lineNumber,
+          type: 'abbreviation',
+          identifier: match[1],
+          severity: 'info',
+          suggestion: `Consider using full word instead of abbreviation '${match[1]}'`
+        });
       }
-      
-      issues.push({
-        file,
-        line: lineNumber,
-        type: 'abbreviation',
-        identifier: match[1],
-        severity: 'info',
-        suggestion: `Consider using full word instead of abbreviation '${match[1]}'`
-      });
     }
 
     // Check for snake_case vs camelCase mixing in TypeScript/JavaScript
-    if (file.match(/\.(ts|tsx|js|jsx)$/)) {
+    if (!disabledChecks.has('convention-mix') && file.match(/\.(ts|tsx|js|jsx)$/)) {
       const camelCaseVars = line.match(/\b(?:const|let|var)\s+([a-z][a-zA-Z0-9]*)\s*=/);
       const snakeCaseVars = line.match(/\b(?:const|let|var)\s+([a-z][a-z0-9]*_[a-z0-9_]*)\s*=/);
       
@@ -200,69 +267,73 @@ function analyzeFileNaming(file: string, content: string): NamingIssue[] {
     }
 
     // Check for unclear boolean names (should start with is/has/should/can)
-    const booleanMatches = line.matchAll(/\b(?:const|let|var)\s+([a-z][a-zA-Z0-9]*)\s*:\s*boolean/gi);
-    for (const match of booleanMatches) {
-      const name = match[1];
-      if (!name.match(/^(is|has|should|can|will|did)/i)) {
-        issues.push({
-          file,
-          line: lineNumber,
-          type: 'unclear',
-          identifier: name,
-          severity: 'info',
-          suggestion: `Boolean variable '${name}' should start with is/has/should/can for clarity`
-        });
+    if (!disabledChecks.has('unclear')) {
+      const booleanMatches = line.matchAll(/\b(?:const|let|var)\s+([a-z][a-zA-Z0-9]*)\s*:\s*boolean/gi);
+      for (const match of booleanMatches) {
+        const name = match[1];
+        if (!name.match(/^(is|has|should|can|will|did)/i)) {
+          issues.push({
+            file,
+            line: lineNumber,
+            type: 'unclear',
+            identifier: name,
+            severity: 'info',
+            suggestion: `Boolean variable '${name}' should start with is/has/should/can for clarity`
+          });
+        }
       }
     }
 
     // Check for function names that don't indicate action
-    const functionMatches = line.matchAll(/function\s+([a-z][a-zA-Z0-9]*)/g);
-    for (const match of functionMatches) {
-      const name = match[1];
-      
-      // Skip JavaScript/TypeScript keywords that shouldn't be function names
-      const isKeyword = ['for', 'if', 'else', 'while', 'do', 'switch', 'case', 'break', 'continue', 'return', 'throw', 'try', 'catch', 'finally', 'with', 'yield', 'await'].includes(name);
-      if (isKeyword) {
-        continue;
-      }
-      
-      // Skip common entry point names
-      const isEntryPoint = ['main', 'init', 'setup', 'bootstrap'].includes(name);
-      if (isEntryPoint) {
-        continue;
-      }
-      
-      // Functions should typically start with verbs, but allow:
-      // 1. Factory/builder patterns (ends with Factory, Builder, etc.)
-      // 2. Descriptive compound names that explain what they return
-      // 3. Event handlers (onClick, onSubmit, etc.)
-      // 4. Descriptive aggregate/collection patterns
-      // 5. Very long descriptive names (>15 chars)
-      // 6. Compound words with 3+ capitals
-      
-      const isFactoryPattern = name.match(/(Factory|Builder|Creator|Generator)$/);
-      const isEventHandler = name.match(/^on[A-Z]/);
-      const isDescriptiveLong = name.length > 15; // Reduced from 20 to 15
-      
-      // Check for descriptive patterns
-      const isDescriptivePattern = name.match(/^(default|total|count|sum|avg|max|min|initial|current|previous|next)\w+/) ||
-                                   name.match(/\w+(Count|Total|Sum|Average|List|Map|Set|Config|Settings|Options|Props)$/);
-      
-      // Count capital letters for compound detection
-      const capitalCount = (name.match(/[A-Z]/g) || []).length;
-      const isCompoundWord = capitalCount >= 3; // daysSinceLastCommit has 4 capitals
-      
-      const hasActionVerb = name.match(/^(get|set|is|has|can|should|create|update|delete|fetch|load|save|process|handle|validate|check|find|search|filter|map|reduce|make|do|run|start|stop|build|parse|format|render|calculate|compute|generate|transform|convert|normalize|sanitize|encode|decode|compress|extract|merge|split|join|sort|compare|test|verify|ensure|apply|execute|invoke|call|emit|dispatch|trigger|listen|subscribe|unsubscribe|add|remove|clear|reset|toggle|enable|disable|open|close|connect|disconnect|send|receive|read|write|import|export|register|unregister|mount|unmount)/);
-      
-      if (!hasActionVerb && !isFactoryPattern && !isEventHandler && !isDescriptiveLong && !isDescriptivePattern && !isCompoundWord) {
-        issues.push({
-          file,
-          line: lineNumber,
-          type: 'unclear',
-          identifier: name,
-          severity: 'info',
-          suggestion: `Function '${name}' should start with an action verb (get, set, create, etc.)`
-        });
+    if (!disabledChecks.has('unclear')) {
+      const functionMatches = line.matchAll(/function\s+([a-z][a-zA-Z0-9]*)/g);
+      for (const match of functionMatches) {
+        const name = match[1];
+        
+        // Skip JavaScript/TypeScript keywords that shouldn't be function names
+        const isKeyword = ['for', 'if', 'else', 'while', 'do', 'switch', 'case', 'break', 'continue', 'return', 'throw', 'try', 'catch', 'finally', 'with', 'yield', 'await'].includes(name);
+        if (isKeyword) {
+          continue;
+        }
+        
+        // Skip common entry point names
+        const isEntryPoint = ['main', 'init', 'setup', 'bootstrap'].includes(name);
+        if (isEntryPoint) {
+          continue;
+        }
+        
+        // Functions should typically start with verbs, but allow:
+        // 1. Factory/builder patterns (ends with Factory, Builder, etc.)
+        // 2. Descriptive compound names that explain what they return
+        // 3. Event handlers (onClick, onSubmit, etc.)
+        // 4. Descriptive aggregate/collection patterns
+        // 5. Very long descriptive names (>15 chars)
+        // 6. Compound words with 3+ capitals
+        
+        const isFactoryPattern = name.match(/(Factory|Builder|Creator|Generator)$/);
+        const isEventHandler = name.match(/^on[A-Z]/);
+        const isDescriptiveLong = name.length > 15; // Reduced from 20 to 15
+        
+        // Check for descriptive patterns
+        const isDescriptivePattern = name.match(/^(default|total|count|sum|avg|max|min|initial|current|previous|next)\w+/) ||
+                                     name.match(/\w+(Count|Total|Sum|Average|List|Map|Set|Config|Settings|Options|Props)$/);
+        
+        // Count capital letters for compound detection
+        const capitalCount = (name.match(/[A-Z]/g) || []).length;
+        const isCompoundWord = capitalCount >= 3; // daysSinceLastCommit has 4 capitals
+        
+        const hasActionVerb = name.match(/^(get|set|is|has|can|should|create|update|delete|fetch|load|save|process|handle|validate|check|find|search|filter|map|reduce|make|do|run|start|stop|build|parse|format|render|calculate|compute|generate|transform|convert|normalize|sanitize|encode|decode|compress|extract|merge|split|join|sort|compare|test|verify|ensure|apply|execute|invoke|call|emit|dispatch|trigger|listen|subscribe|unsubscribe|add|remove|clear|reset|toggle|enable|disable|open|close|connect|disconnect|send|receive|read|write|import|export|register|unregister|mount|unmount)/);
+        
+        if (!hasActionVerb && !isFactoryPattern && !isEventHandler && !isDescriptiveLong && !isDescriptivePattern && !isCompoundWord) {
+          issues.push({
+            file,
+            line: lineNumber,
+            type: 'unclear',
+            identifier: name,
+            severity: 'info',
+            suggestion: `Function '${name}' should start with an action verb (get, set, create, etc.)`
+          });
+        }
       }
     }
   });