moved print to scanconsole

Author: Chrilleweb

src/commands/scanUsage.ts

@@ -1,19 +1,14 @@
-import path from 'path';
 import { scanCodebase } from '../services/codeBaseScanner.js';
 import type {
   ScanUsageOptions,
   EnvUsage,
-  Filtered,
   ScanResult,
 } from '../config/types.js';
 import { determineComparisonFile } from '../core/determineComparisonFile.js';
 import { outputToConsole } from '../services/scanOutputToConsole.js';
 import { createJsonOutput } from '../core/scanJsonOutput.js';
-import { isEnvIgnoredByGit } from '../services/git.js';
-import { printFixTips } from '../ui/shared/printFixTips.js';
 import { printMissingExample } from '../ui/scan/printMissingExample.js';
 import { processComparisonFile } from '../core/processComparisonFile.js';
-import { printAutoFix } from '../ui/compare/printAutoFix.js';
 import { printComparisonError } from '../ui/scan/printComparisonError.js';
 
 /**
@@ -94,6 +89,8 @@ export async function scanUsage(
   let removedDuplicates: string[] = [];
   let gitignoreUpdated = false;
 
+  // If comparing against a file, process it
+  // fx: if the scan is comparing against .env.example, it will check for missing keys there
   if (compareFile) {
     const result = processComparisonFile(scanResult, compareFile, opts);
 
@@ -141,45 +138,13 @@ export async function scanUsage(
     };
   }
 
-  const filtered: Filtered = {
-    missing: scanResult.missing ?? [],
-    duplicatesEnv: dupsEnv,
-    duplicatesEx: dupsExample,
-    gitignoreIssue:
-      isEnvIgnoredByGit({ cwd: opts.cwd, envFile: '.env' }) === false ||
-      isEnvIgnoredByGit({ cwd: opts.cwd, envFile: '.env' }) === null
-        ? { reason: 'not-ignored' }
-        : null,
-  };
-
   // Console output
-  const result = outputToConsole(scanResult, opts, comparedAgainst);
-
-  // Consolidated fix message
-  if (opts.fix) {
-    printAutoFix(
-      fixApplied,
-      {
-        removedDuplicates,
-        addedEnv: fixedKeys,
-        addedExample: opts.examplePath ? fixedKeys : [],
-      },
-      comparedAgainst || '.env',
-      opts.examplePath ? path.basename(opts.examplePath) : 'example file',
-      opts.json ?? false,
-      gitignoreUpdated,
-    );
-  }
-
-    const ignored = isEnvIgnoredByGit({ cwd: opts.cwd, envFile: '.env' });
-    const envNotIgnored = ignored === false || ignored === null;
-
-    printFixTips(
-      filtered,
-      envNotIgnored,
-      opts.json ?? false,
-      opts.fix ?? false,
-    );
+  const result = outputToConsole(scanResult, opts, comparedAgainst, {
+    fixApplied,
+    removedDuplicates,
+    addedEnv: fixedKeys,
+    gitignoreUpdated,
+  });
 
   return { exitWithError: result.exitWithError || duplicatesFound };
 }

src/services/scanOutputToConsole.ts

@@ -1,3 +1,4 @@
+import path from 'path';
 import { checkGitignoreStatus } from './git.js';
 import { printGitignoreWarning } from '../ui/shared/printGitignore.js';
 import type { ScanUsageOptions, ScanResult } from '../config/types.js';
@@ -11,6 +12,9 @@ import { printDuplicates } from '../ui/shared/printDuplicates.js';
 import { printSecrets } from '../ui/scan/printSecrets.js';
 import { printSuccess } from '../ui/shared/printSuccess.js';
 import { printStrictModeError } from '../ui/shared/printStrictModeError.js';
+import type { Filtered } from '../config/types.js';
+import { printFixTips } from '../ui/shared/printFixTips.js';
+import { printAutoFix } from '../ui/compare/printAutoFix.js';
 
 /**
  * Outputs the scan results to the console.
@@ -23,6 +27,12 @@ export function outputToConsole(
   scanResult: ScanResult,
   opts: ScanUsageOptions,
   comparedAgainst: string,
+  fixContext?: {
+    fixApplied: boolean;
+    removedDuplicates: string[];
+    addedEnv: string[];
+    gitignoreUpdated: boolean;
+  },
 ): { exitWithError: boolean } {
   let exitWithError = false;
 
@@ -122,5 +132,35 @@ export function outputToConsole(
     if (exit) exitWithError = true;
   }
 
+  if (opts.fix && fixContext) {
+    printAutoFix(
+      fixContext.fixApplied,
+      {
+        removedDuplicates: fixContext.removedDuplicates,
+        addedEnv: fixContext.addedEnv,
+        addedExample: opts.examplePath ? fixContext.addedEnv : [],
+      },
+      comparedAgainst || '.env',
+      opts.examplePath ? path.basename(opts.examplePath) : 'example file',
+      opts.json ?? false,
+      fixContext.gitignoreUpdated,
+    );
+  }
+
+  // Filtered results for fix tips
+  const filtered: Filtered = {
+    missing: scanResult.missing,
+    duplicatesEnv: scanResult.duplicates?.env ?? [],
+    duplicatesEx: scanResult.duplicates?.example ?? [],
+    gitignoreIssue: hasGitignoreIssue ? { reason: 'not-ignored' } : null,
+  };
+
+  printFixTips(
+    filtered,
+    hasGitignoreIssue,
+    opts.json ?? false,
+    opts.fix ?? false,
+  );
+
   return { exitWithError };
 }

test/e2e/cli.scan-usage.e2e.test.ts

@@ -566,6 +566,8 @@ describe('scan-usage error handling', () => {
   it('will tip --fix flag if missing .env in .gitignore', () => {
     const cwd = tmpDir();
 
+    fs.mkdirSync(path.join(cwd, '.git'));
+    fs.writeFileSync(path.join(cwd, '.gitignore'), 'node_modules\n');
     fs.writeFileSync(path.join(cwd, '.env'), 'API_KEY=secret\n');
     fs.mkdirSync(path.join(cwd, 'src'), { recursive: true });
     fs.writeFileSync(
@@ -574,6 +576,7 @@ describe('scan-usage error handling', () => {
     );
 
     const res = runCli(cwd, ['--scan-usage']);
+    console.log('stdout:', res.stdout);
     expect(res.status).toBe(0);
     expect(res.stdout).toContain('Tip: Run with `--fix` to ensure .env is added to .gitignore');
   });