Merge pull request #3 from evcohen/bugfix

Handle logical expression types when getting node value.

Author: beefancohen

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-jsx-a11y",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "description": "A static analysis linter of jsx and their accessibility with screen readers.",
   "keywords": [
     "eslint",
@@ -27,10 +27,10 @@
   "devDependencies": {
     "babel-cli": "^6.6.0",
     "babel-core": "^6.6.0",
-    "babel-eslint": "^5.0.0",
+    "babel-eslint": "^6.0.0",
     "babel-preset-es2015": "^6.6.0",
     "coveralls": "^2.11.8",
-    "eslint": "2.2.x",
+    "eslint": "^2.2.0",
     "istanbul": "^1.0.0-alpha.2",
     "mocha": "^2.4.5",
     "rimraf": "^2.5.2"

src/util/getAttributeValue.js

@@ -2,6 +2,34 @@
 
 import buildTemplateLiteral from './buildTemplateLiteral';
 
+const getValue = value => {
+  if (value.type === 'Literal') {
+    return value.value === "" ? undefined : value.value;
+  } else if (value.type === 'Identifier') {
+    return value.name === "" ? undefined : value.name;
+  } else if (value.type === 'JSXExpressionContainer') {
+    const expression = value.expression;
+
+    switch (expression.type) {
+      case 'Literal':
+        return expression.value === "" ? undefined : expression.value;
+      case 'TemplateLiteral':
+        return buildTemplateLiteral(expression);
+      case 'Identifier':
+        return expression.name == 'undefined' ? undefined : expression.name;
+      case 'ArrowFunctionExpression':
+      case 'FunctionExpression':
+        return () => void 0;
+      case 'LogicalExpression':
+        return getValue(expression.left) && getValue(expression.right);
+      default:
+        return undefined;
+    }
+  }
+
+  return undefined;
+};
+
 /**
  * Returns the value of a given attribute.
  * Different types of attributes have their associated
@@ -14,26 +42,7 @@ const getAttributeValue = attribute => {
   if (attribute.value === null) {
     return null;
   } else if (attribute.type === 'JSXAttribute') {
-
-    if (attribute.value.type === 'Literal') {
-      return attribute.value.value === "" ? undefined : attribute.value.value;
-    } else if (attribute.value.type === 'JSXExpressionContainer') {
-      const expression = attribute.value.expression;
-
-      switch (expression.type) {
-        case 'Literal':
-          return expression.value === "" ? undefined : expression.value;
-        case 'TemplateLiteral':
-          return buildTemplateLiteral(expression);
-        case 'Identifier':
-          return expression.name == 'undefined' ? undefined : expression.name;
-        case 'ArrowFunctionExpression':
-        case 'FunctionExpression':
-          return () => void 0;
-        default:
-          return undefined;
-      }
-    }
+    return getValue(attribute.value);
   }
 
   return undefined;

tests/src/rules/img-uses-alt.js

@@ -55,6 +55,7 @@ ruleTester.run('img-uses-alt', rule, {
     { code: '<img alt={() => void 0} />', parserOptions },
     { code: '<IMG />', parserOptions },
     { code: '<UX.Layout>test</UX.Layout>', parserOptions },
+    { code: '<img alt={alt || "Alt text" } />', parserOptions },
 
     // CUSTOM ELEMENT TESTS FOR STRING OPTION
     { code: '<Avatar alt="foo" />;', options: string, parserOptions },
@@ -70,6 +71,7 @@ ruleTester.run('img-uses-alt', rule, {
     { code: '<div alt={function(e) {} } />', options: string, parserOptions },
     { code: '<Avatar alt={() => void 0} />', options: string, parserOptions },
     { code: '<AVATAR />', options: string, parserOptions },
+    { code: '<Avatar alt={alt || "foo" } />', options: string, parserOptions },
 
     // CUSTOM ELEMENT TESTS FOR ARRAY OPTION TESTS
     { code: '<Thumbnail alt="foo" />;', options: array, parserOptions },
@@ -85,6 +87,7 @@ ruleTester.run('img-uses-alt', rule, {
     { code: '<div alt={function(e) {} } />', options: array, parserOptions },
     { code: '<Thumbnail alt={() => void 0} />', options: array, parserOptions },
     { code: '<THUMBNAIL />', options: array, parserOptions },
+    { code: '<Thumbnail alt={alt || "foo" } />', options: array, parserOptions },
     { code: '<Image alt="foo" />;', options: array, parserOptions },
     { code: '<Image alt={"foo"} />;', options: array, parserOptions },
     { code: '<Image alt={alt} />;', options: array, parserOptions },
@@ -97,7 +100,8 @@ ruleTester.run('img-uses-alt', rule, {
     { code: '<Image alt={function(e) {} } />', options: array, parserOptions },
     { code: '<div alt={function(e) {} } />', options: array, parserOptions },
     { code: '<Image alt={() => void 0} />', options: array, parserOptions },
-    { code: '<IMAGE />', options: array, parserOptions }
+    { code: '<IMAGE />', options: array, parserOptions },
+    { code: '<Image alt={alt || "foo" } />', options: array, parserOptions }
   ],
   invalid: [
     // DEFAULT ELEMENT 'img' TESTS
@@ -108,6 +112,7 @@ ruleTester.run('img-uses-alt', rule, {
     { code: '<img alt="" />;', errors: [ expectedError ], parserOptions },
     { code: '<img src="xyz" />', errors: [ expectedError ], parserOptions },
     { code: '<img {...this.props} />', errors: [ expectedError ], parserOptions },
+    { code: '<img alt={false || false} />', errors: [ expectedError ], parserOptions },
 
     // CUSTOM ELEMENT TESTS FOR STRING OPTION
     { code: '<Avatar />;', errors: [ customError('Avatar') ], options: string, parserOptions },