eslint-plugin-smarthr 1.4.2 → 1.5.1

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.
 
+## [1.5.1](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v1.5.0...eslint-plugin-smarthr-v1.5.1) (2025-05-12)
+
+
+### Bug Fixes
+
+* require-barrel-import のロジックミスを修正する ([#619](https://github.com/kufu/tamatebako/issues/619)) ([60b21f7](https://github.com/kufu/tamatebako/commit/60b21f7949aa21e85b944825f9a55dda380943fa))
+
+## [1.5.0](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v1.4.2...eslint-plugin-smarthr-v1.5.0) (2025-05-12)
+
+
+### Features
+
+* 個別のルールで行っていたコンポーネントの命名規則チェックをcomponent-name ルールとして統一する ([#610](https://github.com/kufu/tamatebako/issues/610)) ([a73b7e7](https://github.com/kufu/tamatebako/commit/a73b7e7e305bbc84fe7001ca9ed040c3889550f4))
+
 ## [1.4.2](https://github.com/kufu/tamatebako/compare/eslint-plugin-smarthr-v1.4.1...eslint-plugin-smarthr-v1.4.2) (2025-03-27)
 
 

package/libs/common_domain.js

@@ -1,6 +1,7 @@
 const path = require('path')
 const fs = require('fs')
 const { replacePaths, rootPath } = require('./common')
+const { getParentDir } = require('./util')
 
 const BASE_SCHEMA_PROPERTIES = {
   globalModuleDir: { type: 'array', items: { type: 'string' } },
@@ -14,11 +15,7 @@ const calculateDomainContext = (context) => {
   }
 
   const filename = context.getFilename()
-  const parentDir = (() => {
-    const dir = filename.split('/')
-    dir.pop()
-    return dir.join('/')
-  })()
+  const parentDir = getParentDir(filename)
   const humanizeParentDir = parentDir.replace(new RegExp(`^${rootPath}/(.+)$`), '$1')
 
   return {
@@ -34,7 +31,7 @@ const calculateDomainNode = (calclatedContext, node) => {
   const importPath = node.source.value
   const { option, parentDir, humanizeParentDir } = calclatedContext
 
-  let replacedPath = importPath 
+  let replacedPath = importPath
 
   if (replacePaths) {
     const exts = ['.ts', '.tsx', '.js', '.jsx', '']
@@ -75,7 +72,7 @@ const calculateDomainNode = (calclatedContext, node) => {
   if (
     !resolvedImportPath ||
     option.globalModuleDir &&
-    option.globalModuleDir.some((global) => 
+    option.globalModuleDir.some((global) =>
       !!resolvedImportPath.match(new RegExp(`^${path.resolve(`${process.cwd()}/${global}`)}`))
     )
   ) {
@@ -137,4 +134,4 @@ const calculateDomainNode = (calclatedContext, node) => {
   }
 }
 
-module.exports = { BASE_SCHEMA_PROPERTIES, calculateDomainContext, calculateDomainNode }
+module.exports = { BASE_SCHEMA_PROPERTIES, calculateDomainContext, calculateDomainNode, getParentDir }

package/libs/util.js

@@ -0,0 +1,4 @@
+const PARENT_DIR_REGEX = /^(.+)\/.+?$/
+const getParentDir = (filename) => filename.match(PARENT_DIR_REGEX)?.[1] || ''
+
+module.exports = { getParentDir }

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "eslint-plugin-smarthr",
-  "version": "1.4.2",
+  "version": "1.5.1",
   "author": "SmartHR",
   "license": "MIT",
   "description": "A sharable ESLint plugin for SmartHR",
   "main": "index.js",
   "engines": {
-    "node": ">=20.19.0"
+    "node": ">=22.15.0"
   },
   "scripts": {
     "test": "jest"
@@ -26,7 +26,7 @@
     "json5": "^2.2.3"
   },
   "devDependencies": {
-    "typescript-eslint": "^8.19.1"
+    "typescript-eslint": "^8.32.0"
   },
   "peerDependencies": {
     "eslint": "^9"
@@ -37,5 +37,5 @@
     "eslintplugin",
     "smarthr"
   ],
-  "gitHead": "63fb01426aa3a021599ac0e224a0f1946ee9081f"
+  "gitHead": "e74469a80bae406252eea39f939efa557857bc88"
 }

package/rules/a11y-anchor-has-href-attribute/index.js

@@ -1,8 +1,6 @@
 const JSON5 = require('json5')
 const fs = require('fs')
 
-const { generateTagFormatter } = require('../../libs/format_styled_components')
-
 const OPTION = (() => {
   const file = `${process.cwd()}/package.json`
 
@@ -12,26 +10,40 @@ const OPTION = (() => {
 
   const json = JSON5.parse(fs.readFileSync(file))
   const dependencies = [
-    ...Object.keys(json.dependencies || {}),
-    ...Object.keys(json.devDependencies || {}),
+    ...(json.dependencies ? Object.keys(json.dependencies) : []),
+    ...(json.devDependencies ? Object.keys(json.devDependencies) : []),
   ]
 
-  return {
-    nextjs: dependencies.includes('next'),
-    react_router: dependencies.includes('react-router-dom'),
-  }
-})()
+  let nextjs = false
+  let react_router = false
+  const result = () => ({
+    nextjs,
+    react_router,
+  })
 
-const EXPECTED_NAMES = {
-  'Anchor$': 'Anchor$',
-  'Link$': 'Link$',
-  '^a$': '(Anchor|Link)$',
-}
+  for (let i = 0; i < dependencies.length; i++) {
+    switch (dependencies[i]) {
+      case 'next':
+        nextjs = true
 
-const UNEXPECTED_NAMES = {
-  '(Anchor|^a)$': '(Anchor)$',
-  '(Link|^a)$': '(Link)$',
-}
+        if (react_router) {
+          return result()
+        }
+
+        break
+      case 'react-router-dom':
+        react_router = true
+
+        if (nextjs) {
+          return result()
+        }
+
+        break
+    }
+  }
+
+  return result()
+})()
 
 const REGEX_TARGET = /(Anchor|Link|^a)$/
 const check = (node, checkType) => {
@@ -43,7 +55,7 @@ const baseCheck = (node, checkType) => {
   const nodeName = node.name.name || ''
 
   if (
-    nodeName.match(REGEX_TARGET) &&
+    REGEX_TARGET.test(nodeName) &&
     checkExistAttribute(node, findHrefAttribute) &&
     (checkType !== 'allow-spread-attributes' || !node.attributes.some(findSpreadAttr))
   ) {
@@ -106,7 +118,6 @@ module.exports = {
     const checkType = option.checkType || 'always'
 
     return {
-      ...generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES }),
       JSXOpeningElement: (node) => {
         const nodeName = check(node, checkType)
 

package/rules/a11y-clickable-element-has-text/index.js

@@ -1,5 +1,3 @@
-const { generateTagFormatter } = require('../../libs/format_styled_components')
-
 const SCHEMA = [
   {
     type: 'object',
@@ -10,22 +8,6 @@ const SCHEMA = [
   }
 ]
 
-const EXPECTED_NAMES = {
-  'SmartHRLogo$': 'SmartHRLogo$',
-  '(b|B)utton$': 'Button$',
-  'Anchor$': 'Anchor$',
-  'Link$': 'Link$',
-  'Text$': 'Text$',
-  'Message$': 'Message$',
-  '^a$': '(Anchor|Link)$',
-}
-
-const UNEXPECTED_NAMES = {
-  '(B|^b)utton$': '(Button)$',
-  '(Anchor|^a)$': '(Anchor)$',
-  '(Link|^a)$': '(Link)$',
-}
-
 const REGEX_NLSP = /^\s*\n+\s*$/
 const REGEX_CLICKABLE_ELEMENT = /^(a|(.*?)Anchor(Button)?|(.*?)Link|(b|B)utton)$/
 const REGEX_SMARTHR_LOGO = /SmartHRLogo$/
@@ -33,9 +15,7 @@ const REGEX_TEXT_COMPONENT = /(Text|Message)$/
 const REGEX_JSX_TYPE = /^(JSXText|JSXExpressionContainer)$/
 
 const filterFalsyJSXText = (cs) => cs.filter(checkFalsyJSXText)
-const checkFalsyJSXText = (c) => (
-  !(c.type === 'JSXText' && c.value.match(REGEX_NLSP))
-)
+const checkFalsyJSXText = (c) => c.type !== 'JSXText' || !REGEX_NLSP.test(c.value)
 
 const message = `a, buttonなどのクリッカブルな要素内にはテキストを設定してください
  - 要素内にアイコン、画像のみを設置する場合はaltなどの代替テキスト用属性を指定してください
@@ -55,7 +35,6 @@ module.exports = {
     const componentsWithText = option.componentsWithText || []
 
     return {
-      ...generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES }),
       JSXElement: (parentNode) => {
         // HINT: 閉じタグが存在しない === テキストノードが存在しない
         if (!parentNode.closingElement) {
@@ -64,7 +43,7 @@ module.exports = {
 
         const node = parentNode.openingElement
 
-        if (!node.name.name || !node.name.name.match(REGEX_CLICKABLE_ELEMENT)) {
+        if (!node.name.name || !REGEX_CLICKABLE_ELEMENT.test(node.name.name)) {
           return
         }
 
@@ -79,13 +58,13 @@ module.exports = {
             }
             case 'JSXElement': {
               // // HINT: SmartHRLogo コンポーネントは内部でaltを持っているため対象外にする
-              if (c.openingElement.name.name.match(REGEX_SMARTHR_LOGO)) {
+              if (REGEX_SMARTHR_LOGO.test(c.openingElement.name.name)) {
                 return true
               }
 
               const tagName = c.openingElement.name.name
 
-              if (tagName.match(REGEX_TEXT_COMPONENT) || componentsWithText.includes(tagName)) {
+              if (REGEX_TEXT_COMPONENT.test(tagName) || componentsWithText.includes(tagName)) {
                 return true
               }
 

package/rules/a11y-delegate-element-has-role-presentation/index.js

@@ -1,47 +1,28 @@
-const { generateTagFormatter } = require('../../libs/format_styled_components');
-
-const EXPECTED_NAMES = {
-  '(i|I)nput$': 'Input$',
-  '(t|T)extarea$': 'Textarea$',
-  '(s|S)elect$': 'Select$',
-  'InputFile$': 'InputFile$',
-  'RadioButtonPanel$': 'RadioButtonPanel$',
-  'Check(b|B)ox$': 'Checkbox$',
-  'Combo(b|B)ox$': 'Combobox$',
-  '(Date|Wareki)Picker$': '(Date|Wareki)Picker$',
-  'TimePicker$': 'TimePicker$',
-  'DropZone$': 'DropZone$',
-  'Switch$': 'Switch$',
-  'SegmentedControl$': 'SegmentedControl$',
-  'RightFixedNote$': 'RightFixedNote$',
-  'FieldSet$': 'FieldSet$',
-  'Fieldset$': 'Fieldset$',
-  'FormControl$': 'FormControl$',
-  'FormGroup$': 'FormGroup$',
-  '(b|B)utton$': 'Button$',
-  'Anchor$': 'Anchor$',
-  'Link$': 'Link$',
-  'TabItem$': 'TabItem$',
-  '^a$': '(Anchor|Link)$',
-
-  '(f|F)orm$': 'Form$',
-  'ActionDialogWithTrigger$': 'ActionDialogWithTrigger$',
-  'RemoteDialogTrigger$': 'RemoteDialogTrigger$',
-  'RemoteTrigger(.+)Dialog$': 'RemoteTrigger(.+)Dialog$',
-  'FormDialog$': 'FormDialog$',
-  'Pagination$': 'Pagination$',
-  'SideNav$': 'SideNav$',
-  'AccordionPanel$': 'AccordionPanel$',
-  'FilterDropdown$': 'FilterDropdown$',
-}
-
-const UNEXPECTED_NAMES = {
-  '(B|^b)utton$': '(Button)$',
-  '(Anchor|^a)$': '(Anchor)$',
-  '(Link|^a)$': '(Link)$',
-}
-
-const INTERACTIVE_COMPONENT_NAMES = Object.keys(EXPECTED_NAMES).join('|')
+const INTERACTIVE_COMPONENT_NAMES = `(${[
+  '(B|b)utton',
+  '(Check|Combo)(B|b)ox',
+  '(Date(timeLocal)?|Time|Month|Wareki)Picker',
+  '(I|i)nput(File)?',
+  '(S|s)elect',
+  '(T|t)extarea',
+  '(ActionDialogWith|RemoteDialog)Trigger',
+  'AccordionPanel',
+  '^a',
+  'Anchor',
+  'Link',
+  'DropZone',
+  'Field(S|s)et',
+  'FilterDropdown',
+  '(F|f)orm(Control|Group|Dialog)?',
+  'Pagination',
+  'RadioButton(Panel)?',
+  'RemoteTrigger(.+)Dialog',
+  'RightFixedNote',
+  'SegmentedControl',
+  'SideNav',
+  'Switch',
+  'TabItem',
+].join('|')})$`
 const INTERACTIVE_ON_REGEX = /^on(Change|Input|Focus|Blur|(Double)?Click|Key(Down|Up|Press)|Mouse(Enter|Over|Down|Up|Leave)|Select|Submit)$/
 const MEANED_ROLE_REGEX = /^(combobox|group|slider|toolbar)$/
 const INTERACTIVE_NODE_TYPE_REGEX = /^(JSXElement|JSXExpressionContainer|ConditionalExpression)$/
@@ -94,13 +75,13 @@ module.exports = {
   create(context) {
     const options = context.options[0]
     const interactiveComponentRegex = new RegExp(`(${INTERACTIVE_COMPONENT_NAMES}${options?.additionalInteractiveComponentRegex ? `|${options.additionalInteractiveComponentRegex.join('|')}` : ''})`)
-    const findInteractiveNode = (ec) => ec && ec.type.match(INTERACTIVE_NODE_TYPE_REGEX) && isHasInteractive(ec)
+    const findInteractiveNode = (ec) => ec && INTERACTIVE_NODE_TYPE_REGEX.test(ec.type) && isHasInteractive(ec)
     const isHasInteractive = (c) => {
       switch (c.type) {
         case 'JSXElement': {
           const name = c.openingElement.name.name
 
-          if (name && name.match(interactiveComponentRegex)) {
+          if (name && interactiveComponentRegex.test(name)) {
             return true
           } else if (c.children.length > 0) {
             return !!c.children.find(isHasInteractive)
@@ -122,7 +103,6 @@ module.exports = {
     }
 
     return {
-      ...generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES }),
       JSXOpeningElement: (node) => {
         const nodeName = node.name.name || '';
 
@@ -134,7 +114,7 @@ module.exports = {
         node.attributes.forEach((a) => {
           const aName = a.name?.name || ''
 
-          if (aName.match(INTERACTIVE_ON_REGEX)) {
+          if (INTERACTIVE_ON_REGEX.test(aName)) {
             onAttrs.push(aName)
           } else if (AS_REGEX.test(aName) && AS_VALUE_REGEX.test(a.value?.value || '')) {
             isAsInteractive = true
@@ -144,13 +124,13 @@ module.exports = {
             if (v === 'presentation') {
               isRolePresentation = true
               roleMean = v
-            } else if (v.match(MEANED_ROLE_REGEX)) {
+            } else if (MEANED_ROLE_REGEX.test(v)) {
               roleMean = v
             }
           }
         })
 
-        if (isAsInteractive || nodeName.match(interactiveComponentRegex)) {
+        if (isAsInteractive || interactiveComponentRegex.test(nodeName)) {
           if (isRolePresentation) {
             context.report({
               node,
@@ -204,11 +184,10 @@ module.exports = {
                 case 'JSXElement': {
                   const name = n.openingElement.name.name || ''
 
-                  if (name.match(interactiveComponentRegex)) {
-                    return true
-                  }
-
-                  if (forInSearchChildren(n.openingElement.attributes)) {
+                  if (
+                    interactiveComponentRegex.test(name) ||
+                    forInSearchChildren(n.openingElement.attributes)
+                  ) {
                     return true
                   }
 

package/rules/a11y-form-control-in-form/index.js

@@ -1,36 +1,11 @@
-const { generateTagFormatter } = require('../../libs/format_styled_components')
-
-const FIELDSET_EXPECTED_NAMES = {
-  '((F|^f)ieldset)$': '(Fieldset)$',
-  '(Fieldsets)$': '(Fieldsets)$',
-}
-const FORM_CONTROL_EXPECTED_NAMES = {
-  ...FIELDSET_EXPECTED_NAMES,
-  '(FormGroup)$': '(FormGroup)$',
-  '(FormControl)$': '(FormControl)$',
-  '(FormControls)$': '(FormControls)$',
-}
-const FORM_EXPECTED_NAMES = {
-  '((F|^f)orm)$': '(Form)$',
-  '(FormDialog)$': '(FormDialog)$',
-  'RemoteTrigger(.*)FormDialog$': 'RemoteTrigger(.*)FormDialog$',
-  'FilterDropdown$': '(FilterDropdown)$',
-}
-const EXPECTED_NAMES = {
-  ...FORM_CONTROL_EXPECTED_NAMES,
-  ...FORM_EXPECTED_NAMES,
-}
-const UNEXPECTED_NAMES = EXPECTED_NAMES
-
-const targetRegex = new RegExp(`(${Object.keys(FORM_CONTROL_EXPECTED_NAMES).join('|')})`)
-const wrapperRegex = new RegExp(`(${Object.keys(EXPECTED_NAMES).join('|')})`)
+const targetRegex = /((F|^f)ieldset|(F|^f)orm(Group|Control))(s)?$/
+const wrapperRegex = /((F|^f)ieldset(s)?|(F|^f)orm((Group|Control)(s)?)?|(RemoteTrigger(.*))?FormDialog|FilterDropdown)$/
 const ignoreCheckParentTypeRegex = /^(Program|ExportNamedDeclaration)$/
-const messageFieldset = `(${Object.values(FORM_CONTROL_EXPECTED_NAMES).join('|')})`
-const declaratorTargetRegex = new RegExp(messageFieldset)
+const declaratorTargetRegex = /(Fieldset|Form(Group|Control))(s)?$/
 const asRegex = /^(as|forwardedAs)$/
 const bareTagRegex = /^(form|fieldset)$/
 
-const includeAsAttrFormOrFieldset = (a) => a.name?.name.match(asRegex) && a.value.value.match(bareTagRegex)
+const includeAsAttrFormOrFieldset = (a) => asRegex.test(a.name?.name) && bareTagRegex.test(a.value.value)
 
 const searchBubbleUp = (node) => {
   switch (node.type) {
@@ -73,7 +48,6 @@ module.exports = {
   },
   create(context) {
     return {
-      ...generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES }),
       JSXOpeningElement: (node) => {
         const elementName = node.name.name
 
@@ -87,7 +61,7 @@ module.exports = {
  - form要素で囲むことでスクリーンリーダーに入力フォームであることが正しく伝わる、入力要素にfocusした状態でEnterを押せばsubmitできる、inputのpattern属性を利用できるなどのメリットがあります
  - 以下のいずれかの方法で修正をおこなってください
    - 方法1: form要素で ${elementName} を囲んでください。smarthr-ui/ActionDialog、もしくはsmarthr-ui/RemoteTriggerActionDialogを利用している場合、smarthr-ui/FormDialog、smarthr-ui/RemoteTriggerFormDialogに置き換えてください
-   - 方法2: ${elementName} がコンポーネント内の一要素であり、かつその親コンポーネントがFormControl、もしくはFieldsetを表現するものである場合、親コンポーネント名を "${messageFieldset}" とマッチするものに変更してください`,
+   - 方法2: ${elementName} がコンポーネント内の一要素であり、かつその親コンポーネントがFormControl、もしくはFieldsetを表現するものである場合、親コンポーネント名を "${declaratorTargetRegex}" とマッチするものに変更してください`,
             })
           }
         }

package/rules/a11y-heading-in-sectioning-content/index.js

@@ -1,55 +1,3 @@
-const { generateTagFormatter } = require('../../libs/format_styled_components')
-
-const EXPECTED_NAMES = {
-  'PageHeading$': 'PageHeading$',
-  'Heading$': 'Heading$',
-  '^h1$': 'PageHeading$',
-  '^h(|2|3|4|5|6)$': 'Heading$',
-  'Article$': 'Article$',
-  'Aside$': 'Aside$',
-  'Nav$': 'Nav$',
-  'Section$': 'Section$',
-  'ModelessDialog$': 'ModelessDialog$',
-  'Center$': 'Center$',
-  'Cluster$': '(Cluster)$',
-  'Reel$': 'Reel$',
-  'Sidebar$': 'Sidebar$',
-  'Stack$': 'Stack$',
-  'Base$': 'Base$',
-  'BaseColumn$': 'BaseColumn$',
-}
-
-const unexpectedMessageTemplate = `{{extended}} は smarthr-ui/{{expected}} をextendすることを期待する名称になっています
- - childrenにHeadingを含まない場合、コンポーネントの名称から"{{expected}}"を取り除いてください
- - childrenにHeadingを含み、アウトラインの範囲を指定するためのコンポーネントならば、smarthr-ui/{{expected}}をexendしてください
-   - "styled(Xxxx)" 形式の場合、拡張元であるXxxxコンポーネントの名称の末尾に"{{expected}}"を設定し、そのコンポーネント内でsmarthr-ui/{{expected}}を利用してください`
-const UNEXPECTED_NAMES = {
-  '(Heading|^h(1|2|3|4|5|6))$': '(Heading)$',
-  '(A|^a)rticle$': [
-    '(Article)$',
-    unexpectedMessageTemplate,
-  ],
-  '(A|^a)side$': [
-    '(Aside)$',
-    unexpectedMessageTemplate,
-  ],
-  '(N|^n)av$': [
-    '(Nav)$',
-    unexpectedMessageTemplate,
-  ],
-  '(S|^s)ection$': [
-    '(Section)$',
-    unexpectedMessageTemplate,
-  ],
-  'Center$': '(Center)$',
-  'Cluster$': '(Cluster)$',
-  'Reel$': '(Reel)$',
-  'Sidebar$': '(Sidebar)$',
-  'Stack$': '(Stack)$',
-  'Base$': '(Base)$',
-  'BaseColumn$': '(BaseColumn)$',
-}
-
 const headingRegex = /((^h(1|2|3|4|5|6))|Heading)$/
 const pageHeadingRegex = /PageHeading$/
 const declaratorHeadingRegex = /Heading$/
@@ -63,7 +11,7 @@ const noHeadingTagNamesRegex = /^(span|legend)$/
 const ignoreHeadingCheckParentTypeRegex = /^(Program|ExportNamedDeclaration)$/
 const headingAttributeRegex = /^(heading|title)$/
 
-const includeSectioningAsAttr = (a) => a.name?.name.match(asRegex) && bareTagRegex.test(a.value.value)
+const includeSectioningAsAttr = (a) => asRegex.test(a.name?.name) && bareTagRegex.test(a.value.value)
 const findHeadingAttribute = (a) => headingAttributeRegex.test(a.name?.name || '')
 
 const headingMessage = `smarthr-ui/Headingと紐づく内容の範囲（アウトライン）が曖昧になっています。
@@ -117,7 +65,7 @@ const searchBubbleUp = (node) => {
 
   if (
     // Headingコンポーネントの拡張なので対象外
-    node.type === 'VariableDeclarator' && node.parent.parent?.type.match(ignoreHeadingCheckParentTypeRegex) && declaratorHeadingRegex.test(node.id.name) ||
+    node.type === 'VariableDeclarator' && ignoreHeadingCheckParentTypeRegex.test(node.parent.parent?.type) && declaratorHeadingRegex.test(node.id.name) ||
     node.type === 'FunctionDeclaration' && ignoreHeadingCheckParentTypeRegex.test(node.parent.type) && declaratorHeadingRegex.test(node.id.name) ||
     // ModelessDialogのheaderにHeadingを設定している場合も対象外
     node.type === 'JSXAttribute' && node.name.name === 'header' && modelessDialogRegex.test(node.parent.name.name)
@@ -197,7 +145,7 @@ const searchChildren = (n) => {
       } else if (
         (
           headingRegex.test(name) &&
-          !n.openingElement.attributes.find(findTagAttr)?.value.value?.match(noHeadingTagNamesRegex)
+          !noHeadingTagNamesRegex.test(n.openingElement.attributes.find(findTagAttr)?.value.value)
         ) ||
         forInSearchChildren(n.openingElement.attributes)
       ) {
@@ -238,15 +186,11 @@ module.exports = {
   create(context) {
     let h1s = []
     let sections = []
-    let { VariableDeclarator, ...formatter } = generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES, unexpectedMessageTemplate })
-
-    formatter.VariableDeclarator = (node) => {
-      VariableDeclarator(node)
-      VariableDeclaratorBareToSHR(context, node)
-    }
 
     return {
-      ...formatter,
+      VariableDeclarator: (node) => {
+        VariableDeclaratorBareToSHR(context, node)
+      },
       JSXOpeningElement: (node) => {
         const elementName = node.name.name || ''
         const message = reportMessageBareToSHR(elementName, false)
@@ -260,7 +204,7 @@ module.exports = {
         } else if (headingRegex.test(elementName)) {
           const tagAttr = node.attributes.find(findTagAttr)
 
-          if (!tagAttr?.value.value?.match(noHeadingTagNamesRegex)) {
+          if (!noHeadingTagNamesRegex.test(tagAttr?.value.value)) {
             const result = searchBubbleUp(node.parent)
             let hit = false
 

package/rules/a11y-image-has-alt-attribute/index.js

@@ -1,18 +1,3 @@
-const { generateTagFormatter } = require('../../libs/format_styled_components')
-
-const EXPECTED_NAMES = {
-  'Img$': 'Img$',
-  'Image$': 'Image$',
-  'Icon$': 'Icon$',
-  '^(img|svg)$': '(Img|Image|Icon)$',
-}
-
-const UNEXPECTED_NAMES = {
-  '(Img|^(img|svg))$': '(Img)$',
-  '(Image|^(img|svg))$': '(Image)$',
-  '(Icon|^(img|svg))$': '(Icon)$',
-}
-
 const REGEX_IMG = /(img|image)$/i // HINT: Iconは別途テキストが存在する場合が多いためチェックの対象外とする
 
 const findAltAttr = (a) => a.name?.name === 'alt'
@@ -61,7 +46,6 @@ module.exports = {
     const checkType = option.checkType || 'always'
 
     return {
-      ...generateTagFormatter({ context, EXPECTED_NAMES, UNEXPECTED_NAMES }),
       JSXOpeningElement: (node) => {
         if (node.name.name) {
           const matcher = node.name.name.match(REGEX_IMG)