eslint-plugin-smarthr 4.0.1 → 4.0.2

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [4.0.2](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v4.0.1...eslint-plugin-smarthr-v4.0.2) (2026-01-07)
+
+
+### Bug Fixes
+
+* best-practice-for-spread-syntaxのcheckTypeをalways以外を指定した場合、チェック対象のコードによってエラーが発生する問題を修正 ([#1005](https://github.com/kufu/tamatebako/issues/1005)) ([ebd7b71](https://github.com/kufu/tamatebako/commit/ebd7b714a4e31f3875f5c3d9ad6a16bfb6e31634))
+
 ## [4.0.1](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v4.0.0...eslint-plugin-smarthr-v4.0.1) (2026-01-04)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-smarthr",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "author": "SmartHR",
   "license": "MIT",
   "description": "A sharable ESLint plugin for SmartHR",
@@ -37,5 +37,5 @@
     "eslintplugin",
     "smarthr"
   ],
-  "gitHead": "8dd34c6f8ed86887e4287f55b2b511e340291b32"
+  "gitHead": "902835f740df61f2f9ce2c9bfeeff84788e0ed27"
 }

package/rules/best-practice-for-spread-syntax/index.js

@@ -9,8 +9,10 @@ const SCHEMA = [
   }
 ]
 
-const CHECK_JSX_REGEX = /^(always|only-jsx)$/
-const CHECK_OBJ_REGEX = /^(always|only-object)$/
+const CHECK_REGEX = {
+  JSXSpreadAttribute: /^(always|only-jsx)$/,
+  SpreadElement: /^(always|only-object)$/,
+}
 
 // HINT: -1: 見つからなかった >= 0: 見つかった
 const getInsertIndex = (node, type, attributesKey) => {
@@ -45,55 +47,50 @@ module.exports = {
     const option = context.options[0] || {}
     const fix = option.fix
     const checkType = option.checkType || 'always'
+    const result = {}
 
     const generateAction = (type, attributesKey, fixAction) => {
-      return ((node) => {
-        const insertIndex = getInsertIndex(node, type, attributesKey)
+      if (CHECK_REGEX[type].test(checkType)) {
+        result[type] = (node) => {
+          const insertIndex = getInsertIndex(node, type, attributesKey)
 
-        if (insertIndex !== -1) {
-          const code = context.sourceCode.getText(node)
+          if (insertIndex !== -1) {
+            const code = context.sourceCode.getText(node)
 
-          context.report({
-            node,
-            message: `"${code}" は意図しない上書きを防ぐため、spread syntaxでない属性より先に記述してください
+            context.report({
+              node,
+              message: `"${code}" は意図しない上書きを防ぐため、spread syntaxでない属性より先に記述してください
  - 詳細: https://github.com/kufu/tamatebako/tree/master/packages/eslint-plugin-smarthr/rules/best-practice-for-spread-syntax`,
-            fix: fixAction ? (fixer) => {
-              const elementNode = node.parent
-              const normals = []
-              const spreads = []
+              fix: fixAction ? (fixer) => {
+                const elementNode = node.parent
+                const normals = []
+                const spreads = []
 
-              elementNode[attributesKey].forEach((a, i) => {
-                if (a !== node) {
-                  if (insertIndex === i) {
-                    spreads.push(code)
-                  }
+                elementNode[attributesKey].forEach((a, i) => {
+                  if (a !== node) {
+                    if (insertIndex === i) {
+                      spreads.push(code)
+                    }
 
-                  (a.type === type ? spreads : normals).push(context.sourceCode.getText(a))
-                }
-              })
+                    (a.type === type ? spreads : normals).push(context.sourceCode.getText(a))
+                  }
+                })
 
-              return fixer.replaceText(
-                elementNode,
-                fixAction(spreads.concat(normals), elementNode),
-              )
-            } : null
-          });
+                return fixer.replaceText(
+                  elementNode,
+                  fixAction(spreads.concat(normals), elementNode),
+                )
+              } : null
+            });
+          }
         }
-      })
+      }
     }
 
-    return {
-      JSXSpreadAttribute: (
-        CHECK_JSX_REGEX.test(checkType)
-          ? generateAction('JSXSpreadAttribute', 'attributes', (option.fix) && ((attributes, e) => `<${e.name.name} ${attributes.join(' ')}${e.selfClosing ? ' /' : ''}>`))
-          : undefined
-      ),
-      SpreadElement: (
-        CHECK_OBJ_REGEX.test(checkType)
-          ? generateAction('SpreadElement', 'properties', (option.fix) && ((attributes) => `{ ${attributes.join(', ')} }`))
-          : undefined
-      ),
-    }
+    generateAction('JSXSpreadAttribute', 'attributes', (option.fix) && ((attributes, e) => `<${e.name.name} ${attributes.join(' ')}${e.selfClosing ? ' /' : ''}>`))
+    generateAction('SpreadElement', 'properties', (option.fix) && ((attributes) => `{ ${attributes.join(', ')} }`))
+
+    return result
   },
 }
 module.exports.schema = SCHEMA

package/test/best-practice-for-spread-syntax.js

@@ -21,6 +21,8 @@ ruleTester.run('best-practice-for-spread-syntax', rule, {
     { code: `const hoge = { ...props, id: props.id || 'ABC' }` },
     { code: `const hoge = { ...props1, ...props2, id: 'ABC' }` },
     { code: `dig(target, ...keys.slice(1))` },
+    { code: `{[...Array(3)].map((_, i) => (i))}`, options: [ { checkType: 'only-jsx' } ], },
+    { code: `<Fuga id={props.id || 'ABC'} {...props} />`, options: [ { checkType: 'only-object' } ], },
   ],
   invalid: [
     {