Split file

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

@@ -3,7 +3,7 @@ import {
   normalizeQueryArrays,
   isQueryString,
   normalizeArrayPath,
-} from './validate.js'
+} from './validate/main.js'
 
 // There are two formats:
 //  - Query string

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

@@ -10,8 +10,8 @@ import {
   normalizeArraysPath,
   validateEmptyQuery,
   validateQueryString,
-  throwQueryError,
-} from './validate.js'
+} from './validate/main.js'
+import { throwQueryError } from './validate/throw.js'
 
 // Parse a query string into an array of tokens.
 // Also validate and normalize it.

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

@@ -1,6 +1,6 @@
 import { TOKEN_SEPARATOR, ARRAY_SEPARATOR } from './tokens/escape.js'
 import { getObjectTokenType } from './tokens/main.js'
-import { normalizeQueryArrays, normalizeArrayPath } from './validate.js'
+import { normalizeQueryArrays, normalizeArrayPath } from './validate/main.js'
 
 // Inverse of `parseQuery()`
 export const serializeQuery = function (queryArrays) {

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

@@ -1,6 +1,6 @@
-import { inspect } from 'util'
+import { getObjectTokenType, getPathObjectTokenType } from '../tokens/main.js'
 
-import { getObjectTokenType, getPathObjectTokenType } from './tokens/main.js'
+import { throwQueryError, throwTokenError } from './throw.js'
 
 // Validate query string is a string
 export const validateQueryString = function (queryString) {
@@ -116,12 +116,3 @@ const validateToken = function (tokenType, token, query) {
     )
   }
 }
-
-const throwTokenError = function (queryArray, token, message) {
-  throwQueryError(queryArray, `Invalid token: ${inspect(token)}\n${message}`)
-}
-
-// Throw an error when the query is invalid
-export const throwQueryError = function (query, message) {
-  throw new Error(`Invalid query: ${inspect(query)}\n${message}`)
-}

src/config/normalize/lib/wild_wild_parser/validate/throw.js

@@ -0,0 +1,11 @@
+import { inspect } from 'util'
+
+// Throw an error when a token is invalid
+export const throwTokenError = function (queryArray, token, message) {
+  throwQueryError(queryArray, `Invalid token: ${inspect(token)}\n${message}`)
+}
+
+// Throw an error when a query is invalid
+export const throwQueryError = function (query, message) {
+  throw new Error(`Invalid query: ${inspect(query)}\n${message}`)
+}