Start reworking systems

src/combination/dimensions.js

@@ -20,11 +20,13 @@ const DIMENSIONS = [
     createdByUser: false,
   },
   {
-    isDimension: (propName) => propName.startsWith('system'),
+    isDimension: (propName) => propName.startsWith(SYSTEM_PREFIX),
     createdByUser: true,
   },
 ]
 
+export const SYSTEM_PREFIX = 'system.'
+
 // Retrieve several combinations' dimensions.
 export const getCombsDimensions = function (combinations) {
   return combinations.flatMap(getCombDimensions).filter(isUniqueCombDimension)

src/combination/ids/get.js

@@ -42,3 +42,17 @@ 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,8 +1,11 @@
 import { setArrayElement } from '../../utils/set.js'
 
-import { getCombsDimensionsIds, getCombDimensionsIds } from './get.js'
+import {
+  getCombsDimensionsIds,
+  getCombDimensionsIds,
+  setDimensionId,
+} from './get.js'
 import { isSameDimension, hasCrossDimensionsIds, findSameId } 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.
@@ -37,7 +40,10 @@ const namespaceRawResultIds = function (
     namespaceDimensionsIds.bind(undefined, dimensionsIds),
     rawResult.combinations,
   )
-  const rawResultA = updateRawResult(rawResult, combinations)
+  const rawResultA =
+    rawResult.combinations === combinations
+      ? rawResult
+      : { ...rawResult, combinations }
   return setArrayElement(rawResults, index, rawResultA)
 }
 
@@ -103,9 +109,3 @@ const addDimensionId = function (dimensionsIds, combDimensionId) {
 
   return similarDimensionId
 }
-
-const updateRawResult = function (rawResult, combinations) {
-  return rawResult.combinations === combinations
-    ? rawResult
-    : syncDimensionIds({ ...rawResult, combinations })
-}

src/combination/list.js

@@ -1,3 +1,5 @@
+import mapObj from 'map-obj'
+
 import { UserError } from '../error/main.js'
 import { selectCombinations } from '../select/main.js'
 
@@ -10,18 +12,14 @@ import { listTasks } from './tasks/main.js'
 export const listCombinations = async function ({
   runners,
   inputs,
-  systemId,
+  system,
   select,
   cwd,
 }) {
   const tasks = await listTasks(runners, cwd)
   const inputsList = toInputsList(inputs)
 
-  const combinations = getCombinationsProduct({
-    tasks,
-    inputsList,
-    systemId,
-  })
+  const combinations = getCombinationsProduct({ tasks, inputsList, system })
   validateCombinationsIds(combinations, inputsList)
 
   const combinationsA = selectCombinations(combinations, select)
@@ -31,15 +29,20 @@ export const listCombinations = async function ({
 // Get cartesian product of all combinations.
 // `taskPath` is not set in `dimensions.task.path` because it used by the `init`
 // stage before task dimension ids are known.
-const getCombinationsProduct = function ({ tasks, inputsList, systemId }) {
+const getCombinationsProduct = function ({ tasks, inputsList, system }) {
   if (tasks.length === 0) {
     throw new UserError(`Please specify some "tasks".`)
   }
 
+  const systemDimensions = mapObj(system, getSystemDimension)
   return tasks.map(({ id, taskPath, runner }) => ({
-    dimensions: { task: { id }, runner, system: { id: systemId } },
+    dimensions: { task: { id }, runner, ...systemDimensions },
     taskPath,
     inputsList,
     stats: {},
   }))
 }
+
+const getSystemDimension = function (propName, id) {
+  return { id }
+}

src/history/normalize/load.js

@@ -2,6 +2,7 @@ import sortOn from 'sort-on'
 
 import { namespaceDimensionIds } from '../../combination/ids/namespace.js'
 import { selectRawResults } from '../../select/main.js'
+import { renameAllSystemIds } from '../../system/rename.js'
 
 import { decompressRawResult } from './compress.js'
 import { migrateRawResults } from './migrate.js'
@@ -11,9 +12,10 @@ export const loadRawResults = function (rawResults, select, newCombinations) {
   const rawResultsA = migrateRawResults(rawResults)
   const rawResultsB = rawResultsA.map(decompressRawResult)
   const rawResultsC = namespaceDimensionIds(rawResultsB, newCombinations)
-  const rawResultsD = selectRawResults(rawResultsC, select)
-  const rawResultsE = sortResults(rawResultsD)
-  return rawResultsE
+  const rawResultsD = renameAllSystemIds(rawResultsC)
+  const rawResultsE = selectRawResults(rawResultsD, select)
+  const rawResultsF = sortResults(rawResultsE)
+  return rawResultsF
 }
 
 const sortResults = function (rawResults) {

src/report/normalize/titles_add.js

@@ -1,3 +1,5 @@
+import mapObj from 'map-obj'
+
 import { getCombDimensions } from '../../combination/dimensions.js'
 
 import { padTitles } from './titles_pad.js'
@@ -34,13 +36,22 @@ const addCombinationTitle = function ({
   }
 }
 
-// Add `footer.systems[*].title`
+// Add `footer.systems[*].dimensions[*].title`
 export const addFooterTitles = function (footer, titles, showTitles) {
   const titlesA = showTitles ? titles : {}
-  const systems = footer.systems.map((system) => addTitle(system, titlesA))
+  const systems = footer.systems.map((system) =>
+    addSystemTitles(system, titlesA),
+  )
   return { ...footer, systems }
 }
 
+const addSystemTitles = function (system, titles) {
+  const dimensions = mapObj(system.dimensions, (propName, dimension) =>
+    addTitle(dimension, titles),
+  )
+  return { ...system, dimensions }
+}
+
 // Allow users to rename identifiers from any combination dimension: tasks,
 // runners, systems, variations.
 // Shown only in reporters. Computed during reporting, i.e. not persisted in

src/system/create/main.js

@@ -24,19 +24,19 @@ import { getSystemVersions } from './versions.js'
 //    history results
 export const createSystemInfo = async function (
   combinations,
-  { cwd, systemId, envInfo },
+  { cwd, system: dimensions, envInfo },
 ) {
   const id = uuidv4()
   const timestamp = getTimestamp()
-  const system = await getSystem({ systemId, envInfo, combinations, cwd })
+  const system = await getSystem({ dimensions, envInfo, combinations, cwd })
   return { id, timestamp, system }
 }
 
-const getSystem = async function ({ systemId, combinations, cwd }) {
+const getSystem = async function ({ dimensions, combinations, cwd }) {
   const versions = await getSystemVersions(combinations, cwd)
   const machine = getMachine()
   const { git, ci } = getEnvInfo(cwd)
-  return cleanObject({ id: systemId, machine, git, ci, versions })
+  return cleanObject({ dimensions, machine, git, ci, versions })
 }
 
 const getMachine = function () {

src/system/merge.js

@@ -1,6 +1,8 @@
+import { isDeepStrictEqual } from 'util'
+
 // When merging results, we report all `systems`. This concatenates them.
-// Systems with the same id are merged, with the most recent result having
-// priority.
+// Systems with all dimensions equal are merged, with the most recent result
+// having priority.
 // Order matters: we show more recent systems first, i.e. they must be first
 // in the array.
 // `system` objects should not contain `undefined`, so we can directly merge.
@@ -16,7 +18,9 @@ export const mergeSystems = function (result, previousResult) {
 }
 
 const appendSystem = function ({ systems }, { system: previousSystem }) {
-  const systemIndex = systems.findIndex(({ id }) => id === previousSystem.id)
+  const systemIndex = systems.findIndex(({ dimensions }) =>
+    isDeepStrictEqual(dimensions, previousSystem.dimensions),
+  )
   return systemIndex === -1
     ? [...systems, previousSystem]
     : [

src/system/rename.js

@@ -0,0 +1,37 @@
+import { SYSTEM_PREFIX } from '../combination/dimensions.js'
+
+// Some logic updates `rawResult.combinations[*].dimensions[*].id`.
+// System ids are persisted in two places: `rawResult.system.dimensions` and
+// `rawResult.combinations[*].dimensions`.
+// We need to update the former.
+export const renameAllSystemIds = function (rawResults) {
+  return rawResults.map(renameSystemIds)
+}
+
+const renameSystemIds = function (rawResult) {
+  const [{ dimensions }] = rawResult.combinations
+  return Object.entries(dimensions)
+    .filter(isSystemDimension)
+    .reduce(renameSystemId, rawResult)
+}
+
+const isSystemDimension = function ([propName]) {
+  return propName.startsWith(SYSTEM_PREFIX)
+}
+
+const renameSystemId = function (rawResult, [propName, { id }]) {
+  const propNameA = unprefixPropName(propName)
+  return rawResult.system.dimensions[propNameA] === id
+    ? rawResult
+    : {
+        ...rawResult,
+        system: {
+          ...rawResult.system,
+          dimensions: { ...rawResult.system.dimensions, [propNameA]: id },
+        },
+      }
+}
+
+const unprefixPropName = function (propName) {
+  return propName.slice(SYSTEM_PREFIX.length)
+}