@code-pushup/ci 0.54.0 → 0.56.0

package/README.md

@@ -94,20 +94,26 @@ A `Comment` object has the following required properties:
 
 Optionally, you can override default options for further customization:
 
-| Property          | Type                      | Default                          | Description                                                                       |
-| :---------------- | :------------------------ | :------------------------------- | :-------------------------------------------------------------------------------- |
-| `monorepo`        | `boolean \| MonorepoTool` | `false`                          | Enables [monorepo mode](#monorepo-mode)                                           |
-| `projects`        | `string[] \| null`        | `null`                           | Custom projects configuration for [monorepo mode](#monorepo-mode)                 |
-| `task`            | `string`                  | `'code-pushup'`                  | Name of command to run Code PushUp per project in [monorepo mode](#monorepo-mode) |
-| `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                                     |
-| `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                            |
+| Property           | Type                      | Default                          | Description                                                                                                                                              |
+| :----------------- | :------------------------ | :------------------------------- | :------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `monorepo`         | `boolean \| MonorepoTool` | `false`                          | Enables [monorepo mode](#monorepo-mode)                                                                                                                  |
+| `projects`         | `string[] \| null`        | `null`                           | Custom projects configuration for [monorepo mode](#monorepo-mode)                                                                                        |
+| `task`             | `string`                  | `'code-pushup'`                  | Name of command to run Code PushUp per project in [monorepo mode](#monorepo-mode)                                                                        |
+| `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) [^3] |
+| `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                                                                                                            |
+| `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                                                                                                   |
+| `output`           | `string`                  | `'.code-pushup'`                 | Directory where Code PushUp reports will be created (interpolates project name [^2])                                                                     |
 
 [^1]: By default, the `code-pushup.config` file is autodetected as described in [`@code-pushup/cli` docs](../cli/README.md#configuration).
 
+[^2]: In monorepo mode, any occurrence of `{project}` in the `output` path will be replaced with a project name. This separation of folders per project (e.g. `output: '.code-pushup/{project}'`) may be useful for caching purposes.
+
+[^3]: The `{task}` pattern is replaced with the `task` value, so the default behaviour is to list projects using `npx nx show projects --with-target=code-pushup --json`. The `nxProjectsFilter` options gives Nx users the flexibility to filter projects in alternative ways supported by the Nx CLI (e.g. `--affected`, `--projects`, `--exclude`, `--type`) - refer to [options in Nx docs](https://nx.dev/nx-api/nx/documents/show#options) for details.
+
 The `Logger` object has the following required properties:
 
 | Property | Type                        | Description        |

package/index.js

@@ -36,7 +36,7 @@ function exists(value) {
   return value != null;
 }
 function getMissingRefsForCategories(categories, plugins) {
-  if (categories.length === 0) {
+  if (!categories || categories.length === 0) {
     return false;
   }
   const auditRefsFromCategory = categories.flatMap(
@@ -535,12 +535,9 @@ var unrefinedCoreConfigSchema = z14.object({
 var coreConfigSchema = refineCoreConfig(unrefinedCoreConfigSchema);
 function refineCoreConfig(schema) {
   return schema.refine(
-    (coreCfg) => !getMissingRefsForCategories(coreCfg.categories ?? [], coreCfg.plugins),
-    (coreCfg) => ({
-      message: missingRefsForCategoriesErrorMsg(
-        coreCfg.categories ?? [],
-        coreCfg.plugins
-      )
+    ({ categories, plugins }) => !getMissingRefsForCategories(categories, plugins),
+    ({ categories, plugins }) => ({
+      message: missingRefsForCategoriesErrorMsg(categories, plugins)
     })
   );
 }
@@ -597,19 +594,16 @@ var reportSchema = packageVersionSchema({
 ).merge(
   z15.object(
     {
-      categories: z15.array(categoryConfigSchema),
       plugins: z15.array(pluginReportSchema).min(1),
+      categories: z15.array(categoryConfigSchema).optional(),
       commit: commitSchema.describe("Git commit for which report was collected").nullable()
     },
     { description: "Collect output data" }
   )
 ).refine(
-  (report) => !getMissingRefsForCategories(report.categories, report.plugins),
-  (report) => ({
-    message: missingRefsForCategoriesErrorMsg(
-      report.categories,
-      report.plugins
-    )
+  ({ categories, plugins }) => !getMissingRefsForCategories(categories, plugins),
+  ({ categories, plugins }) => ({
+    message: missingRefsForCategoriesErrorMsg(categories, plugins)
   })
 );
 
@@ -819,6 +813,11 @@ function projectToFilename(project) {
 // packages/utils/src/lib/git/git.ts
 import { simpleGit } from "simple-git";
 
+// packages/utils/src/lib/transform.ts
+function toArray(val) {
+  return Array.isArray(val) ? val : [val];
+}
+
 // packages/utils/src/lib/git/git.commits-and-tags.ts
 import { simpleGit as simpleGit2 } from "simple-git";
 
@@ -929,22 +928,26 @@ var nxHandler = {
   tool: "nx",
   async isConfigured(options) {
     return await fileExists(join3(options.cwd, "nx.json")) && (await executeProcess({
-      ...options,
       command: "npx",
-      args: ["nx", "report"]
+      args: ["nx", "report"],
+      cwd: options.cwd,
+      observer: options.observer
     })).code === 0;
   },
   async listProjects(options) {
     const { stdout } = await executeProcess({
-      ...options,
       command: "npx",
       args: [
         "nx",
         "show",
         "projects",
-        `--with-target=${options.task}`,
+        ...toArray(options.nxProjectsFilter).map(
+          (arg) => arg.replaceAll("{task}", options.task)
+        ),
         "--json"
-      ]
+      ],
+      cwd: options.cwd,
+      observer: options.observer
     });
     const projects = parseProjects(stdout);
     return projects.map((project) => ({
@@ -1114,6 +1117,7 @@ function createMonorepoHandlerOptions(settings) {
   return {
     task: settings.task,
     cwd: settings.directory,
+    nxProjectsFilter: settings.nxProjectsFilter,
     ...!settings.silent && {
       observer: {
         onStdout: (stdout) => {
@@ -1171,10 +1175,11 @@ import { simpleGit as simpleGit4 } from "simple-git";
 import path from "node:path";
 function persistCliOptions({
   directory,
-  project
+  project,
+  output
 }) {
   return [
-    `--persist.outputDir=${path.join(directory, DEFAULT_PERSIST_OUTPUT_DIR)}`,
+    `--persist.outputDir=${path.join(directory, output)}`,
     `--persist.filename=${createFilename(project)}`,
     ...DEFAULT_PERSIST_FORMAT.map((format) => `--persist.format=${format}`)
   ];
@@ -1183,9 +1188,10 @@ function persistedCliFiles({
   directory,
   isDiff,
   project,
-  formats
+  formats,
+  output
 }) {
-  const rootDir = path.join(directory, DEFAULT_PERSIST_OUTPUT_DIR);
+  const rootDir = path.join(directory, output);
   const filename = isDiff ? `${createFilename(project)}-diff` : createFilename(project);
   const filePaths = (formats ?? DEFAULT_PERSIST_FORMAT).reduce(
     (acc, format) => ({
@@ -1218,24 +1224,25 @@ async function runCollect({
   config,
   directory,
   silent,
-  project
+  project,
+  output
 }) {
   const { stdout } = await executeProcess({
     command: bin,
     args: [
       ...config ? [`--config=${config}`] : [],
-      ...persistCliOptions({ directory, project })
+      ...persistCliOptions({ directory, project, output })
     ],
     cwd: directory
   });
   if (!silent) {
     console.info(stdout);
   }
-  return persistedCliFiles({ directory, project });
+  return persistedCliFiles({ directory, project, output });
 }
 
 // packages/ci/src/lib/cli/commands/compare.ts
-async function runCompare({ before, after, label }, { bin, config, directory, silent, project }) {
+async function runCompare({ before, after, label }, { bin, config, directory, silent, project, output }) {
   const { stdout } = await executeProcess({
     command: bin,
     args: [
@@ -1244,32 +1251,37 @@ async function runCompare({ before, after, label }, { bin, config, directory, si
       `--after=${after}`,
       ...label ? [`--label=${label}`] : [],
       ...config ? [`--config=${config}`] : [],
-      ...persistCliOptions({ directory, project })
+      ...persistCliOptions({ directory, project, output })
     ],
     cwd: directory
   });
   if (!silent) {
     console.info(stdout);
   }
-  return persistedCliFiles({ directory, isDiff: true, project });
+  return persistedCliFiles({ directory, isDiff: true, project, output });
 }
 
 // packages/ci/src/lib/cli/commands/merge-diffs.ts
-async function runMergeDiffs(files, { bin, config, directory, silent }) {
+async function runMergeDiffs(files, { bin, config, directory, silent, output }) {
   const { stdout } = await executeProcess({
     command: bin,
     args: [
       "merge-diffs",
       ...files.map((file) => `--files=${file}`),
       ...config ? [`--config=${config}`] : [],
-      ...persistCliOptions({ directory })
+      ...persistCliOptions({ directory, output })
     ],
     cwd: directory
   });
   if (!silent) {
     console.info(stdout);
   }
-  return persistedCliFiles({ directory, isDiff: true, formats: ["md"] });
+  return persistedCliFiles({
+    directory,
+    isDiff: true,
+    formats: ["md"],
+    output
+  });
 }
 
 // packages/ci/src/lib/cli/commands/print-config.ts
@@ -1296,7 +1308,8 @@ function createCommandContext(settings, project) {
     bin: project?.bin ?? settings.bin,
     directory: project?.directory ?? settings.directory,
     config: settings.config,
-    silent: settings.silent
+    silent: settings.silent,
+    output: settings.output.replaceAll("{project}", project?.name ?? "")
   };
 }
 
@@ -1350,7 +1363,9 @@ var DEFAULT_SETTINGS = {
   silent: false,
   debug: false,
   detectNewIssues: true,
-  logger: console
+  logger: console,
+  output: DEFAULT_PERSIST_OUTPUT_DIR,
+  nxProjectsFilter: "--with-target={task}"
 };
 
 // packages/ci/src/lib/git.ts
@@ -1510,6 +1525,9 @@ function createIssuesSortCompareFn(report) {
   return (a, b) => getAuditImpactValue(b, report) - getAuditImpactValue(a, report);
 }
 function getAuditImpactValue({ audit, plugin }, report) {
+  if (!report.categories) {
+    return 0;
+  }
   return report.categories.map((category) => {
     const weights = category.refs.map((ref) => {
       if (ref.plugin !== plugin.slug) {
@@ -1519,17 +1537,20 @@ function getAuditImpactValue({ audit, plugin }, report) {
         case "audit":
           return ref.slug === audit.slug ? ref.weight : 0;
         case "group":
-          const group = report.plugins.find(({ slug }) => slug === ref.plugin)?.groups?.find(({ slug }) => slug === ref.slug);
-          if (!group?.refs.length) {
-            return 0;
-          }
-          const groupRatio = (group.refs.find(({ slug }) => slug === audit.slug)?.weight ?? 0) / group.refs.reduce((acc, { weight }) => acc + weight, 0);
-          return ref.weight * groupRatio;
+          return calculateGroupImpact(ref, audit, report);
       }
     });
     return weights.reduce((acc, weight) => acc + weight, 0) / category.refs.reduce((acc, { weight }) => acc + weight, 0);
   }).reduce((acc, value) => acc + value, 0);
 }
+function calculateGroupImpact(ref, audit, report) {
+  const group = report.plugins.find(({ slug }) => slug === ref.plugin)?.groups?.find(({ slug }) => slug === ref.slug);
+  if (!group?.refs.length) {
+    return 0;
+  }
+  const groupRatio = (group.refs.find(({ slug }) => slug === audit.slug)?.weight ?? 0) / group.refs.reduce((acc, { weight }) => acc + weight, 0);
+  return ref.weight * groupRatio;
+}
 
 // packages/ci/src/lib/run.ts
 async function runInCI(refs, api, options, git = simpleGit4()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/ci",
-  "version": "0.54.0",
+  "version": "0.56.0",
   "description": "CI automation logic for Code PushUp (provider-agnostic)",
   "license": "MIT",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/ci#readme",
@@ -28,8 +28,8 @@
   "main": "./index.js",
   "types": "./src/index.d.ts",
   "dependencies": {
-    "@code-pushup/models": "0.54.0",
-    "@code-pushup/utils": "0.54.0",
+    "@code-pushup/models": "0.56.0",
+    "@code-pushup/utils": "0.56.0",
     "glob": "^10.4.5",
     "simple-git": "^3.20.0",
     "yaml": "^2.5.1"

package/src/lib/cli/commands/collect.d.ts

@@ -1,3 +1,3 @@
 import type { CommandContext } from '../context';
 import { type PersistedCliFiles } from '../persist';
-export declare function runCollect({ bin, config, directory, silent, project, }: CommandContext): Promise<PersistedCliFiles>;
+export declare function runCollect({ bin, config, directory, silent, project, output, }: CommandContext): Promise<PersistedCliFiles>;

package/src/lib/cli/commands/compare.d.ts

@@ -5,5 +5,5 @@ type CompareOptions = {
     after: string;
     label?: string;
 };
-export declare function runCompare({ before, after, label }: CompareOptions, { bin, config, directory, silent, project }: CommandContext): Promise<PersistedCliFiles>;
+export declare function runCompare({ before, after, label }: CompareOptions, { bin, config, directory, silent, project, output }: CommandContext): Promise<PersistedCliFiles>;
 export {};

package/src/lib/cli/commands/merge-diffs.d.ts

@@ -1,3 +1,3 @@
 import type { CommandContext } from '../context';
 import { type PersistedCliFiles } from '../persist';
-export declare function runMergeDiffs(files: string[], { bin, config, directory, silent }: CommandContext): Promise<PersistedCliFiles<'md'>>;
+export declare function runMergeDiffs(files: string[], { bin, config, directory, silent, output }: CommandContext): Promise<PersistedCliFiles<'md'>>;

package/src/lib/cli/context.d.ts

@@ -1,6 +1,6 @@
 import type { Settings } from '../models';
 import type { ProjectConfig } from '../monorepo';
-export type CommandContext = Pick<Settings, 'bin' | 'config' | 'directory' | 'silent'> & {
+export type CommandContext = Pick<Settings, 'bin' | 'config' | 'directory' | 'silent' | 'output'> & {
     project?: string;
 };
 export declare function createCommandContext(settings: Settings, project: ProjectConfig | null | undefined): CommandContext;

package/src/lib/cli/persist.d.ts

@@ -8,14 +8,20 @@ export type PersistedCliFiles<T extends Format = Format> = PersistedCliFilesForm
 export type PersistedCliFilesFormats<T extends Format = Format> = {
     [F in T as `${F}FilePath`]: string;
 };
-export declare function persistCliOptions({ directory, project, }: {
+export declare function persistCliOptions({ directory, project, output, }: {
     directory: string;
     project?: string;
+    output: string;
 }): string[];
-export declare function persistedCliFiles<TFormat extends Format = Format>({ directory, isDiff, project, formats, }: {
+export declare function persistedCliFiles<TFormat extends Format = Format>({ directory, isDiff, project, formats, output, }: {
     directory: string;
     isDiff?: boolean;
     project?: string;
     formats?: TFormat[];
+    output: string;
 }): PersistedCliFiles<TFormat>;
-export declare function findPersistedFiles(rootDir: string, files: string[], project?: string): PersistedCliFiles;
+export declare function findPersistedFiles({ rootDir, files, project, }: {
+    rootDir: string;
+    files: string[];
+    project?: string;
+}): PersistedCliFiles;

package/src/lib/issues.d.ts

@@ -1,4 +1,4 @@
-import type { Audit, Issue, PluginMeta, Report, ReportsDiff } from '@code-pushup/models';
+import type { Audit, CategoryRef, Issue, PluginMeta, Report, ReportsDiff } from '@code-pushup/models';
 import { type ChangedFiles } from './git';
 export type SourceFileIssue = Required<Issue> & IssueContext;
 type IssueContext = {
@@ -13,4 +13,5 @@ export declare function filterRelevantIssues({ currReport, prevReport, reportsDi
 }): SourceFileIssue[];
 export declare function issuesMatch(prev: SourceFileIssue, curr: SourceFileIssue, changedFiles: ChangedFiles): boolean;
 export declare function getAuditImpactValue({ audit, plugin }: IssueContext, report: Report): number;
+export declare function calculateGroupImpact(ref: CategoryRef, audit: Audit, report: Report): number;
 export {};

package/src/lib/models.d.ts

@@ -8,6 +8,7 @@ export type Options = {
     monorepo?: boolean | MonorepoTool;
     projects?: string[] | null;
     task?: string;
+    nxProjectsFilter?: string | string[];
     bin?: string;
     config?: string | null;
     directory?: string;
@@ -15,6 +16,7 @@ export type Options = {
     debug?: boolean;
     detectNewIssues?: boolean;
     logger?: Logger;
+    output?: string;
 };
 /**
  * {@link Options} with filled-in defaults.

package/src/lib/monorepo/tools.d.ts

@@ -10,6 +10,7 @@ export type MonorepoHandlerOptions = {
     task: string;
     cwd: string;
     observer?: ProcessObserver;
+    nxProjectsFilter: string | string[];
 };
 export type ProjectConfig = {
     name: string;