@tuomashatakka/eslint-config 3.2.0 → 3.2.1

package/.github/workflows/publish.yml

@@ -1,59 +1,26 @@
-name: Publish to npm
+name: Publish Package
 
 on:
   push:
-    branches: [main]
-    paths: ['package.json']
+    tags:
+      - 'v*'
+
+permissions:
+  id-token: write  # Required for OIDC
+  contents: read
 
 jobs:
   publish:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
-          token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v6
 
-      - name: Detect version change
-        id: version
-        run: |
-          CURRENT=$(jq -r .version package.json)
-          PREVIOUS=$(git show HEAD~1:package.json 2>/dev/null | jq -r .version 2>/dev/null || echo "")
-          echo "CURRENT=$CURRENT" >> "$GITHUB_OUTPUT"
-          echo "PREVIOUS=$PREVIOUS" >> "$GITHUB_OUTPUT"
-          if [ "$CURRENT" != "$PREVIOUS" ] && [ -n "$CURRENT" ]; then
-            echo "CHANGED=true" >> "$GITHUB_OUTPUT"
-            echo "Version bumped: $PREVIOUS -> $CURRENT"
-          else
-            echo "CHANGED=false" >> "$GITHUB_OUTPUT"
-            echo "No version change ($CURRENT); skipping publish."
-          fi
-
-      - uses: actions/setup-node@v4
-        if: steps.version.outputs.CHANGED == 'true'
+      - uses: actions/setup-node@v6
         with:
-          node-version: 22
-          registry-url: https://registry.npmjs.org
-          cache: npm
-
-      - if: steps.version.outputs.CHANGED == 'true'
-        run: npm ci
-
-      - if: steps.version.outputs.CHANGED == 'true'
-        run: npm run test
-
-      - name: Publish to npm
-        if: steps.version.outputs.CHANGED == 'true'
-        run: npm publish --access public
-        env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Tag release
-        if: steps.version.outputs.CHANGED == 'true'
-        run: |
-          git config user.name "github-actions[bot]"
-          git config user.email "github-actions[bot]@users.noreply.github.com"
-          git tag "v${{ steps.version.outputs.CURRENT }}"
-          git push origin "v${{ steps.version.outputs.CURRENT }}"
+          node-version: '24'
+          registry-url: 'https://registry.npmjs.org'
+          package-manager-cache: false  # never use caching in release builds
+      - run: npm ci
+      - run: npm run build --if-present
+      - run: npm test
+      - run: npm publish  # Or: npm stage publish

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tuomashatakka/eslint-config",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Default eslint configuration",
   "type": "module",
   "main": "index.mjs",

package/plugins/whitespaced/rules/aligned-assignments.mjs

@@ -198,26 +198,34 @@ export default {
       if (allAligned)
         return
 
-      for (const row of subBlock) {
-        const currentCol = row.equalsToken.loc.start.column
+      // Report the entire block as a single issue
+      const firstRow = subBlock[0]
+      const lastRow  = subBlock[subBlock.length - 1]
+      
+      context.report({
+        loc: {
+          start: firstRow.reportNode.loc.start,
+          end:   lastRow.reportNode.loc.end,
+        },
+        messageId: 'misalignedAssignment',
+        fix (fixer) {
+          const fixes = []
+          for (const row of subBlock) {
+            const currentCol = row.equalsToken.loc.start.column
+            if (currentCol === targetEqualsCol)
+              continue
 
-        if (currentCol === targetEqualsCol)
-          continue
-
-        context.report({
-          node:      row.reportNode,
-          messageId: 'misalignedAssignment',
-          fix (fixer) {
             const desiredPad = targetEqualsCol - row.lhsEndCol
-            if (desiredPad < 1)
-              return null
-            return fixer.replaceTextRange(
-              [ row.lhsEndIdx, row.equalsToken.range[0] ],
-              ' '.repeat(desiredPad)
-            )
-          },
-        })
-      }
+            if (desiredPad >= 1) {
+              fixes.push(fixer.replaceTextRange(
+                [ row.lhsEndIdx, row.equalsToken.range[0] ],
+                ' '.repeat(desiredPad)
+              ))
+            }
+          }
+          return fixes.length > 0 ? fixes : null
+        },
+      })
     }
 
 
@@ -255,30 +263,42 @@ export default {
       if (allAligned)
         return
 
-      for (const declarator of annotated) {
-        const colonCol = getTypeColonColumn(declarator)
-
-        if (colonCol === null || colonCol === maxColonCol)
-          continue
-
-        const colonToken = sourceCode.getFirstToken(declarator.id.typeAnnotation)
-        const idEndIdx   = declarator.id.range[1]
-        const desiredPad = maxColonCol - declarator.id.loc.end.column
-
-        if (desiredPad < 0)
-          continue
-
-        context.report({
-          node:      declarator,
-          messageId: 'misalignedTypes',
-          fix (fixer) {
-            return fixer.replaceTextRange(
-              [ idEndIdx, colonToken.range[0] ],
-              ' '.repeat(desiredPad)
-            )
-          },
-        })
-      }
+      // Report the entire block as a single issue
+      const firstDecl = annotated[0]
+      const lastDecl  = annotated[annotated.length - 1]
+      
+      context.report({
+        loc: {
+          start: firstDecl.loc.start,
+          end:   lastDecl.loc.end,
+        },
+        messageId: 'misalignedTypes',
+        fix (fixer) {
+          const fixes = []
+          for (const declarator of annotated) {
+            const colonCol = getTypeColonColumn(declarator)
+
+            if (colonCol === null || colonCol === maxColonCol)
+              continue
+
+            const colonToken = sourceCode.getFirstToken(declarator.id.typeAnnotation)
+            const idEndIdx   = declarator.id.range[1]
+            const desiredPad = maxColonCol - colonToken.loc.start.column
+
+            if (desiredPad > 0) {
+              fixes.push(fixer.replaceTextRange(
+                [ colonToken.range[0], colonToken.range[0] ],
+                ' '.repeat(desiredPad)
+              ))
+            } else if (desiredPad < 0) {
+              // Colon is too far to the right, need to move it left
+              // This is more complex, so we'll skip it for now
+              continue
+            }
+          }
+          return fixes.length > 0 ? fixes : null
+        },
+      })
     }
 
 

package/rules.mjs

@@ -41,7 +41,7 @@ export const rules = {
   'no-array-constructor':                      [ 'error' ],
   'omit/omit-unnecessary-parens-brackets':     [ 'warn' ],
   'no-inline-types/no-inline-multiline-types': [ 'warn' ],
-  'whitespaced/aligned-assignments':           [ 'warn', { alignTypes: true }],
+  'whitespaced/aligned-assignments':           [ 'warn', { alignTypes: false }],
   '@stylistic/function-call-spacing':          [ 'warn', 'never' ],
   '@stylistic/computed-property-spacing':      [ 'warn', 'never' ],
   '@stylistic/brace-style':                    [ 'warn', 'stroustrup', { allowSingleLine: false }],
@@ -90,7 +90,7 @@ export const rules = {
   '@stylistic/quotes':                         [ 'warn', 'single', { avoidEscape: true, allowTemplateLiterals: 'always' }],
   '@stylistic/jsx-newline':                    [ 'warn', { prevent: true, allowMultilines: true }],
   '@stylistic/jsx-equals-spacing':             [ 'warn', 'never' ],
-  '@stylistic/jsx-max-props-per-line':         [ 'warn', { maximum: 1, when: 'multiline' }],
+  '@stylistic/jsx-max-props-per-line':         [ 'warn', { maximum: 3, when: 'multiline' }],
   '@stylistic/jsx-self-closing-comp':          [ 'warn', { component: true, html: true }],
   '@stylistic/jsx-one-expression-per-line':    [ 'warn', { allow: 'non-jsx' }],
   '@stylistic/jsx-tag-spacing':                [ 'warn', { closingSlash: 'never', beforeSelfClosing: 'always', beforeClosing: 'never', afterOpening: 'never' }],