eslint-plugin-smarthr 0.2.2 → 0.2.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.2.3](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.2...v0.2.3) (2022-08-26)
+
+
+### Bug Fixes
+
+* a11y-xxxx: styled(Hoge)の実行結果を変数に代入しないパターンに対応する ([#26](https://github.com/kufu/eslint-plugin-smarthr/issues/26)) ([0bb0259](https://github.com/kufu/eslint-plugin-smarthr/commit/0bb02595a3be35802c1fe8bc41011fd1e55bf319))
+
 ### [0.2.2](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.1...v0.2.2) (2022-08-18)
 
 

package/libs/format_styled_components.js

@@ -1,3 +1,31 @@
+const getExtendedComponentName = (node) => {
+  if (!node.parent) {
+    return null
+  }
+
+  return node.parent.id?.name || getExtendedComponentName(node.parent)
+}
+const getBaseComponentName = (node) => {
+  if (!node) {
+    return null
+  }
+
+  if (node.type === 'CallExpression') {
+    if (node.callee.name === 'styled') {
+      return node.arguments[0].name
+    }
+    if (node.callee.object?.name === 'styled') {
+      return node.callee.property.name
+    }
+  }
+
+  if (node?.object?.name === 'styled') {
+    return node.property.name
+  }
+
+  return getBaseComponentName(node.parent)
+}
+
 const generateTagFormatter = ({ context, EXPECTED_NAMES }) => ({
   ImportDeclaration: (node) => {
     if (node.source.value !== 'styled-components') {
@@ -17,40 +45,29 @@ const generateTagFormatter = ({ context, EXPECTED_NAMES }) => ({
     }
   },
   TaggedTemplateExpression: (node) => {
-    const { tag } = node
-    const base = (() => {
-      if (tag.type === 'CallExpression' && tag.callee.name === 'styled') {
-        return tag.arguments[0].name
-      }
-
-      if (tag?.object?.name === 'styled') {
-        return tag.property.name
-      }
+    const extended = getExtendedComponentName(node)
 
-      return null
-    })()
+    if (extended) {
+      const base = getBaseComponentName(node.tag)
 
-    if (!base) {
-      return
-    }
+      if (base) {
+        Object.entries(EXPECTED_NAMES).forEach(([b, e]) => {
+          if (base.match(new RegExp(b))) {
+            const extendedregex = new RegExp(e)
 
-    const extended = node.parent.id.name
-
-    Object.entries(EXPECTED_NAMES).forEach(([b, e]) => {
-      if (base.match(new RegExp(b))) {
-        const extendedregex = new RegExp(e)
-
-        if (!extended.match(extendedregex)) {
-          context.report({
-            node: node.parent,
-            messageId: 'format-styled-components',
-            data: {
-              message: `${extended}を正規表現 "${extendedregex.toString()}" がmatchする名称に変更してください`,
-            },
-          });
-        }
+            if (!extended.match(extendedregex)) {
+              context.report({
+                node: node.parent,
+                messageId: 'format-styled-components',
+                data: {
+                  message: `${extended}を正規表現 "${extendedregex.toString()}" がmatchする名称に変更してください`,
+                },
+              });
+            }
+          }
+        })
       }
-    })
+    }
   },
 })
 

package/package.json

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