eslint-plugin-smarthr 0.2.10 → 0.2.13

package/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 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.13](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.12...v0.2.13) (2022-12-07)
+
+
+### Bug Fixes
+
+* redundant-nameのarrowedNameなどで利用するファイルパスが削られすぎていたため、指定が行いにくい問題を修正する ([4d45281](https://github.com/kufu/eslint-plugin-smarthr/commit/4d45281c383a9996437f3603dd954548f428cd19))
+
+### [0.2.12](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.11...v0.2.12) (2022-12-07)
+
+
+### Bug Fixes
+
+* ファイルが複数の.を保つ場合（例 xxx.test.tsx）正常に動作しないバグを修正する ([#42](https://github.com/kufu/eslint-plugin-smarthr/issues/42)) ([23eb5b5](https://github.com/kufu/eslint-plugin-smarthr/commit/23eb5b51039085d3239adca42c65395b81869f9d))
+
+### [0.2.11](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.10...v0.2.11) (2022-12-07)
+
+
+### Bug Fixes
+
+* redundant-nameの省略文字列がファイルパスによって正常に生成できないバグを修正 ([49eb1d9](https://github.com/kufu/eslint-plugin-smarthr/commit/49eb1d9ad1e9c153b7cb150190a81e5fae6bedf6))
+
 ### [0.2.10](https://github.com/kufu/eslint-plugin-smarthr/compare/v0.2.9...v0.2.10) (2022-11-22)
 
 ### Features

package/package.json

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

package/rules/redundant-name/index.js

@@ -86,7 +86,8 @@ const fetchTerminalImportName = (filename) => {
 const generateRedundantKeywords = ({ args, key, terminalImportName }) => {
   const option = args.option[key] || {}
   const ignoreKeywords = option.ignoreKeywords || DEFAULT_CONFIG[key].IGNORE_KEYWORDS
-  const terminalImportKeyword = terminalImportName ? terminalImportName.toLowerCase() : '' 
+  const terminalImportKeyword = terminalImportName ? terminalImportName.toLowerCase() : ''
+
   return args.keywords.reduce((prev, keyword) => {
     if (keyword === terminalImportKeyword || ignoreKeywords.includes(keyword)) {
       return prev
@@ -100,7 +101,7 @@ const generateRedundantKeywords = ({ args, key, terminalImportName }) => {
   }, [])
 }
 const handleReportBetterName = ({
-  key, 
+  key,
   context,
   option,
   filename,
@@ -170,13 +171,13 @@ const handleReportBetterName = ({
         Object.entries(option.betterNames).forEach(([regex, calc]) => {
           if (calc && filename.match(new RegExp(regex))) {
             switch(calc.operator) {
-              case '=': 
+              case '=':
                 candidates = calc.names
                 break
-              case '-': 
+              case '-':
                 candidates = candidates.filter((c) => !calc.names.includes(c))
                 break
-              case '+': 
+              case '+':
                 candidates = uniq([...candidates, ...calc.names])
                 break
             }
@@ -412,12 +413,15 @@ module.exports = {
     let rules = {}
 
     const option = context.options[0]
-    const filename = context.getFilename().match(/^(.+?)\..+?$/)[1]
+    let filename = context.getFilename()
     const keywords = uniq((() => {
       const keywordMatcher = filename.match(new RegExp(`${rootPath}/(.+?)$`))
 
       if (keywordMatcher) {
         const keywords = keywordMatcher[1].split('/')
+        keywords[keywords.length - 1] = keywords[keywords.length - 1].split('.')[0]
+
+        filename = `${rootPath}/${keywords.join('/')}`
 
         if (keywords[keywords.length - 1] === 'index') {
           keywords.pop()
@@ -435,7 +439,7 @@ module.exports = {
       return []
     })())
 
-    const args = { 
+    const args = {
       context,
       option,
       filename,