FIX francoismassart#121

Author: francoismassart

lib/rules/enforces-shorthand.js

@@ -240,7 +240,10 @@ module.exports = {
                 const hasL = sameVariantAndValue.some((c) => c.shorthand === 'l') || (hasTL && hasBL);
                 const hasX = sameVariantAndValue.some((c) => c.shorthand === 'x') || (hasL && hasR);
                 const hasY = sameVariantAndValue.some((c) => c.shorthand === 'y') || (hasT && hasB);
-                const hasAll = sameVariantAndValue.some((c) => c.shorthand === 'all') || (hasY && hasX);
+                const hasAll =
+                  sameVariantAndValue.some((c) => c.shorthand === 'all') || !supportCorners
+                    ? hasY && hasX
+                    : (hasL && hasR) || (hasT && hasB);
                 const important = cls.important ? '!' : '';
                 const isNegative = ('' + cls.value).substring(0, 1) === '-';
                 const minus = isNegative ? '-' : '';
@@ -249,15 +252,15 @@ module.exports = {
                 if (hasAll) {
                   const all = getBodyByShorthand(targetGroups, classname.parentType, 'all');
                   const val = absoluteVal.length ? '-' + absoluteVal : '';
-                  const patchedName = `${cls.variants}${important}${minus}${all}${val}`;
+                  const patchedName = `${cls.variants}${important}${minus}${mergedConfig.prefix}${all}${val}`;
                   troubles.push([sameVariantAndValue.map((c) => c.name), patchedName]);
                   cls.name = patchedName;
                   cls.shorthand = 'all';
                   validated.push(cls);
                 } else if (hasY || hasX) {
                   const xOrY = hasX ? 'x' : 'y';
                   const xOrYType = getBodyByShorthand(targetGroups, classname.parentType, xOrY);
-                  const patchedName = `${cls.variants}${important}${minus}${xOrYType}${
+                  const patchedName = `${cls.variants}${important}${minus}${mergedConfig.prefix}${xOrYType}${
                     absoluteVal.length ? '-' + absoluteVal : ''
                   }`;
                   const toBeReplaced = sameVariantAndValue
@@ -288,7 +291,7 @@ module.exports = {
                   const side = hasT ? 't' : hasR ? 'r' : hasB ? 'b' : 'l';
                   const sideBody = getBodyByShorthand(targetGroups, classname.parentType, side);
                   const val = absoluteVal.length ? '-' + absoluteVal : '';
-                  const patchedName = `${cls.variants}${important}${minus}${sideBody}${val}`;
+                  const patchedName = `${cls.variants}${important}${minus}${mergedConfig.prefix}${sideBody}${val}`;
                   const toBeReplaced = sameVariantAndValue
                     .filter((c) => {
                       const candidates = hasT ? ['tl', 'tr'] : hasR ? ['tr', 'br'] : hasB ? ['bl', 'br'] : ['tl', 'bl'];

tests/lib/rules/enforces-shorthand.js

@@ -398,5 +398,25 @@ ruleTester.run("shorthands", rule, {
       output: `classnames({'md:!rounded-tr block md:rounded-tl md:rounded-b': true})`,
       errors: [generateError(["md:rounded-br", "md:rounded-bl"], "md:rounded-b")],
     },
+    {
+      code: `classnames('sfc-border-l-0 sfc-border-r-0')`,
+      output: `classnames('sfc-border-x-0')`,
+      options: [
+        {
+          config: { prefix: "sfc-" },
+        },
+      ],
+      errors: [generateError(["sfc-border-l-0", "sfc-border-r-0"], "sfc-border-x-0")],
+    },
+    {
+      code: `classnames('md_sfc-border-l-0 md_sfc-border-r-0')`,
+      output: `classnames('md_sfc-border-x-0')`,
+      options: [
+        {
+          config: { prefix: "sfc-", separator: "_" },
+        },
+      ],
+      errors: [generateError(["md_sfc-border-l-0", "md_sfc-border-r-0"], "md_sfc-border-x-0")],
+    },
   ],
 });