Move reporter.format to reporter.config.format

ehmicky · Jan 30, 2022 · 4566303 · 4566303
1 parent 1474470
commit 4566303
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/src/report/config/main.js b/src/report/config/main.js
@@ -19,7 +19,7 @@ const addOutput = function (reporter) {
   const output = getOutput(reporter)
   const format = detectFormat(reporter, output)
   const tty = getTty(output)
-  return { ...reporter, config: { ...reporter.config, output }, format, tty }
+  return { ...reporter, config: { ...reporter.config, output, format }, tty }
 }
 
 // The reporter's output is decided by (in priority order):

diff --git a/src/report/config/programmatic.js b/src/report/config/programmatic.js
@@ -19,15 +19,15 @@ export const addProgrammaticReporter = function (reporters) {
 
 const PROGRAMMATIC_REPORTER = {
   id: 'programmatic',
-  format: 'programmatic',
   capabilities: {
     debugStats: false,
     history: true,
   },
   tty: false,
   config: {
-    quiet: true,
+    format: 'programmatic',
     output: '',
+    quiet: true,
     showSystem: true,
     showMetadata: true,
     showTitles: true,

diff --git a/src/report/config/validate.js b/src/report/config/validate.js
@@ -37,7 +37,7 @@ const validateConcatGroup = function (output, reporters) {
   )
 }
 
-const reporterCannotConcat = function ({ format }) {
+const reporterCannotConcat = function ({ config: { format } }) {
   return !FORMATS[format].concat
 }
 

diff --git a/src/report/contents/get.js b/src/report/contents/get.js
@@ -19,11 +19,10 @@ const callReportFunc = async function ({
   reporter,
   reporter: {
     result,
-    format,
     footerString,
     startData,
     config: reporterConfig,
-    config: { output, colors },
+    config: { format, output, colors },
   },
 }) {
   const reporterSpecificConfig = omit.default(
@@ -40,6 +39,7 @@ const callReportFunc = async function ({
 
 // We only pass reporter-specific properties, not core ones
 const CORE_REPORTER_PROPS = [
+  'format',
   'output',
   'colors',
   'showTitles',

diff --git a/src/top/footer/main.js b/src/top/footer/main.js
@@ -14,8 +14,7 @@ export const computeFooter = function ({
   timestamp,
   reporter,
   reporter: {
-    format,
-    config: { showTitles, showMetadata, showSystem },
+    config: { format, showTitles, showMetadata, showSystem },
   },
   config: { titles },
 }) {