Move default value logic

src/config/default.js

@@ -1,29 +1,6 @@
-import { cwd as getCwd } from 'process'
-
-import isPlainObj from 'is-plain-obj'
-
-import { getDefaultId } from '../history/merge/id.js'
-import { isTtyInput } from '../report/tty.js'
 import { cleanObject } from '../utils/clean.js'
 
 // Add default configuration properties
-export const addDefaultConfig = function (config, command) {
-  const defaultConfig = getDefaultConfig(config, command)
-  return cleanObject({ ...defaultConfig, ...config })
-}
-
-const getDefaultConfig = function (config, command) {
-  return {
-    cwd: getCwd(),
-    force: !isTtyInput(),
-    merge: getDefaultId(),
-    showMetadata: METADATA_COMMANDS.has(command),
-    showSystem: getDefaultShowSystem(config),
-  }
+export const addDefaultConfig = function (config) {
+  return cleanObject(config)
 }
-
-const getDefaultShowSystem = function ({ system = {} }) {
-  return isPlainObj(system) && Object.keys(system).length !== 0
-}
-
-const METADATA_COMMANDS = new Set(['show', 'remove'])

src/config/main.js

@@ -6,7 +6,7 @@ import { addPlugins } from './plugin/add.js'
 // Retrieve configuration
 export const getConfig = async function (command, configFlags = {}) {
   const { config, configInfos } = await loadConfig(configFlags)
-  const configA = addDefaultConfig(config, command)
+  const configA = addDefaultConfig(config)
   const configB = normalizeConfig(configA, command, configInfos)
   const configC = await addPlugins(configB, command)
   return configC

src/config/normalize.js

@@ -26,7 +26,7 @@ const normalizePropConfig = function (
   }
 
   const value = config[name]
-  const args = [name, { configInfos, config }]
+  const args = [name, { configInfos, config, command }]
 
   const valueA = addDefaultValue(value, defaultValue, args)
 

src/config/properties.js

@@ -1,8 +1,13 @@
 /* eslint-disable max-lines */
+import { cwd as getCwd } from 'process'
+
+import isPlainObj from 'is-plain-obj'
+
 import { normalizeLimit } from '../history/compare/normalize.js'
 import { normalizeDelta } from '../history/delta/normalize.js'
-import { validateMerge } from '../history/merge/id.js'
+import { getDefaultId, validateMerge } from '../history/merge/id.js'
 import { isOutputPath } from '../report/output.js'
+import { isTtyInput } from '../report/tty.js'
 import { normalizePrecision } from '../run/precision.js'
 
 import {
@@ -17,8 +22,11 @@ import {
   checkJson,
 } from './check.js'
 import { normalizeConfigPath, normalizeConfigGlob } from './path.js'
+// eslint-disable-next-line import/max-dependencies
 import { recurseConfigSelectors } from './select/normalize.js'
 
+const METADATA_COMMANDS = new Set(['show', 'remove'])
+
 export const CONFIG_PROPS = {
   colors: {
     commands: 'report',
@@ -28,6 +36,9 @@ export const CONFIG_PROPS = {
   },
   cwd: {
     commands: 'all',
+    default() {
+      return getCwd()
+    },
     normalize(value, name, { configInfos }) {
       checkDefinedString(value, name)
       return normalizeConfigPath(value, name, configInfos)
@@ -42,6 +53,9 @@ export const CONFIG_PROPS = {
   },
   force: {
     commands: 'remove',
+    default() {
+      return !isTtyInput()
+    },
     normalize(value, name) {
       checkBoolean(value, name)
     },
@@ -66,6 +80,9 @@ export const CONFIG_PROPS = {
   },
   merge: {
     commands: 'run',
+    default() {
+      return getDefaultId()
+    },
     normalize(value, name) {
       checkDefinedString(value, name)
       validateMerge(value, name)
@@ -172,6 +189,9 @@ export const CONFIG_PROPS = {
   },
   showMetadata: {
     commands: 'report',
+    default(name, { command }) {
+      return METADATA_COMMANDS.has(command)
+    },
     normalize(value, name) {
       checkBoolean(value, name)
     },
@@ -187,6 +207,9 @@ export const CONFIG_PROPS = {
   },
   showSystem: {
     commands: 'report',
+    default(name, { config: { system } }) {
+      return isPlainObj(system) && Object.keys(system).length !== 0
+    },
     normalize(value, name) {
       checkBoolean(value, name)
     },