stylelint-order 0.5.0 → 0.8.1

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## 0.8.1
+
+* Add `stylelint@9.0.0` as a peer dependency.
+
+## 0.8.0
+
+* Breaking change: Dropped Node.js 4 support. Use Node.js 6 or newer.
+* Changed: `order` and `properties-order` will no longer autofix proactively. If there no violations would be reported with autofix disabled, then nothing will be changed with autofix enabled. Previously, there were changes to `flexible` properties order ([#49](https://github.com/hudochenkov/stylelint-order/issues/49)) or to the order of content within declaration blocks ([#51](https://github.com/hudochenkov/stylelint-order/issues/51)).
+
+## 0.7.0
+
+* Specified `stylelint` in `peerDependencies` rather in `dependencies`. Following [stylelint's plugin guide](https://github.com/stylelint/stylelint/blob/master/docs/developer-guide/plugins.md#peer-dependencies).
+
+## 0.6.0
+
+* Migrated to `stylelint@8.0.0`.
+
 ## 0.5.0
 * Added autofixing for every rule! Please read docs before using this feature, because each rule has some caveats. stylelint 7.11+ is required for this feature.
 * Removed SCSS nested properties support.

package/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright 2016–2017 Aleks Hudochenkov <aleks@hudochenkov.com>
+Copyright 2016–present Aleks Hudochenkov <aleks@hudochenkov.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

package/README.md

@@ -4,8 +4,16 @@ A plugin pack of order related linting rules for [stylelint]. Every rule support
 
 ## Installation
 
+First, install [stylelint]:
+
+```
+npm install stylelint --save-dev
+```
+
+Then install plugin:
+
 ```
-npm install stylelint-order
+npm install stylelint-order --save-dev
 ```
 
 ## Usage

package/index.js

@@ -1,10 +1,8 @@
-'use strict';
-
-const createPlugin = require('stylelint').createPlugin;
-const namespace = require('./utils').namespace;
+const { createPlugin } = require('stylelint');
+const { namespace } = require('./utils');
 const rules = require('./rules');
 
-const rulesPlugins = Object.keys(rules).map((ruleName) => {
+const rulesPlugins = Object.keys(rules).map(ruleName => {
 	return createPlugin(namespace(ruleName), rules[ruleName]);
 });
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylelint-order",
-  "version": "0.5.0",
+  "version": "0.8.1",
   "description": "A collection of order related linting rules for stylelint.",
   "keywords": [
     "stylelint-plugin",
@@ -17,7 +17,7 @@
   },
   "homepage": "https://github.com/hudochenkov/stylelint-order",
   "engines": {
-    "node": ">=4"
+    "node": ">=6"
   },
   "files": [
     "rules",
@@ -28,21 +28,37 @@
   "main": "index.js",
   "dependencies": {
     "lodash": "^4.17.4",
-    "postcss": "^6.0.1",
-    "postcss-sorting": "^3.0.0",
-    "stylelint": "^7.11.0"
+    "postcss": "^6.0.14",
+    "postcss-sorting": "^3.1.0"
+  },
+  "peerDependencies": {
+    "stylelint": "^8.0.0 || ^9.0.0"
   },
   "devDependencies": {
-    "eslint": "^3.19.0",
-    "eslint-config-hudochenkov": "^1.3.0",
-    "jest": "^20.0.4"
+    "eslint": "~4.12.1",
+    "eslint-config-hudochenkov": "~2.0.0",
+    "eslint-config-prettier": "~2.9.0",
+    "eslint-plugin-prettier": "~2.3.1",
+    "husky": "^0.14.3",
+    "jest": "^21.2.1",
+    "lint-staged": "^6.0.0",
+    "prettier": "~1.8.2",
+    "stylelint": "^8.3.1"
   },
   "scripts": {
+    "precommit": "lint-staged",
     "pretest": "eslint .",
     "test": "jest",
     "jest": "jest",
     "watch": "jest --watch",
-    "coverage": "jest --coverage"
+    "coverage": "jest --coverage",
+    "fix": "npm run pretest -- --fix"
+  },
+  "lint-staged": {
+    "*.js": [
+      "npm run fix",
+      "git add"
+    ]
   },
   "jest": {
     "setupFiles": [

package/rules/checkAlphabeticalOrder.js

@@ -4,7 +4,10 @@ module.exports = function checkAlphabeticalOrder(firstPropData, secondPropData)
 	// If unprefixed prop names are the same, compare the prefixed versions
 	if (firstPropData.unprefixedName === secondPropData.unprefixedName) {
 		// If first property has no prefix and second property has prefix
-		if (!postcss.vendor.prefix(firstPropData.name).length && postcss.vendor.prefix(secondPropData.name).length) {
+		if (
+			!postcss.vendor.prefix(firstPropData.name).length &&
+			postcss.vendor.prefix(secondPropData.name).length
+		) {
 			return false;
 		}
 

package/rules/index.js

@@ -1,5 +1,5 @@
 module.exports = {
-	'order': require('./order'),
+	order: require('./order'),
 	'properties-order': require('./properties-order'),
 	'properties-alphabetical-order': require('./properties-alphabetical-order'),
 };

package/rules/order/calcAtRulePatternPriority.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = function calcAtRulePatternPriority(pattern, node) {
 	// 0 — it pattern doesn't match
 	// 1 — pattern without `name` and `hasBlock`
@@ -30,7 +28,11 @@ module.exports = function calcAtRulePatternPriority(pattern, node) {
 	}
 
 	// doesn't have `name` and `hasBlock`
-	if (!pattern.hasOwnProperty('hasBlock') && !pattern.hasOwnProperty('name') && !pattern.hasOwnProperty('paremeter')) {
+	if (
+		!pattern.hasOwnProperty('hasBlock') &&
+		!pattern.hasOwnProperty('name') &&
+		!pattern.hasOwnProperty('paremeter')
+	) {
 		priority = 1;
 	}
 
@@ -45,7 +47,12 @@ module.exports = function calcAtRulePatternPriority(pattern, node) {
 	}
 
 	// patter has `name`, `parameter`, and `hasBlock`, but it doesn't match all properties
-	if (pattern.hasOwnProperty('name') && pattern.hasOwnProperty('parameter') && pattern.hasOwnProperty('hasBlock') && priority < 30000) {
+	if (
+		pattern.hasOwnProperty('name') &&
+		pattern.hasOwnProperty('parameter') &&
+		pattern.hasOwnProperty('hasBlock') &&
+		priority < 30000
+	) {
 		priority = 0;
 	}
 

package/rules/order/calcRulePatternPriority.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = function calcRulePatternPriority(pattern, node) {
 	// 0 — it pattern doesn't match
 	// 1 — pattern without `selector`

package/rules/order/checkNode.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
 const checkOrder = require('./checkOrder');
@@ -46,6 +44,13 @@ module.exports = function checkNode(node, sharedInfo) {
 			return;
 		}
 
+		if (sharedInfo.isFixEnabled) {
+			sharedInfo.shouldFix = true;
+
+			// Don't go further, fix will be applied
+			return;
+		}
+
 		stylelint.utils.report({
 			message: sharedInfo.messages.expected(nodeData.description, previousNodeData.description),
 			node: child,

package/rules/order/checkOrder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
 
@@ -15,14 +13,27 @@ module.exports = function checkOrder(firstNodeData, secondNodeData, allNodesData
 	if (firstNodeIsUnspecified && !secondNodeIsUnspecified) {
 		// If first node is unspecified, look for a specified node before it to
 		// compare to the current node
-		const priorSpecifiedNodeData = _.findLast(allNodesData.slice(0, -1), (d) => Boolean(d.expectedPosition));
+		const priorSpecifiedNodeData = _.findLast(allNodesData.slice(0, -1), d =>
+			Boolean(d.expectedPosition)
+		);
 
 		if (
-			priorSpecifiedNodeData && priorSpecifiedNodeData.expectedPosition
-			&& priorSpecifiedNodeData.expectedPosition > secondNodeData.expectedPosition
+			priorSpecifiedNodeData &&
+			priorSpecifiedNodeData.expectedPosition &&
+			priorSpecifiedNodeData.expectedPosition > secondNodeData.expectedPosition
 		) {
+			if (sharedInfo.isFixEnabled) {
+				sharedInfo.shouldFix = true;
+
+				// Don't go further, fix will be applied
+				return;
+			}
+
 			stylelint.utils.report({
-				message: sharedInfo.messages.expected(secondNodeData.description, priorSpecifiedNodeData.description),
+				message: sharedInfo.messages.expected(
+					secondNodeData.description,
+					priorSpecifiedNodeData.description
+				),
 				node: secondNodeData.node,
 				result: sharedInfo.result,
 				ruleName: sharedInfo.ruleName,
@@ -36,7 +47,7 @@ module.exports = function checkOrder(firstNodeData, secondNodeData, allNodesData
 		return true;
 	}
 
-	const unspecified = sharedInfo.unspecified;
+	const { unspecified } = sharedInfo;
 
 	if (unspecified === 'ignore' && (firstNodeIsUnspecified || secondNodeIsUnspecified)) {
 		return true;
@@ -45,6 +56,7 @@ module.exports = function checkOrder(firstNodeData, secondNodeData, allNodesData
 	if (unspecified === 'top' && firstNodeIsUnspecified) {
 		return true;
 	}
+
 	if (unspecified === 'top' && secondNodeIsUnspecified) {
 		return false;
 	}
@@ -52,6 +64,7 @@ module.exports = function checkOrder(firstNodeData, secondNodeData, allNodesData
 	if (unspecified === 'bottom' && secondNodeIsUnspecified) {
 		return true;
 	}
+
 	if (unspecified === 'bottom' && firstNodeIsUnspecified) {
 		return false;
 	}

package/rules/order/createExpectedOrder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 const getDescription = require('./getDescription');
 
@@ -7,27 +5,17 @@ module.exports = function createExpectedOrder(input) {
 	const order = {};
 	let expectedPosition = 0;
 
-	input.forEach((item) => {
+	input.forEach(item => {
 		expectedPosition += 1;
 
-		if (
-			(
-				_.isString(item)
-				&& item !== 'at-rules'
-				&& item !== 'rules'
-			)
-			|| item === 'less-mixins'
-		) {
+		if ((_.isString(item) && item !== 'at-rules' && item !== 'rules') || item === 'less-mixins') {
 			order[item] = {
 				expectedPosition,
 				description: getDescription(item),
 			};
 		}
 
-		if (
-			item === 'rules'
-			|| item.type === 'rule'
-		) {
+		if (item === 'rules' || item.type === 'rule') {
 			// Convert 'rules' into extended pattern
 			if (item === 'rules') {
 				item = {
@@ -56,10 +44,7 @@ module.exports = function createExpectedOrder(input) {
 			order[item.type].push(nodeData);
 		}
 
-		if (
-			item === 'at-rules'
-			|| item.type === 'at-rule'
-		) {
+		if (item === 'at-rules' || item.type === 'at-rule') {
 			// Convert 'at-rules' into extended pattern
 			if (item === 'at-rules') {
 				item = {

package/rules/order/getDescription.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 module.exports = function getDescription(item) {
@@ -8,7 +6,7 @@ module.exports = function getDescription(item) {
 		'dollar-variables': '$-variable',
 		'at-variables': '@-variable',
 		'less-mixins': 'Less mixin',
-		'declarations': 'declaration',
+		declarations: 'declaration',
 	};
 
 	if (_.isPlainObject(item)) {

package/rules/order/getOrderData.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const utils = require('../../utils');
 const calcAtRulePatternPriority = require('./calcAtRulePatternPriority');
 const calcRulePatternPriority = require('./calcRulePatternPriority');
@@ -18,11 +16,7 @@ module.exports = function getOrderData(expectedOrder, node) {
 		} else if (utils.isStandardSyntaxProperty(node.prop)) {
 			nodeType = 'declarations';
 		}
-	} else if (
-		node.type === 'rule'
-		&& node.ruleWithoutBody
-		&& !node.extendRule
-	) {
+	} else if (node.type === 'rule' && node.empty && !node.extend) {
 		nodeType = 'less-mixins';
 	} else if (node.type === 'rule') {
 		nodeType = {
@@ -37,7 +31,7 @@ module.exports = function getOrderData(expectedOrder, node) {
 			let prioritizedPattern;
 			let max = 0;
 
-			rules.forEach(function (pattern) {
+			rules.forEach(function(pattern) {
 				const priority = calcRulePatternPriority(pattern, nodeType);
 
 				if (priority > max) {
@@ -72,7 +66,7 @@ module.exports = function getOrderData(expectedOrder, node) {
 			let prioritizedPattern;
 			let max = 0;
 
-			atRules.forEach(function (pattern) {
+			atRules.forEach(function(pattern) {
 				const priority = calcAtRulePatternPriority(pattern, nodeType);
 
 				if (priority > max) {

package/rules/order/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
 const postcssSorting = require('postcss-sorting');
@@ -17,7 +15,7 @@ const messages = stylelint.utils.ruleMessages(ruleName, {
 function rule(expectation, options, context) {
 	context = context || {};
 
-	return function (root, result) {
+	return function(root, result) {
 		const validOptions = stylelint.utils.validateOptions(
 			result,
 			ruleName,
@@ -39,18 +37,13 @@ function rule(expectation, options, context) {
 			return;
 		}
 
-		const disableFix = _.get(options, ['disableFix'], false);
-
-		if (context.fix && !disableFix) {
-			postcssSorting({ order: expectation })(root);
-
-			return;
-		}
+		const disableFix = _.get(options, 'disableFix', false);
+		const isFixEnabled = context.fix && !disableFix;
 
 		const expectedOrder = createExpectedOrder(expectation);
 
 		// By default, ignore unspecified properties
-		const unspecified = _.get(options, ['unspecified'], 'ignore');
+		const unspecified = _.get(options, 'unspecified', 'ignore');
 
 		const sharedInfo = {
 			expectedOrder,
@@ -58,14 +51,25 @@ function rule(expectation, options, context) {
 			messages,
 			ruleName,
 			result,
+			isFixEnabled,
+			shouldFix: false,
 		};
 
 		// Check all rules and at-rules recursively
 		root.walk(function processRulesAndAtrules(node) {
+			// return early if we know there is a violation and auto fix should be applied
+			if (isFixEnabled && sharedInfo.shouldFix) {
+				return;
+			}
+
 			if (node.type === 'rule' || node.type === 'atrule') {
 				checkNode(node, sharedInfo);
 			}
 		});
+
+		if (sharedInfo.shouldFix) {
+			postcssSorting({ order: expectation })(root);
+		}
 	};
 }
 

package/rules/order/validatePrimaryOption.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 module.exports = function validatePrimaryOption(actualOptions) {
@@ -10,52 +8,68 @@ module.exports = function validatePrimaryOption(actualOptions) {
 
 	// Every item in the array must be a certain string or an object
 	// with a "type" property
-	if (!actualOptions.every((item) => {
-		if (_.isString(item)) {
-			return _.includes(['custom-properties', 'dollar-variables', 'at-variables', 'declarations', 'rules', 'at-rules', 'less-mixins'], item);
-		}
+	if (
+		!actualOptions.every(item => {
+			if (_.isString(item)) {
+				return _.includes(
+					[
+						'custom-properties',
+						'dollar-variables',
+						'at-variables',
+						'declarations',
+						'rules',
+						'at-rules',
+						'less-mixins',
+					],
+					item
+				);
+			}
 
-		return _.isPlainObject(item) && !_.isUndefined(item.type);
-	})) {
+			return _.isPlainObject(item) && !_.isUndefined(item.type);
+		})
+	) {
 		return false;
 	}
 
 	const objectItems = actualOptions.filter(_.isPlainObject);
 
-	if (!objectItems.every((item) => {
-		let result = true;
-
-		if (item.type !== 'at-rule' && item.type !== 'rule') {
-			return false;
-		}
+	if (
+		!objectItems.every(item => {
+			let result = true;
 
-		if (item.type === 'at-rule') {
-			// if parameter is specified, name should be specified also
-			if (!_.isUndefined(item.parameter) && _.isUndefined(item.name)) {
+			if (item.type !== 'at-rule' && item.type !== 'rule') {
 				return false;
 			}
 
-			if (!_.isUndefined(item.hasBlock)) {
-				result = item.hasBlock === true || item.hasBlock === false;
-			}
+			if (item.type === 'at-rule') {
+				// if parameter is specified, name should be specified also
+				if (!_.isUndefined(item.parameter) && _.isUndefined(item.name)) {
+					return false;
+				}
 
-			if (!_.isUndefined(item.name)) {
-				result = _.isString(item.name) && item.name.length;
-			}
+				if (!_.isUndefined(item.hasBlock)) {
+					result = item.hasBlock === true || item.hasBlock === false;
+				}
+
+				if (!_.isUndefined(item.name)) {
+					result = _.isString(item.name) && item.name.length;
+				}
 
-			if (!_.isUndefined(item.parameter)) {
-				result = (_.isString(item.parameter) && item.parameter.length) || _.isRegExp(item.parameter);
+				if (!_.isUndefined(item.parameter)) {
+					result =
+						(_.isString(item.parameter) && item.parameter.length) || _.isRegExp(item.parameter);
+				}
 			}
-		}
 
-		if (item.type === 'rule') {
-			if (!_.isUndefined(item.selector)) {
-				result = (_.isString(item.selector) && item.selector.length) || _.isRegExp(item.selector);
+			if (item.type === 'rule') {
+				if (!_.isUndefined(item.selector)) {
+					result = (_.isString(item.selector) && item.selector.length) || _.isRegExp(item.selector);
+				}
 			}
-		}
 
-		return result;
-	})) {
+			return result;
+		})
+	) {
 		return false;
 	}
 

package/rules/properties-alphabetical-order/index.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
 const postcss = require('postcss');
@@ -16,7 +14,7 @@ const messages = stylelint.utils.ruleMessages(ruleName, {
 function rule(actual, options, context) {
 	context = context || {};
 
-	return function (root, result) {
+	return function(root, result) {
 		const validOptions = stylelint.utils.validateOptions(
 			result,
 			ruleName,
@@ -71,7 +69,7 @@ function checkNode(node, result) {
 			return;
 		}
 
-		const prop = child.prop;
+		const { prop } = child;
 
 		if (!utils.isStandardSyntaxProperty(prop)) {
 			return;

package/rules/properties-order/README.md

@@ -568,42 +568,3 @@ a {
 ```
 
 If `unspecified` secondary option was set to `ignore`, it will be re-set to `bottom`.
-
-If `order: "flexible"` is using, for sorting it will be treated as `strict`. It might change properties order, but linting will not be broken.
-
-Given:
-
-```json
-{
-	"properties-order": [
-		{
-			"order": "flexible",
-			"properties": [
-				"color",
-				"font-size",
-				"font-weight"
-			]
-		}
-	]
-}
-```
-
-Before:
-
-```css
-a {
-	font-size: 1em;
-	color: pink;
-	font-weight: normal;
-}
-```
-
-After:
-
-```css
-a {
-	color: pink;
-	font-size: 1em;
-	font-weight: normal;
-}
-```

package/rules/properties-order/addEmptyLineBefore.js

@@ -1,14 +1,12 @@
-'use strict';
-
 const _ = require('lodash');
 
 // Add an empty line before a node. Mutates the node.
 module.exports = function addEmptyLineBefore(node, newline) {
-	if (!(/\r?\n/).test(node.raws.before)) {
+	if (!/\r?\n/.test(node.raws.before)) {
 		node.raws.before = _.repeat(newline, 2) + node.raws.before;
-	} else if ((/^\r?\n/).test(node.raws.before)) {
+	} else if (/^\r?\n/.test(node.raws.before)) {
 		node.raws.before = newline + node.raws.before;
-	} else if ((/\r?\n$/).test(node.raws.before)) {
+	} else if (/\r?\n$/.test(node.raws.before)) {
 		node.raws.before = node.raws.before + newline;
 	} else {
 		node.raws.before = node.raws.before.replace(/(\r?\n)/, `${newline}$1`);

package/rules/properties-order/checkEmptyLineBefore.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
 const addEmptyLineBefore = require('./addEmptyLineBefore');
@@ -11,17 +9,16 @@ module.exports = function checkEmptyLineBefore(firstPropData, secondPropData, sh
 	const secondPropIsUnspecified = !secondPropData.orderData;
 
 	// Now check newlines between ...
-	const firstPropSeparatedGroup = (!firstPropIsUnspecified)
+	const firstPropSeparatedGroup = !firstPropIsUnspecified
 		? firstPropData.orderData.separatedGroup
 		: sharedInfo.lastKnownSeparatedGroup;
-	const secondPropSeparatedGroup = (!secondPropIsUnspecified)
+	const secondPropSeparatedGroup = !secondPropIsUnspecified
 		? secondPropData.orderData.separatedGroup
 		: sharedInfo.lastKnownSeparatedGroup;
 
-	if (
-		firstPropSeparatedGroup !== secondPropSeparatedGroup
-		&& !secondPropIsUnspecified
-	) {
+	sharedInfo.lastKnownSeparatedGroup = secondPropSeparatedGroup;
+
+	if (firstPropSeparatedGroup !== secondPropSeparatedGroup && !secondPropIsUnspecified) {
 		// Get an array of just the property groups, remove any solo properties
 		const groups = _.reject(sharedInfo.expectation, _.isString);
 
@@ -30,7 +27,7 @@ module.exports = function checkEmptyLineBefore(firstPropData, secondPropData, sh
 		const emptyLineBefore = _.get(groups[secondPropSeparatedGroup - 2], 'emptyLineBefore');
 
 		if (!hasEmptyLineBefore(secondPropData.node) && emptyLineBefore === 'always') {
-			if (sharedInfo.context.fix && !sharedInfo.disableFix) {
+			if (sharedInfo.isFixEnabled) {
 				addEmptyLineBefore(secondPropData.node, sharedInfo.context.newline);
 			} else {
 				stylelint.utils.report({
@@ -41,7 +38,7 @@ module.exports = function checkEmptyLineBefore(firstPropData, secondPropData, sh
 				});
 			}
 		} else if (hasEmptyLineBefore(secondPropData.node) && emptyLineBefore === 'never') {
-			if (sharedInfo.context.fix && !sharedInfo.disableFix) {
+			if (sharedInfo.isFixEnabled) {
 				removeEmptyLinesBefore(secondPropData.node, sharedInfo.context.newline);
 			} else {
 				stylelint.utils.report({
@@ -53,6 +50,4 @@ module.exports = function checkEmptyLineBefore(firstPropData, secondPropData, sh
 			}
 		}
 	}
-
-	sharedInfo.lastKnownSeparatedGroup = secondPropSeparatedGroup;
 };

package/rules/properties-order/checkNode.js

@@ -1,95 +1,93 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const postcss = require('postcss');
-const _ = require('lodash');
+const postcssSorting = require('postcss-sorting');
 const utils = require('../../utils');
 const checkEmptyLineBefore = require('./checkEmptyLineBefore');
 const checkOrder = require('./checkOrder');
+const getNodeData = require('./getNodeData');
+const createFlatOrder = require('./createFlatOrder');
 
 module.exports = function checkNode(node, sharedInfo) {
-	// Skip if it's an empty rule
-	if (!node.nodes || !node.nodes.length) {
-		return;
-	}
-
-	const allPropData = [];
 	const allNodesData = [];
 
-	sharedInfo.lastKnownSeparatedGroup = 1;
+	// Collect order data for all nodes
+	node.each(function collectDataForEveryNode(child) {
+		const nodeData = getNodeData(child, sharedInfo.expectedOrder);
 
-	node.each(function processEveryNode(child) {
-		let nodeData = {
-			node: child,
-		};
-
-		if (child.type === 'decl') {
-			const prop = child.prop;
-
-			if (
-				utils.isStandardSyntaxProperty(prop)
-				&& !utils.isCustomProperty(prop)
-			) {
-				let unprefixedPropName = postcss.vendor.unprefixed(prop);
-
-				// Hack to allow -moz-osx-font-smoothing to be understood
-				// just like -webkit-font-smoothing
-				if (unprefixedPropName.indexOf('osx-') === 0) {
-					unprefixedPropName = unprefixedPropName.slice(4);
-				}
+		allNodesData.push(nodeData);
+	});
 
-				nodeData = {
-					name: prop,
-					unprefixedName: unprefixedPropName,
-					orderData: sharedInfo.expectedOrder[unprefixedPropName],
-					node: child,
-				};
+	const allPropData = allNodesData.filter(item => item.name);
+	let shouldFixOrder = false;
 
-				allPropData.push(nodeData);
-			}
+	// First, check order
+	allPropData.forEach(function checkEveryPropForOrder(propData, index) {
+		// return early if we know there is a violation and auto fix should be applied
+		if (shouldFixOrder && sharedInfo.isFixEnabled) {
+			return;
 		}
 
-		allNodesData.push(nodeData);
-
 		// current node should be a standard declaration
-		if (
-			child.type !== 'decl'
-			|| !utils.isStandardSyntaxProperty(nodeData.node.prop)
-			|| utils.isCustomProperty(nodeData.node.prop)
-		) {
+		if (!utils.isProperty(propData.node)) {
 			return;
 		}
 
-		// First, check order
-		const previousPropData = _.nth(allPropData, -2);
+		const previousPropData = allPropData[index - 1];
 
 		// Skip first decl
-		if (
-			previousPropData
-			&& (!sharedInfo.context.fix || sharedInfo.disableFix)
-		) {
-			const isCorrectOrder = checkOrder(previousPropData, nodeData, allPropData, sharedInfo);
-
-			if (!isCorrectOrder) {
-				stylelint.utils.report({
-					message: sharedInfo.messages.expected(nodeData.name, previousPropData.name),
-					node: child,
-					result: sharedInfo.result,
-					ruleName: sharedInfo.ruleName,
-				});
+		if (previousPropData) {
+			const checkedOrder = checkOrder({
+				firstPropData: previousPropData,
+				secondPropData: propData,
+				unspecified: sharedInfo.unspecified,
+				allPropData: allPropData.slice(0, index),
+			});
+
+			if (!checkedOrder.result) {
+				if (sharedInfo.isFixEnabled) {
+					shouldFixOrder = true;
+				} else {
+					stylelint.utils.report({
+						message: sharedInfo.messages.expected(
+							checkedOrder.secondNode.name,
+							checkedOrder.firstNode.name
+						),
+						node: checkedOrder.secondNode.node,
+						result: sharedInfo.result,
+						ruleName: sharedInfo.ruleName,
+					});
+				}
 			}
 		}
+	});
+
+	if (shouldFixOrder && sharedInfo.isFixEnabled) {
+		const sortingOptions = {
+			'properties-order': createFlatOrder(sharedInfo.expectation),
+			'unspecified-properties-position':
+				sharedInfo.unspecified === 'ignore' ? 'bottom' : sharedInfo.unspecified,
+		};
+
+		// creating PostCSS Root node with current node as a child,
+		// so PostCSS Sorting can process it
+		const tempRoot = postcss.root({ nodes: [node] });
+
+		postcssSorting(sortingOptions)(tempRoot);
+	}
+
+	sharedInfo.lastKnownSeparatedGroup = 1;
 
-		// Second, check emptyLineBefore
-		let previousNodeData = _.nth(allNodesData, -2);
+	// Second, check emptyLineBefore
+	allNodesData.forEach(function checkEveryPropForEmptyLine(nodeData, index) {
+		let previousNodeData = allNodesData[index - 1];
 
 		// if previous node is shared-line comment, use second previous node
 		if (
-			previousNodeData
-			&& previousNodeData.node.type === 'comment'
-			&& previousNodeData.node.raw('before').indexOf('\n') === -1
+			previousNodeData &&
+			previousNodeData.node.type === 'comment' &&
+			previousNodeData.node.raw('before').indexOf('\n') === -1
 		) {
-			previousNodeData = _.nth(allNodesData, -3);
+			previousNodeData = allNodesData[index - 2];
 		}
 
 		// skip first decl
@@ -97,18 +95,11 @@ module.exports = function checkNode(node, sharedInfo) {
 			return;
 		}
 
-		if (previousNodeData.node.type !== 'decl') {
-			return;
-		}
-
 		// previous node should be a standard declaration
-		if (
-			!utils.isStandardSyntaxProperty(previousNodeData.node.prop)
-			|| utils.isCustomProperty(previousNodeData.node.prop)
-		) {
+		if (!utils.isProperty(previousNodeData.node)) {
 			return;
 		}
 
-		checkEmptyLineBefore(previousPropData, nodeData, sharedInfo);
+		checkEmptyLineBefore(previousNodeData, nodeData, sharedInfo);
 	});
 };

package/rules/properties-order/checkOrder.js

@@ -1,18 +1,26 @@
-'use strict';
-
-const stylelint = require('stylelint');
 const postcss = require('postcss');
 const _ = require('lodash');
 const checkAlphabeticalOrder = require('../checkAlphabeticalOrder');
 
-module.exports = function checkOrder(firstPropData, secondPropData, allPropData, sharedInfo) {
+module.exports = function checkOrder({ firstPropData, secondPropData, allPropData, unspecified }) {
+	function report(result, firstNode = firstPropData, secondNode = secondPropData) {
+		return {
+			result,
+			firstNode,
+			secondNode,
+		};
+	}
+
 	if (firstPropData.unprefixedName === secondPropData.unprefixedName) {
 		// If first property has no prefix and second property has prefix
-		if (!postcss.vendor.prefix(firstPropData.name).length && postcss.vendor.prefix(secondPropData.name).length) {
-			return false;
+		if (
+			!postcss.vendor.prefix(firstPropData.name).length &&
+			postcss.vendor.prefix(secondPropData.name).length
+		) {
+			return report(false);
 		}
 
-		return true;
+		return report(true);
 	}
 
 	const firstPropIsUnspecified = !firstPropData.orderData;
@@ -20,76 +28,64 @@ module.exports = function checkOrder(firstPropData, secondPropData, allPropData,
 
 	// Check actual known properties
 	if (!firstPropIsUnspecified && !secondPropIsUnspecified) {
-		return firstPropData.orderData.expectedPosition <= secondPropData.orderData.expectedPosition;
+		return report(
+			firstPropData.orderData.expectedPosition <= secondPropData.orderData.expectedPosition
+		);
 	}
 
 	if (firstPropIsUnspecified && !secondPropIsUnspecified) {
 		// If first prop is unspecified, look for a specified prop before it to
 		// compare to the current prop
-		const priorSpecifiedPropData = _.findLast(allPropData.slice(0, -1), (d) => Boolean(d.orderData));
+		const priorSpecifiedPropData = _.findLast(allPropData.slice(0, -1), d => Boolean(d.orderData));
 
 		if (
-			priorSpecifiedPropData
-			&& priorSpecifiedPropData.orderData
-			&& priorSpecifiedPropData.orderData.expectedPosition > secondPropData.orderData.expectedPosition
+			priorSpecifiedPropData &&
+			priorSpecifiedPropData.orderData &&
+			priorSpecifiedPropData.orderData.expectedPosition > secondPropData.orderData.expectedPosition
 		) {
-			stylelint.utils.report({
-				message: sharedInfo.messages.expected(secondPropData.name, priorSpecifiedPropData.name),
-				node: secondPropData.node,
-				result: sharedInfo.result,
-				ruleName: sharedInfo.ruleName,
-			});
-
-			return true; // avoid logging another warning
+			return report(false, priorSpecifiedPropData, secondPropData);
 		}
 	}
 
-	const unspecified = sharedInfo.unspecified;
-
 	// Now deal with unspecified props
 	// Starting with bottomAlphabetical as it requires more specific conditionals
-	if (
-		unspecified === 'bottomAlphabetical'
-		&& !firstPropIsUnspecified
-		&& secondPropIsUnspecified
-	) {
-		return true;
+	if (unspecified === 'bottomAlphabetical' && !firstPropIsUnspecified && secondPropIsUnspecified) {
+		return report(true);
 	}
 
-	if (
-		unspecified === 'bottomAlphabetical'
-		&& secondPropIsUnspecified
-		&& firstPropIsUnspecified
-	) {
+	if (unspecified === 'bottomAlphabetical' && firstPropIsUnspecified && secondPropIsUnspecified) {
 		if (checkAlphabeticalOrder(firstPropData, secondPropData)) {
-			return true;
+			return report(true);
 		}
 
-		return false;
+		return report(false);
 	}
+
 	if (unspecified === 'bottomAlphabetical' && firstPropIsUnspecified) {
-		return false;
+		return report(false);
 	}
 
 	if (firstPropIsUnspecified && secondPropIsUnspecified) {
-		return true;
+		return report(true);
 	}
 
 	if (unspecified === 'ignore' && (firstPropIsUnspecified || secondPropIsUnspecified)) {
-		return true;
+		return report(true);
 	}
 
 	if (unspecified === 'top' && firstPropIsUnspecified) {
-		return true;
+		return report(true);
 	}
+
 	if (unspecified === 'top' && secondPropIsUnspecified) {
-		return false;
+		return report(false);
 	}
 
 	if (unspecified === 'bottom' && secondPropIsUnspecified) {
-		return true;
+		return report(true);
 	}
+
 	if (unspecified === 'bottom' && firstPropIsUnspecified) {
-		return false;
+		return report(false);
 	}
 };

package/rules/properties-order/createExpectedOrder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 module.exports = function createExpectedOrder(input) {
@@ -10,7 +8,7 @@ module.exports = function createExpectedOrder(input) {
 	appendGroup(input);
 
 	function appendGroup(items) {
-		items.forEach((item) => appendItem(item, false));
+		items.forEach(item => appendItem(item, false));
 	}
 
 	function appendItem(item, inFlexibleGroup) {
@@ -35,7 +33,7 @@ module.exports = function createExpectedOrder(input) {
 		if (item.order && item.order === 'flexible') {
 			expectedPosition += 1;
 
-			item.properties.forEach((property) => {
+			item.properties.forEach(property => {
 				appendItem(property, true);
 			});
 		} else {

package/rules/properties-order/createFlatOrder.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 module.exports = function createFlatOrder(order) {
@@ -8,7 +6,7 @@ module.exports = function createFlatOrder(order) {
 	appendGroup(order);
 
 	function appendGroup(items) {
-		items.forEach((item) => appendItem(item));
+		items.forEach(item => appendItem(item));
 	}
 
 	function appendItem(item) {

package/rules/properties-order/getNodeData.js

@@ -0,0 +1,25 @@
+const postcss = require('postcss');
+const utils = require('../../utils');
+
+module.exports = function getNodeData(node, expectedOrder) {
+	const nodeData = {
+		node,
+	};
+
+	if (utils.isProperty(node)) {
+		const { prop } = node;
+		let unprefixedPropName = postcss.vendor.unprefixed(prop);
+
+		// Hack to allow -moz-osx-font-smoothing to be understood
+		// just like -webkit-font-smoothing
+		if (unprefixedPropName.indexOf('osx-') === 0) {
+			unprefixedPropName = unprefixedPropName.slice(4);
+		}
+
+		nodeData.name = prop;
+		nodeData.unprefixedName = unprefixedPropName;
+		nodeData.orderData = expectedOrder[unprefixedPropName];
+	}
+
+	return nodeData;
+};

package/rules/properties-order/hasEmptyLineBefore.js

@@ -1,5 +1,3 @@
-'use strict';
-
 module.exports = function hasEmptyLineBefore(decl) {
 	if (/\r?\n\s*\r?\n/.test(decl.raw('before'))) {
 		return true;

package/rules/properties-order/index.js

@@ -1,26 +1,20 @@
-'use strict';
-
 const stylelint = require('stylelint');
 const _ = require('lodash');
-const postcssSorting = require('postcss-sorting');
 const utils = require('../../utils');
 const checkNode = require('./checkNode');
 const createExpectedOrder = require('./createExpectedOrder');
-const createFlatOrder = require('./createFlatOrder');
 const validatePrimaryOption = require('./validatePrimaryOption');
 
 const ruleName = utils.namespace('properties-order');
 
 const messages = stylelint.utils.ruleMessages(ruleName, {
 	expected: (first, second) => `Expected "${first}" to come before "${second}"`,
-	expectedEmptyLineBefore: (property) => `Expected an empty line before property "${property}"`,
-	rejectedEmptyLineBefore: (property) => `Unexpected an empty line before property "${property}"`,
+	expectedEmptyLineBefore: property => `Expected an empty line before property "${property}"`,
+	rejectedEmptyLineBefore: property => `Unexpected an empty line before property "${property}"`,
 });
 
-const rule = function (expectation, options, context) {
-	context = context || {};
-
-	return function (root, result) {
+const rule = function(expectation, options, context = {}) {
+	return function(root, result) {
 		const validOptions = stylelint.utils.validateOptions(
 			result,
 			ruleName,
@@ -31,12 +25,7 @@ const rule = function (expectation, options, context) {
 			{
 				actual: options,
 				possible: {
-					unspecified: [
-						'top',
-						'bottom',
-						'ignore',
-						'bottomAlphabetical',
-					],
+					unspecified: ['top', 'bottom', 'ignore', 'bottomAlphabetical'],
 					disableFix: _.isBoolean,
 				},
 				optional: true,
@@ -48,22 +37,9 @@ const rule = function (expectation, options, context) {
 		}
 
 		// By default, ignore unspecified properties
-		let unspecified = _.get(options, ['unspecified'], 'ignore');
-
-		const disableFix = _.get(options, ['disableFix'], false);
-
-		if (context.fix && !disableFix) {
-			if (unspecified === 'ignore') {
-				unspecified = 'bottom';
-			}
-
-			const sortingOptions = {
-				'properties-order': createFlatOrder(expectation),
-				'unspecified-properties-position': unspecified,
-			};
-
-			postcssSorting(sortingOptions)(root);
-		}
+		const unspecified = _.get(options, 'unspecified', 'ignore');
+		const disableFix = _.get(options, 'disableFix', false);
+		const isFixEnabled = context.fix && !disableFix;
 
 		const expectedOrder = createExpectedOrder(expectation);
 
@@ -75,12 +51,12 @@ const rule = function (expectation, options, context) {
 			ruleName,
 			result,
 			context,
-			disableFix,
+			isFixEnabled,
 		};
 
 		// Check all rules and at-rules recursively
 		root.walk(function processRulesAndAtrules(node) {
-			if (node.type === 'rule' || node.type === 'atrule') {
+			if (utils.isRuleWithNodes(node)) {
 				checkNode(node, sharedInfo);
 			}
 		});

package/rules/properties-order/removeEmptyLinesBefore.js

@@ -1,5 +1,3 @@
-'use strict';
-
 // Remove empty lines before a node. Mutates the node.
 module.exports = function removeEmptyLinesBefore(node, newline) {
 	node.raws.before = node.raws.before.replace(/(\r?\n\s*\r?\n)+/g, newline);

package/rules/properties-order/validatePrimaryOption.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const _ = require('lodash');
 
 module.exports = function validatePrimaryOption(actualOptions) {
@@ -10,37 +8,43 @@ module.exports = function validatePrimaryOption(actualOptions) {
 
 	// Every item in the array must be a string or an object
 	// with a "properties" property
-	if (!actualOptions.every((item) => {
-		if (_.isString(item)) {
-			return true;
-		}
-
-		return _.isPlainObject(item) && !_.isUndefined(item.properties);
-	})) {
+	if (
+		!actualOptions.every(item => {
+			if (_.isString(item)) {
+				return true;
+			}
+
+			return _.isPlainObject(item) && !_.isUndefined(item.properties);
+		})
+	) {
 		return false;
 	}
 
 	const objectItems = actualOptions.filter(_.isPlainObject);
 
 	// Every object-item's "properties" should be an array with no items, or with strings
-	if (!objectItems.every((item) => {
-		if (!Array.isArray(item.properties)) {
-			return false;
-		}
-
-		return item.properties.every((property) => _.isString(property));
-	})) {
+	if (
+		!objectItems.every(item => {
+			if (!Array.isArray(item.properties)) {
+				return false;
+			}
+
+			return item.properties.every(property => _.isString(property));
+		})
+	) {
 		return false;
 	}
 
 	// Every object-item's "emptyLineBefore" must be "always" or "never"
-	if (!objectItems.every((item) => {
-		if (_.isUndefined(item.emptyLineBefore)) {
-			return true;
-		}
-
-		return _.includes(['always', 'never'], item.emptyLineBefore);
-	})) {
+	if (
+		!objectItems.every(item => {
+			if (_.isUndefined(item.emptyLineBefore)) {
+				return true;
+			}
+
+			return _.includes(['always', 'never'], item.emptyLineBefore);
+		})
+	) {
 		return false;
 	}
 

package/utils/index.js

@@ -2,6 +2,8 @@ module.exports = {
 	namespace: require('./namespace'),
 	isCustomProperty: require('./isCustomProperty'),
 	isStandardSyntaxProperty: require('./isStandardSyntaxProperty'),
+	isProperty: require('./isProperty'),
 	isDollarVariable: require('./isDollarVariable'),
 	isAtVariable: require('./isAtVariable'),
+	isRuleWithNodes: require('./isRuleWithNodes'),
 };

package/utils/isCustomProperty.js

@@ -6,5 +6,5 @@
  */
 
 module.exports = function isCustomProperty(property) {
-	return (property.slice(0, 2) === '--');
+	return property.slice(0, 2) === '--';
 };

package/utils/isProperty.js

@@ -0,0 +1,9 @@
+// Check whether a property is a CSS property
+const isCustomProperty = require('./isCustomProperty');
+const isStandardSyntaxProperty = require('./isStandardSyntaxProperty');
+
+module.exports = function isProperty(node) {
+	return (
+		node.type === 'decl' && isStandardSyntaxProperty(node.prop) && !isCustomProperty(node.prop)
+	);
+};

package/utils/isRuleWithNodes.js

@@ -0,0 +1,3 @@
+module.exports = function isRuleWithNodes(node) {
+	return (node.type === 'rule' || node.type === 'atrule') && node.nodes && node.nodes.length;
+};