Compatibility with newer postcss-sorting

Robbert · Oct 16, 2021 · 6e7330a · 6e7330a
1 parent 4597116
commit 6e7330a
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 77 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
 	"main": "index.js",
 	"dependencies": {
 		"postcss": "^8.3.9",
-		"postcss-sorting": "^7.0.0"
+		"postcss-sorting": "^7.0.1"
 	},
 	"peerDependencies": {
 		"stylelint": "^14.0.0"

diff --git a/rules/order/checkNode.js b/rules/order/checkNode.js
@@ -1,14 +1,12 @@
 const stylelint = require('stylelint');
-const postcss = require('postcss');
-const postcssSorting = require('postcss-sorting');
+const sortNode = require('postcss-sorting/lib/order/sortNode');
 const checkOrder = require('./checkOrder');
 const getOrderData = require('./getOrderData');
 const ruleName = require('./ruleName');
 const messages = require('./messages');
 
 module.exports = function checkNode({
 	node,
-	originalNode,
 	isFixEnabled,
 	orderInfo,
 	primaryOption,
@@ -37,15 +35,7 @@ module.exports = function checkNode({
 		});
 
 		if (shouldFix) {
-			let sortingOptions = {
-				order: primaryOption,
-			};
-
-			// creating PostCSS Root node with current node as a child,
-			// so PostCSS Sorting can process it
-			let tempRoot = postcss.root({ nodes: [originalNode] });
-
-			postcssSorting(sortingOptions)(tempRoot);
+			sortNode(node, primaryOption);
 		}
 	}
 

diff --git a/rules/order/index.js b/rules/order/index.js
@@ -51,7 +51,6 @@ function rule(primaryOption, options = {}, context = {}) {
 			if (isRuleWithNodes(node)) {
 				checkNode({
 					node,
-					originalNode,
 					isFixEnabled,
 					orderInfo,
 					primaryOption,

diff --git a/rules/properties-alphabetical-order/index.js b/rules/properties-alphabetical-order/index.js
@@ -1,5 +1,5 @@
 let stylelint = require('stylelint');
-let postcssSorting = require('postcss-sorting');
+let sortNodeProperties = require('postcss-sorting/lib/properties-order/sortNodeProperties');
 let { namespace, getContainingNode, isRuleWithNodes } = require('../../utils');
 let checkNode = require('./checkNode');
 
@@ -33,12 +33,6 @@ function rule(actual, options = {}, context = {}) {
 
 		let disableFix = options.disableFix || false;
 
-		if (context.fix && !disableFix) {
-			postcssSorting({ 'properties-order': 'alphabetical' })(root);
-
-			return;
-		}
-
 		let processedParents = [];
 
 		root.walk(function processRulesAndAtrules(input) {
@@ -52,7 +46,11 @@ function rule(actual, options = {}, context = {}) {
 			processedParents.push(node);
 
 			if (isRuleWithNodes(node)) {
-				checkNode(node, result, ruleName, messages);
+				if (context.fix && !disableFix) {
+					sortNodeProperties(node, { order: 'alphabetical' });
+				} else {
+					checkNode(node, result, ruleName, messages);
+				}
 			}
 		});
 	};

diff --git a/rules/properties-order/checkNodeForOrder.js b/rules/properties-order/checkNodeForOrder.js
@@ -1,16 +1,14 @@
 const stylelint = require('stylelint');
-const postcss = require('postcss');
-const postcssSorting = require('postcss-sorting');
+const sortNodeProperties = require('postcss-sorting/lib/properties-order/sortNodeProperties');
 const { isProperty } = require('../../utils');
 const checkOrder = require('./checkOrder');
 const getNodeData = require('./getNodeData');
 const createFlatOrder = require('./createFlatOrder');
 const ruleName = require('./ruleName');
 const messages = require('./messages');
 
-module.exports = async function checkNodeForOrder({
+module.exports = function checkNodeForOrder({
 	node,
-	originalNode,
 	isFixEnabled,
 	primaryOption,
 	unspecified,
@@ -48,24 +46,10 @@ module.exports = async function checkNodeForOrder({
 		});
 
 		if (shouldFixOrder) {
-			let sortingOptions = {
-				'properties-order': createFlatOrder(primaryOption),
-				'unspecified-properties-position':
-					unspecified === 'ignore' ? 'bottom' : unspecified,
-			};
-
-			// creating PostCSS Root node with current node as a child,
-			// so PostCSS Sorting can process it
-			let tempRoot = postcss.root({ nodes: [originalNode] });
-
-			try {
-				await postcss([postcssSorting(sortingOptions)]).process(tempRoot, {
-					from: result.from,
-				});
-			} catch (e) {
-				// With CSS-in-JS syntax PostCSS throws stringify error for node.type `literal`. Why it's even tries to stringify?!
-				// If syntax is provided to both `tempRoot` and to `postcss().process()`, then CSS-in-JS syntax fails with exceeded call stack
-			}
+			sortNodeProperties(node, {
+				order: createFlatOrder(primaryOption),
+				unspecifiedPropertiesPosition: unspecified === 'ignore' ? 'bottom' : unspecified,
+			});
 		}
 	}
 

diff --git a/rules/properties-order/index.js b/rules/properties-order/index.js
@@ -40,7 +40,7 @@ function rule(primaryOption, options = {}, context = {}) {
 		let processedParents = [];
 
 		// Check all rules and at-rules recursively
-		root.walk(async function processRulesAndAtrules(input) {
+		root.walk(function processRulesAndAtrules(input) {
 			let node = getContainingNode(input);
 
 			// Avoid warnings duplication, caused by interfering in `root.walk()` algorigthm with `getContainingNode()`
@@ -51,9 +51,8 @@ function rule(primaryOption, options = {}, context = {}) {
 			processedParents.push(node);
 
 			if (isRuleWithNodes(node)) {
-				await checkNodeForOrder({
+				checkNodeForOrder({
 					node,
-					originalNode: input,
 					isFixEnabled,
 					primaryOption,
 					unspecified: options.unspecified || 'ignore',

diff --git a/rules/properties-order/tests/custom-properties.js b/rules/properties-order/tests/custom-properties.js