Refactoring

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

@@ -1,18 +1,29 @@
 import { parseQuery, serializePath } from '../../wild_wild_path_parser/main.js'
+import { validateInherited } from '../validate.js'
 
 import { removeDuplicates } from './duplicate.js'
 import { expandTokens } from './expand.js'
 import { groupSortChildEntries } from './group.js'
-import { getOpts } from './options.js'
 import { expandRecursiveTokens } from './recurse.js'
 
 // Iterate over all values (and their associated path) matching a specific
 // query for on specific target value.
 // Uses an iterator:
 //  - To allow consumers to return only the first matching entry quickly
 //  - To keep memory consumption low even on big queries
-export const iterate = function* (target, query, opts) {
-  const optsA = getOpts(opts)
+export const iterate = function* (
+  target,
+  query,
+  {
+    childFirst = false,
+    sort = false,
+    missing = false,
+    classes = false,
+    inherited = false,
+  } = {},
+) {
+  const opts = { childFirst, sort, missing, classes, inherited }
+  validateInherited(opts)
   const parents = new Set([])
   const queryArrays = parseQuery(query)
   const entries = queryArrays.map((queryArray) => ({
@@ -21,7 +32,7 @@ export const iterate = function* (target, query, opts) {
     path: [],
     missing: false,
   }))
-  yield* iterateLevel({ entries, index: 0, parents, opts: optsA })
+  yield* iterateLevel({ entries, index: 0, parents, opts })
 }
 
 // `parents` is used to prevent infinite recursions when using ** together with

src/config/normalize/lib/wild_wild_path/set.js

@@ -2,6 +2,7 @@ import { isParentPath } from '../wild_wild_path_parser/main.js'
 
 import { list } from './get.js'
 import { getMissingValue } from './iterate/missing.js'
+import { validateClasses } from './validate.js'
 
 // Set a value to one or multiple properties in `target` using a query string.
 // Unless `mutate` is `true`, this returns a new copy
@@ -19,15 +20,6 @@ export const set = function (
   return reduceParents({ target, query, setFunc, missing, classes, inherited })
 }
 
-// Class instances are not clonable. Therefore, they require `mutate`.
-export const validateClasses = function (classes, mutate) {
-  if (classes && !mutate) {
-    throw new Error(
-      'The "mutate" option must be true when the "classes" option is true.',
-    )
-  }
-}
-
 // Modify a target object multiple times for each matched property.
 export const reduceParents = function ({
   target,

src/config/normalize/lib/wild_wild_path/validate.js

@@ -0,0 +1,17 @@
+// Class instances are not clonable. Therefore, they require `mutate`.
+export const validateClasses = function (classes, mutate) {
+  if (classes && !mutate) {
+    throw new Error(
+      'The "mutate" option must be true when the "classes" option is true.',
+    )
+  }
+}
+
+// Without classes, there are no inherited properties
+export const validateInherited = function ({ classes, inherited }) {
+  if (inherited && !classes) {
+    throw new Error(
+      'The "classes" option must be true when the "inherited" option is true.',
+    )
+  }
+}