@mrhenry/stylelint-mrhenry-nesting 2.2.3 → 3.0.1

package/{stylelint-mrhenry-nesting.cjs → index.mjs}

@@ -1,5 +1,5 @@
-const stylelint = require("stylelint");
-const selectorParser = require('postcss-selector-parser');
+import stylelint from 'stylelint';
+import selectorParser from 'postcss-selector-parser';
 
 const ruleName = "@mrhenry/stylelint-mrhenry-nesting";
 const messages = stylelint.utils.ruleMessages(ruleName, {
@@ -25,13 +25,29 @@ const meta = {
 	fixable: true,
 };
 
-const ruleFunction = (primaryOption, secondaryOptionObject, context) => {
+/** @type {import('stylelint').Rule<true|null, Array<string | RegExp>>} */
+const ruleFunction = (primaryOption, secondaryOption, context) => {
 	return (postcssRoot, postcssResult) => {
-		if (!primaryOption) {
-			return;
-		}
+		const validPrimary = stylelint.utils.validateOptions(postcssResult, ruleName, {
+			actual: primaryOption,
+			possible: [true]
+		});
+
+		/* c8 ignore next */
+		if (!validPrimary) return;
+
+		const validSecondary = stylelint.utils.validateOptions(postcssResult, ruleName, {
+			actual: secondaryOption,
+			possible: {
+				ignoreAtRules: [isString, isRegExp],
+			},
+			optional: true,
+		});
+
+		/* c8 ignore next */
+		if (!validSecondary) return;
 		
-		const ignoreAtRulesOptions = secondaryOptionObject?.ignoreAtRules ?? [];
+		const ignoreAtRulesOptions = secondaryOption?.ignoreAtRules ?? [];
 
 		postcssRoot.walkAtRules((atrule) => {
 			let name = atrule.name.toLowerCase();
@@ -39,7 +55,8 @@ const ruleFunction = (primaryOption, secondaryOptionObject, context) => {
 				name === 'media' ||
 				name === 'supports' ||
 				name === 'container' ||
-				name === 'scope'
+				name === 'scope' ||
+				name === 'starting-style'
 			) {
 				// always allowed
 				return;
@@ -119,7 +136,7 @@ const ruleFunction = (primaryOption, secondaryOptionObject, context) => {
 			const selectorsAST = selectorParser().astSync(rule.selector);
 			const firstCompoundOrSelf = getFirstCompoundOrSelf(selectorsAST);
 
-			isRelativeSelector = false;
+			let isRelativeSelector = false;
 			if (firstCompoundOrSelf.nodes[0]?.type === 'combinator') {
 				isRelativeSelector = true;
 			}
@@ -172,7 +189,7 @@ const ruleFunction = (primaryOption, secondaryOptionObject, context) => {
 				// .foo { .bar {} }
 				if (selectorAST.nodes[0]?.type !== 'nesting') {
 					if (context.fix) {
-						fixSelector(rule, selectorsAST, selectorAST);
+						fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector);
 						continue;
 					}
 
@@ -242,7 +259,7 @@ const ruleFunction = (primaryOption, secondaryOptionObject, context) => {
 	};
 };
 
-function fixSelector(rule, selectorsAST, selectorAST) {
+function fixSelector(rule, selectorsAST, selectorAST, isRelativeSelector) {
 	if (
 		selectorAST.nodes.length === 1 &&
 		selectorAST.nodes[0].type === 'pseudo'
@@ -294,19 +311,32 @@ ruleFunction.ruleName = ruleName;
 ruleFunction.messages = messages;
 ruleFunction.meta = meta;
 
-module.exports = stylelint.createPlugin(ruleName, ruleFunction);
+export default stylelint.createPlugin(ruleName, ruleFunction);
 
 function getFirstCompoundOrSelf(x) {
+	/* c8 ignore next */
 	if (!x.nodes) {
+		/* c8 ignore next */
 		return x;
+		/* c8 ignore next */
 	}
 
 	for (let i = 0; i < x.nodes.length; i++) {
 		/* c8 ignore next */
 		if (x.nodes[i].type !== 'selector') {
+			/* c8 ignore next */
 			return x;
+			/* c8 ignore next */
 		}
 	}
 
 	return x.nodes[0];
 }
+
+function isRegExp(value) {
+	return value instanceof RegExp;
+}
+
+function isString(value) {
+	return typeof value === 'string' || value instanceof String;
+}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@mrhenry/stylelint-mrhenry-nesting",
-  "version": "2.2.3",
+  "version": "3.0.1",
   "description": "Mr. Henry's preferred way of writing nested CSS",
   "publishConfig": {
     "access": "public"
   },
-  "main": "stylelint-mrhenry-nesting.cjs",
+  "type": "module",
+  "main": "index.mjs",
   "scripts": {
-    "test": "npm run test:jest",
-    "test:jest": "c8 --100 jest"
+    "test": "c8 --100 node --test"
   },
   "author": "Mr. Henry",
   "license": "MIT",
@@ -19,13 +19,10 @@
     "directory": "packages/nesting"
   },
   "files": [
-    "stylelint-mrhenry-nesting.js",
+    "index.mjs",
     "LICENSE",
     "README.md"
   ],
-  "jest": {
-    "preset": "jest-preset-stylelint"
-  },
   "keywords": [
     "stylelint",
     "stylelint-plugin"
@@ -34,9 +31,9 @@
     "postcss-selector-parser": "^6.0.11"
   },
   "peerDependencies": {
-    "stylelint": "^14.16.1 || ^15.0.0"
+    "stylelint": "^16.0.0"
   },
   "devDependencies": {
-    "stylelint": "^15.10.1"
+    "stylelint": "^16.0.2"
   }
 }