@code-pushup/core 0.84.0 → 0.85.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/core",
-  "version": "0.84.0",
+  "version": "0.85.0",
   "license": "MIT",
   "description": "Core business logic for the used by the Code PushUp CLI",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/core#readme",
@@ -39,8 +39,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@code-pushup/models": "0.84.0",
-    "@code-pushup/utils": "0.84.0",
+    "@code-pushup/models": "0.85.0",
+    "@code-pushup/utils": "0.85.0",
     "ansis": "^3.3.0"
   },
   "peerDependencies": {

package/src/index.d.ts

@@ -1,13 +1,13 @@
 export { collectAndPersistReports, type CollectAndPersistReportsOptions, } from './lib/collect-and-persist.js';
 export { compareReportFiles, compareReports, type CompareOptions, } from './lib/compare.js';
-export { getRunnerOutputsPath, type ValidatedRunnerResult, } from './lib/implementation/runner.js';
+export { getRunnerOutputsPath, type RunnerResult, } from './lib/implementation/runner.js';
 export { history, type HistoryOnlyOptions, type HistoryOptions, } from './lib/history.js';
 export { collect, type CollectOptions } from './lib/implementation/collect.js';
 export type { ReportsToCompare } from './lib/implementation/compare-scorables.js';
 export { executePlugin, executePlugins, } from './lib/implementation/execute-plugin.js';
-export { AuditOutputsMissingAuditError } from './lib/implementation/runner.js';
 export { PersistDirError, PersistError, persistReport, } from './lib/implementation/persist.js';
 export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
+export { AuditOutputsMissingAuditError } from './lib/implementation/runner.js';
 export { mergeDiffs } from './lib/merge-diffs.js';
 export type { GlobalOptions } from './lib/types.js';
 export { upload, type UploadOptions } from './lib/upload.js';

package/src/index.js

@@ -4,9 +4,9 @@ export { getRunnerOutputsPath, } from './lib/implementation/runner.js';
 export { history, } from './lib/history.js';
 export { collect } from './lib/implementation/collect.js';
 export { executePlugin, executePlugins, } from './lib/implementation/execute-plugin.js';
-export { AuditOutputsMissingAuditError } from './lib/implementation/runner.js';
 export { PersistDirError, PersistError, persistReport, } from './lib/implementation/persist.js';
 export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
+export { AuditOutputsMissingAuditError } from './lib/implementation/runner.js';
 export { mergeDiffs } from './lib/merge-diffs.js';
 export { upload } from './lib/upload.js';
 //# sourceMappingURL=index.js.map

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,GAEzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,kBAAkB,EAClB,cAAc,GAEf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,GAErB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,OAAO,GAGR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAuB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EACL,aAAa,EACb,cAAc,GACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EACL,eAAe,EACf,YAAY,EACZ,aAAa,GACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EACV,eAAe,EACf,YAAY,GACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAsB,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,wBAAwB,GAEzB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EACL,kBAAkB,EAClB,cAAc,GAEf,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,oBAAoB,GAErB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EACL,OAAO,GAGR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAuB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EACL,aAAa,EACb,cAAc,GACf,MAAM,wCAAwC,CAAC;AAChD,OAAO,EACL,eAAe,EACf,YAAY,EACZ,aAAa,GACd,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,UAAU,EACV,eAAe,EACf,YAAY,GACb,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAsB,MAAM,iBAAiB,CAAC"}

package/src/lib/implementation/runner.d.ts

@@ -2,22 +2,17 @@ import { type AuditOutputs, type PluginConfig, type RunnerArgs, type RunnerConfi
 export type RunnerResult = {
     date: string;
     duration: number;
-    audits: unknown;
-};
-export type ValidatedRunnerResult = Omit<RunnerResult, 'audits'> & {
     audits: AuditOutputs;
 };
-export declare function executeRunnerConfig(config: RunnerConfig, args: RunnerArgs): Promise<RunnerResult>;
-export declare function executeRunnerFunction(runner: RunnerFunction, args: RunnerArgs): Promise<RunnerResult>;
+export declare function executeRunnerConfig(config: RunnerConfig, args: RunnerArgs): Promise<unknown>;
+export declare function executeRunnerFunction(runner: RunnerFunction, args: RunnerArgs): Promise<unknown>;
 /**
  * Error thrown when plugin output is invalid.
  */
 export declare class AuditOutputsMissingAuditError extends Error {
     constructor(auditSlug: string);
 }
-export declare function executePluginRunner(pluginConfig: Pick<PluginConfig, 'audits' | 'runner'>, args: RunnerArgs): Promise<Omit<RunnerResult, 'audits'> & {
-    audits: AuditOutputs;
-}>;
+export declare function executePluginRunner(pluginConfig: Pick<PluginConfig, 'audits' | 'runner'>, args: RunnerArgs): Promise<RunnerResult>;
 export declare function getRunnerOutputsPath(pluginSlug: string, outputDir: string): string;
 /**
  * Save audit outputs to a file to be able to cache the results
@@ -25,5 +20,5 @@ export declare function getRunnerOutputsPath(pluginSlug: string, outputDir: stri
  * @param pluginSlug
  * @param outputDir
  */
-export declare function writeRunnerResults(pluginSlug: string, outputDir: string, runnerResult: ValidatedRunnerResult): Promise<void>;
-export declare function readRunnerResults(pluginSlug: string, outputDir: string): Promise<ValidatedRunnerResult | null>;
+export declare function writeRunnerResults(pluginSlug: string, outputDir: string, runnerResult: RunnerResult): Promise<void>;
+export declare function readRunnerResults(pluginSlug: string, outputDir: string): Promise<RunnerResult | null>;

package/src/lib/implementation/runner.js

@@ -2,21 +2,13 @@ import { bold } from 'ansis';
 import { writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { auditOutputsSchema, } from '@code-pushup/models';
-import { calcDuration, ensureDirectoryExists, executeProcess, fileExists, isVerbose, readJsonFile, removeDirectoryIfExists, runnerArgsToEnv, ui, } from '@code-pushup/utils';
+import { calcDuration, ensureDirectoryExists, executeProcess, fileExists, readJsonFile, removeDirectoryIfExists, runnerArgsToEnv, } from '@code-pushup/utils';
 import { normalizeAuditOutputs } from '../normalize.js';
 export async function executeRunnerConfig(config, args) {
     const { outputFile, outputTransform } = config;
-    const { duration, date } = await executeProcess({
+    await executeProcess({
         command: config.command,
         args: config.args,
-        observer: {
-            onStdout: stdout => {
-                if (isVerbose()) {
-                    ui().logger.log(stdout);
-                }
-            },
-            onStderr: stderr => ui().logger.error(stderr),
-        },
         env: { ...process.env, ...runnerArgsToEnv(args) },
     });
     // read process output from the file system and parse it
@@ -25,24 +17,12 @@ export async function executeRunnerConfig(config, args) {
     await removeDirectoryIfExists(path.dirname(outputFile));
     // transform unknownAuditOutputs to auditOutputs
     const audits = outputTransform ? await outputTransform(outputs) : outputs;
-    // create runner result
-    return {
-        duration,
-        date,
-        audits,
-    };
+    return audits;
 }
 export async function executeRunnerFunction(runner, args) {
-    const date = new Date().toISOString();
-    const start = performance.now();
     // execute plugin runner
     const audits = await runner(args);
-    // create runner result
-    return {
-        date,
-        duration: calcDuration(start),
-        audits,
-    };
+    return audits;
 }
 /**
  * Error thrown when plugin output is invalid.
@@ -54,10 +34,12 @@ export class AuditOutputsMissingAuditError extends Error {
 }
 export async function executePluginRunner(pluginConfig, args) {
     const { audits: pluginConfigAudits, runner } = pluginConfig;
-    const runnerResult = typeof runner === 'object'
+    const date = new Date().toISOString();
+    const start = performance.now();
+    const unvalidatedAuditOutputs = typeof runner === 'object'
         ? await executeRunnerConfig(runner, args)
         : await executeRunnerFunction(runner, args);
-    const { audits: unvalidatedAuditOutputs, ...executionMeta } = runnerResult;
+    const duration = calcDuration(start);
     const result = auditOutputsSchema.safeParse(unvalidatedAuditOutputs);
     if (!result.success) {
         throw new Error(`Audit output is invalid: ${result.error.message}`);
@@ -65,7 +47,8 @@ export async function executePluginRunner(pluginConfig, args) {
     const auditOutputs = result.data;
     auditOutputsCorrelateWithPluginOutput(auditOutputs, pluginConfigAudits);
     return {
-        ...executionMeta,
+        date,
+        duration,
         audits: await normalizeAuditOutputs(auditOutputs),
     };
 }

package/src/lib/implementation/runner.js.map

@@ -1 +1 @@
-{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../src/lib/implementation/runner.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../../../src/lib/implementation/runner.ts"],"names":[],"mappings":"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"}