Move files

src/combination/tasks/load.js

@@ -1,5 +1,5 @@
 import { UserError, PluginError } from '../../error/main.js'
-import { computeRunnerVersions } from '../../top/system/versions.js'
+import { computeRunnerVersions } from '../../top/system/versions/compute.js'
 
 // Select the runners and retrieve their related spawn options using
 // `runner.launch()`

src/combination/tasks/main.js

@@ -1,4 +1,4 @@
-import { getCommonVersions } from '../../top/system/versions.js'
+import { getCommonVersions } from '../../top/system/versions/common.js'
 import { getCombsNoDimensions } from '../filter.js'
 
 import { applyDefaultTasks } from './default.js'

src/run/create.js

@@ -2,7 +2,7 @@ import { listCombinations } from '../combination/list.js'
 import { listHistory } from '../history/data/main.js'
 import { normalizeRawResults } from '../history/normalize/load.js'
 import { createTopProps } from '../top/create.js'
-import { mergeSystemVersions } from '../top/system/versions.js'
+import { mergeSystemVersions } from '../top/system/versions/merge.js'
 
 // Create a new rawResult to measure
 export const createResult = async function (config) {

src/top/system/versions/common.js

@@ -0,0 +1,19 @@
+import { dirname } from 'path'
+import { fileURLToPath } from 'url'
+
+import { readPackageUp } from 'read-pkg-up'
+
+// Retrieve runtime versions common to all runners
+export const getCommonVersions = async function () {
+  return await getSpydVersion()
+}
+
+// Store the `spyd` version on each result
+// TODO: use static JSON imports once those are possible
+const getSpydVersion = async function () {
+  const cwd = dirname(fileURLToPath(import.meta.url))
+  const {
+    packageJson: { version },
+  } = await readPackageUp({ cwd, normalize: false })
+  return { Spyd: version }
+}

src/top/system/versions.js → src/top/system/versions/compute.js

@@ -1,28 +1,8 @@
-import { dirname } from 'path'
-import { fileURLToPath } from 'url'
-
 import mapObj from 'map-obj'
 import pProps from 'p-props'
-import { readPackageUp } from 'read-pkg-up'
-
-import { PluginError } from '../../error/main.js'
-import { groupBy } from '../../utils/group.js'
-import { spawnProcess } from '../../utils/spawn.js'
 
-// Retrieve runtime versions common to all runners
-export const getCommonVersions = async function () {
-  return await getSpydVersion()
-}
-
-// Store the `spyd` version on each result
-// TODO: use static JSON imports once those are possible
-const getSpydVersion = async function () {
-  const cwd = dirname(fileURLToPath(import.meta.url))
-  const {
-    packageJson: { version },
-  } = await readPackageUp({ cwd, normalize: false })
-  return { Spyd: version }
-}
+import { PluginError } from '../../../error/main.js'
+import { spawnProcess } from '../../../utils/spawn.js'
 
 // Get runtime versions for this runner, returned as `versions` from
 // `runner.launch()`. This is an object where:
@@ -87,26 +67,3 @@ ${error.message}`,
     )
   }
 }
-
-// Merge `result.combinations[*].dimensions.runner.versions` into
-// `result.systems[*].versions`.
-export const mergeSystemVersions = function (rawResult) {
-  const versions = getSystemVersions(rawResult)
-  return { ...rawResult, systems: [{ ...rawResult.systems[0], versions }] }
-}
-
-const getSystemVersions = function ({ combinations }) {
-  const runners = combinations.map(getRunner)
-  const versionsArray = Object.values(groupBy(runners, 'id')).map(
-    getRunnerVersions,
-  )
-  return Object.assign({}, ...versionsArray)
-}
-
-const getRunner = function ({ dimensions: { runner } }) {
-  return runner
-}
-
-const getRunnerVersions = function ([{ versions }]) {
-  return versions
-}

src/top/system/versions/merge.js

@@ -0,0 +1,24 @@
+import { groupBy } from '../../../utils/group.js'
+
+// Merge `result.combinations[*].dimensions.runner.versions` into
+// `result.systems[*].versions`.
+export const mergeSystemVersions = function (rawResult) {
+  const versions = getSystemVersions(rawResult)
+  return { ...rawResult, systems: [{ ...rawResult.systems[0], versions }] }
+}
+
+const getSystemVersions = function ({ combinations }) {
+  const runners = combinations.map(getRunner)
+  const versionsArray = Object.values(groupBy(runners, 'id')).map(
+    getRunnerVersions,
+  )
+  return Object.assign({}, ...versionsArray)
+}
+
+const getRunner = function ({ dimensions: { runner } }) {
+  return runner
+}
+
+const getRunnerVersions = function ([{ versions }]) {
+  return versions
+}