Replaces ARIA.json with aria-query::aria

jessebeach · jessebeach · commit 762f44c63dd4 · 2017-02-01T11:03:50.000-08:00
diff --git a/__tests__/src/rules/aria-props-test.js b/__tests__/src/rules/aria-props-test.js
@@ -8,21 +8,21 @@
 // Requirements
 // -----------------------------------------------------------------------------
 
+import { aria } from 'aria-query';
 import { RuleTester } from 'eslint';
 import parserOptionsMapper from '../../__util__/parserOptionsMapper';
 import rule from '../../../src/rules/aria-props';
-import ariaAttributes from '../../../src/util/attributes/ARIA.json';
 import getSuggestion from '../../../src/util/getSuggestion';
 
 // -----------------------------------------------------------------------------
 // Tests
 // -----------------------------------------------------------------------------
 
 const ruleTester = new RuleTester();
+const ariaAttributes = [...aria.keys()];
 
 const errorMessage = (name) => {
-  const dictionary = Object.keys(ariaAttributes).map(aria => aria.toLowerCase());
-  const suggestions = getSuggestion(name, dictionary);
+  const suggestions = getSuggestion(name, ariaAttributes);
   const message = `${name}: This attribute is an invalid ARIA attribute.`;
 
   if (suggestions.length > 0) {
@@ -39,7 +39,7 @@ const errorMessage = (name) => {
 };
 
 // Create basic test cases using all valid role types.
-const basicValidityTests = Object.keys(ariaAttributes).map(prop => ({
+const basicValidityTests = ariaAttributes.map(prop => ({
   code: `<div ${prop.toLowerCase()}="foobar" />`,
 }));
 
diff --git a/__tests__/src/rules/aria-proptypes-test.js b/__tests__/src/rules/aria-proptypes-test.js
@@ -8,8 +8,8 @@
 // Requirements
 // -----------------------------------------------------------------------------
 
+import { aria } from 'aria-query';
 import { RuleTester } from 'eslint';
-import ariaAttributes from '../../../src/util/attributes/ARIA.json';
 import parserOptionsMapper from '../../__util__/parserOptionsMapper';
 import rule, { validityCheck } from '../../../src/rules/aria-proptypes';
 
@@ -20,7 +20,10 @@ import rule, { validityCheck } from '../../../src/rules/aria-proptypes';
 const ruleTester = new RuleTester();
 
 const errorMessage = (name) => {
-  const { type, values: permittedValues } = ariaAttributes[name.toUpperCase()];
+  const {
+    type,
+    values: permittedValues,
+  } = aria.get(name.toLowerCase());
 
   switch (type) {
     case 'tristate':
diff --git a/__tests__/src/rules/role-supports-aria-props-test.js b/__tests__/src/rules/role-supports-aria-props-test.js
@@ -8,11 +8,13 @@
 // Requirements
 // -----------------------------------------------------------------------------
 
-import { roles } from 'aria-query';
+import {
+  aria,
+  roles,
+} from 'aria-query';
 import { RuleTester } from 'eslint';
 import parserOptionsMapper from '../../__util__/parserOptionsMapper';
 import rule from '../../../src/rules/role-supports-aria-props';
-import ARIA from '../../../src/util/attributes/ARIA.json';
 
 // -----------------------------------------------------------------------------
 // Tests
@@ -38,7 +40,7 @@ const nonAbstractRoles = [...roles.keys()].filter(role => roles.get(role).abstra
 
 const createTests = rolesNames => rolesNames.reduce((tests, role) => {
   const validPropsForRole = roles.get(role.toLowerCase()).props;
-  const invalidPropsForRole = Object.keys(ARIA)
+  const invalidPropsForRole = [...aria.keys()]
     .map(attribute => attribute.toLowerCase())
     .filter(attribute => validPropsForRole.indexOf(attribute) === -1);
   const normalRole = role.toLowerCase();
diff --git a/src/rules/aria-props.js b/src/rules/aria-props.js
@@ -7,14 +7,15 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { aria } from 'aria-query';
 import { propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
-import ariaAttributes from '../util/attributes/ARIA.json';
 import getSuggestion from '../util/getSuggestion';
 
+const ariaAttributes = [...aria.keys()];
+
 const errorMessage = (name) => {
-  const dictionary = Object.keys(ariaAttributes).map(aria => aria.toLowerCase());
-  const suggestions = getSuggestion(name, dictionary);
+  const suggestions = getSuggestion(name, ariaAttributes);
   const message = `${name}: This attribute is an invalid ARIA attribute.`;
 
   if (suggestions.length > 0) {
@@ -35,14 +36,14 @@ module.exports = {
   create: context => ({
     JSXAttribute: (attribute) => {
       const name = propName(attribute);
-      const normalizedName = name ? name.toUpperCase() : '';
+      const normalizedName = name ? name.toLowerCase() : '';
 
       // `aria` needs to be prefix of property.
-      if (normalizedName.indexOf('ARIA-') !== 0) {
+      if (normalizedName.indexOf('aria-') !== 0) {
         return;
       }
 
-      const isValid = Object.keys(ariaAttributes).indexOf(normalizedName) > -1;
+      const isValid = ariaAttributes.indexOf(normalizedName) > -1;
 
       if (isValid === false) {
         context.report({
diff --git a/src/rules/aria-proptypes.js b/src/rules/aria-proptypes.js
@@ -7,9 +7,9 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { aria } from 'aria-query';
 import { getLiteralPropValue, propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
-import ariaAttributes from '../util/attributes/ARIA.json';
 
 const errorMessage = (name, type, permittedValues) => {
   switch (type) {
@@ -63,10 +63,10 @@ module.exports = {
   create: context => ({
     JSXAttribute: (attribute) => {
       const name = propName(attribute);
-      const normalizedName = name ? name.toUpperCase() : '';
+      const normalizedName = name ? name.toLowerCase() : '';
 
       // Not a valid aria-* state or property.
-      if (normalizedName.indexOf('ARIA-') !== 0 || ariaAttributes[normalizedName] === undefined) {
+      if (normalizedName.indexOf('aria-') !== 0 || aria.get(normalizedName) === undefined) {
         return;
       }
 
@@ -78,7 +78,7 @@ module.exports = {
       }
 
       // These are the attributes of the property/state to check against.
-      const attributes = ariaAttributes[normalizedName];
+      const attributes = aria.get(normalizedName);
       const permittedType = attributes.type;
       const allowUndefined = attributes.allowUndefined || false;
       const permittedValues = attributes.values || [];
diff --git a/src/rules/aria-unsupported-elements.js b/src/rules/aria-unsupported-elements.js
@@ -8,10 +8,10 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
+import { aria } from 'aria-query';
 import { elementType, propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
 import DOM from '../util/attributes/DOM.json';
-import ARIA from '../util/attributes/ARIA.json';
 
 const errorMessage = invalidProp =>
   `This element does not support ARIA roles, states and properties. \
@@ -33,20 +33,20 @@ module.exports = {
         reserved: isReservedNodeType = false,
       } = nodeAttrs;
 
-      // If it's not reserved, then it can have ARIA-* roles, states, and properties
+      // If it's not reserved, then it can have aria-* roles, states, and properties
       if (isReservedNodeType === false) {
         return;
       }
 
-      const invalidAttributes = Object.keys(ARIA).concat('ROLE');
+      const invalidAttributes = [...aria.keys()].concat('role');
 
       node.attributes.forEach((prop) => {
         if (prop.type === 'JSXSpreadAttribute') {
           return;
         }
 
         const name = propName(prop);
-        const normalizedName = name ? name.toUpperCase() : '';
+        const normalizedName = name ? name.toLowerCase() : '';
 
         if (invalidAttributes.indexOf(normalizedName) > -1) {
           context.report({
diff --git a/src/rules/role-supports-aria-props.js b/src/rules/role-supports-aria-props.js
@@ -8,10 +8,12 @@
 // Rule Definition
 // ----------------------------------------------------------------------------
 
-import { roles } from 'aria-query';
+import {
+  aria,
+  roles,
+} from 'aria-query';
 import { getProp, getLiteralPropValue, elementType, propName } from 'jsx-ast-utils';
 import { generateObjSchema } from '../util/schemas';
-import ARIA from '../util/attributes/ARIA.json';
 import getImplicitRole from '../util/getImplicitRole';
 
 const errorMessage = (attr, role, tag, isImplicit) => {
@@ -51,7 +53,7 @@ module.exports = {
 
       // Make sure it has no aria-* properties defined outside of its property set.
       const propertySet = roles.get(roleValue.toLowerCase()).props;
-      const invalidAriaPropsForRole = Object.keys(ARIA)
+      const invalidAriaPropsForRole = [...aria.keys()]
         .map(attribute => attribute.toLowerCase())
         .filter(attribute => propertySet.indexOf(attribute) === -1);
 
diff --git a/src/util/attributes/ARIA.json b/src/util/attributes/ARIA.json
