fix: adjust middleware

Author: BioPhoton

packages/cli/README.md

@@ -212,7 +212,7 @@ Each example is fully tested to demonstrate best practices for plugin testing as
 | **`--persist.outputDir`**   | `string`             | n/a      | Directory for the produced reports.                                         |
 | **`--persist.filename`**    | `string`             | `report` | Filename for the produced reports without extension.                        |
 | **`--persist.format`**      | `('json' \| 'md')[]` | `json`   | Format(s) of the report file.                                               |
-| **`--persist.skipReports`** | `boolean`            | `false`  | Skip generating report files. (useful in combination with caching)           |
+| **`--persist.skipReports`** | `boolean`            | `false`  | Skip generating report files. (useful in combination with caching)          |
 | **`--upload.organization`** | `string`             | n/a      | Organization slug from portal.                                              |
 | **`--upload.project`**      | `string`             | n/a      | Project slug from portal.                                                   |
 | **`--upload.server`**       | `string`             | n/a      | URL to your portal server.                                                  |

packages/cli/src/lib/implementation/core-config.middleware.ts

@@ -15,6 +15,24 @@ export type CoreConfigMiddlewareOptions = GeneralCliOptions &
   CoreConfigCliOptions &
   FilterOptions;
 
+function buildPersistConfig(
+  cliPersist: CoreConfigCliOptions['persist'],
+  rcPersist: CoreConfig['persist'],
+): Required<CoreConfig['persist']> {
+  return {
+    outputDir:
+      cliPersist?.outputDir ??
+      rcPersist?.outputDir ??
+      DEFAULT_PERSIST_OUTPUT_DIR,
+    filename:
+      cliPersist?.filename ?? rcPersist?.filename ?? DEFAULT_PERSIST_FILENAME,
+    format: normalizeFormats(
+      cliPersist?.format ?? rcPersist?.format ?? DEFAULT_PERSIST_FORMAT,
+    ),
+    skipReports: cliPersist?.skipReports ?? rcPersist?.skipReports ?? false,
+  };
+}
+
 export async function coreConfigMiddleware<
   T extends CoreConfigMiddlewareOptions,
 >(processArgs: T): Promise<GeneralCliOptions & CoreConfig & FilterOptions> {
@@ -43,18 +61,7 @@ export async function coreConfigMiddleware<
         });
   return {
     ...(config != null && { config }),
-    persist: {
-      outputDir:
-        cliPersist?.outputDir ??
-        rcPersist?.outputDir ??
-        DEFAULT_PERSIST_OUTPUT_DIR,
-      filename:
-        cliPersist?.filename ?? rcPersist?.filename ?? DEFAULT_PERSIST_FILENAME,
-      format: normalizeFormats(
-        cliPersist?.format ?? rcPersist?.format ?? DEFAULT_PERSIST_FORMAT,
-      ),
-      skipReports: cliPersist?.skipReports ?? rcPersist?.skipReports ?? false,
-    },
+    persist: buildPersistConfig(cliPersist, rcPersist),
     ...(upload != null && { upload }),
     ...remainingRcConfig,
     ...remainingCliOptions,

packages/core/src/lib/collect-and-persist.ts

@@ -35,7 +35,9 @@ export async function collectAndPersistReports(
   const { persist } = options;
   const { skipReports = false, ...persistOptions } = persist ?? {};
 
-  if (skipReports !== true) {
+  if (skipReports === true) {
+    logger.info('Skipping saving reports as `persist.skipReports` is true');
+  } else {
     const persistResults = await persistReport(
       reportResult,
       sortedScoredReport,
@@ -45,8 +47,6 @@ export async function collectAndPersistReports(
     if (isVerbose()) {
       logPersistedResults(persistResults);
     }
-  } else {
-    logger.info('Skipping saving reports as `persist.skipReports` is true');
   }
 
   // terminal output