Add a sort to the data before creating the custom array

barinali · Dec 27, 2019 · e14f128 · e14f128
1 parent 9ad8a93
commit e14f128
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/index.js b/index.js
@@ -44,6 +44,12 @@ module.exports = {
       data = data.filter(filter)
     }
 
+    if (sortBy && fields[sortBy]) {
+      // ignore upper and lowercase
+      const collator = new Intl.Collator([], {sensitivity:'accent'})
+      data.sort((a, b) => collator.compare(a[sortBy], b[sortBy]))
+    }
+
     data.forEach(countryData => {
       let collectionObject = {}
       for (const field in fields) {
@@ -52,12 +58,6 @@ module.exports = {
       finalCollection.push(collectionObject)
     })
 
-    if (sortBy && fields[sortBy]) {
-      // ignore upper and lowercase
-      const collator = new Intl.Collator([], {sensitivity:'accent'})
-      finalCollection.sort((a, b) => collator.compare(a[sortBy], b[sortBy]))
-    }
-
     return finalCollection
   },
   /**