@eslint-config-snapshot/cli 1.3.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @eslint-config-snapshot/cli
 
+## 1.3.1
+
+### Patch Changes
+
+- Improve catalog check/update summaries and dedupe baseline totals across groups.
+- Updated dependencies
+  - @eslint-config-snapshot/api@1.3.1
+
 ## 1.3.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -102,7 +102,7 @@ function summarizeChanges(changes) {
   return { introduced, removed, severity, options, workspace };
 }
 function summarizeSnapshots(snapshots) {
-  const { rules, error, warn, off } = countRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules));
+  const { rules, error, warn, off } = countUniqueRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules));
   return { groups: snapshots.size, rules, error, warn, off };
 }
 function countUniqueWorkspaces(snapshots) {
@@ -276,25 +276,34 @@ function formatBaselineSummaryLines(summary, workspaceCount) {
 - \u{1F39A}\uFE0F severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off
 `;
 }
-function countRuleSeverities(ruleObjects) {
-  let rules = 0;
+function countUniqueRuleSeverities(ruleObjects) {
+  const severityRank = { off: 0, warn: 1, error: 2 };
+  const severityByRule = /* @__PURE__ */ new Map();
+  for (const rulesObject of ruleObjects) {
+    for (const [ruleName, entry] of Object.entries(rulesObject)) {
+      const nextSeverity = getPrimarySeverity(entry);
+      if (!nextSeverity) {
+        continue;
+      }
+      const currentSeverity = severityByRule.get(ruleName);
+      if (!currentSeverity || severityRank[nextSeverity] > severityRank[currentSeverity]) {
+        severityByRule.set(ruleName, nextSeverity);
+      }
+    }
+  }
   let error = 0;
   let warn = 0;
   let off = 0;
-  for (const rulesObject of ruleObjects) {
-    for (const entry of Object.values(rulesObject)) {
-      rules += 1;
-      const severity = getPrimarySeverity(entry);
-      if (severity === "error") {
-        error += 1;
-      } else if (severity === "warn") {
-        warn += 1;
-      } else {
-        off += 1;
-      }
+  for (const severity of severityByRule.values()) {
+    if (severity === "error") {
+      error += 1;
+    } else if (severity === "warn") {
+      warn += 1;
+    } else {
+      off += 1;
     }
   }
-  return { rules, error, warn, off };
+  return { rules: severityByRule.size, error, warn, off };
 }
 function getPrimarySeverity(entry) {
   if (!entry) {
@@ -871,10 +880,12 @@ async function executeCatalogUpdate(cwd, terminal, snapshotDir) {
   const rows = await computeCatalogRows(cwd, terminal, snapshotDir, "catalog:update", false);
   await writeCatalogBaselineFiles(cwd, snapshotDir, rows);
   const groups = rows.length;
-  const available = rows.reduce((sum, row) => sum + row.totalStats.totalAvailable, 0);
-  const inUse = rows.reduce((sum, row) => sum + row.totalStats.inUse, 0);
+  const available = countUniqueRules(rows.map((row) => row.availableRules));
+  const inUse = countUniqueRules(rows.map((row) => row.observedRules.filter((ruleName) => row.availableRules.includes(ruleName))));
   terminal.write(`\u{1F9EA} Catalog baseline updated: ${groups} groups, ${available} available rules, ${inUse} currently in use.
 `);
+  terminal.section("\u{1F4CA} Catalog summary");
+  terminal.write(formatShortCatalog(rows, false));
   return 0;
 }
 async function executeCatalogCheck(cwd, terminal, snapshotDir) {
@@ -889,8 +900,12 @@ async function executeCatalogCheck(cwd, terminal, snapshotDir) {
   const diffs = compareCatalogBaselines(stored, current);
   if (diffs.length === 0) {
     terminal.write("Great news: no catalog drift detected.\n");
+    terminal.section("\u{1F4CA} Catalog summary");
+    terminal.write(formatShortCatalog(rows, false));
     return 0;
   }
+  terminal.section("\u{1F4CA} Catalog summary");
+  terminal.write(formatShortCatalog(rows, false));
   terminal.write(`\u26A0\uFE0F Heads up: catalog drift detected in ${diffs.length} groups.
 `);
   for (const diff of diffs) {
@@ -1131,6 +1146,15 @@ function toPercent(value, total) {
   }
   return Number((value / total * 100).toFixed(1));
 }
+function countUniqueRules(ruleLists) {
+  const unique = /* @__PURE__ */ new Set();
+  for (const rules of ruleLists) {
+    for (const rule of rules) {
+      unique.add(rule);
+    }
+  }
+  return unique.size;
+}
 
 // src/commands/check.ts
 var UPDATE_HINT = "Tip: when you intentionally accept changes, run `eslint-config-snapshot --update` to refresh the baseline.\n";

package/dist/index.js

@@ -67,7 +67,7 @@ function summarizeChanges(changes) {
   return { introduced, removed, severity, options, workspace };
 }
 function summarizeSnapshots(snapshots) {
-  const { rules, error, warn, off } = countRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules));
+  const { rules, error, warn, off } = countUniqueRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules));
   return { groups: snapshots.size, rules, error, warn, off };
 }
 function countUniqueWorkspaces(snapshots) {
@@ -241,25 +241,34 @@ function formatBaselineSummaryLines(summary, workspaceCount) {
 - \u{1F39A}\uFE0F severity mix: ${summary.error} errors, ${summary.warn} warnings, ${summary.off} off
 `;
 }
-function countRuleSeverities(ruleObjects) {
-  let rules = 0;
+function countUniqueRuleSeverities(ruleObjects) {
+  const severityRank = { off: 0, warn: 1, error: 2 };
+  const severityByRule = /* @__PURE__ */ new Map();
+  for (const rulesObject of ruleObjects) {
+    for (const [ruleName, entry] of Object.entries(rulesObject)) {
+      const nextSeverity = getPrimarySeverity(entry);
+      if (!nextSeverity) {
+        continue;
+      }
+      const currentSeverity = severityByRule.get(ruleName);
+      if (!currentSeverity || severityRank[nextSeverity] > severityRank[currentSeverity]) {
+        severityByRule.set(ruleName, nextSeverity);
+      }
+    }
+  }
   let error = 0;
   let warn = 0;
   let off = 0;
-  for (const rulesObject of ruleObjects) {
-    for (const entry of Object.values(rulesObject)) {
-      rules += 1;
-      const severity = getPrimarySeverity(entry);
-      if (severity === "error") {
-        error += 1;
-      } else if (severity === "warn") {
-        warn += 1;
-      } else {
-        off += 1;
-      }
+  for (const severity of severityByRule.values()) {
+    if (severity === "error") {
+      error += 1;
+    } else if (severity === "warn") {
+      warn += 1;
+    } else {
+      off += 1;
     }
   }
-  return { rules, error, warn, off };
+  return { rules: severityByRule.size, error, warn, off };
 }
 function getPrimarySeverity(entry) {
   if (!entry) {
@@ -850,10 +859,12 @@ async function executeCatalogUpdate(cwd, terminal, snapshotDir) {
   const rows = await computeCatalogRows(cwd, terminal, snapshotDir, "catalog:update", false);
   await writeCatalogBaselineFiles(cwd, snapshotDir, rows);
   const groups = rows.length;
-  const available = rows.reduce((sum, row) => sum + row.totalStats.totalAvailable, 0);
-  const inUse = rows.reduce((sum, row) => sum + row.totalStats.inUse, 0);
+  const available = countUniqueRules(rows.map((row) => row.availableRules));
+  const inUse = countUniqueRules(rows.map((row) => row.observedRules.filter((ruleName) => row.availableRules.includes(ruleName))));
   terminal.write(`\u{1F9EA} Catalog baseline updated: ${groups} groups, ${available} available rules, ${inUse} currently in use.
 `);
+  terminal.section("\u{1F4CA} Catalog summary");
+  terminal.write(formatShortCatalog(rows, false));
   return 0;
 }
 async function executeCatalogCheck(cwd, terminal, snapshotDir) {
@@ -868,8 +879,12 @@ async function executeCatalogCheck(cwd, terminal, snapshotDir) {
   const diffs = compareCatalogBaselines(stored, current);
   if (diffs.length === 0) {
     terminal.write("Great news: no catalog drift detected.\n");
+    terminal.section("\u{1F4CA} Catalog summary");
+    terminal.write(formatShortCatalog(rows, false));
     return 0;
   }
+  terminal.section("\u{1F4CA} Catalog summary");
+  terminal.write(formatShortCatalog(rows, false));
   terminal.write(`\u26A0\uFE0F Heads up: catalog drift detected in ${diffs.length} groups.
 `);
   for (const diff of diffs) {
@@ -1110,6 +1125,15 @@ function toPercent(value, total) {
   }
   return Number((value / total * 100).toFixed(1));
 }
+function countUniqueRules(ruleLists) {
+  const unique = /* @__PURE__ */ new Set();
+  for (const rules of ruleLists) {
+    for (const rule of rules) {
+      unique.add(rule);
+    }
+  }
+  return unique.size;
+}
 
 // src/commands/check.ts
 var UPDATE_HINT = "Tip: when you intentionally accept changes, run `eslint-config-snapshot --update` to refresh the baseline.\n";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-config-snapshot/cli",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "type": "module",
   "repository": {
     "type": "git",
@@ -31,6 +31,6 @@
     "commander": "^14.0.3",
     "debug": "^4.4.3",
     "fast-glob": "^3.3.3",
-    "@eslint-config-snapshot/api": "1.3.0"
+    "@eslint-config-snapshot/api": "1.3.1"
   }
 }

package/src/commands/catalog.ts

@@ -87,9 +87,11 @@ export async function executeCatalogUpdate(cwd: string, terminal: TerminalIO, sn
   await writeCatalogBaselineFiles(cwd, snapshotDir, rows)
 
   const groups = rows.length
-  const available = rows.reduce((sum, row) => sum + row.totalStats.totalAvailable, 0)
-  const inUse = rows.reduce((sum, row) => sum + row.totalStats.inUse, 0)
+  const available = countUniqueRules(rows.map((row) => row.availableRules))
+  const inUse = countUniqueRules(rows.map((row) => row.observedRules.filter((ruleName) => row.availableRules.includes(ruleName))))
   terminal.write(`🧪 Catalog baseline updated: ${groups} groups, ${available} available rules, ${inUse} currently in use.\n`)
+  terminal.section('📊 Catalog summary')
+  terminal.write(formatShortCatalog(rows, false))
   return 0
 }
 
@@ -107,9 +109,13 @@ export async function executeCatalogCheck(cwd: string, terminal: TerminalIO, sna
   const diffs = compareCatalogBaselines(stored, current)
   if (diffs.length === 0) {
     terminal.write('Great news: no catalog drift detected.\n')
+    terminal.section('📊 Catalog summary')
+    terminal.write(formatShortCatalog(rows, false))
     return 0
   }
 
+  terminal.section('📊 Catalog summary')
+  terminal.write(formatShortCatalog(rows, false))
   terminal.write(`⚠️ Heads up: catalog drift detected in ${diffs.length} groups.\n`)
   for (const diff of diffs) {
     terminal.write(
@@ -392,3 +398,13 @@ function toPercent(value: number, total: number): number {
   }
   return Number(((value / total) * 100).toFixed(1))
 }
+
+function countUniqueRules(ruleLists: string[][]): number {
+  const unique = new Set<string>()
+  for (const rules of ruleLists) {
+    for (const rule of rules) {
+      unique.add(rule)
+    }
+  }
+  return unique.size
+}

package/src/formatters.ts

@@ -101,7 +101,7 @@ export function summarizeChanges(changes: Array<{ groupId: string; diff: Snapsho
 }
 
 export function summarizeSnapshots(snapshots: Map<string, SnapshotLike>) {
-  const { rules, error, warn, off } = countRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules))
+  const { rules, error, warn, off } = countUniqueRuleSeverities([...snapshots.values()].map((snapshot) => snapshot.rules))
   return { groups: snapshots.size, rules, error, warn, off }
 }
 
@@ -331,6 +331,39 @@ export function countRuleSeverities(ruleObjects: RuleObject[]) {
   return { rules, error, warn, off }
 }
 
+export function countUniqueRuleSeverities(ruleObjects: RuleObject[]) {
+  const severityRank: Record<'off' | 'warn' | 'error', number> = { off: 0, warn: 1, error: 2 }
+  const severityByRule = new Map<string, 'off' | 'warn' | 'error'>()
+
+  for (const rulesObject of ruleObjects) {
+    for (const [ruleName, entry] of Object.entries(rulesObject)) {
+      const nextSeverity = getPrimarySeverity(entry)
+      if (!nextSeverity) {
+        continue
+      }
+      const currentSeverity = severityByRule.get(ruleName)
+      if (!currentSeverity || severityRank[nextSeverity] > severityRank[currentSeverity]) {
+        severityByRule.set(ruleName, nextSeverity)
+      }
+    }
+  }
+
+  let error = 0
+  let warn = 0
+  let off = 0
+  for (const severity of severityByRule.values()) {
+    if (severity === 'error') {
+      error += 1
+    } else if (severity === 'warn') {
+      warn += 1
+    } else {
+      off += 1
+    }
+  }
+
+  return { rules: severityByRule.size, error, warn, off }
+}
+
 function getPrimarySeverity(entry: SnapshotRuleEntry | undefined): 'off' | 'warn' | 'error' | undefined {
   if (!entry) {
     return undefined

package/test/cli.terminal.integration.test.ts

@@ -266,11 +266,15 @@ no-debugger: off
     const update = run(['catalog-update'])
     expect(update.status).toBe(0)
     expect(update.stdout).toContain('Catalog baseline updated:')
+    expect(update.stdout).toContain('📦 total:')
+    expect(update.stdout).toContain('🔌 plugins tracked:')
     expect(update.stderr).toBe('')
 
     const check = run(['catalog-check'])
     expect(check.status).toBe(0)
-    expect(check.stdout).toBe('Great news: no catalog drift detected.\n')
+    expect(check.stdout).toContain('Great news: no catalog drift detected.')
+    expect(check.stdout).toContain('📦 total:')
+    expect(check.stdout).toContain('🔌 plugins tracked:')
     expect(check.stderr).toBe('')
   })
 

package/test/formatters.unit.test.ts

@@ -44,4 +44,35 @@ describe('output helpers', () => {
     )
     expect(summary).toEqual({ groups: 1, rules: 3, error: 1, warn: 1, off: 1 })
   })
+
+  it('deduplicates rules across groups in summary', () => {
+    const summary = summarizeSnapshots(
+      new Map([
+        [
+          'group-a',
+          {
+            groupId: 'group-a',
+            workspaces: ['packages/a'],
+            rules: {
+              shared: ['warn'],
+              onlyA: ['off']
+            }
+          }
+        ],
+        [
+          'group-b',
+          {
+            groupId: 'group-b',
+            workspaces: ['packages/b'],
+            rules: {
+              shared: ['error'],
+              onlyB: ['warn']
+            }
+          }
+        ]
+      ])
+    )
+
+    expect(summary).toEqual({ groups: 2, rules: 3, error: 1, warn: 1, off: 1 })
+  })
 })