[fix] - Fix some syntactical and stylistic issues for cleaner code.

Author: beefancohen

.eslintrc.js

@@ -143,6 +143,7 @@ module.exports = {
     "prefer-const": 2,
     "prefer-spread": 2,
     "prefer-template": 2,
+    'quotes': [2, 'single', 'avoid-escape'],
     "radix": 2,
     "semi": 2,
     "sort-vars": [ 2, {

docs/rules/no-unsupported-elements-use-aria.md

@@ -1,6 +1,6 @@
 # no-unsupported-elements-use-aria
 
-Certain reserved DOM elements do not support ARIA roles, states and properties. This is often because they are not visible, for example `meta`, `html`, `script`, `style`. This rule enforces that these DOM elements do not contain the role and/or aria-* props.
+Certain reserved DOM elements do not support ARIA roles, states and properties. This is often because they are not visible, for example `meta`, `html`, `script`, `style`. This rule enforces that these DOM elements do not contain the `role` and/or `aria-*` props.
 
 #### References
 1. [AX_ARIA_12](https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12)
@@ -12,12 +12,12 @@ This rule takes no arguments.
 ### Succeed
 ```jsx
 <!-- Good: the meta element should not be given any ARIA attributes -->
-<meta charset="UTF-8">
+<meta charset="UTF-8" />
 ```
 
 ### Fail
 ```jsx
 <!-- Bad: the meta element should not be given any ARIA attributes -->
-<meta charset="UTF-8" aria-hidden="false">
+<meta charset="UTF-8" aria-hidden="false" />
 ```
 

src/rules/img-uses-alt.js

@@ -60,15 +60,15 @@ module.exports = context => ({
 
 module.exports.schema = [
   {
-    "oneOf": [
-      { "type": "string" },
+    'oneOf': [
+      { 'type': 'string' },
       {
-        "type": "array",
-        "items": {
-          "type": "string"
+        'type': 'array',
+        'items': {
+          'type': 'string'
         },
-        "minItems": 1,
-        "uniqueItems": true
+        'minItems': 1,
+        'uniqueItems': true
       }
     ]
   }

src/rules/label-uses-for.js

@@ -40,15 +40,15 @@ module.exports = context => ({
 
 module.exports.schema = [
   {
-    "oneOf": [
-      { "type": "string" },
+    'oneOf': [
+      { 'type': 'string' },
       {
-        "type": "array",
-        "items": {
-          "type": "string"
+        'type': 'array',
+        'items': {
+          'type': 'string'
         },
-        "minItems": 1,
-        "uniqueItems": true
+        'minItems': 1,
+        'uniqueItems': true
       }
     ]
   }

src/rules/no-hash-href.js

@@ -38,15 +38,15 @@ module.exports = context => ({
 
 module.exports.schema = [
   {
-    "oneOf": [
-      { "type": "string" },
+    'oneOf': [
+      { 'type': 'string' },
       {
-        "type": "array",
-        "items": {
-          "type": "string"
+        'type': 'array',
+        'items': {
+          'type': 'string'
         },
-        "minItems": 1,
-        "uniqueItems": true
+        'minItems': 1,
+        'uniqueItems': true
       }
     ]
   }

src/rules/no-unsupported-elements-use-aria.js

@@ -26,11 +26,10 @@ module.exports = context => ({
       return;
     }
 
-    // Check if it has role attribute;
-    const hasRole = hasAttribute(node.attributes, 'role');
-    const hasAria = Object.keys(ARIA).some(prop => hasAttribute(node.attributes, prop.toLowerCase()));
+    const invalidAttributes = Object.keys(ARIA).concat('ROLE');
+    const hasAria = hasAttribute(node.attributes, ...invalidAttributes);
 
-    if (hasRole || hasAria) {
+    if (hasAria) {
       context.report({
         node,
         message: errorMessage

src/rules/role-requires-aria.js

@@ -14,7 +14,7 @@ import hasAttribute from '../util/hasAttribute';
 
 const errorMessage = (role, requiredProps) =>
   `Elements with the ARIA role "${role}" must have the following ` +
-  `attributes defined: ${requiredProps.toString().toLowerCase()}`;
+  `attributes defined: ${String(requiredProps).toLowerCase()}`;
 
 module.exports = context => ({
   JSXAttribute: attribute => {
@@ -31,7 +31,7 @@ module.exports = context => ({
       return;
     }
 
-    const normalizedValues = `${value}`.toUpperCase().split(" ");
+    const normalizedValues = String(value).toUpperCase().split(' ');
     const validRoles = normalizedValues.filter(value => Object.keys(validRoleTypes).indexOf(value) > -1);
 
     validRoles.forEach(role => {

src/rules/valid-aria-role.js

@@ -28,7 +28,7 @@ module.exports = context => ({
       return;
     }
 
-    const normalizedValues = `${value}`.toUpperCase().split(" ");
+    const normalizedValues = String(value).toUpperCase().split(' ');
     const isValid = normalizedValues.every(value => Object.keys(validRoleTypes).indexOf(value) > -1);
 
     if (isValid === true) {

src/util/hasAttribute.js

@@ -7,17 +7,20 @@
  * as the purpose of this linter is to do hard checks of explicit JSX props.
  *
  */
-const hasAttribute = (attributes, attribute) => {
+const hasAttribute = (attributesOnNode, ...attributesToCheck) => {
   let nodeAttribute = undefined;
 
-  const hasAttr = attributes.some(attr => {
+  // Normalize.
+  const comparators = attributesToCheck.map(attribute => attribute.toUpperCase());
+
+  const hasAttr = attributesOnNode.some(attr => {
     // If the attributes contain a spread attribute, then skip.
     if (attr.type === 'JSXSpreadAttribute') {
       return false;
     }
 
     // Normalize.
-    if (attr.name.name.toUpperCase() === attribute.toUpperCase()) {
+    if (comparators.indexOf(attr.name.name.toUpperCase()) > -1) {
       nodeAttribute = attr;
       return true;
     }

src/util/values/Literal.js

@@ -1,9 +1,9 @@
 const extract = value => {
   const { value: extractedValue } = value;
 
-  if (extractedValue === "true") {
+  if (extractedValue === 'true') {
     return true;
-  } else if (extractedValue === "false") {
+  } else if (extractedValue === 'false') {
     return false;
   }