@eslint-config-snapshot/cli 0.3.2 → 0.4.0

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @eslint-config-snapshot/cli
 
+## 0.4.0
+
+### Minor Changes
+
+- Minor release with improved CLI output consistency and faster workspace extraction using ESLint API fallback strategy.
+
+### Patch Changes
+
+- Updated dependencies
+  - @eslint-config-snapshot/api@0.4.0
+
 ## 0.3.2
 
 ### Patch Changes

package/dist/index.cjs

@@ -266,8 +266,13 @@ async function executeUpdate(cwd, printSummary) {
   await writeSnapshots(cwd, currentSnapshots);
   if (printSummary) {
     const summary = summarizeSnapshots(currentSnapshots);
-    process.stdout.write(`Baseline updated: ${summary.groups} groups, ${summary.rules} rules.
-`);
+    const color = createColorizer();
+    writeSectionTitle("Summary", color);
+    process.stdout.write(
+      `Baseline updated: ${summary.groups} groups, ${summary.rules} rules.
+Severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off.
+`
+    );
   }
   return 0;
 }
@@ -317,19 +322,20 @@ async function computeCurrentSnapshots(cwd) {
       const sampled = await (0, import_api.sampleWorkspaceFiles)(workspaceAbs, config.sampling);
       let extractedCount = 0;
       let lastExtractionError;
-      for (const sampledRel of sampled) {
-        const sampledAbs = import_node_path.default.resolve(workspaceAbs, sampledRel);
-        try {
-          extractedForGroup.push((0, import_api.extractRulesFromPrintConfig)(workspaceAbs, sampledAbs));
+      const sampledAbs = sampled.map((sampledRel) => import_node_path.default.resolve(workspaceAbs, sampledRel));
+      const results = await (0, import_api.extractRulesForWorkspaceSamples)(workspaceAbs, sampledAbs);
+      for (const result of results) {
+        if (result.rules) {
+          extractedForGroup.push(result.rules);
           extractedCount += 1;
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          if (message.startsWith("Invalid JSON from eslint --print-config") || message.startsWith("Empty ESLint print-config output")) {
-            lastExtractionError = message;
-            continue;
-          }
-          throw error;
+          continue;
+        }
+        const message = result.error instanceof Error ? result.error.message : String(result.error);
+        if (isRecoverableExtractionError(message)) {
+          lastExtractionError = message;
+          continue;
         }
+        throw result.error ?? new Error(message);
       }
       if (extractedCount === 0) {
         const context = lastExtractionError ? ` Last error: ${lastExtractionError}` : "";
@@ -343,6 +349,9 @@ async function computeCurrentSnapshots(cwd) {
   }
   return snapshots;
 }
+function isRecoverableExtractionError(message) {
+  return message.startsWith("Invalid JSON from eslint --print-config") || message.startsWith("Empty ESLint print-config output") || message.includes("File ignored because of a matching ignore pattern") || message.includes("File ignored by default");
+}
 async function resolveWorkspaceAssignments(cwd, config) {
   const discovery = await (0, import_api.discoverWorkspaces)({ cwd, workspaceInput: config.workspaceInput });
   const assignments = config.grouping.mode === "standalone" ? discovery.workspacesRel.map((workspace) => ({ name: workspace, workspaces: [workspace] })) : (0, import_api.assignGroupsByMatch)(discovery.workspacesRel, config.grouping.groups ?? [{ name: "default", match: ["**/*"] }]);
@@ -705,22 +714,29 @@ function printWhatChanged(changes, currentSnapshots) {
   const changeSummary = summarizeChanges(changes);
   if (changes.length === 0) {
     process.stdout.write(color.green("Great news: no snapshot drift detected.\n"));
+    writeSectionTitle("Summary", color);
     process.stdout.write(
-      `Baseline status: ${currentSummary.groups} groups, ${currentSummary.rules} rules (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off).
+      `- baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
+- severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
 `
     );
     return 0;
   }
   process.stdout.write(color.red("Heads up: snapshot drift detected.\n"));
+  writeSectionTitle("Summary", color);
   process.stdout.write(
-    `Changed groups: ${changes.length} | introduced: ${changeSummary.introduced} | removed: ${changeSummary.removed} | severity: ${changeSummary.severity} | options: ${changeSummary.options} | workspace membership: ${changeSummary.workspace}
-`
-  );
-  process.stdout.write(
-    `Current rules: ${currentSummary.rules} (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off)
+    `- changed groups: ${changes.length}
+- introduced rules: ${changeSummary.introduced}
+- removed rules: ${changeSummary.removed}
+- severity changes: ${changeSummary.severity}
+- options changes: ${changeSummary.options}
+- workspace membership changes: ${changeSummary.workspace}
+- current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
+- current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
 
 `
   );
+  writeSectionTitle("Changes", color);
   for (const change of changes) {
     process.stdout.write(color.bold(`group ${change.groupId}
 `));
@@ -735,6 +751,10 @@ function printWhatChanged(changes, currentSnapshots) {
   writeSubtleInfo(UPDATE_HINT);
   return 1;
 }
+function writeSectionTitle(title, color) {
+  process.stdout.write(`${color.bold(title)}
+`);
+}
 function summarizeChanges(changes) {
   let introduced = 0;
   let removed = 0;

package/dist/index.js

@@ -7,7 +7,7 @@ import {
   buildSnapshot,
   diffSnapshots,
   discoverWorkspaces,
-  extractRulesFromPrintConfig,
+  extractRulesForWorkspaceSamples,
   findConfigPath,
   getConfigScaffold,
   hasDiff,
@@ -246,8 +246,13 @@ async function executeUpdate(cwd, printSummary) {
   await writeSnapshots(cwd, currentSnapshots);
   if (printSummary) {
     const summary = summarizeSnapshots(currentSnapshots);
-    process.stdout.write(`Baseline updated: ${summary.groups} groups, ${summary.rules} rules.
-`);
+    const color = createColorizer();
+    writeSectionTitle("Summary", color);
+    process.stdout.write(
+      `Baseline updated: ${summary.groups} groups, ${summary.rules} rules.
+Severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off.
+`
+    );
   }
   return 0;
 }
@@ -297,19 +302,20 @@ async function computeCurrentSnapshots(cwd) {
       const sampled = await sampleWorkspaceFiles(workspaceAbs, config.sampling);
       let extractedCount = 0;
       let lastExtractionError;
-      for (const sampledRel of sampled) {
-        const sampledAbs = path.resolve(workspaceAbs, sampledRel);
-        try {
-          extractedForGroup.push(extractRulesFromPrintConfig(workspaceAbs, sampledAbs));
+      const sampledAbs = sampled.map((sampledRel) => path.resolve(workspaceAbs, sampledRel));
+      const results = await extractRulesForWorkspaceSamples(workspaceAbs, sampledAbs);
+      for (const result of results) {
+        if (result.rules) {
+          extractedForGroup.push(result.rules);
           extractedCount += 1;
-        } catch (error) {
-          const message = error instanceof Error ? error.message : String(error);
-          if (message.startsWith("Invalid JSON from eslint --print-config") || message.startsWith("Empty ESLint print-config output")) {
-            lastExtractionError = message;
-            continue;
-          }
-          throw error;
+          continue;
+        }
+        const message = result.error instanceof Error ? result.error.message : String(result.error);
+        if (isRecoverableExtractionError(message)) {
+          lastExtractionError = message;
+          continue;
         }
+        throw result.error ?? new Error(message);
       }
       if (extractedCount === 0) {
         const context = lastExtractionError ? ` Last error: ${lastExtractionError}` : "";
@@ -323,6 +329,9 @@ async function computeCurrentSnapshots(cwd) {
   }
   return snapshots;
 }
+function isRecoverableExtractionError(message) {
+  return message.startsWith("Invalid JSON from eslint --print-config") || message.startsWith("Empty ESLint print-config output") || message.includes("File ignored because of a matching ignore pattern") || message.includes("File ignored by default");
+}
 async function resolveWorkspaceAssignments(cwd, config) {
   const discovery = await discoverWorkspaces({ cwd, workspaceInput: config.workspaceInput });
   const assignments = config.grouping.mode === "standalone" ? discovery.workspacesRel.map((workspace) => ({ name: workspace, workspaces: [workspace] })) : assignGroupsByMatch(discovery.workspacesRel, config.grouping.groups ?? [{ name: "default", match: ["**/*"] }]);
@@ -685,22 +694,29 @@ function printWhatChanged(changes, currentSnapshots) {
   const changeSummary = summarizeChanges(changes);
   if (changes.length === 0) {
     process.stdout.write(color.green("Great news: no snapshot drift detected.\n"));
+    writeSectionTitle("Summary", color);
     process.stdout.write(
-      `Baseline status: ${currentSummary.groups} groups, ${currentSummary.rules} rules (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off).
+      `- baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
+- severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
 `
     );
     return 0;
   }
   process.stdout.write(color.red("Heads up: snapshot drift detected.\n"));
+  writeSectionTitle("Summary", color);
   process.stdout.write(
-    `Changed groups: ${changes.length} | introduced: ${changeSummary.introduced} | removed: ${changeSummary.removed} | severity: ${changeSummary.severity} | options: ${changeSummary.options} | workspace membership: ${changeSummary.workspace}
-`
-  );
-  process.stdout.write(
-    `Current rules: ${currentSummary.rules} (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off)
+    `- changed groups: ${changes.length}
+- introduced rules: ${changeSummary.introduced}
+- removed rules: ${changeSummary.removed}
+- severity changes: ${changeSummary.severity}
+- options changes: ${changeSummary.options}
+- workspace membership changes: ${changeSummary.workspace}
+- current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules
+- current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off
 
 `
   );
+  writeSectionTitle("Changes", color);
   for (const change of changes) {
     process.stdout.write(color.bold(`group ${change.groupId}
 `));
@@ -715,6 +731,10 @@ function printWhatChanged(changes, currentSnapshots) {
   writeSubtleInfo(UPDATE_HINT);
   return 1;
 }
+function writeSectionTitle(title, color) {
+  process.stdout.write(`${color.bold(title)}
+`);
+}
 function summarizeChanges(changes) {
   let introduced = 0;
   let removed = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-config-snapshot/cli",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "type": "module",
   "repository": {
     "type": "git",
@@ -30,6 +30,6 @@
     "@inquirer/prompts": "^8.2.0",
     "commander": "^14.0.3",
     "fast-glob": "^3.3.3",
-    "@eslint-config-snapshot/api": "0.3.2"
+    "@eslint-config-snapshot/api": "0.4.0"
   }
 }

package/src/index.ts

@@ -5,7 +5,7 @@ import {
   buildSnapshot,
   diffSnapshots,
   discoverWorkspaces,
-  extractRulesFromPrintConfig,
+  extractRulesForWorkspaceSamples,
   findConfigPath,
   getConfigScaffold,
   hasDiff,
@@ -340,7 +340,11 @@ async function executeUpdate(cwd: string, printSummary: boolean): Promise<number
 
   if (printSummary) {
     const summary = summarizeSnapshots(currentSnapshots)
-    process.stdout.write(`Baseline updated: ${summary.groups} groups, ${summary.rules} rules.\n`)
+    const color = createColorizer()
+    writeSectionTitle('Summary', color)
+    process.stdout.write(
+      `Baseline updated: ${summary.groups} groups, ${summary.rules} rules.\nSeverity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off.\n`
+    )
   }
 
   return 0
@@ -400,23 +404,23 @@ async function computeCurrentSnapshots(cwd: string): Promise<Map<string, BuiltSn
       let extractedCount = 0
       let lastExtractionError: string | undefined
 
-      for (const sampledRel of sampled) {
-        const sampledAbs = path.resolve(workspaceAbs, sampledRel)
-        try {
-          extractedForGroup.push(extractRulesFromPrintConfig(workspaceAbs, sampledAbs))
+      const sampledAbs = sampled.map((sampledRel) => path.resolve(workspaceAbs, sampledRel))
+      const results = await extractRulesForWorkspaceSamples(workspaceAbs, sampledAbs)
+
+      for (const result of results) {
+        if (result.rules) {
+          extractedForGroup.push(result.rules)
           extractedCount += 1
-        } catch (error: unknown) {
-          const message = error instanceof Error ? error.message : String(error)
-          if (
-            message.startsWith('Invalid JSON from eslint --print-config') ||
-            message.startsWith('Empty ESLint print-config output')
-          ) {
-            lastExtractionError = message
-            continue
-          }
-
-          throw error
+          continue
         }
+
+        const message = result.error instanceof Error ? result.error.message : String(result.error)
+        if (isRecoverableExtractionError(message)) {
+          lastExtractionError = message
+          continue
+        }
+
+        throw result.error ?? new Error(message)
       }
 
       if (extractedCount === 0) {
@@ -434,6 +438,15 @@ async function computeCurrentSnapshots(cwd: string): Promise<Map<string, BuiltSn
   return snapshots
 }
 
+function isRecoverableExtractionError(message: string): boolean {
+  return (
+    message.startsWith('Invalid JSON from eslint --print-config') ||
+    message.startsWith('Empty ESLint print-config output') ||
+    message.includes('File ignored because of a matching ignore pattern') ||
+    message.includes('File ignored by default')
+  )
+}
+
 async function resolveWorkspaceAssignments(cwd: string, config: Awaited<ReturnType<typeof loadConfig>>) {
   const discovery = await discoverWorkspaces({ cwd, workspaceInput: config.workspaceInput })
 
@@ -880,20 +893,20 @@ function printWhatChanged(changes: Array<{ groupId: string; diff: SnapshotDiff }
 
   if (changes.length === 0) {
     process.stdout.write(color.green('Great news: no snapshot drift detected.\n'))
+    writeSectionTitle('Summary', color)
     process.stdout.write(
-      `Baseline status: ${currentSummary.groups} groups, ${currentSummary.rules} rules (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off).\n`
+      `- baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules\n- severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off\n`
     )
     return 0
   }
 
   process.stdout.write(color.red('Heads up: snapshot drift detected.\n'))
+  writeSectionTitle('Summary', color)
   process.stdout.write(
-    `Changed groups: ${changes.length} | introduced: ${changeSummary.introduced} | removed: ${changeSummary.removed} | severity: ${changeSummary.severity} | options: ${changeSummary.options} | workspace membership: ${changeSummary.workspace}\n`
-  )
-  process.stdout.write(
-    `Current rules: ${currentSummary.rules} (severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off)\n\n`
+    `- changed groups: ${changes.length}\n- introduced rules: ${changeSummary.introduced}\n- removed rules: ${changeSummary.removed}\n- severity changes: ${changeSummary.severity}\n- options changes: ${changeSummary.options}\n- workspace membership changes: ${changeSummary.workspace}\n- current baseline: ${currentSummary.groups} groups, ${currentSummary.rules} rules\n- current severity mix: ${currentSummary.error} errors, ${currentSummary.warn} warnings, ${currentSummary.off} off\n\n`
   )
 
+  writeSectionTitle('Changes', color)
   for (const change of changes) {
     process.stdout.write(color.bold(`group ${change.groupId}\n`))
     const lines = formatDiff(change.groupId, change.diff).split('\n').slice(1)
@@ -908,6 +921,10 @@ function printWhatChanged(changes: Array<{ groupId: string; diff: SnapshotDiff }
   return 1
 }
 
+function writeSectionTitle(title: string, color: ReturnType<typeof createColorizer>): void {
+  process.stdout.write(`${color.bold(title)}\n`)
+}
+
 function summarizeChanges(changes: Array<{ groupId: string; diff: SnapshotDiff }>) {
   let introduced = 0
   let removed = 0