@mrhenry/stylelint-mrhenry-nesting 3.1.3 → 3.2.0

package/index.mjs

@@ -166,6 +166,8 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						result: postcssResult,
 						ruleName,
 					});
+
+					return;
 				}
 			}
 
@@ -183,6 +185,21 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 					continue;
 				}
 
+				// .foo { & {} }
+				// .foo { && {} }
+				if (selectorAST.nodes.every((x) => x.type === 'nesting' || x.type === 'comment')) {
+					stylelint.utils.report({
+						message: messages.rejectedNestingSelectorIncorrectShape(),
+						node: rule,
+						index: 0,
+						endIndex: rule.selector.length,
+						result: postcssResult,
+						ruleName,
+					});
+
+					continue;
+				}
+
 				let nestingCounter = 0;
 				selectorAST.walkNesting(() => {
 					nestingCounter++;
@@ -201,8 +218,11 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
-						fix: () => {
-							fixSelector_AncestorPattern(rule, selectorsAST, selectorAST);
+						fix: {
+							apply: () => {
+								fixSelector_AncestorPattern(rule, selectorsAST, selectorAST);
+							},
+							node: rule
 						}
 					});
 
@@ -223,18 +243,21 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
-						fix: () => {
-							const a = selectorAST.nodes[0];
-							const b = selectorAST.nodes[1];
-
-							selectorAST.replaceWith(selectorParser.selector({
-								nodes: [
-									b,
-									a,
-								]
-							}));
-
-							rule.selector = selectorsAST.toString();
+						fix: {
+							apply: () => {
+								const a = selectorAST.nodes[0];
+								const b = selectorAST.nodes[1];
+
+								selectorAST.replaceWith(selectorParser.selector({
+									nodes: [
+										b,
+										a,
+									]
+								}));
+
+								rule.selector = selectorsAST.toString();
+							},
+							node: rule
 						}
 					});
 
@@ -250,8 +273,11 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
-						fix: () => {
-							fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector);
+						fix: {
+							apply: () => {
+								fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector);
+							},
+							node: rule
 						}
 					});
 
@@ -267,17 +293,20 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
-						fix: () => {
-							const firstPart = selectorAST.nodes[0];
-							const afterFirstPart = selectorAST.nodes[0]?.next();
-
-							if (firstPart && afterFirstPart?.type === 'combinator') {
-								selectorAST.nodes[0]?.replaceWith(selectorParser.nesting())
-								fixSelector(rule, selectorsAST, selectorAST);
-							} else {
-								selectorAST.nodes[0]?.remove();
-								fixSelector(rule, selectorsAST, selectorAST);
-							}
+						fix: {
+							apply: () => {
+								const firstPart = selectorAST.nodes[0];
+								const afterFirstPart = selectorAST.nodes[0]?.next();
+
+								if (firstPart && afterFirstPart?.type === 'combinator') {
+									selectorAST.nodes[0]?.replaceWith(selectorParser.nesting())
+									fixSelector(rule, selectorsAST, selectorAST);
+								} else {
+									selectorAST.nodes[0]?.remove();
+									fixSelector(rule, selectorsAST, selectorAST);
+								}
+							},
+							node: rule
 						}
 					});
 
@@ -293,9 +322,12 @@ const ruleFunction = (primaryOption, secondaryOption) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
-						fix: () => {
-							selectorAST.nodes[0]?.remove();
-							fixSelector(rule, selectorsAST, selectorAST);
+						fix: {
+							apply: () => {
+								selectorAST.nodes[0]?.remove();
+								fixSelector(rule, selectorsAST, selectorAST);
+							},
+							node: rule
 						}
 					});
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/stylelint-mrhenry-nesting",
-  "version": "3.1.3",
+  "version": "3.2.0",
   "description": "Mr. Henry's preferred way of writing nested CSS",
   "publishConfig": {
     "access": "public"
@@ -28,13 +28,13 @@
     "stylelint-plugin"
   ],
   "dependencies": {
-    "@csstools/selector-specificity": "^4.0.0",
-    "postcss-selector-parser": "^6.1.1"
+    "@csstools/selector-specificity": "^5.0.0",
+    "postcss-selector-parser": "^7.0.0"
   },
   "peerDependencies": {
-    "stylelint": "^16.8.2"
+    "stylelint": "^16.14.1"
   },
   "devDependencies": {
-    "stylelint": "^16.8.2"
+    "stylelint": "^16.14.1"
   }
 }