Refactoring

src/combination/ids/get.js

@@ -42,17 +42,3 @@ const getDimensionId = function (combination, dimension) {
   const { id } = combination.dimensions[dimension.propName]
   return { id, dimension }
 }
-
-// Rename the `id` of a dimensionId for a given combination's dimension
-export const setDimensionId = function (
-  combination,
-  { id, dimension: { propName } },
-) {
-  return {
-    ...combination,
-    dimensions: {
-      ...combination.dimensions,
-      [propName]: { ...combination.dimensions[propName], id },
-    },
-  }
-}

src/combination/ids/namespace.js

@@ -1,7 +1,8 @@
 import { setArrayElement } from '../../utils/set.js'
 
-import { getCombDimensionsIds, setDimensionId } from './get.js'
+import { getCombDimensionsIds } from './get.js'
 import { isSameId, isSameDimension, hasCrossDimensionsIds } from './has.js'
+import { setDimensionId, syncDimensionIds } from './set.js'
 
 // When a result is created, we ensure that two dimensions do not have the
 // same ids, by throwing errors.
@@ -115,16 +116,6 @@ const updateRawResult = function (rawResult, combinations) {
   }
 
   const rawResultA = { ...rawResult, combinations }
-  const rawResultB = renameSystemIds(rawResultA)
+  const rawResultB = syncDimensionIds(rawResultA)
   return rawResultB
 }
-
-// System ids are persisted in two places: `rawResult.system.id` and
-// `rawResult.combinations[*].dimensions.system`.
-// We need to update the former.
-const renameSystemIds = function (rawResult) {
-  const { id } = rawResult.combinations[0].dimensions.system
-  return rawResult.system.id === id
-    ? rawResult
-    : { ...rawResult, system: { ...rawResult.system, id } }
-}

src/combination/ids/set.js

@@ -0,0 +1,30 @@
+// Rename the `id` of a dimensionId for a given combination's dimension
+export const setDimensionId = function (
+  combination,
+  { id, dimension: { propName } },
+) {
+  return {
+    ...combination,
+    dimensions: {
+      ...combination.dimensions,
+      [propName]: { ...combination.dimensions[propName], id },
+    },
+  }
+}
+
+// When updating `rawResult.combinations[*].dimensions[*].id`, we need to also
+// update some properties in `rawResult` which have the same value,
+// such as `rawResult.system.id`.
+export const syncDimensionIds = function (rawResult) {
+  return renameSystemIds(rawResult)
+}
+
+// System ids are persisted in two places: `rawResult.system.id` and
+// `rawResult.combinations[*].dimensions.system`.
+// We need to update the former.
+const renameSystemIds = function (rawResult) {
+  const { id } = rawResult.combinations[0].dimensions.system
+  return rawResult.system.id === id
+    ? rawResult
+    : { ...rawResult, system: { ...rawResult.system, id } }
+}