@eslint-config-snapshot/api 0.3.0 → 0.3.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eslint-config-snapshot/api
 
+## 0.3.2
+
+### Patch Changes
+
+- Fix deterministic aggregation when same-severity ESLint rule options differ across sampled files, preventing update crashes.
+
+## 0.3.1
+
+### Patch Changes
+
+- Release patch bump after init UX clarity improvements for default catch-all group messaging.
+
 ## 0.3.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -398,8 +398,20 @@ function aggregateRules(ruleMaps) {
       }
       const currentOptions = currentEntry.length > 1 ? canonicalizeJson(currentEntry[1]) : void 0;
       const nextOptions = nextEntry.length > 1 ? canonicalizeJson(nextEntry[1]) : void 0;
-      if (JSON.stringify(currentOptions) !== JSON.stringify(nextOptions)) {
-        throw new Error(`Conflicting rule options for ${ruleName} at severity ${currentEntry[0]}`);
+      if (currentOptions === void 0 && nextOptions !== void 0) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry));
+        continue;
+      }
+      if (currentOptions !== void 0 && nextOptions === void 0) {
+        continue;
+      }
+      if (currentOptions === void 0 && nextOptions === void 0) {
+        continue;
+      }
+      const currentJson = JSON.stringify(currentOptions);
+      const nextJson = JSON.stringify(nextOptions);
+      if (nextJson < currentJson) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry));
       }
     }
   }

package/dist/index.js

@@ -343,8 +343,20 @@ function aggregateRules(ruleMaps) {
       }
       const currentOptions = currentEntry.length > 1 ? canonicalizeJson(currentEntry[1]) : void 0;
       const nextOptions = nextEntry.length > 1 ? canonicalizeJson(nextEntry[1]) : void 0;
-      if (JSON.stringify(currentOptions) !== JSON.stringify(nextOptions)) {
-        throw new Error(`Conflicting rule options for ${ruleName} at severity ${currentEntry[0]}`);
+      if (currentOptions === void 0 && nextOptions !== void 0) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry));
+        continue;
+      }
+      if (currentOptions !== void 0 && nextOptions === void 0) {
+        continue;
+      }
+      if (currentOptions === void 0 && nextOptions === void 0) {
+        continue;
+      }
+      const currentJson = JSON.stringify(currentOptions);
+      const nextJson = JSON.stringify(nextOptions);
+      if (nextJson < currentJson) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry));
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eslint-config-snapshot/api",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "type": "module",
   "repository": {
     "type": "git",

package/src/snapshot.ts

@@ -36,8 +36,23 @@ export function aggregateRules(ruleMaps: readonly Map<string, NormalizedRuleEntr
       const currentOptions = currentEntry.length > 1 ? canonicalizeJson(currentEntry[1]) : undefined
       const nextOptions = nextEntry.length > 1 ? canonicalizeJson(nextEntry[1]) : undefined
 
-      if (JSON.stringify(currentOptions) !== JSON.stringify(nextOptions)) {
-        throw new Error(`Conflicting rule options for ${ruleName} at severity ${currentEntry[0]}`)
+      if (currentOptions === undefined && nextOptions !== undefined) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry))
+        continue
+      }
+
+      if (currentOptions !== undefined && nextOptions === undefined) {
+        continue
+      }
+
+      if (currentOptions === undefined && nextOptions === undefined) {
+        continue
+      }
+
+      const currentJson = JSON.stringify(currentOptions)
+      const nextJson = JSON.stringify(nextOptions)
+      if (nextJson < currentJson) {
+        aggregated.set(ruleName, canonicalizeJson(nextEntry))
       }
     }
   }

package/test/snapshot.test.ts

@@ -53,12 +53,25 @@ describe('snapshot', () => {
     })
   })
 
-  it('throws on conflicting options at same severity', () => {
-    expect(() =>
-      aggregateRules([
-        new Map([['no-restricted-imports', ['error', { paths: ['a'] }] as const]]),
-        new Map([['no-restricted-imports', ['error', { paths: ['b'] }] as const]])
-      ])
-    ).toThrow('Conflicting rule options for no-restricted-imports at severity error')
+  it('resolves conflicting options at same severity deterministically', () => {
+    const result = aggregateRules([
+      new Map([['no-restricted-imports', ['error', { paths: ['b'] }] as const]]),
+      new Map([['no-restricted-imports', ['error', { paths: ['a'] }] as const]])
+    ])
+
+    expect(Object.fromEntries(result.entries())).toEqual({
+      'no-restricted-imports': ['error', { paths: ['a'] }]
+    })
+  })
+
+  it('prefers configured options over bare severity at same level', () => {
+    const result = aggregateRules([
+      new Map([['@typescript-eslint/consistent-type-imports', ['warn'] as const]]),
+      new Map([['@typescript-eslint/consistent-type-imports', ['warn', { fixStyle: 'inline-type-imports' }] as const]])
+    ])
+
+    expect(Object.fromEntries(result.entries())).toEqual({
+      '@typescript-eslint/consistent-type-imports': ['warn', { fixStyle: 'inline-type-imports' }]
+    })
   })
 })