stylelint-plugin-defensive-css 0.0.2 → 0.0.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-plugin-defensive-css",
-  "version": "0.0.2",
+  "version": "0.0.5",
   "description": "A Stylelint plugin to enforce defensive CSS best practices.",
   "main": "src/index.js",
   "files": [

package/src/rules/use-defensive-css/base.js

@@ -15,7 +15,7 @@ const ruleMessages = stylelint.utils.ruleMessages(ruleName, {
     return 'Flex rows must have a `flex-wrap: wrap;` or `flex-wrap: wrap-reverse` declaration.';
   },
   vendorPrefixWGrouping() {
-    return `It's not recommended to group selectors that are meant to work with different browsers. Instead, split them to separate rules.`;
+    return `Separate different vendor prefixes into their own rules.`;
   },
 });
 

package/src/rules/use-defensive-css/index.js

@@ -8,20 +8,23 @@ const {
 } = require('../../utils/findShorthandBackgroundRepeat');
 const { findVendorPrefixes } = require('../../utils/findVendorPrefixes');
 
-const ruleFunction = (_, options) => {
-  let isLastStyleDeclaration = false;
-  const backgroundRepeatProps = {
-    hasBackgroundImage: false,
-    isMissingBackgroundRepeat: true,
-    nodeToReport: undefined,
-  };
-  const flexWrappingProps = {
-    isDisplayFlex: false,
-    isFlexRow: true,
-    isMissingFlexWrap: true,
-    nodeToReport: undefined,
-  };
+const defaultBackgroundRepeatProps = {
+  hasBackgroundImage: false,
+  isMissingBackgroundRepeat: true,
+  nodeToReport: undefined,
+};
+const defaultFlexWrappingProps = {
+  isDisplayFlex: false,
+  isFlexRow: true,
+  isMissingFlexWrap: true,
+  nodeToReport: undefined,
+};
 
+let backgroundRepeatProps = { ...defaultBackgroundRepeatProps };
+let flexWrappingProps = { ...defaultFlexWrappingProps };
+let isLastStyleDeclaration = false;
+
+const ruleFunction = (_, options) => {
   return (root, result) => {
     const validOptions = stylelint.utils.validateOptions(result, ruleName);
 
@@ -30,12 +33,9 @@ const ruleFunction = (_, options) => {
     }
 
     root.walkDecls((decl) => {
-      if (
+      isLastStyleDeclaration =
         JSON.stringify(decl) ===
-        JSON.stringify(decl.parent.nodes[decl.parent.nodes.length - 1])
-      ) {
-        isLastStyleDeclaration = true;
-      }
+        JSON.stringify(decl.parent.nodes[decl.parent.nodes.length - 1]);
 
       /* BACKGROUND REPEAT  */
       if (options?.['background-repeat']) {
@@ -55,16 +55,17 @@ const ruleFunction = (_, options) => {
           backgroundRepeatProps.isMissingBackgroundRepeat = false;
         }
 
-        if (
-          isLastStyleDeclaration &&
-          Object.values(backgroundRepeatProps).every((prop) => prop)
-        ) {
-          stylelint.utils.report({
-            message: ruleMessages.backgroundRepeat(),
-            node: decl.parent,
-            result,
-            ruleName,
-          });
+        if (isLastStyleDeclaration) {
+          if (Object.values(backgroundRepeatProps).every((prop) => prop)) {
+            stylelint.utils.report({
+              message: ruleMessages.backgroundRepeat(),
+              node: decl.parent,
+              result,
+              ruleName,
+            });
+          }
+
+          backgroundRepeatProps = { ...defaultBackgroundRepeatProps };
         }
       }
 
@@ -95,16 +96,17 @@ const ruleFunction = (_, options) => {
           flexWrappingProps.isMissingFlexWrap = false;
         }
 
-        if (
-          isLastStyleDeclaration &&
-          Object.values(flexWrappingProps).every((prop) => prop)
-        ) {
-          stylelint.utils.report({
-            message: ruleMessages.flexWrapping(),
-            node: flexWrappingProps.nodeToReport,
-            result,
-            ruleName,
-          });
+        if (isLastStyleDeclaration) {
+          if (Object.values(flexWrappingProps).every((prop) => prop)) {
+            stylelint.utils.report({
+              message: ruleMessages.flexWrapping(),
+              node: flexWrappingProps.nodeToReport,
+              result,
+              ruleName,
+            });
+          }
+
+          flexWrappingProps = { ...defaultFlexWrappingProps };
         }
       }