Move functions related to properties-order to its folder

Author: hudochenkov

lib/__tests__/vendor.test.js renamed to lib/properties-order/__tests__/vendor.test.js

@@ -0,0 +1,60 @@
+const sortDeclarationsAlphabetically = require('./sortDeclarationsAlphabetically');
+let vendor = require('./vendor');
+
+module.exports = function sortDeclarations(a, b) {
+	// If unprefixed prop names are the same, compare the prefixed versions
+	if (a.node.type === 'decl' && b.node.type === 'decl' && a.unprefixedName === b.unprefixedName) {
+		// If first property has no prefix and second property has prefix
+		if (!vendor.prefix(a.name).length && vendor.prefix(b.name).length) {
+			return 1;
+		}
+
+		if (vendor.prefix(a.name).length && !vendor.prefix(b.name).length) {
+			return -1;
+		}
+	}
+
+	if (a.orderData && b.orderData !== undefined) {
+		// If a and b have the same group index, and a's property index is
+		// higher than b's property index, in a sorted list a appears after
+		// b:
+		if (a.orderData.propertyIndex !== b.orderData.propertyIndex) {
+			return a.orderData.propertyIndex - b.orderData.propertyIndex;
+		}
+	}
+
+	if (
+		a.unspecifiedPropertiesPosition === 'bottom' ||
+		a.unspecifiedPropertiesPosition === 'bottomAlphabetical' ||
+		b.unspecifiedPropertiesPosition === 'bottomAlphabetical'
+	) {
+		if (a.orderData !== undefined && b.orderData === undefined) {
+			return -1;
+		}
+
+		if (a.orderData === undefined && b.orderData !== undefined) {
+			return 1;
+		}
+	}
+
+	if (a.unspecifiedPropertiesPosition === 'top') {
+		if (a.orderData !== undefined && b.orderData === undefined) {
+			return 1;
+		}
+
+		if (a.orderData === undefined && b.orderData !== undefined) {
+			return -1;
+		}
+	}
+
+	if (a.unspecifiedPropertiesPosition === 'bottomAlphabetical') {
+		if (a.orderData === undefined && b.orderData === undefined) {
+			return sortDeclarationsAlphabetically(a, b);
+		}
+	}
+
+	// If a and b have the same group index and the same property index,
+	// in a sorted list they appear in the same order they were in
+	// original array:
+	return a.initialIndex - b.initialIndex;
+};

lib/createExpectedPropertiesOrder.js renamed to lib/properties-order/createExpectedPropertiesOrder.js

@@ -0,0 +1,35 @@
+let shorthandData = require('./shorthandData');
+let vendor = require('./vendor');
+
+module.exports = function sortDeclarationsAlphabetically(a, b) {
+	if (isShorthand(a.unprefixedName, b.unprefixedName)) {
+		return -1;
+	}
+
+	if (isShorthand(b.unprefixedName, a.unprefixedName)) {
+		return 1;
+	}
+
+	if (a.unprefixedName === b.unprefixedName) {
+		if (a.node.type === 'decl' && b.node.type === 'decl') {
+			// If first property has no prefix and second property has prefix
+			if (!vendor.prefix(a.name).length && vendor.prefix(b.name).length) {
+				return 1;
+			}
+
+			if (vendor.prefix(a.name).length && !vendor.prefix(b.name).length) {
+				return -1;
+			}
+		}
+
+		return a.initialIndex - b.initialIndex;
+	}
+
+	return a.unprefixedName <= b.unprefixedName ? -1 : 1;
+};
+
+function isShorthand(a, b) {
+	const longhands = shorthandData[a] || [];
+
+	return longhands.includes(b);
+}

lib/getPropertiesOrderData.js renamed to lib/properties-order/getPropertiesOrderData.js

@@ -1,11 +1,12 @@
-let createExpectedPropertiesOrder = require('../createExpectedPropertiesOrder');
+let createExpectedPropertiesOrder = require('./createExpectedPropertiesOrder');
 let getComments = require('../getComments');
-let getPropertiesOrderData = require('../getPropertiesOrderData');
+let getPropertiesOrderData = require('./getPropertiesOrderData');
 let isCustomProperty = require('../isCustomProperty');
 let isRuleWithNodes = require('../isRuleWithNodes');
 let isStandardSyntaxProperty = require('../isStandardSyntaxProperty');
-let sorting = require('../sorting');
-let vendor = require('../vendor');
+let sortDeclarations = require('./sortDeclarations');
+let sortDeclarationsAlphabetically = require('./sortDeclarationsAlphabetically');
+let vendor = require('./vendor');
 
 module.exports = function sortNodeProperties(node, { order, unspecifiedPropertiesPosition }) {
 	if (!isRuleWithNodes(node)) {
@@ -57,9 +58,9 @@ module.exports = function sortNodeProperties(node, { order, unspecifiedPropertie
 	});
 
 	if (isAlphabetical) {
-		declarations.sort(sorting.sortDeclarationsAlphabetically);
+		declarations.sort(sortDeclarationsAlphabetically);
 	} else {
-		declarations.sort(sorting.sortDeclarations);
+		declarations.sort(sortDeclarations);
 	}
 
 	let foundDeclarations = false;

lib/shorthandData.js renamed to lib/properties-order/shorthandData.js

@@ -1,103 +1,7 @@
-const shorthandData = require('./shorthandData');
-const vendor = require('./vendor');
-
 module.exports = {
-	sortDeclarations,
-	sortDeclarationsAlphabetically,
 	sortByIndexes,
 };
 
-function sortDeclarations(a, b) {
-	// If unprefixed prop names are the same, compare the prefixed versions
-	if (a.node.type === 'decl' && b.node.type === 'decl' && a.unprefixedName === b.unprefixedName) {
-		// If first property has no prefix and second property has prefix
-		if (!vendor.prefix(a.name).length && vendor.prefix(b.name).length) {
-			return 1;
-		}
-
-		if (vendor.prefix(a.name).length && !vendor.prefix(b.name).length) {
-			return -1;
-		}
-	}
-
-	if (a.orderData && b.orderData !== undefined) {
-		// If a and b have the same group index, and a's property index is
-		// higher than b's property index, in a sorted list a appears after
-		// b:
-		if (a.orderData.propertyIndex !== b.orderData.propertyIndex) {
-			return a.orderData.propertyIndex - b.orderData.propertyIndex;
-		}
-	}
-
-	if (
-		a.unspecifiedPropertiesPosition === 'bottom' ||
-		a.unspecifiedPropertiesPosition === 'bottomAlphabetical' ||
-		b.unspecifiedPropertiesPosition === 'bottomAlphabetical'
-	) {
-		if (a.orderData !== undefined && b.orderData === undefined) {
-			return -1;
-		}
-
-		if (a.orderData === undefined && b.orderData !== undefined) {
-			return 1;
-		}
-	}
-
-	if (a.unspecifiedPropertiesPosition === 'top') {
-		if (a.orderData !== undefined && b.orderData === undefined) {
-			return 1;
-		}
-
-		if (a.orderData === undefined && b.orderData !== undefined) {
-			return -1;
-		}
-	}
-
-	if (a.unspecifiedPropertiesPosition === 'bottomAlphabetical') {
-		if (a.orderData === undefined && b.orderData === undefined) {
-			return sortDeclarationsAlphabetically(a, b);
-		}
-	}
-
-	// If a and b have the same group index and the same property index,
-	// in a sorted list they appear in the same order they were in
-	// original array:
-	return a.initialIndex - b.initialIndex;
-}
-
-function isShorthand(a, b) {
-	const longhands = shorthandData[a] || [];
-
-	return longhands.includes(b);
-}
-
-function sortDeclarationsAlphabetically(a, b) {
-	if (isShorthand(a.unprefixedName, b.unprefixedName)) {
-		return -1;
-	}
-
-	if (isShorthand(b.unprefixedName, a.unprefixedName)) {
-		return 1;
-	}
-
-	if (a.unprefixedName === b.unprefixedName) {
-		if (a.node.type === 'decl' && b.node.type === 'decl') {
-			// If first property has no prefix and second property has prefix
-			if (!vendor.prefix(a.name).length && vendor.prefix(b.name).length) {
-				return 1;
-			}
-
-			if (vendor.prefix(a.name).length && !vendor.prefix(b.name).length) {
-				return -1;
-			}
-		}
-
-		return a.initialIndex - b.initialIndex;
-	}
-
-	return a.unprefixedName <= b.unprefixedName ? -1 : 1;
-}
-
 function sortByIndexes(a, b) {
 	// If a and b have the same group index, and a's property index is
 	// higher than b's property index, in a sorted list a appears after