fix: francoismassart#216 classRegex ignored in vuejs (francoismassart#217)

* fix: francoismassart#216

* test: issue francoismassart#216

Author: francoismassart

lib/rules/classnames-order.js

@@ -244,7 +244,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             sortNodeArgumentValue(node, null);

lib/rules/enforces-negative-arbitrary-values.js

@@ -188,7 +188,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             parseForNegativeArbitraryClassNames(node);

lib/rules/enforces-shorthand.js

@@ -421,7 +421,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             parseForShorthandCandidates(node);

lib/rules/migration-from-tailwind-2.js

@@ -299,7 +299,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             parseForObsoleteClassNames(node);

lib/rules/no-arbitrary-value.js

@@ -188,7 +188,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             parseForArbitraryValues(node, null);

lib/rules/no-contradicting-classname.js

@@ -216,7 +216,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             astUtil.parseNodeRecursive(node, null, parseForContradictingClassNames, true);

lib/rules/no-custom-classname.js

@@ -187,7 +187,7 @@ module.exports = {
       */
       VAttribute: function (node) {
         switch (true) {
-          case !astUtil.isValidVueAttribute(node):
+          case !astUtil.isValidVueAttribute(node, classRegex):
             return;
           case astUtil.isVLiteralValue(node):
             astUtil.parseNodeRecursive(node, null, parseForCustomClassNames);

lib/util/ast.js

@@ -36,25 +36,26 @@ function isClassAttribute(node, classRegex) {
  * Find out if node is `class`
  *
  * @param {ASTNode} node The AST node being checked
+ * @param {String} classRegex Regex to test the attribute that is being checked against
  * @returns {Boolean}
  */
-function isVueClassAttribute(node) {
+function isVueClassAttribute(node, classRegex) {
+  const re = new RegExp(classRegex);
+  let name = '';
   switch (true) {
-    case node.key && /^class$/.test(node.key.name):
+    case node.key && node.key.name && re.test(node.key.name):
       // class="vue-classes-as-litteral"
       return true;
-      break;
     case node.key &&
       node.key.name &&
       node.key.name.name &&
       node.key.argument &&
       node.key.argument.name &&
       /^bind$/.test(node.key.name.name) &&
-      /^class$/.test(node.key.argument.name):
+      re.test(node.key.argument.name):
       // v-bind:class="vue-classes-as-bind"
       // :class="vue-classes-as-bind"
       return true;
-      break;
     default:
       return false;
   }
@@ -154,10 +155,11 @@ function isValidJSXAttribute(node, classRegex) {
  * Find out if the node is a valid candidate for our rules
  *
  * @param {ASTNode} node The AST node being checked
+ * @param {String} classRegex Regex to test the attribute that is being checked against
  * @returns {Boolean}
  */
-function isValidVueAttribute(node) {
-  if (!isVueClassAttribute(node)) {
+function isValidVueAttribute(node, classRegex) {
+  if (!isVueClassAttribute(node, classRegex)) {
     // Only run for class attributes
     return false;
   }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-tailwindcss",
-  "version": "3.10.0",
+  "version": "3.10.1-beta.3",
   "description": "Rules enforcing best practices while using Tailwind CSS",
   "keywords": [
     "eslint",