fix(ci): always show execute process errors and log stdout if verbose

vmasek · vmasek · commit aeb62607623f · 2025-03-04T01:00:41.000+01:00
diff --git a/packages/ci/README.md b/packages/ci/README.md
@@ -103,7 +103,7 @@ Optionally, you can override default options for further customization:
 | `nxProjectsFilter` | `string \| string[]`      | `'--with-target={task}'`         | Arguments passed to [`nx show projects`](https://nx.dev/nx-api/nx/documents/show#projects), only relevant for Nx in [monorepo mode](#monorepo-mode) [^2] |
 | `directory`        | `string`                  | `process.cwd()`                  | Directory in which Code PushUp CLI should run                                                                                                            |
 | `config`           | `string \| null`          | `null` [^1]                      | Path to config file (`--config` option)                                                                                                                  |
-| `silent`           | `boolean`                 | `false`                          | Toggles if logs from CLI commands are printed                                                                                                            |
+| `silent`           | `boolean`                 | `false`                          | Hides logs from CLI commands are printed                                                                                                                 |
 | `bin`              | `string`                  | `'npx --no-install code-pushup'` | Command for executing Code PushUp CLI                                                                                                                    |
 | `detectNewIssues`  | `boolean`                 | `true`                           | Toggles if new issues should be detected and returned in `newIssues` property                                                                            |
 | `logger`           | `Logger`                  | `console`                        | Logger for reporting progress and encountered problems                                                                                                   |
diff --git a/packages/ci/src/lib/cli/commands/collect.ts b/packages/ci/src/lib/cli/commands/collect.ts
@@ -1,22 +1,22 @@
 import { DEFAULT_PERSIST_FORMAT } from '@code-pushup/models';
-import { executeProcess } from '@code-pushup/utils';
+import { executeProcess, isVerbose } from '@code-pushup/utils';
 import type { CommandContext } from '../context.js';
 
 export async function runCollect({
   bin,
   config,
   directory,
-  silent,
+  observer,
 }: CommandContext): Promise<void> {
-  const { stdout } = await executeProcess({
+  await executeProcess({
     command: bin,
     args: [
+      ...(isVerbose() ? ['--verbose'] : []),
+      '--no-progress',
       ...(config ? [`--config=${config}`] : []),
       ...DEFAULT_PERSIST_FORMAT.map(format => `--persist.format=${format}`),
     ],
     cwd: directory,
+    observer,
   });
-  if (!silent) {
-    console.info(stdout);
-  }
 }
diff --git a/packages/ci/src/lib/cli/commands/compare.ts b/packages/ci/src/lib/cli/commands/compare.ts
@@ -1,5 +1,5 @@
 import { DEFAULT_PERSIST_FORMAT } from '@code-pushup/models';
-import { executeProcess } from '@code-pushup/utils';
+import { executeProcess, isVerbose } from '@code-pushup/utils';
 import type { CommandContext } from '../context.js';
 
 type CompareOptions = {
@@ -10,21 +10,21 @@ type CompareOptions = {
 
 export async function runCompare(
   { before, after, label }: CompareOptions,
-  { bin, config, directory, silent }: CommandContext,
+  { bin, config, directory, observer }: CommandContext,
 ): Promise<void> {
-  const { stdout } = await executeProcess({
+  await executeProcess({
     command: bin,
     args: [
       'compare',
+      ...(isVerbose() ? ['--verbose'] : []),
+      '--no-progress',
       `--before=${before}`,
       `--after=${after}`,
       ...(label ? [`--label=${label}`] : []),
       ...(config ? [`--config=${config}`] : []),
       ...DEFAULT_PERSIST_FORMAT.map(format => `--persist.format=${format}`),
     ],
     cwd: directory,
+    observer,
   });
-  if (!silent) {
-    console.info(stdout);
-  }
 }
diff --git a/packages/ci/src/lib/cli/commands/merge-diffs.ts b/packages/ci/src/lib/cli/commands/merge-diffs.ts
@@ -3,30 +3,30 @@ import {
   DEFAULT_PERSIST_FILENAME,
   DEFAULT_PERSIST_OUTPUT_DIR,
 } from '@code-pushup/models';
-import { executeProcess } from '@code-pushup/utils';
+import { executeProcess, isVerbose } from '@code-pushup/utils';
 import type { CommandContext } from '../context.js';
 
 export async function runMergeDiffs(
   files: string[],
-  { bin, config, directory, silent }: CommandContext,
+  { bin, config, directory, observer }: CommandContext,
 ): Promise<string> {
   const outputDir = path.join(directory, DEFAULT_PERSIST_OUTPUT_DIR);
   const filename = `merged-${DEFAULT_PERSIST_FILENAME}`;
 
-  const { stdout } = await executeProcess({
+  await executeProcess({
     command: bin,
     args: [
       'merge-diffs',
+      ...(isVerbose() ? ['--verbose'] : []),
+      '--no-progress',
       ...files.map(file => `--files=${file}`),
       ...(config ? [`--config=${config}`] : []),
       `--persist.outputDir=${outputDir}`,
       `--persist.filename=${filename}`,
     ],
     cwd: directory,
+    observer,
   });
-  if (!silent) {
-    console.info(stdout);
-  }
 
   return path.join(outputDir, `${filename}-diff.md`);
 }
diff --git a/packages/ci/src/lib/cli/commands/print-config.ts b/packages/ci/src/lib/cli/commands/print-config.ts
@@ -3,6 +3,7 @@ import path from 'node:path';
 import {
   executeProcess,
   generateRandomId,
+  isVerbose,
   readJsonFile,
   stringifyError,
 } from '@code-pushup/utils';
@@ -12,24 +13,24 @@ export async function runPrintConfig({
   bin,
   config,
   directory,
-  silent,
+  observer,
 }: CommandContext): Promise<unknown> {
   // random file name so command can be run in parallel
   const outputFile = `code-pushup.${generateRandomId()}.config.json`;
   const outputPath = path.join(directory, outputFile);
 
-  const { stdout } = await executeProcess({
+  await executeProcess({
     command: bin,
     args: [
       ...(config ? [`--config=${config}`] : []),
       'print-config',
+      ...(isVerbose() ? ['--verbose'] : []),
+      '--no-progress',
       `--output=${outputFile}`,
     ],
     cwd: directory,
+    observer,
   });
-  if (!silent) {
-    console.info(stdout);
-  }
 
   try {
     const content = await readJsonFile(outputPath);
diff --git a/packages/ci/src/lib/cli/context.ts b/packages/ci/src/lib/cli/context.ts
@@ -1,10 +1,10 @@
+import { type ProcessObserver, isVerbose } from '@code-pushup/utils';
 import type { Settings } from '../models.js';
 import type { ProjectConfig } from '../monorepo/index.js';
 
-export type CommandContext = Pick<
-  Settings,
-  'bin' | 'config' | 'directory' | 'silent'
->;
+export type CommandContext = Pick<Settings, 'bin' | 'config' | 'directory'> & {
+  observer?: ProcessObserver;
+};
 
 export function createCommandContext(
   settings: Settings,
@@ -14,6 +14,15 @@ export function createCommandContext(
     bin: project?.bin ?? settings.bin,
     directory: project?.directory ?? settings.directory,
     config: settings.config,
-    silent: settings.silent,
+    observer: {
+      onStderr: stderr => {
+        console.warn(stderr);
+      },
+      ...(isVerbose() && {
+        onStdout: stdout => {
+          console.info(stdout);
+        },
+      }),
+    },
   };
 }
diff --git a/packages/ci/src/lib/monorepo/handlers/nx.ts b/packages/ci/src/lib/monorepo/handlers/nx.ts
@@ -25,25 +25,23 @@ export const nxHandler: MonorepoToolHandler = {
     );
   },
 
-  async listProjects(options) {
+  async listProjects({ cwd, task, nxProjectsFilter, observer }) {
     const { stdout } = await executeProcess({
       command: 'npx',
       args: [
         'nx',
         'show',
         'projects',
-        ...toArray(options.nxProjectsFilter).map(arg =>
-          arg.replaceAll('{task}', options.task),
-        ),
+        ...toArray(nxProjectsFilter).map(arg => arg.replaceAll('{task}', task)),
         '--json',
       ],
-      cwd: options.cwd,
-      observer: options.observer,
+      cwd,
+      observer,
     });
     const projects = parseProjects(stdout);
     return projects.toSorted().map(project => ({
       name: project,
-      bin: `npx nx run ${project}:${options.task} --skip-nx-cache --`,
+      bin: `npx nx run ${project}:${task} --skip-nx-cache --`,
     }));
   },
 
diff --git a/packages/ci/src/lib/monorepo/list-projects.ts b/packages/ci/src/lib/monorepo/list-projects.ts
@@ -1,5 +1,6 @@
 import { glob } from 'glob';
 import path from 'node:path';
+import { isVerbose } from '@code-pushup/utils';
 import type { Logger, Settings } from '../models.js';
 import { detectMonorepoTool } from './detect-tool.js';
 import { getToolHandler } from './handlers/index.js';
@@ -95,16 +96,16 @@ function createMonorepoHandlerOptions(
     cwd: settings.directory,
     parallel: settings.parallel,
     nxProjectsFilter: settings.nxProjectsFilter,
-    ...(!settings.silent && {
-      observer: {
+    observer: {
+      onStderr: stderr => {
+        console.warn(stderr);
+      },
+      ...(isVerbose() && {
         onStdout: stdout => {
           console.info(stdout);
         },
-        onStderr: stderr => {
-          console.warn(stderr);
-        },
-      },
-    }),
+      }),
+    },
   };
 }
 
diff --git a/packages/ci/src/lib/run-utils.ts b/packages/ci/src/lib/run-utils.ts
@@ -3,6 +3,7 @@ import path from 'node:path';
 import type { SimpleGit } from 'simple-git';
 import type { CoreConfig, Report, ReportsDiff } from '@code-pushup/models';
 import {
+  isVerbose,
   removeUndefinedAndEmptyProps,
   stringifyError,
 } from '@code-pushup/utils';
@@ -69,6 +70,10 @@ export async function createRunEnv(
   options: Options | undefined,
   git: SimpleGit,
 ): Promise<RunEnv> {
+  console.log(isVerbose());
+  // eslint-disable-next-line functional/immutable-data
+  process.env['CP_VERBOSE'] = options?.silent ? 'false' : 'true';
+  console.log(isVerbose());
   const [head, base] = await Promise.all([
     normalizeGitRef(refs.head, git),
     refs.base && normalizeGitRef(refs.base, git),
diff --git a/packages/ci/src/lib/run.integration.test.ts b/packages/ci/src/lib/run.integration.test.ts
