Refactoring

ehmicky · Mar 13, 2022 · 7bfa247 · 7bfa247
1 parent d9a729f
commit 7bfa247
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/config/normalize/lib/wild_wild_path/iterate/main.js b/src/config/normalize/lib/wild_wild_path/iterate/main.js
@@ -92,14 +92,20 @@ const iterateChildren = function* ({ childEntries, childFirst, sort, index }) {
     return
   }
 
-  const childEntriesGroups = Object.values(groupBy(childEntries, getLastProp))
+  const childEntriesGroups = groupSortChildEntries(childEntries)
 
   // eslint-disable-next-line fp/no-loops
   for (const entries of childEntriesGroups) {
     yield* iterateLevel({ entries, childFirst, sort, index: nextIndex })
   }
 }
 
+// We need to group entries by the last property to ensure `childFirst` order.
+// We also sort when `sort` is true`
+const groupSortChildEntries = function (childEntries) {
+  return Object.values(groupBy(childEntries, getLastProp))
+}
+
 const getLastProp = function ({ path }) {
   return path[path.length - 1]
 }