[lint] - Fix all new linting errors.

Author: beefancohen

src/rules/aria-props.js

@@ -7,9 +7,9 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { propName } from 'jsx-ast-utils';
 import ariaAttributes from '../util/attributes/ARIA';
 import getSuggestion from '../util/getSuggestion';
-import { propName } from 'jsx-ast-utils';
 
 const errorMessage = name => {
   const dictionary = Object.keys(ariaAttributes).map(aria => aria.toLowerCase());

src/rules/aria-proptypes.js

@@ -7,8 +7,8 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-import ariaAttributes from '../util/attributes/ARIA';
 import { getLiteralPropValue, propName } from 'jsx-ast-utils';
+import ariaAttributes from '../util/attributes/ARIA';
 
 const errorMessage = (name, type, permittedValues) => {
   switch (type) {

src/rules/aria-role.js

@@ -7,8 +7,8 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-import roles from '../util/attributes/role';
 import { getLiteralPropValue, propName } from 'jsx-ast-utils';
+import roles from '../util/attributes/role';
 
 const errorMessage = 'Elements with ARIA roles must use a valid, non-abstract ARIA role.';
 

src/rules/aria-unsupported-elements.js

@@ -8,9 +8,9 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { elementType, propName } from 'jsx-ast-utils';
 import DOM from '../util/attributes/DOM';
 import ARIA from '../util/attributes/ARIA';
-import { elementType, propName } from 'jsx-ast-utils';
 
 const errorMessage = invalidProp =>
   `This element does not support ARIA roles, states and properties. \
@@ -28,8 +28,10 @@ module.exports = {
   create: context => ({
     JSXOpeningElement: node => {
       const nodeType = elementType(node);
-      const nodeAttrs = DOM[nodeType];
-      const isReservedNodeType = nodeAttrs && nodeAttrs.reserved || false;
+      const nodeAttrs = DOM[nodeType] || {};
+      const {
+        reserved: isReservedNodeType = false,
+      } = nodeAttrs;
 
       // If it's not reserved, then it can have ARIA-* roles, states, and properties
       if (isReservedNodeType === false) {

src/rules/onclick-has-focus.js

@@ -3,9 +3,9 @@
  * @author Ethan Cohen
  */
 
+import { getProp, elementType } from 'jsx-ast-utils';
 import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
-import { getProp, elementType } from 'jsx-ast-utils';
 import getTabIndex from '../util/getTabIndex';
 
 // ----------------------------------------------------------------------------

src/rules/onclick-has-role.js

@@ -4,9 +4,9 @@
  * @author Ethan Cohen
  */
 
+import { getProp, getPropValue, elementType } from 'jsx-ast-utils';
 import isHiddenFromScreenReader from '../util/isHiddenFromScreenReader';
 import isInteractiveElement from '../util/isInteractiveElement';
-import { getProp, getPropValue, elementType } from 'jsx-ast-utils';
 
 // ----------------------------------------------------------------------------
 // Rule Definition

src/rules/role-has-required-aria-props.js

@@ -8,9 +8,8 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-import validRoleTypes from '../util/attributes/role';
 import { getProp, getLiteralPropValue, propName } from 'jsx-ast-utils';
-
+import validRoleTypes from '../util/attributes/role';
 
 const errorMessage = (role, requiredProps) =>
   `Elements with the ARIA role "${role}" must have the following ` +

src/rules/role-supports-aria-props.js

@@ -8,10 +8,10 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { getProp, getLiteralPropValue, elementType, propName } from 'jsx-ast-utils';
 import ROLES from '../util/attributes/role';
 import ARIA from '../util/attributes/ARIA';
 import getImplicitRole from '../util/getImplicitRole';
-import { getProp, getLiteralPropValue, elementType, propName } from 'jsx-ast-utils';
 
 const errorMessage = (attr, role, tag, isImplicit) => {
   if (isImplicit) {

src/util/isInteractiveElement.js

@@ -34,7 +34,7 @@ const isInteractiveElement = (tagName, attributes) => {
     return true;
   }
 
-  if (interactiveMap.hasOwnProperty(tagName) === false) {
+  if ({}.hasOwnProperty.call(interactiveMap, tagName) === false) {
     return false;
   }
 

tests/index.js

@@ -1,9 +1,9 @@
 /* eslint-env mocha */
-import plugin from '../src';
 
 import assert from 'assert';
 import fs from 'fs';
 import path from 'path';
+import plugin from '../src';
 
 const rules = fs.readdirSync(path.resolve(__dirname, '../src/rules/'))
   .map(f => path.basename(f, '.js'));