Refactoring

ehmicky · Mar 6, 2022 · ad85e46 · ad85e46
1 parent 0be42b4
commit ad85e46
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/src/config/normalize/lib/star_dot_path/parsing/path.js b/src/config/normalize/lib/star_dot_path/parsing/path.js
@@ -8,3 +8,8 @@ export const pathHasAny = function (path) {
 const nodeHasAny = function (node) {
   return node === ANY_TOKEN || (Array.isArray(node) && node.includes(ANY_TOKEN))
 }
+
+// Check if node is an array index
+export const isIndexNode = function (node) {
+  return Number.isInteger(node)
+}
diff --git a/src/config/normalize/lib/star_dot_path/parsing/serialize.js b/src/config/normalize/lib/star_dot_path/parsing/serialize.js
@@ -1,3 +1,4 @@
+import { isIndexNode } from './path.js'
 import { SEPARATOR, ANY, ANY_TOKEN, SPECIAL_CHARS_REGEXP } from './special.js'
 
 // Inverse of `parse()`
@@ -16,7 +17,7 @@ const serializeToken = function (token, index) {
     return ANY
   }
 
-  if (Number.isInteger(token)) {
+  if (isIndexNode(token)) {
     return String(token)
   }
 

diff --git a/src/config/normalize/lib/star_dot_path/set.js b/src/config/normalize/lib/star_dot_path/set.js
@@ -5,7 +5,7 @@ import { setArray } from '../../../../utils/set.js'
 import { listEntries, normalizeEntry } from './entries/main.js'
 import { isObject } from './entries/recurse.js'
 import { maybeParse } from './parsing/parse.js'
-import { pathHasAny } from './parsing/path.js'
+import { pathHasAny, isIndexNode } from './parsing/path.js'
 
 // Set a value to one or multiple properties in `target` using a query string
 export const set = function (target, queryOrPath, setValue) {
@@ -54,7 +54,7 @@ const addDefaultTarget = function (target, key) {
     return target
   }
 
-  return Number.isInteger(key) ? [] : {}
+  return isIndexNode(key) ? [] : {}
 }
 
 // Delete one or multiple properties in `target` using a query string
@@ -96,7 +96,7 @@ const excludeEntry = function (
 }
 
 const removeValue = function (value, key) {
-  if (!Number.isInteger(key)) {
+  if (!isIndexNode(key)) {
     return omitLib.default(value, [key])
   }
 
@@ -113,7 +113,7 @@ const setNewChildValue = function (value, key, newChildValue) {
     return value
   }
 
-  return Number.isInteger(key)
+  return isIndexNode(key)
     ? setArray(value, key, newChildValue)
     : { ...value, [key]: newChildValue }
 }