[Refactor] move collation normalization into getSorter()

Author: forivall

src/rules/order.js

@@ -242,10 +242,20 @@ function makeOutOfOrderReport(context, imported) {
   reportOutOfOrder(context, imported, outOfOrder, 'before');
 }
 
-function getSorter(ascending) {
-  const multiplier = ascending ? 1 : -1;
+function getSorter(alphabetizeOptions) {
+  const multiplier = alphabetizeOptions.order === 'asc' ? 1 : -1;
+  const caseInsensitive = alphabetizeOptions.caseInsensitive;
+  const collate =
+    caseInsensitive === 'invert'
+      ? swapCase
+      : caseInsensitive
+        ? (s) => String(s).toLowerCase()
+        : (s) => s;
 
   return function importsSorter(importA, importB) {
+    importA = collate(importA);
+    importB = collate(importB);
+
     let result;
 
     if (importA < importB) {
@@ -261,6 +271,7 @@ function getSorter(ascending) {
 }
 
 function swapCase(input) {
+  input = String(input);
   let result = '';
   for (let i = 0; i < input.length; i++) {
     const lower = input[i].toLowerCase();
@@ -280,14 +291,10 @@ function mutateRanksToAlphabetize(imported, alphabetizeOptions) {
 
   const groupRanks = Object.keys(groupedByRanks);
 
-  const sorterFn = getSorter(alphabetizeOptions.order === 'asc');
-  const comparator =
-    alphabetizeOptions.caseInsensitive === 'invert' ? (a, b) => sorterFn(swapCase(String(a)), swapCase(String(b)))
-      : alphabetizeOptions.caseInsensitive ? (a, b) => sorterFn(String(a).toLowerCase(), String(b).toLowerCase())
-        : (a, b) => sorterFn(a, b);
+  const sorterFn = getSorter(alphabetizeOptions);
   // sort imports locally within their group
   groupRanks.forEach(function(groupRank) {
-    groupedByRanks[groupRank].sort(comparator);
+    groupedByRanks[groupRank].sort(sorterFn);
   });
 
   // assign globally unique rank to each import