Add roots to remove|set()

ehmicky · Mar 13, 2022 · 31b9c3a · 31b9c3a
1 parent 53c6527
commit 31b9c3a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/config/normalize/lib/wild_wild_path/remove.js b/src/config/normalize/lib/wild_wild_path/remove.js
@@ -1,4 +1,5 @@
-import { validateClasses, reduceParents, setValue } from './set.js'
+import { reduceParents, setValue } from './set.js'
+import { validateClasses } from './validate.js'
 
 // Same as `set()` but removing a value
 export const remove = function (

diff --git a/src/config/normalize/lib/wild_wild_path/set.js b/src/config/normalize/lib/wild_wild_path/set.js
@@ -1,5 +1,3 @@
-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'
@@ -31,21 +29,15 @@ export const reduceParents = function ({
 }) {
   const entries = list(target, query, {
     childFirst: false,
+    roots: true,
     sort: false,
     missing,
     classes,
     inherited,
   })
-  return entries
-    .filter(hasNoParentSet)
-    .reduce((targetA, { path }) => setFunc(targetA, path, 0), target)
-}
-
-// If both a parent and a child property are set, the parent prevails
-const hasNoParentSet = function ({ path: pathA }, indexA, entries) {
-  return entries.every(
-    ({ path: pathB }, indexB) =>
-      indexA <= indexB || !isParentPath(pathB, pathA),
+  return entries.reduce(
+    (targetA, { path }) => setFunc(targetA, path, 0),
+    target,
   )
 }