Refactoring

src/config/normalize/lib/wild_wild_path/iterate/main.js

@@ -27,37 +27,33 @@ export const iterate = function* (
 
 const iterateLevel = function* (entries, index, opts) {
   const entriesA = removeDuplicates(entries)
-  const parentEntries = getParentEntries(entriesA, index)
+  const parentEntry = getParentEntry(entriesA, index)
 
-  if (!opts.childFirst) {
-    yield* parentEntries
+  if (parentEntry !== undefined && !opts.childFirst) {
+    yield parentEntry
   }
 
-  yield* iterateChildEntries({ entries, parentEntries, index, opts })
+  yield* iterateChildEntries({ entries: entriesA, parentEntry, index, opts })
 
-  if (opts.childFirst) {
-    yield* parentEntries
+  if (parentEntry !== undefined && opts.childFirst) {
+    yield parentEntry
   }
 }
 
-const getParentEntries = function (entries, index) {
-  return entries
-    .filter(({ queryArray }) => queryArray.length === index)
-    .map(normalizeEntry)
+const getParentEntry = function (entries, index) {
+  const parentEntry = entries.find(
+    ({ queryArray }) => queryArray.length === index,
+  )
+  return parentEntry === undefined ? undefined : normalizeEntry(parentEntry)
 }
 
 const normalizeEntry = function ({ value, path, missing }) {
   const query = serializePath(path)
   return { value, path, query, missing }
 }
 
-const iterateChildEntries = function* ({
-  entries,
-  parentEntries,
-  index,
-  opts,
-}) {
-  if (parentEntries.length === entries.length) {
+const iterateChildEntries = function* ({ entries, parentEntry, index, opts }) {
+  if (parentEntry !== undefined && entries.length === 1) {
     return
   }