@sun-asterisk/sunlint 1.3.20 → 1.3.21

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}`);
     }

package/core/github-annotate-service.js

@@ -182,14 +182,56 @@ function readJsonFile(jsonFile) {
   }
 }
 
+/**
+ * Get git root directory
+ * @param {string} cwd - Current working directory
+ * @returns {string} Git root path
+ */
+function getGitRoot(cwd = process.cwd()) {
+  try {
+    const { execSync } = require('child_process');
+    const gitRoot = execSync('git rev-parse --show-toplevel', {
+      cwd,
+      encoding: 'utf8'
+    }).trim();
+    return gitRoot;
+  } catch (error) {
+    logger.warn('Not a git repository, using cwd as root');
+    return cwd;
+  }
+}
+
+/**
+ * Normalize path to be relative from git root
+ * @param {string} filePath - File path (absolute or relative)
+ * @param {string} gitRoot - Git root directory
+ * @returns {string} Normalized relative path
+ */
+function normalizePathFromGitRoot(filePath, gitRoot) {
+  let normalized = filePath;
+
+  // Convert absolute path to relative from git root
+  if (filePath.startsWith(gitRoot)) {
+    normalized = filePath.slice(gitRoot.length);
+    if (normalized.startsWith('/') || normalized.startsWith('\\')) {
+      normalized = normalized.slice(1);
+    }
+  }
+
+  // Normalize path separators to forward slash
+  normalized = normalized.replace(/\\/g, '/');
+
+  return normalized;
+}
+
 /**
  * Parse violations from JSON data
  * @param {Array|Object} raw - Raw JSON data
+ * @param {string} gitRoot - Git root directory for path normalization
  * @returns {Array} Array of violation objects
  */
-function parseViolations(raw) {
+function parseViolations(raw, gitRoot) {
   const violations = [];
-  const cwd = process.env.GITHUB_WORKSPACE || process.cwd();
 
   if (Array.isArray(raw)) {
     for (const fileObj of raw) {
@@ -203,18 +245,8 @@ function parseViolations(raw) {
         continue;
       }
 
-      let relPath = fileObj.filePath;
-
-      // Convert absolute path to relative
-      if (relPath.startsWith(cwd)) {
-        relPath = relPath.slice(cwd.length);
-        if (relPath.startsWith('/') || relPath.startsWith('\\')) {
-          relPath = relPath.slice(1);
-        }
-      }
-
-      // Normalize path separators
-      relPath = relPath.replace(/\\/g, '/');
+      // Normalize path relative to git root (same as GitHub API)
+      const relPath = normalizePathFromGitRoot(fileObj.filePath, gitRoot);
 
       for (const msg of fileObj.messages) {
         if (!msg || typeof msg !== 'object') {
@@ -243,7 +275,12 @@ function parseViolations(raw) {
     if (!Array.isArray(rawViolations)) {
       throw new Error('violations property must be an array');
     }
-    violations.push(...rawViolations);
+
+    // Normalize paths for raw violations too
+    violations.push(...rawViolations.map(v => ({
+      ...v,
+      file: normalizePathFromGitRoot(v.file, gitRoot)
+    })));
   } else {
     throw new Error('JSON data must be an array or object with violations property');
   }
@@ -521,9 +558,13 @@ async function annotate({
     logger.info('Reading result file', { jsonFile });
     const raw = readJsonFile(jsonFile);
 
-    // Step 3: Parse violations
+    // Step 2.5: Get git root for path normalization
+    const gitRoot = getGitRoot();
+    logger.debug('Git root directory', { gitRoot });
+
+    // Step 3: Parse violations with git root normalization
     logger.info('Parsing violations');
-    const violations = parseViolations(raw);
+    const violations = parseViolations(raw, gitRoot);
 
     if (violations.length === 0) {
       logger.info('No violations found');
@@ -607,6 +648,14 @@ async function annotate({
     let linesSkipped = 0;
     let renamedFilesHandled = 0;
 
+    // Debug: Log sample paths for comparison
+    logger.debug('Path comparison debug:', {
+      sampleViolationFiles: violations.slice(0, 3).map(v => v.file),
+      samplePRFiles: Array.from(prFilesInfo.keys()).slice(0, 3),
+      totalViolations: violations.length,
+      totalPRFiles: prFilesInfo.size
+    });
+
     for (const v of violations) {
       let targetFile = v.file;
       let fileInfo = prFilesInfo.get(targetFile);
@@ -813,9 +862,13 @@ async function postSummaryComment({
     logger.info('Reading result file', { jsonFile });
     const raw = readJsonFile(jsonFile);
 
-    // Step 3: Parse violations
+    // Step 2.5: Get git root for path normalization
+    const gitRoot = getGitRoot();
+    logger.debug('Git root directory', { gitRoot });
+
+    // Step 3: Parse violations with git root normalization
     logger.info('Parsing violations for summary');
-    const violations = parseViolations(raw);
+    const violations = parseViolations(raw, gitRoot);
 
     // Step 4: Initialize Octokit
     const token = githubToken || process.env.GITHUB_TOKEN;

package/core/output-service.js

@@ -28,9 +28,9 @@ class OutputService {
     try {
       const packageJsonPath = path.join(__dirname, '..', 'package.json');
       const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
-      return packageJson.version || '1.3.18';
+      return packageJson.version || '1.3.21';
     } catch (error) {
-      return '1.3.18'; // Fallback version
+      return '1.3.21'; // Fallback version
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sun-asterisk/sunlint",
-  "version": "1.3.20",
+  "version": "1.3.21",
   "description": "☀️ SunLint - Multi-language static analysis tool for code quality and security | Sun* Engineering Standards",
   "main": "cli.js",
   "bin": {