CHANGELOG.md

@@ -6,6 +6,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [0.4.0] - 2020-08-15
+
+### Added
+
+- The `controlComponents` option for the `label-has-for` rule, which allows you to configure the rule to allow additional control components.
+
 ## [0.3.1] - 2020-07-10
 
 ### Changed
@@ -51,7 +57,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - Initial release 🎉.
 
-[unreleased]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.3.1...HEAD
+[unreleased]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.4.0...HEAD
+[0.4.0]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.3.1...v0.4.0
 [0.3.1]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.3.0...v0.3.1
 [0.3.0]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.2.0...v0.3.0
 [0.2.0]: https://github.com/vue-a11y/eslint-plugin-vuejs-accessibility/compare/v0.1.3...v0.2.0

docs/label-has-for.md

@@ -17,7 +17,8 @@ This rule takes one optional object argument of type object:
     "vuejs-accessibility/label-has-for": [
       "error",
       {
-        "components": ["Label"],
+        "components": ["VLabel"],
+        "controlComponents": ["VInput"],
         "required": {
           "every": ["nesting", "id"]
         },
@@ -28,7 +29,9 @@ This rule takes one optional object argument of type object:
 }
 ```
 
-For the `components` option, these strings determine which JSX elements (**always including** `<label>`) should be checked for having the `for` prop. This is a good use case when you have a wrapper component that simply renders a `label` element.
+For the `components` option, these strings determine which elements (**always including** `<label>`) should be checked for having the `for` prop. This is a good use case when you have a wrapper component that simply renders a `label` element.
+
+For the `controlComponents` option, these strings determine which elements should be counted as form control elements. By default, this includes `input`, `meter`, `progress`, `select`, and `textarea`. This is a good use case when you have a wrapper component that simplify renders a `input` element.
 
 The `required` option (defaults to `"required": { "every": ["nesting", "id"] }`) determines which checks are activated. You're allowed to pass in one of the following types:
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-vuejs-accessibility",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "An eslint plugin for checking Vue.js files for accessibility",
   "main": "src/index.js",
   "scripts": {

src/rules/__tests__/label-has-for.test.js

@@ -13,6 +13,10 @@ makeRuleTester("label-has-for", rule, {
     {
       code: "<label for='id'><slot /></label>",
       options: [{ allowChildren: true }]
+    },
+    {
+      code: "<label for='id'><VInput /></label>",
+      options: [{ controlComponents: ["VInput"] }]
     }
   ],
   invalid: [
@@ -21,8 +25,8 @@ makeRuleTester("label-has-for", rule, {
     "<label for='id'><slot /></label>",
     "<label for='id'><div /></label>",
     {
-      code: "<Label for='id' />",
-      options: [{ components: ["Label"] }],
+      code: "<VLabel for='id' />",
+      options: [{ components: ["VLabel"] }],
       errors: [{ messageId: "default" }]
     }
   ]

src/rules/__tests__/makeRuleTester.js

@@ -8,7 +8,7 @@ const makeValidExample = (example) => {
     return { filename, code: makeTemplate(example) };
   }
 
-  return Object.assign(example, { filename });
+  return Object.assign(example, { filename, code: makeTemplate(example.code) });
 };
 
 const makeInvalidExample = (example) => {

src/rules/label-has-for.js

@@ -8,7 +8,7 @@ const {
 
 const controlTypes = ["input", "meter", "progress", "select", "textarea"];
 
-const validateNesting = (node, allowChildren) =>
+const validateNesting = (node, allowChildren, controlComponents) =>
   node.children.some((child) => {
     if (child.rawName === "slot") {
       return allowChildren;
@@ -17,35 +17,41 @@ const validateNesting = (node, allowChildren) =>
     if (child.type === "VElement") {
       return (
         !isHiddenFromScreenReader(child) &&
-        (controlTypes.includes(getElementType(child)) ||
+        (controlTypes
+          .concat(controlComponents)
+          .includes(getElementType(child)) ||
           validateNesting(child, allowChildren))
       );
     }
 
     return false;
   });
 
-const validate = (node, rule, allowChildren) => {
+const validate = (node, rule, allowChildren, controlComponents) => {
   switch (rule) {
     case "nesting":
-      return validateNesting(node, allowChildren);
+      return validateNesting(node, allowChildren, controlComponents);
     case "id":
       return getElementAttributeValue(node, "for");
     default:
       return false;
   }
 };
 
-const isValidLabel = (node, required, allowChildren) => {
+const isValidLabel = (node, required, allowChildren, controlComponents) => {
   if (Array.isArray(required.some)) {
-    return required.some.some((rule) => validate(node, rule, allowChildren));
+    return required.some.some((rule) =>
+      validate(node, rule, allowChildren, controlComponents)
+    );
   }
 
   if (Array.isArray(required.every)) {
-    return required.every.every((rule) => validate(node, rule, allowChildren));
+    return required.every.every((rule) =>
+      validate(node, rule, allowChildren, controlComponents)
+    );
   }
 
-  return validate(node, required, allowChildren);
+  return validate(node, required, allowChildren, controlComponents);
 };
 
 module.exports = {
@@ -67,6 +73,13 @@ module.exports = {
             },
             uniqueItems: true
           },
+          controlComponents: {
+            type: "array",
+            items: {
+              type: "string"
+            },
+            uniqueItems: true
+          },
           required: {
             oneOf: [
               {
@@ -116,12 +129,13 @@ module.exports = {
         const {
           allowChildren = false,
           components = [],
+          controlComponents = [],
           required = { every: ["nesting", "id"] }
         } = context.options[0] || {};
 
         if (
           ["label"].concat(components).includes(getElementType(node)) &&
-          !isValidLabel(node, required, allowChildren)
+          !isValidLabel(node, required, allowChildren, controlComponents)
         ) {
           context.report({ node, messageId: "default" });
         }