[Fix]: Fixed no error with multibyte characters specified in words op…

…tion. Fixes #969
jsx-eslint · Jan 8, 2024 · f270961 · f270961
1 parent 1adec35
commit f270961
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/__tests__/src/rules/img-redundant-alt-test.js b/__tests__/src/rules/img-redundant-alt-test.js
@@ -74,6 +74,7 @@ ruleTester.run('img-redundant-alt', rule, {
     { code: '<img alt="ImageMagick" />;' },
     { code: '<Image alt="Photo of a friend" />' },
     { code: '<Image alt="Foo" />', settings: componentsSettings },
+    { code: '<img alt="画像" />', options: [{ words: ['イメージ'] }] },
   )).map(parserOptionsMapper),
   invalid: parsers.all([].concat(
     { code: '<img alt="Photo of friend." />;', errors: [expectedError] },
@@ -129,5 +130,8 @@ ruleTester.run('img-redundant-alt', rule, {
     { code: '<img alt="Word2" />;', options: array, errors: [expectedError] },
     { code: '<Image alt="Word1" />;', options: array, errors: [expectedError] },
     { code: '<Image alt="Word2" />;', options: array, errors: [expectedError] },
+
+    { code: '<img alt="イメージ" />', options: [{ words: ['イメージ'] }], errors: [expectedError] },
+    { code: '<img alt="イメージです" />', options: [{ words: ['イメージ'] }], errors: [expectedError] },
   )).map(parserOptionsMapper),
 });
diff --git a/src/rules/img-redundant-alt.js b/src/rules/img-redundant-alt.js
@@ -25,6 +25,16 @@ const schema = generateObjSchema({
   words: arraySchema,
 });
 
+function containsRedundantWord(value, redundantWords) {
+  const lowercaseRedundantWords = redundantWords.map((redundantWord) => redundantWord.toLowerCase());
+  const isASCII = /[\x20-\x7F]+/.test(value);
+
+  if (isASCII) {
+    return value.split(/\s+/).some((valueWord) => lowercaseRedundantWords.includes(valueWord.toLowerCase()));
+  }
+  return lowercaseRedundantWords.some((redundantWord) => value.toLowerCase().includes(redundantWord));
+}
+
 export default {
   meta: {
     docs: {
@@ -63,7 +73,7 @@ export default {
         const redundantWords = REDUNDANT_WORDS.concat(words);
 
         if (typeof value === 'string' && isVisible) {
-          const hasRedundancy = new RegExp(`(?!{)\\b(${redundantWords.join('|')})\\b(?!})`, 'i').test(value);
+          const hasRedundancy = containsRedundantWord(value, redundantWords);
 
           if (hasRedundancy === true) {
             context.report({