Merge branch 'main' into chore/add-zod2md-nx-plugin

Author: John Doe

packages/plugin-coverage/package.json

@@ -37,7 +37,6 @@
     "@code-pushup/models": "0.96.1",
     "@code-pushup/utils": "0.96.1",
     "parse-lcov": "^1.0.4",
-    "yargs": "^17.7.2",
     "zod": "^4.0.5"
   },
   "peerDependencies": {

packages/plugin-coverage/src/bin.ts

@@ -1,6 +1,4 @@
 import { createRequire } from 'node:module';
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
 import {
   type Audit,
   type Group,
@@ -13,7 +11,7 @@ import {
   type CoverageType,
   coveragePluginConfigSchema,
 } from './config.js';
-import { createRunnerConfig } from './runner/index.js';
+import { createRunnerFunction } from './runner/runner.js';
 import { coverageDescription, coverageTypeWeightMapper } from './utils.js';
 
 /**
@@ -60,12 +58,6 @@ export async function coveragePlugin(
     })),
   };
 
-  const runnerScriptPath = path.join(
-    fileURLToPath(path.dirname(import.meta.url)),
-    '..',
-    'bin.js',
-  );
-
   const packageJson = createRequire(import.meta.url)(
     '../../package.json',
   ) as typeof import('../../package.json');
@@ -82,7 +74,7 @@ export async function coveragePlugin(
     version: packageJson.version,
     audits,
     groups: [group],
-    runner: await createRunnerConfig(runnerScriptPath, coverageConfig),
+    runner: createRunnerFunction(coverageConfig),
     ...(scoreTargets && { scoreTargets }),
   };
 }

packages/plugin-coverage/src/lib/coverage-plugin.ts

@@ -1,15 +1,8 @@
 import path from 'node:path';
 import { describe, expect, it } from 'vitest';
-import { type RunnerConfig, pluginConfigSchema } from '@code-pushup/models';
+import { pluginConfigSchema } from '@code-pushup/models';
 import { coveragePlugin } from './coverage-plugin.js';
 
-vi.mock('./runner/index.ts', () => ({
-  createRunnerConfig: vi.fn().mockReturnValue({
-    command: 'node',
-    outputFile: 'runner-output.json',
-  } satisfies RunnerConfig),
-}));
-
 describe('coveragePlugin', () => {
   const LCOV_PATH = path.join(
     'packages',
@@ -30,7 +23,7 @@ describe('coveragePlugin', () => {
         title: 'Code coverage',
         audits: expect.any(Array),
         groups: expect.any(Array),
-        runner: expect.any(Object),
+        runner: expect.any(Function),
       }),
     );
   });

packages/plugin-coverage/src/lib/coverage-plugin.unit.test.ts

@@ -1,54 +1,12 @@
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { expect } from 'vitest';
-import type { AuditOutputs, RunnerConfig } from '@code-pushup/models';
-import { createRunnerFiles, readJsonFile } from '@code-pushup/utils';
-import type { FinalCoveragePluginConfig } from '../config.js';
-import { createRunnerConfig, executeRunner } from './index.js';
+import { type AuditOutputs, DEFAULT_PERSIST_CONFIG } from '@code-pushup/models';
+import { createRunnerFunction } from './runner.js';
 
-describe('createRunnerConfig', () => {
-  it('should create a valid runner config', async () => {
-    const runnerConfig = await createRunnerConfig('executeRunner.ts', {
-      reports: ['coverage/lcov.info'],
-      coverageTypes: ['branch'],
-      scoreTargets: 0.85,
-      continueOnCommandFail: true,
-    });
-    expect(runnerConfig).toStrictEqual<RunnerConfig>({
-      command: 'node',
-      args: [
-        '"executeRunner.ts"',
-        expect.stringContaining('plugin-config.json'),
-        expect.stringContaining('runner-output.json'),
-      ],
-      outputFile: expect.stringContaining('runner-output.json'),
-      configFile: expect.stringContaining('plugin-config.json'),
-    });
-  });
-
-  it('should provide plugin config to runner in JSON file', async () => {
-    const pluginConfig: FinalCoveragePluginConfig = {
-      coverageTypes: ['line'],
-      reports: ['coverage/lcov.info'],
-      coverageToolCommand: { command: 'npm', args: ['run', 'test'] },
-      scoreTargets: 0.85,
-      continueOnCommandFail: true,
-    };
-
-    const { configFile } = await createRunnerConfig(
-      'executeRunner.ts',
-      pluginConfig,
-    );
-
-    expect(configFile).toMatch(/.*plugin-config\.json$/);
-    const config = await readJsonFile<FinalCoveragePluginConfig>(configFile!);
-    expect(config).toStrictEqual(pluginConfig);
-  });
-});
-
-describe('executeRunner', () => {
+describe('createRunnerFunction', () => {
   it('should successfully execute runner', async () => {
-    const config: FinalCoveragePluginConfig = {
+    const runner = createRunnerFunction({
       reports: [
         path.join(
           fileURLToPath(path.dirname(import.meta.url)),
@@ -61,18 +19,11 @@ describe('executeRunner', () => {
       ],
       coverageTypes: ['line'],
       continueOnCommandFail: true,
-    };
-
-    const runnerFiles = await createRunnerFiles(
-      'coverage',
-      JSON.stringify(config),
-    );
-    await executeRunner(runnerFiles);
+    });
 
-    const results = await readJsonFile<AuditOutputs>(
-      runnerFiles.runnerOutputPath,
-    );
-    expect(results).toStrictEqual<AuditOutputs>([
+    await expect(
+      runner({ persist: DEFAULT_PERSIST_CONFIG }),
+    ).resolves.toStrictEqual([
       {
         slug: 'line-coverage',
         score: 0.7,
@@ -112,6 +63,6 @@ describe('executeRunner', () => {
           ],
         },
       },
-    ]);
+    ] satisfies AuditOutputs);
   });
 });

packages/plugin-coverage/src/lib/runner/index.ts

@@ -0,0 +1,34 @@
+import type { RunnerFunction } from '@code-pushup/models';
+import { executeProcess } from '@code-pushup/utils';
+import type { FinalCoveragePluginConfig } from '../config.js';
+import { lcovResultsToAuditOutputs } from './lcov/lcov-runner.js';
+
+export function createRunnerFunction(
+  config: FinalCoveragePluginConfig,
+): RunnerFunction {
+  return async () => {
+    const {
+      reports,
+      coverageToolCommand,
+      continueOnCommandFail,
+      coverageTypes,
+    } = config;
+
+    // Run coverage tool if provided
+    if (coverageToolCommand != null) {
+      const { command, args } = coverageToolCommand;
+      try {
+        await executeProcess({ command, args });
+      } catch {
+        if (!continueOnCommandFail) {
+          throw new Error(
+            'Coverage plugin: Running coverage tool failed. Make sure all your provided tests are passing.',
+          );
+        }
+      }
+    }
+
+    // Calculate coverage from LCOV results
+    return lcovResultsToAuditOutputs(reports, coverageTypes);
+  };
+}

packages/plugin-coverage/src/lib/runner/runner.int.test.ts

@@ -10,4 +10,4 @@ export {
   eslintConfigFromNxProject,
   eslintConfigFromNxProjectAndDeps,
   eslintConfigFromNxProjects,
-} from './lib/nx/index.js';
+} from './lib/nx/nx.js';

packages/plugin-coverage/src/lib/runner/runner.ts

@@ -7,8 +7,8 @@ import {
   eslintPluginOptionsSchema,
 } from './config.js';
 import { ESLINT_PLUGIN_SLUG, ESLINT_PLUGIN_TITLE } from './constants.js';
-import { listAuditsAndGroups } from './meta/index.js';
-import { createRunnerFunction } from './runner/index.js';
+import { listAuditsAndGroups } from './meta/list.js';
+import { createRunnerFunction } from './runner/runner.js';
 
 /**
  * Instantiates Code PushUp ESLint plugin for use in core config.

packages/plugin-eslint/src/index.ts

@@ -1,6 +1,6 @@
 import { pluginConfigSchema } from '@code-pushup/models';
 import { eslintPlugin } from './eslint-plugin.js';
-import * as metaModule from './meta/index.js';
+import * as metaModule from './meta/list.js';
 
 describe('eslintPlugin', () => {
   const listAuditsAndGroupsSpy = vi.spyOn(metaModule, 'listAuditsAndGroups');