Fix tests and code style

jsx-eslint · Jan 9, 2024 · 90bcd30 · 90bcd30
1 parent 48b1250
commit 90bcd30
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 12 deletions.
diff --git a/lib/rules/jsx-no-script-url.js b/lib/rules/jsx-no-script-url.js
@@ -5,6 +5,7 @@
 
 'use strict';
 
+const includes = require('array-includes');
 const docsUrl = require('../util/docsUrl');
 const linkComponentsUtil = require('../util/linkComponents');
 const report = require('../util/report');
@@ -28,8 +29,8 @@ function shouldVerifyProp(node, config) {
 
   if (!name || !parentName || !config.has(parentName)) return false;
 
-  const attributes = config.get(parentName)
-  return attributes.includes(name);
+  const attributes = config.get(parentName);
+  return includes(attributes, name);
 }
 
 function parseLegacyOption(config, option) {

diff --git a/lib/rules/jsx-no-target-blank.js b/lib/rules/jsx-no-target-blank.js
@@ -5,6 +5,7 @@
 
 'use strict';
 
+const includes = require('array-includes');
 const docsUrl = require('../util/docsUrl');
 const linkComponentsUtil = require('../util/linkComponents');
 const report = require('../util/report');
@@ -49,15 +50,15 @@ function attributeValuePossiblyBlank(attribute) {
 }
 
 function hasExternalLink(node, linkAttributes, warnOnSpreadAttributes, spreadAttributeIndex) {
-  const linkIndex = findLastIndex(node.attributes, (attr) => attr.name && linkAttributes.includes(attr.name.name));
+  const linkIndex = findLastIndex(node.attributes, (attr) => attr.name && includes(linkAttributes, attr.name.name));
   const foundExternalLink = linkIndex !== -1 && ((attr) => attr.value && attr.value.type === 'Literal' && /^(?:\w+:|\/\/)/.test(attr.value.value))(
     node.attributes[linkIndex]);
   return foundExternalLink || (warnOnSpreadAttributes && linkIndex < spreadAttributeIndex);
 }
 
 function hasDynamicLink(node, linkAttributes) {
   const dynamicLinkIndex = findLastIndex(node.attributes, (attr) => attr.name
-    && linkAttributes.includes(attr.name.name)
+    && includes(linkAttributes, attr.name.name)
     && attr.value
     && attr.value.type === 'JSXExpressionContainer');
   if (dynamicLinkIndex !== -1) {

diff --git a/lib/util/linkComponents.js b/lib/util/linkComponents.js
@@ -26,7 +26,7 @@ function getFormComponents(context) {
     if (typeof value === 'string') {
       return [value, [DEFAULT_FORM_ATTRIBUTE]];
     }
-    return [value.name, value.formAttributes || [value.formAttribute]];
+    return [value.name, [].concat(value.formAttribute)];
   }));
 }
 
@@ -39,7 +39,7 @@ function getLinkComponents(context) {
     if (typeof value === 'string') {
       return [value, [DEFAULT_LINK_ATTRIBUTE]];
     }
-    return [value.name, value.linkAttributes || [value.linkAttribute]];
+    return [value.name, [].concat(value.linkAttribute)];
   }));
 }
 

diff --git a/tests/lib/rules/jsx-no-script-url.js b/tests/lib/rules/jsx-no-script-url.js
@@ -71,17 +71,17 @@ ruleTester.run('jsx-no-script-url', rule, {
       errors: [{ messageId: 'noScriptURL' }],
       settings: {
         linkComponents: [
-          { name: 'Foo', linkAttribute: ['to'] }
-        ]
+          { name: 'Foo', linkAttribute: 'to' },
+        ],
       },
     },
     {
       code: '<Foo href="javascript:"></Foo>',
       errors: [{ messageId: 'noScriptURL' }],
       settings: {
         linkComponents: [
-          { name: 'Foo', linkAttribute: ['to'] }
-        ]
+          { name: 'Foo', linkAttribute: ['to', 'href'] },
+        ],
       },
     },
     {
@@ -120,8 +120,8 @@ ruleTester.run('jsx-no-script-url', rule, {
       ],
       settings: {
         linkComponents: [
-          { name: 'Foo', linkAttribute: ['to', 'href'] }
-        ]
+          { name: 'Foo', linkAttribute: ['to', 'href'] },
+        ],
       },
     },
   ]),

diff --git a/tests/lib/rules/jsx-no-target-blank.js b/tests/lib/rules/jsx-no-target-blank.js
@@ -102,6 +102,11 @@ ruleTester.run('jsx-no-target-blank', rule, {
       options: [{ enforceDynamicLinks: 'never' }],
       settings: { linkComponents: { name: 'Link', linkAttribute: 'to' } },
     },
+    {
+      code: '<Link target="_blank" to={ dynamicLink }></Link>',
+      options: [{ enforceDynamicLinks: 'never' }],
+      settings: { linkComponents: { name: 'Link', linkAttribute: ['to'] } },
+    },
     {
       code: '<a href="foobar" target="_blank" rel="noopener"></a>',
       options: [{ allowReferrer: true }],