Refactoring

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

@@ -1,3 +1,5 @@
+import isPlainObj from 'is-plain-obj'
+
 import { getObjectTokenType } from '../tokens/main.js'
 
 // Iteration among siglings is not sorted, for performance reasons.
@@ -39,7 +41,42 @@ export const expandToken = function (
 //  - But are handled by the other ones
 export const handleMissingValue = function (value, token, classes) {
   const tokenType = getObjectTokenType(token)
-  const missing = tokenType.isMissing(value, classes)
-  const valueA = missing ? tokenType.defaultValue : value
+  const { missing, value: valueA } = tokenType.array
+    ? handleMissingArrayValue(tokenType, value)
+    : handleMissingObjectValue(tokenType, value, classes)
   return { tokenType, missing, value: valueA }
 }
+
+const handleMissingArrayValue = function (tokenType, value) {
+  return Array.isArray(value)
+    ? { missing: false, value }
+    : { missing: true, value: [] }
+}
+
+const handleMissingObjectValue = function (tokenType, value, classes) {
+  return isRecurseObject(value, classes)
+    ? { missing: false, value }
+    : { missing: true, value: {} }
+}
+
+// Whether a property is considered an object that can:
+//  - Be recursed over
+//  - Be cloned with `{...}`
+//     - Therefore we do not allow class instances
+// Values that are not recursed are considered atomic, like simple types, i.e.:
+//  - Properties, even if they exist, will be considered missing
+//     - With tokens like *, no entries will be returned
+//  - Setting will override the value, not merge it
+// This must return `false` for arrays.
+// By default, we only consider plain objects
+//  - Excluding:
+//     - Class instances, including native ones (RegExp, Error, etc.)
+//     - `Object.create({})`
+//     - `import * as object from ...` (`Module` instance)
+//  - This is because only plain objects are clonable, i.e. do not require
+//    `mutate` to be `true`
+const isRecurseObject = function (value, classes) {
+  return classes
+    ? typeof value === 'object' && value !== null
+    : isPlainObj(value)
+}

src/config/normalize/lib/wild_wild_path/tokens/any.js

@@ -1,7 +1,5 @@
 import isPlainObj from 'is-plain-obj'
 
-import { objectProps } from './common.js'
-
 // Check the type of a parsed token
 const testObject = function (token) {
   return isPlainObj(token) && token.type === ANY_TYPE
@@ -53,12 +51,12 @@ const equals = function () {
 }
 
 export const ANY_TOKEN = {
+  array: false,
   testObject,
   serialize,
   testString,
   parse,
   normalize,
-  ...objectProps,
   iterate,
   equals,
 }

src/config/normalize/lib/wild_wild_path/tokens/array.js

@@ -1,5 +1,3 @@
-import { arrayProps } from './common.js'
-
 // Check the type of a parsed token.
 // Integers specified as string tokens are assumed to be property names, not
 // array indices.
@@ -58,12 +56,12 @@ const equals = function (tokenA, tokenB) {
 }
 
 export const ARRAY_TOKEN = {
+  array: true,
   testObject,
   serialize,
   testString,
   parse,
   normalize,
-  ...arrayProps,
   iterate,
   equals,
 }

src/config/normalize/lib/wild_wild_path/tokens/prop.js

@@ -1,4 +1,3 @@
-import { objectProps } from './common.js'
 import { ESCAPE, TOKEN_SEPARATOR, escapeSpecialChars } from './escape.js'
 import { getOtherStringTokenType } from './other.js'
 
@@ -48,12 +47,12 @@ const equals = function (tokenA, tokenB) {
 }
 
 export const PROP_TOKEN = {
+  array: false,
   testObject,
   serialize,
   testString,
   parse,
   normalize,
-  ...objectProps,
   iterate,
   equals,
 }

src/config/normalize/lib/wild_wild_path/tokens/regexp.js

@@ -1,4 +1,3 @@
-import { objectProps } from './common.js'
 import { escapeSpecialChars } from './escape.js'
 
 // Check the type of a parsed token
@@ -54,12 +53,12 @@ const iterate = function (value, token) {
 }
 
 export const REGEXP_TOKEN = {
+  array: false,
   testObject,
   serialize,
   testString,
   parse,
   normalize,
-  ...objectProps,
   iterate,
   equals,
 }

src/config/normalize/lib/wild_wild_path/tokens/slice.js

@@ -1,7 +1,6 @@
 import isPlainObj from 'is-plain-obj'
 
 import { ARRAY_TOKEN, getArrayIndex } from './array.js'
-import { arrayProps } from './common.js'
 
 // Check the type of a parsed token.
 const testObject = function (token) {
@@ -77,12 +76,12 @@ const equals = function (tokenA, tokenB) {
 }
 
 export const SLICE_TOKEN = {
+  array: true,
   testObject,
   serialize,
   testString,
   parse,
   normalize,
-  ...arrayProps,
   iterate,
   equals,
 }