@mrhenry/stylelint-mrhenry-nesting 3.1.1 → 3.1.3

package/index.mjs

@@ -29,8 +29,7 @@ const meta = {
 	fixable: true,
 };
 
-/** @type {import('stylelint').Rule<true|null, Array<string | RegExp>>} */
-const ruleFunction = (primaryOption, secondaryOption, context) => {
+const ruleFunction = (primaryOption, secondaryOption) => {
 	return (postcssRoot, postcssResult) => {
 		const validPrimary = stylelint.utils.validateOptions(postcssResult, ruleName, {
 			actual: primaryOption,
@@ -185,51 +184,65 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 				}
 
 				let nestingCounter = 0;
-				{
-					selectorAST.walkNesting(() => {
-						nestingCounter++;
-					});
-				}
+				selectorAST.walkNesting(() => {
+					nestingCounter++;
+				});
 
 				// .foo { .bar & {} }
 				if (
-					context.fix &&
 					nestingCounter === 1 &&
 					selectorAST.nodes[selectorAST.nodes.length - 1]?.type === 'nesting' &&
 					selectorAST.nodes[selectorAST.nodes.length - 2]?.type === 'combinator'
 				) {
-					fixSelector_AncestorPattern(rule, selectorsAST, selectorAST);
+					stylelint.utils.report({
+						message: messages.rejectedMustStartWithAmpersand(),
+						node: rule,
+						index: 0,
+						endIndex: rule.selector.length,
+						result: postcssResult,
+						ruleName,
+						fix: () => {
+							fixSelector_AncestorPattern(rule, selectorsAST, selectorAST);
+						}
+					});
+
 					continue;
 				}
 
 				// .foo { :focus& {} }
 				if (
-					context.fix &&
 					selectorAST.nodes.length === 2 &&
 					selectorAST.nodes[0]?.type === 'pseudo' &&
 					selectorParser.isPseudoClass(selectorAST.nodes[0]) &&
 					selectorAST.nodes[1]?.type === 'nesting'
 				) {
-					const a = selectorAST.nodes[0];
-					const b = selectorAST.nodes[1];
-
-					selectorAST.replaceWith(selectorParser.selector({
-						nodes: [
-							b,
-							a,
-						]
-					}))
-					rule.selector = selectorsAST.toString();
+					stylelint.utils.report({
+						message: messages.rejectedMustStartWithAmpersand(),
+						node: rule,
+						index: 0,
+						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();
+						}
+					});
+
 					continue;
 				}
 
 				// .foo { .bar {} }
 				if (selectorAST.nodes[0]?.type !== 'nesting') {
-					if (context.fix) {
-						fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector);
-						continue;
-					}
-
 					stylelint.utils.report({
 						message: messages.rejectedMustStartWithAmpersand(),
 						node: rule,
@@ -237,6 +250,9 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
+						fix: () => {
+							fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector);
+						}
 					});
 
 					continue;
@@ -244,22 +260,6 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 
 				// .foo { & + .bar {} }
 				if (selectorAST.nodes.length !== 2) {
-					if (context.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);
-						}
-						
-						continue;
-					}
-
 					stylelint.utils.report({
 						message: messages.rejectedNestingSelectorIncorrectShape(),
 						node: rule,
@@ -267,6 +267,18 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 						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);
+							}
+						}
 					});
 
 					continue;
@@ -274,12 +286,6 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 
 				// .foo { &.bar {} }
 				if (selectorAST.nodes[1]?.type !== 'pseudo') {
-					if (context.fix) {
-						selectorAST.nodes[0]?.remove();
-						fixSelector(rule, selectorsAST, selectorAST);
-						continue;
-					}
-
 					stylelint.utils.report({
 						message: messages.rejectedMustEndWithPseudo(),
 						node: rule,
@@ -287,6 +293,10 @@ const ruleFunction = (primaryOption, secondaryOption, context) => {
 						endIndex: rule.selector.length,
 						result: postcssResult,
 						ruleName,
+						fix: () => {
+							selectorAST.nodes[0]?.remove();
+							fixSelector(rule, selectorsAST, selectorAST);
+						}
 					});
 
 					continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrhenry/stylelint-mrhenry-nesting",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "description": "Mr. Henry's preferred way of writing nested CSS",
   "publishConfig": {
     "access": "public"
@@ -32,9 +32,9 @@
     "postcss-selector-parser": "^6.1.1"
   },
   "peerDependencies": {
-    "stylelint": "^16.0.0"
+    "stylelint": "^16.8.2"
   },
   "devDependencies": {
-    "stylelint": "^16.7.0"
+    "stylelint": "^16.8.2"
   }
 }