@sun-asterisk/sunlint 1.3.19 → 1.3.21

package/core/cli-program.js

@@ -37,7 +37,7 @@ function createCliProgram() {
     .option('--output-summary <file>', 'Output summary report file path (JSON format for CI/CD)')
     .option('--upload-report [url]', 'Upload summary report to API endpoint after analysis (default: Sun* Coding Standards API)')
     .option('--config <file>', 'Configuration file path (default: auto-discover)')
-    .option('--github-annotate', 'Annotate GitHub PR with results (requires --output and --format=json)');
+    .option('--github-annotate [mode]', 'Annotate GitHub PR: annotate (inline), summary (comment), all (both) - default: all');
 
   // File targeting options
   program
@@ -135,6 +135,13 @@ CI/CD Integration:
   $ sunlint --all --output-summary=report.json --upload-report
   $ sunlint --all --output-summary=report.json --upload-report=https://custom-api.com/reports
 
+GitHub Actions Integration:
+  $ sunlint --all --input=src --github-annotate                       # Both inline + summary (default)
+  $ sunlint --all --input=src --github-annotate=annotate              # Inline comments only
+  $ sunlint --all --input=src --github-annotate=summary               # Summary comment only
+  $ sunlint --all --input=src --github-annotate=all                   # Both inline + summary
+  $ sunlint --all --changed-files --github-annotate                   # With changed files
+
 ESLint Integration:
   $ sunlint --typescript --eslint-integration --input=src
   $ sunlint --all --eslint-integration --eslint-merge-rules --input=src

package/core/file-targeting-service.js

@@ -12,6 +12,7 @@ const { minimatch } = require('minimatch');
 class FileTargetingService {
   constructor() {
     this.supportedLanguages = ['typescript', 'javascript', 'dart', 'kotlin', 'java', 'swift'];
+    this.GitUtils = require('./git-utils');
   }
 
   /**
@@ -22,35 +23,43 @@ class FileTargetingService {
     try {
       const startTime = Date.now();
       const metadata = config._metadata;
-      
+
       if (cliOptions.verbose) {
         console.log(chalk.cyan(`📁 File Targeting: ${this.getTargetingMode(metadata)}`));
         if (metadata?.shouldBypassProjectDiscovery) {
           console.log(chalk.blue(`🎯 Optimized targeting for ${metadata.analysisScope}`));
         }
       }
-      
+
       let allFiles = [];
-      
-      // Smart project-level optimization
-      const optimizedPaths = this.optimizeProjectPaths(inputPaths, cliOptions);
-      
-      // Use enhanced targeting based on metadata
-      if (metadata?.shouldBypassProjectDiscovery) {
-        allFiles = await this.collectTargetedFiles(optimizedPaths, config, cliOptions);
+
+      // Handle --changed-files option (git diff mode)
+      if (cliOptions.changedFiles) {
+        if (cliOptions.verbose) {
+          console.log(chalk.cyan('🔄 Using --changed-files mode (git diff)'));
+        }
+        allFiles = await this.getGitChangedFiles(cliOptions);
       } else {
-        allFiles = await this.collectProjectFiles(optimizedPaths, config, cliOptions);
+        // Smart project-level optimization
+        const optimizedPaths = this.optimizeProjectPaths(inputPaths, cliOptions);
+
+        // Use enhanced targeting based on metadata
+        if (metadata?.shouldBypassProjectDiscovery) {
+          allFiles = await this.collectTargetedFiles(optimizedPaths, config, cliOptions);
+        } else {
+          allFiles = await this.collectProjectFiles(optimizedPaths, config, cliOptions);
+        }
       }
 
       // Apply filtering logic
       const targetFiles = this.applyFiltering(allFiles, config, cliOptions);
-      
+
       const duration = Date.now() - startTime;
-      
+
       if (cliOptions.verbose) {
         console.log(chalk.green(`✅ File targeting completed in ${duration}ms (${targetFiles.length} files)`));
       }
-      
+
       return {
         files: targetFiles,
         stats: this.generateStats(targetFiles, config),
@@ -62,6 +71,41 @@ class FileTargetingService {
     }
   }
 
+  /**
+   * Get files changed in git (for --changed-files option)
+   */
+  async getGitChangedFiles(cliOptions) {
+    try {
+      const baseRef = cliOptions.diffBase || null; // null = auto-detect
+      const changedFiles = this.GitUtils.getChangedFiles(baseRef);
+
+      if (cliOptions.verbose) {
+        const detectedBase = baseRef || this.GitUtils.getSmartBaseRef();
+        console.log(chalk.blue(`ℹ️  Using base ref: ${detectedBase}`));
+        console.log(chalk.blue(`ℹ️  Found ${changedFiles.length} changed file(s)`));
+
+        if (changedFiles.length > 0 && changedFiles.length <= 10) {
+          console.log(chalk.gray('   Changed files:'));
+          changedFiles.forEach(f => {
+            console.log(chalk.gray(`   - ${path.relative(process.cwd(), f)}`));
+          });
+        } else if (changedFiles.length > 10) {
+          console.log(chalk.gray(`   First 10 changed files:`));
+          changedFiles.slice(0, 10).forEach(f => {
+            console.log(chalk.gray(`   - ${path.relative(process.cwd(), f)}`));
+          });
+          console.log(chalk.gray(`   ... and ${changedFiles.length - 10} more`));
+        }
+      }
+
+      return changedFiles;
+    } catch (error) {
+      console.error(chalk.yellow(`⚠️  Failed to get changed files: ${error.message}`));
+      console.error(chalk.yellow('ℹ️  Falling back to all files'));
+      return [];
+    }
+  }
+
   /**
    * Get targeting mode description
    */
@@ -293,15 +337,22 @@ class FileTargetingService {
     if (debug) console.log(`🔍 [DEBUG] applyFiltering: start with ${filteredFiles.length} files`);
     if (debug) console.log(`🔍 [DEBUG] config.include:`, config.include);
     if (debug) console.log(`🔍 [DEBUG] cliOptions.include:`, cliOptions.include);
+    if (debug) console.log(`🔍 [DEBUG] cliOptions.changedFiles:`, cliOptions.changedFiles);
+
+    // IMPORTANT: When using --changed-files, skip include patterns
+    // Git already filtered the files, we only need to apply excludes
+    const skipIncludePatterns = cliOptions.changedFiles;
 
     // 1. Apply config include patterns first (medium priority)
-    if (config.include && config.include.length > 0) {
+    if (!skipIncludePatterns && config.include && config.include.length > 0) {
       filteredFiles = this.applyIncludePatterns(filteredFiles, config.include, debug);
       if (debug) console.log(`🔍 [DEBUG] After config include: ${filteredFiles.length} files`);
+    } else if (skipIncludePatterns && debug) {
+      console.log(`🔍 [DEBUG] Skipping config include patterns (--changed-files mode)`);
     }
 
     // 2. Apply CLI include overrides (highest priority - completely overrides config)
-    if (cliOptions.include) {
+    if (!skipIncludePatterns && cliOptions.include) {
       // CLI include completely replaces config include - start fresh from all files
       filteredFiles = this.applyIncludePatterns([...files], cliOptions.include, debug);
     }

package/core/git-utils.js

@@ -21,13 +21,98 @@ class GitUtils {
     }
   }
 
+  /**
+   * Detect if running in PR context (GitHub Actions, GitLab CI, etc.)
+   * @returns {Object|null} PR context info or null
+   */
+  static detectPRContext() {
+    // GitHub Actions
+    if (process.env.GITHUB_EVENT_NAME === 'pull_request' ||
+        process.env.GITHUB_EVENT_NAME === 'pull_request_target') {
+      return {
+        provider: 'github',
+        baseBranch: process.env.GITHUB_BASE_REF,
+        headBranch: process.env.GITHUB_HEAD_REF,
+        prNumber: process.env.GITHUB_REF ? process.env.GITHUB_REF.match(/refs\/pull\/(\d+)\/merge/)?.[1] : null
+      };
+    }
+
+    // GitLab CI
+    if (process.env.CI_MERGE_REQUEST_ID) {
+      return {
+        provider: 'gitlab',
+        baseBranch: process.env.CI_MERGE_REQUEST_TARGET_BRANCH_NAME,
+        headBranch: process.env.CI_MERGE_REQUEST_SOURCE_BRANCH_NAME,
+        prNumber: process.env.CI_MERGE_REQUEST_IID
+      };
+    }
+
+    return null;
+  }
+
+  /**
+   * Get smart base reference for diff
+   * Auto-detects PR context or falls back to common base branches
+   * @param {string} cwd - Working directory
+   * @returns {string} Base reference for git diff
+   */
+  static getSmartBaseRef(cwd = process.cwd()) {
+    if (!this.isGitRepository(cwd)) {
+      throw new Error('Not a git repository');
+    }
+
+    // Check PR context first
+    const prContext = this.detectPRContext();
+    if (prContext && prContext.baseBranch) {
+      const candidates = [
+        `origin/${prContext.baseBranch}`,
+        `upstream/${prContext.baseBranch}`,
+        prContext.baseBranch
+      ];
+
+      for (const candidate of candidates) {
+        try {
+          execSync(`git rev-parse --verify ${candidate}`, { cwd, stdio: 'ignore' });
+          return candidate;
+        } catch (error) {
+          // Continue to next candidate
+        }
+      }
+    }
+
+    // Fallback to common base branches
+    const fallbackBranches = [
+      'origin/main',
+      'origin/master',
+      'origin/develop',
+      'upstream/main',
+      'upstream/master',
+      'main',
+      'master',
+      'develop'
+    ];
+
+    for (const branch of fallbackBranches) {
+      try {
+        execSync(`git rev-parse --verify ${branch}`, { cwd, stdio: 'ignore' });
+        return branch;
+      } catch (error) {
+        // Continue to next candidate
+      }
+    }
+
+    // Last resort: use HEAD (uncommitted changes only)
+    return 'HEAD';
+  }
+
   /**
    * Get list of changed files compared to base reference
-   * @param {string} baseRef - Base git reference (e.g., 'origin/main')
+   * @param {string|null} baseRef - Base git reference (e.g., 'origin/main'). If null, auto-detect.
    * @param {string} cwd - Working directory
+   * @param {boolean} includeUncommitted - Include uncommitted changes
    * @returns {string[]} Array of changed file paths
    */
-  static getChangedFiles(baseRef = 'HEAD', cwd = process.cwd()) {
+  static getChangedFiles(baseRef = null, cwd = process.cwd(), includeUncommitted = true) {
     if (!this.isGitRepository(cwd)) {
       throw new Error('Not a git repository');
     }
@@ -35,15 +120,40 @@ class GitUtils {
     try {
       // Get git root directory
       const gitRoot = execSync('git rev-parse --show-toplevel', { cwd, encoding: 'utf8' }).trim();
-      
-      const command = `git diff --name-only ${baseRef}`;
-      const output = execSync(command, { cwd: gitRoot, encoding: 'utf8' });
-      
-      return output
-        .split('\n')
-        .filter(file => file.trim() !== '')
-        .map(file => path.resolve(gitRoot, file))
-        .filter(file => fs.existsSync(file)); // Only existing files
+
+      // Auto-detect base ref if not provided
+      const actualBaseRef = baseRef || this.getSmartBaseRef(cwd);
+
+      const allFiles = new Set();
+
+      // Get committed changes
+      if (actualBaseRef !== 'HEAD') {
+        // Use two-dot diff for branch comparison (what's new in this branch)
+        const command = `git diff --name-only ${actualBaseRef}..HEAD`;
+        const output = execSync(command, { cwd: gitRoot, encoding: 'utf8' });
+
+        output
+          .split('\n')
+          .filter(file => file.trim() !== '')
+          .forEach(file => allFiles.add(path.resolve(gitRoot, file)));
+      }
+
+      // Get uncommitted changes if requested
+      if (includeUncommitted) {
+        const uncommittedCommand = 'git diff --name-only HEAD';
+        try {
+          const uncommittedOutput = execSync(uncommittedCommand, { cwd: gitRoot, encoding: 'utf8' });
+          uncommittedOutput
+            .split('\n')
+            .filter(file => file.trim() !== '')
+            .forEach(file => allFiles.add(path.resolve(gitRoot, file)));
+        } catch (error) {
+          // Ignore errors for uncommitted changes (might be empty)
+        }
+      }
+
+      // Filter to only existing files
+      return Array.from(allFiles).filter(file => fs.existsSync(file));
     } catch (error) {
       throw new Error(`Failed to get changed files: ${error.message}`);
     }