eslint-plugin-smarthr 2.1.0 → 2.2.0

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 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.
 
+## [2.2.0](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v2.1.0...eslint-plugin-smarthr-v2.2.0) (2025-11-07)
+
+
+### Features
+
+* a11y-help-link-with-support-hrefで対象となる変数名のバグを修正 ([#890](https://github.com/kufu/tamatebako/issues/890)) ([c9c4984](https://github.com/kufu/tamatebako/commit/c9c49848293fd88640e886c6586ae8d92a99f40c))
+* trim-propsでtemplate literalもautofixの対象にする ([#884](https://github.com/kufu/tamatebako/issues/884)) ([4072950](https://github.com/kufu/tamatebako/commit/40729507f5084308128ca39d5887ee81f2f67dd5))
+
 ## [2.1.0](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v2.0.0...eslint-plugin-smarthr-v2.1.0) (2025-10-29)
 
 

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "eslint-plugin-smarthr",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "author": "SmartHR",
   "license": "MIT",
   "description": "A sharable ESLint plugin for SmartHR",
   "main": "index.js",
   "engines": {
-    "node": ">=22.21.0"
+    "node": ">=22.21.1"
   },
   "scripts": {
     "test": "jest"
@@ -26,7 +26,7 @@
     "json5": "^2.2.3"
   },
   "devDependencies": {
-    "typescript-eslint": "^8.46.2"
+    "typescript-eslint": "^8.46.3"
   },
   "peerDependencies": {
     "eslint": "^9"
@@ -37,5 +37,5 @@
     "eslintplugin",
     "smarthr"
   ],
-  "gitHead": "41a58b02c8a6116db8f65bfed94283fa0187d53f"
+  "gitHead": "56a52ee0be0573e3c6117ff2b368543fbbac5c4f"
 }

package/rules/a11y-help-link-with-support-href/index.js

@@ -1,7 +1,7 @@
 const SCHEMA = []
 
 const SUPPORT_URL_PREFIX_REGEX = /(\/|\.)support\./
-const SUPPORT_IDENTIFIER_REGEX = /(S|(^|_)s)upport(.*)(H(ref|REF)|U(rl|URL))$/
+const SUPPORT_IDENTIFIER_REGEX = /(S|(^|_)s)upport(.*)(H(ref|REF)|U(rl|RL))$/
 const PATH_OBJ_REGEX = /^((p|P)ath|PATH)\./
 const SUPPORT_PATH_MEMBER_REGEX = /\.support\./
 

package/rules/trim-props/index.js

@@ -1,5 +1,4 @@
 const SCHEMA = []
-const EXTRA_SPACE_REGES = /(^\s+|\s+$)/
 
 /**
  * @type {import('@typescript-eslint/utils').TSESLint.RuleModule<''>}
@@ -12,22 +11,20 @@ module.exports = {
   },
   create(context) {
     return {
-      JSXOpeningElement: (node) =>
-        node.attributes.forEach((current) => {
-          const attribute = current.value?.type === 'JSXExpressionContainer' ? current.value.expression : current.value
-          const props = attribute?.value
-
-          if (typeof props === 'string' && EXTRA_SPACE_REGES.test(props)) {
-            return context.report({
-              node,
-              loc: current.loc,
-              message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください',
-              fix(fixer) {
-                return fixer.replaceTextRange([attribute.range[0] + 1, attribute.range[1] - 1], props.trim())
-              },
-            })
-          }
+      'JSXAttribute Literal[value=/(^ | $)/]': (node) => {
+        return context.report({
+          node,
+          message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください',
+          fix: (fixer) => fixer.replaceText(node, context.sourceCode.getText(node).replace(/^('|")\s+/, '$1').replace(/\s+('|")$/, '$1')),
+        })
+      },
+      'JSXAttribute TemplateLiteral:has(TemplateElement:matches(:first-child[value.raw=/^ /],:last-child[value.raw=/ $/]))': (node) => {
+        return context.report({
+          node,
+          message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください',
+          fix: (fixer) => fixer.replaceText(node, context.sourceCode.getText(node).replace(/(^`\s+|\s+`$)/g, '`')),
         })
+      },
     }
   },
 }

package/test/a11y-help-link-with-support-href.js

@@ -19,7 +19,8 @@ ruleTester.run('a11y-help-link-with-support-href', rule, {
     { code: `<HelpLink href="//support.hoge" />` },
     { code: `<HelpLink href={"//support.hoge"} />` },
     { code: `<HelpLink href={path.support.hoge} />` },
-    { code: `<HelpLink href={supportUrl} />` },
+    { code: `<HelpLink href={supportURL} />` },
+    { code: `<HelpLink href={supportHref} />` },
   ],
   invalid: [
     { code: `<Anchor href="//support.hoge">any</Anchor>`, errors: [{ message: errorText }] },

package/test/trim-props.js

@@ -16,8 +16,9 @@ ruleTester.run('trim-props', rule, {
     { code: '<a href="https://www.google.com">google</a>' },
     { code: '<a href={"https://www.google.com"}>google</a>' },
     { code: '<img src="/sample.jpg" alt="sample" />' },
-    { code: '<img src={"/sample.jpg"} alt={"sample"} />' },
+    { code: `<img src={'/sample.jpg'} alt={'sample'} />` },
     { code: '<div data-spec="info-area">....</div>' },
+    { code: '<div data-spec={`a${b} c`}>....</div>' },
   ],
   invalid: [
     {
@@ -59,8 +60,8 @@ ruleTester.run('trim-props', rule, {
       ],
     },
     {
-      code: '<img src={" /sample.jpg"} alt={"sample "} />',
-      output: '<img src={"/sample.jpg"} alt={"sample"} />',
+      code: `<img src={' /sample.jpg'} alt={'sample '} />`,
+      output: `<img src={'/sample.jpg'} alt={'sample'} />`,
       errors: [
         { message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください' },
         { message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください' },
@@ -76,5 +77,15 @@ ruleTester.run('trim-props', rule, {
       output: '<div data-spec={"info-area"}>....</div>',
       errors: [{ message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください' }],
     },
+    {
+      code: '<div data-spec={` ab c `}>....</div>',
+      output: '<div data-spec={`ab c`}>....</div>',
+      errors: [{ message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください' }],
+    },
+    {
+      code: '<div data-spec={` a${b} c `}>....</div>',
+      output: '<div data-spec={`a${b} c`}>....</div>',
+      errors: [{ message: '属性に設定している文字列から先頭、末尾の空白文字を削除してください' }],
+    },
   ],
-})
+})