eslint-plugin-smarthr 0.3.2 → 0.3.3

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.
 
+### [0.3.3](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.3.2...v0.3.3) (2023-07-10)
+
+
+### Bug Fixes
+
+* a11y-heading-in-sectioning-contentのHeadingアウトライン未指定の誤検知を修正する ([#65](https://github.com/kufu/eslint-plugin-smarthr/issues/65)) ([2cbf6aa](https://github.com/kufu/eslint-plugin-smarthr/commit/2cbf6aaff61f7846a80a895ed4e5e63ff9674c87))
+
 ### [0.3.2](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.3.1...v0.3.2) (2023-07-07)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-smarthr",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "author": "SmartHR",
   "license": "MIT",
   "description": "A sharable ESLint plugin for SmartHR",

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

@@ -10,6 +10,7 @@ const EXPECTED_NAMES = {
 }
 
 const headingRegex = /((^h(1|2|3|4|5|6))|Heading)$/
+const declaratorHeadingRegex = /Heading$/
 const sectioningRegex = /((A(rticle|side))|Nav|Section|^SectioningFragment)$/
 const bareTagRegex = /^(article|aside|nav|section)$/
 const messagePrefix = 'Headingと紐づく内容の範囲（アウトライン）が曖昧になっています。'
@@ -37,6 +38,11 @@ const searchBubbleUp = (node) => {
     return node
   }
 
+  // Headingコンポーネントの拡張なので対象外
+  if (node.type === 'VariableDeclarator' && node.id.name.match(declaratorHeadingRegex)) {
+    return null
+  }
+
   return searchBubbleUp(node.parent)
 }
 
@@ -82,27 +88,30 @@ module.exports = {
           })
         } else if (elementName.match(headingRegex)) {
           const result = searchBubbleUp(node.parent)
-          const saved = sections.find((s) => s[0] === result)
-
-          // HINT: 最初の1つ目は通知しない（）
-          if (!saved) {
-            sections.push([result, node])
-          } else {
-            // HINT: 同じファイルで同じSectioningContent or トップノードを持つ場合
-            const [section, unreport] = saved
-            const targets = unreport ? [unreport, node] : [node]
-
-            saved[1] = undefined
-
-            targets.forEach((n) => {
-              context.report({
-                node: n,
-                message:
-                  section.type === 'Program'
-                  ? rootMessage
-                  : commonMessage,
+
+          if (result) {
+            const saved = sections.find((s) => s[0] === result)
+
+            // HINT: 最初の1つ目は通知しない（）
+            if (!saved) {
+              sections.push([result, node])
+            } else {
+              // HINT: 同じファイルで同じSectioningContent or トップノードを持つ場合
+              const [section, unreport] = saved
+              const targets = unreport ? [unreport, node] : [node]
+
+              saved[1] = undefined
+
+              targets.forEach((n) => {
+                context.report({
+                  node: n,
+                  message:
+                    section.type === 'Program'
+                    ? rootMessage
+                    : commonMessage,
+                })
               })
-            })
+            }
           }
         }
       },

package/test/a11y-heading-in-sectioning-content.js

@@ -37,6 +37,7 @@ ruleTester.run('a11y-heading-in-sectioning-content', rule, {
     { code: '<><Heading>hoge</Heading><Article><Heading>hoge</Heading></Article></>' },
     { code: '<><Heading>hoge</Heading><Nav><Heading>hoge</Heading></Nav></>' },
     { code: '<><Heading>hoge</Heading><SectioningFragment><Heading>hoge</Heading></SectioningFragment></>' },
+    { code: 'const HogeHeading = () => <FugaHeading anyArg={abc}>hoge</FugaHeading>;const FugaHeading = () => <AbcHeading anyArg={abc}>hoge</AbcHeading>' },
   ],
   invalid: [
     { code: `import hoge from 'styled-components'`, errors: [ { message: `styled-components をimportする際は、名称が"styled" となるようにしてください。例: "import styled from 'styled-components'"` } ] },
@@ -62,5 +63,6 @@ ruleTester.run('a11y-heading-in-sectioning-content', rule, {
     { code: '<aside>hoge</aside>', errors: [ { message: `"aside"を利用せず、smarthr-ui/Asideを拡張してください。Headingのレベルが自動計算されるようになります。` } ] },
     { code: '<nav>hoge</nav>', errors: [ { message: `"nav"を利用せず、smarthr-ui/Navを拡張してください。Headingのレベルが自動計算されるようになります。` } ] },
     { code: '<section>hoge</section>', errors: [ { message: `"section"を利用せず、smarthr-ui/Sectionを拡張してください。Headingのレベルが自動計算されるようになります。` } ] },
+    { code: 'const Hoge = () => <FugaHeading anyArg={abc}>hoge</FugaHeading>;const Fuga = () => <AbcHeading anyArg={abc}>hoge</AbcHeading>', errors: [ { message: rootMessage }, { message: rootMessage } ] },
   ],
 });