Merge pull request #1616 from jaaberg/jsx-no-literals-binary

Find string literals as a part of BinaryExpressions in jsx-no-literals
jsx-eslint · Jan 16, 2018 · c2c7a2a · c2c7a2a
2 parents 8237551 + 28581df
commit c2c7a2a
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 5 deletions.
diff --git a/lib/rules/jsx-no-literals.js b/lib/rules/jsx-no-literals.js
@@ -45,16 +45,24 @@ module.exports = {
       });
     }
 
+    function getParentIgnoringBinaryExpressions(node) {
+      let current = node;
+      while (current.parent.type === 'BinaryExpression') {
+        current = current.parent;
+      }
+      return current.parent;
+    }
+
     function getValidation(node) {
+      const parent = getParentIgnoringBinaryExpressions(node);
       const standard = !/^[\s]+$/.test(node.value) &&
           typeof node.value === 'string' &&
-          node.parent &&
-          node.parent.type.indexOf('JSX') !== -1 &&
-          node.parent.type !== 'JSXAttribute';
+          parent.type.indexOf('JSX') !== -1 &&
+          parent.type !== 'JSXAttribute';
       if (isNoStrings) {
         return standard;
       }
-      return standard && node.parent.type !== 'JSXExpressionContainer';
+      return standard && parent.type !== 'JSXExpressionContainer';
     }
 
     // --------------------------------------------------------------------------
@@ -70,7 +78,8 @@ module.exports = {
       },
 
       TemplateLiteral: function(node) {
-        if (isNoStrings && node.parent.type === 'JSXExpressionContainer') {
+        const parent = getParentIgnoringBinaryExpressions(node);
+        if (isNoStrings && parent.type === 'JSXExpressionContainer') {
           reportLiteralNode(node);
         }
       }

diff --git a/tests/lib/rules/jsx-no-literals.js b/tests/lib/rules/jsx-no-literals.js
@@ -286,6 +286,14 @@ ruleTester.run('jsx-no-literals', rule, {
       `,
       options: [{noStrings: true}],
       errors: [{message: 'Strings not allowed in JSX files'}]
+    }, {
+      code: `
+        <Foo bar="test">
+          {'Test' + name}
+        </Foo>
+      `,
+      options: [{noStrings: true}],
+      errors: [{message: 'Strings not allowed in JSX files'}]
     }, {
       code: `
         <Foo bar="test">
@@ -315,6 +323,35 @@ ruleTester.run('jsx-no-literals', rule, {
       code: '<Foo bar={`Test`} />',
       options: [{noStrings: true}],
       errors: [{message: 'Strings not allowed in JSX files'}]
+    }, {
+      code: '<Foo bar={`${baz}`} />',
+      options: [{noStrings: true}],
+      errors: [{message: 'Strings not allowed in JSX files'}]
+    }, {
+      code: '<Foo bar={`Test ${baz}`} />',
+      options: [{noStrings: true}],
+      errors: [{message: 'Strings not allowed in JSX files'}]
+    }, {
+      code: '<Foo bar={`foo` + \'bar\'} />',
+      options: [{noStrings: true}],
+      errors: [
+        {message: 'Strings not allowed in JSX files'},
+        {message: 'Strings not allowed in JSX files'}
+      ]
+    }, {
+      code: '<Foo bar={`foo` + `bar`} />',
+      options: [{noStrings: true}],
+      errors: [
+        {message: 'Strings not allowed in JSX files'},
+        {message: 'Strings not allowed in JSX files'}
+      ]
+    }, {
+      code: '<Foo bar={\'foo\' + `bar`} />',
+      options: [{noStrings: true}],
+      errors: [
+        {message: 'Strings not allowed in JSX files'},
+        {message: 'Strings not allowed in JSX files'}
+      ]
     }
   ]
 });