Rename parse*() to normalize*()

src/config/normalize/lib/modify.js

@@ -2,7 +2,7 @@ import { callValueFunc, callUserFunc, getValidateExampleError } from './call.js'
 import { resolvePath } from './path.js'
 import { transformValue } from './transform.js'
 import { getWarnings } from './warn.js'
-import { parsePath } from './wild_wild_parser/main.js'
+import { normalizePath } from './wild_wild_parser/main.js'
 import { has } from './wild_wild_path/main.js'
 
 // Once the initial value has been computed, apply validation and transforms,
@@ -70,6 +70,6 @@ const renameProp = async function (value, rename, opts) {
     return
   }
 
-  const renamedPath = parsePath(renameReturn)
+  const renamedPath = normalizePath(renameReturn)
   return has(opts.funcOpts.config, renamedPath) ? undefined : renamedPath
 }

src/config/normalize/lib/opts.js

@@ -2,7 +2,7 @@ import { callUserFunc } from './call.js'
 import { getCwd } from './cwd.js'
 import { applyMoves } from './move.js'
 import { getPrefix, DEFAULT_PREFIX } from './prefix.js'
-import { parsePath, serializePath } from './wild_wild_parser/main.js'
+import { normalizePath, serializePath } from './wild_wild_parser/main.js'
 
 // Retrieve `opts` passed to most methods.
 // `funcOpts` are passed to user-provided functions.
@@ -53,7 +53,7 @@ const computeParent = async function (opts, moves, parent) {
 // By default, there are none.
 const appendParentToName = async function (parent, opts) {
   const parentA = await callUserFunc(parent, opts)
-  const parentPath = parsePath(parentA)
+  const parentPath = normalizePath(parentA)
   return [...parentPath, ...opts.funcOpts.originalPath]
 }
 

src/config/normalize/lib/rule.js

@@ -1,4 +1,4 @@
-import { parseQuery, serializeQuery } from './wild_wild_parser/main.js'
+import { normalizeQuery, serializeQuery } from './wild_wild_parser/main.js'
 import { get } from './wild_wild_path/main.js'
 
 // Validate and normalize rules.
@@ -10,7 +10,7 @@ export const normalizeRules = function (rules) {
 
 const parseName = function ({ name, ...rule }) {
   const nameQuery = serializeQuery(name)
-  const namePath = parseQuery(name)
+  const namePath = normalizeQuery(name)
   return { ...rule, nameQuery, namePath }
 }
 

src/config/normalize/lib/transform.js

@@ -2,7 +2,7 @@ import isPlainObj from 'is-plain-obj'
 import pReduce from 'p-reduce'
 
 import { callValueFunc } from './call.js'
-import { parsePath } from './wild_wild_parser/main.js'
+import { normalizePath } from './wild_wild_parser/main.js'
 
 // Apply `transform(value, opts)` which transforms the value set by the user.
 // If can also delete it by returning `undefined`.
@@ -58,7 +58,7 @@ const isTransformMove = function (transformReturn) {
 }
 
 const getTransformMove = function ({ value, newProp }) {
-  const newPropA = parsePath(newProp)
+  const newPropA = normalizePath(newProp)
   return newPropA.length === 0 ? {} : { value, newProp: newPropA }
 }
 

src/config/normalize/lib/wild_wild_parser/compare.js

@@ -1,5 +1,5 @@
 import { validatePath } from './normalize.js'
-import { parseQuery } from './parse.js'
+import { normalizeQuery } from './parse.js'
 import { getObjectTokenType } from './tokens/main.js'
 
 // Check if two queries are equal.
@@ -8,8 +8,8 @@ import { getObjectTokenType } from './tokens/main.js'
 //  - Unions, e.g. `a b` === `b a`
 //  - Duplicates, e.g. `a a` === `a`
 export const isSameQuery = function (queryA, queryB) {
-  const queryArraysA = parseQuery(queryA)
-  const queryArraysB = parseQuery(queryB)
+  const queryArraysA = normalizeQuery(queryA)
+  const queryArraysB = normalizeQuery(queryB)
   return (
     queryArraysA.length === queryArraysB.length &&
     queryArraysA.every((queryArrayA) =>

src/config/normalize/lib/wild_wild_parser/main.js

@@ -4,6 +4,6 @@ export {
   isSameToken,
   isParentPath,
 } from './compare.js'
-export { parseQuery, parsePath } from './parse.js'
+export { normalizeQuery, normalizePath } from './parse.js'
 export { serializeQuery, serializePath } from './serialize.js'
 export { getTokenType } from './tokens/main.js'

src/config/normalize/lib/wild_wild_parser/parse.js

@@ -82,13 +82,13 @@ import { parseQueryString } from './query.js'
 //  - I.e. query or path syntax errors, or wrong arguments
 //  - But queries matching nothing do not throw: instead they return nothing
 // Parse a path
-export const parsePath = function (query) {
-  const queryArrays = parseQuery(query)
+export const normalizePath = function (query) {
+  const queryArrays = normalizeQuery(query)
   return normalizePathShape(queryArrays)
 }
 
 // Parse a query string or array
-export const parseQuery = function (query) {
+export const normalizeQuery = function (query) {
   return isQueryString(query)
     ? safeParseQueryString(query)
     : normalizeQueryArrays(query)

src/config/normalize/lib/wild_wild_parser/serialize.js

@@ -1,18 +1,18 @@
-import { parseQuery, parsePath } from './parse.js'
+import { normalizeQuery, normalizePath } from './parse.js'
 import { TOKEN_SEPARATOR, ARRAY_SEPARATOR } from './tokens/escape.js'
 import { getObjectTokenType } from './tokens/main.js'
 
 // Inverse of `parseQuery()`
 // When passing a query string, it is parsed and re-serialized to validate and
 // normalize it.
 export const serializeQuery = function (query) {
-  const queryArrays = parseQuery(query)
+  const queryArrays = normalizeQuery(query)
   return queryArrays.map(serializeQueryArray).join(ARRAY_SEPARATOR)
 }
 
 // Inverse of `parsePath()`
 export const serializePath = function (query) {
-  const path = parsePath(query)
+  const path = normalizePath(query)
   return serializeQueryArray(path)
 }
 

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

@@ -1,4 +1,4 @@
-import { parseQuery } from '../../wild_wild_parser/main.js'
+import { normalizeQuery } from '../../wild_wild_parser/main.js'
 
 import { iterateChildEntries } from './children.js'
 import { removeDuplicates } from './duplicate.js'
@@ -18,7 +18,7 @@ export const iterate = function* (target, query, opts) {
 }
 
 const getRootEntries = function (target, query) {
-  const queryArrays = parseQuery(query)
+  const queryArrays = normalizeQuery(query)
   return queryArrays.map((queryArray) => ({
     queryArray,
     value: target,

src/config/plugin/lib/shared.js

@@ -1,11 +1,14 @@
-import { parseQuery } from '../../normalize/lib/wild_wild_parser/main.js'
+import { normalizeQuery } from '../../normalize/lib/wild_wild_parser/main.js'
 import { pick } from '../../normalize/lib/wild_wild_utils/main.js'
 
 // Retrieve top-level properties that are shared with all plugins of a specific
 // type. Those are merged with plugin-specific properties.
 export const getSharedConfig = function (sharedConfig, item = []) {
   const sharedPropNames = [...new Set(item.map(getRuleName))]
-  const sharedConfigA = pick(sharedConfig, sharedPropNames.flatMap(parseQuery))
+  const sharedConfigA = pick(
+    sharedConfig,
+    sharedPropNames.flatMap(normalizeQuery),
+  )
   return { sharedConfig: sharedConfigA, sharedPropNames }
 }