diff --git a/src/config/normalize/lib/wild_wild_path/get.js b/src/config/normalize/lib/wild_wild_path/get.js index b60e644ee..e239e46e8 100644 --- a/src/config/normalize/lib/wild_wild_path/get.js +++ b/src/config/normalize/lib/wild_wild_path/get.js @@ -1,23 +1,23 @@ -import { listEntries, normalizeEntry } from './entries.js' +import { iterate, normalizeEntry } from './iterate.js' // Retrieve all properties in `target` matching a query string. // Unlike `get|has()` it also return missing entries, letting consumers filter // them or not. export const list = function (target, queryOrPath) { - const entries = listEntries(target, queryOrPath) + const entries = iterate(target, queryOrPath) return entries.map(normalizeEntry) } // Retrieve a single property's value in `target` matching a query string. // Wildcards can be used, but only the first value is returned. export const get = function (target, queryOrPath) { - const entry = listEntries(target, queryOrPath).find(isExisting) + const entry = iterate(target, queryOrPath).find(isExisting) return entry === undefined ? undefined : entry.value } // Check if a property is not missing according to a query export const has = function (target, queryOrPath) { - return listEntries(target, queryOrPath).some(isExisting) + return iterate(target, queryOrPath).some(isExisting) } const isExisting = function ({ missing }) { diff --git a/src/config/normalize/lib/wild_wild_path/entries.js b/src/config/normalize/lib/wild_wild_path/iterate.js similarity index 96% rename from src/config/normalize/lib/wild_wild_path/entries.js rename to src/config/normalize/lib/wild_wild_path/iterate.js index ec48018b7..6e628d30c 100644 --- a/src/config/normalize/lib/wild_wild_path/entries.js +++ b/src/config/normalize/lib/wild_wild_path/iterate.js @@ -4,7 +4,7 @@ import { getObjectTokenType } from './tokens/main.js' // List all values (and their associated path) matching a specific query for // on specific target value. -export const listEntries = function (target, queryOrPath) { +export const iterate = function (target, queryOrPath) { const path = parse(queryOrPath) return path.reduce(listTokenEntries, [ { value: target, path: [], missing: false }, diff --git a/src/config/normalize/lib/wild_wild_path/remove.js b/src/config/normalize/lib/wild_wild_path/remove.js index b9a7893b0..5912314b9 100644 --- a/src/config/normalize/lib/wild_wild_path/remove.js +++ b/src/config/normalize/lib/wild_wild_path/remove.js @@ -2,12 +2,12 @@ import omit from 'omit.js' import { setArray } from '../../../../utils/set.js' -import { listEntries, handleMissingValue } from './entries.js' +import { iterate, handleMissingValue } from './iterate.js' import { setValue } from './set.js' // Same as `set()` but removing a value export const remove = function (target, queryOrPath) { - const entries = listEntries(target, queryOrPath) + const entries = iterate(target, queryOrPath) return entries.some(hasRootPath) ? undefined : entries.reduce( diff --git a/src/config/normalize/lib/wild_wild_path/set.js b/src/config/normalize/lib/wild_wild_path/set.js index 1a5c371ba..ce3000ab4 100644 --- a/src/config/normalize/lib/wild_wild_path/set.js +++ b/src/config/normalize/lib/wild_wild_path/set.js @@ -1,10 +1,10 @@ import { setArray } from '../../../../utils/set.js' -import { listEntries, handleMissingValue } from './entries.js' +import { iterate, handleMissingValue } from './iterate.js' // Set a value to one or multiple properties in `target` using a query string export const set = function (target, queryOrPath, value) { - const entries = listEntries(target, queryOrPath) + const entries = iterate(target, queryOrPath) return entries.reduce( (targetA, entry) => setEntry(targetA, entry.path, value, 0), target,