Skip to content

Commit e313d2f

Browse files
committed
refactor: add various logs WIP
1 parent 470dd72 commit e313d2f

File tree

5 files changed

+21
-3
lines changed

5 files changed

+21
-3
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export async function collectAndPersistReports(
2828

2929
const report = await collect(options);
3030
const sortedScoredReport = sortReport(scoreReport(report));
31+
3132
const persistResults = await persistReport(
3233
report,
3334
sortedScoredReport,

packages/core/src/lib/implementation/collect.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { createRequire } from 'node:module';
22
import type { CoreConfig, Report } from '@code-pushup/models';
3-
import { calcDuration, getLatestCommit } from '@code-pushup/utils';
3+
import { calcDuration, getLatestCommit, ui } from '@code-pushup/utils';
44
import type { GlobalOptions } from '../types.js';
55
import { executePlugins } from './execute-plugin.js';
66

@@ -12,6 +12,7 @@ export type CollectOptions = Pick<CoreConfig, 'plugins' | 'categories'> &
1212
* @param options
1313
*/
1414
export async function collect(options: CollectOptions): Promise<Report> {
15+
ui().logger.log('Running collect');
1516
const { plugins, categories } = options;
1617
const date = new Date().toISOString();
1718
const start = performance.now();

packages/core/src/lib/implementation/runner.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@ import type {
44
RunnerConfig,
55
RunnerFunction,
66
} from '@code-pushup/models';
7-
import { calcDuration, executeProcess, readJsonFile } from '@code-pushup/utils';
7+
import {
8+
calcDuration,
9+
executeProcess,
10+
readJsonFile,
11+
removeDirectoryIfExists,
12+
} from '@code-pushup/utils';
813

914
export type RunnerResult = {
1015
date: string;
@@ -26,7 +31,8 @@ export async function executeRunnerConfig(
2631
});
2732

2833
// read process output from file system and parse it
29-
const outputs = await readJsonFile(path.join(process.cwd(), outputFile));
34+
const outputs = await readJsonFile(outputFile);
35+
await removeDirectoryIfExists(path.dirname(outputFile));
3036

3137
// transform unknownAuditOutputs to auditOutputs
3238
const audits = outputTransform ? await outputTransform(outputs) : outputs;

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import {
1212
filePathToCliArg,
1313
objectToCliArgs,
1414
readJsonFile,
15+
ui,
1516
} from '@code-pushup/utils';
1617
import type { ESLintPluginRunnerConfig, ESLintTarget } from '../config.js';
1718
import { lint } from './lint.js';
@@ -25,6 +26,8 @@ export async function executeRunner({
2526
const { slugs, targets } =
2627
await readJsonFile<ESLintPluginRunnerConfig>(runnerConfigPath);
2728

29+
ui().logger.log(`ESLint plugin executing ${targets.length} lint targets`);
30+
2831
const linterOutputs = await targets.reduce(
2932
async (acc, target) => [...(await acc), await lint(target)],
3033
Promise.resolve<LinterOutput[]>([]),

packages/utils/src/lib/execute-process.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
spawn,
77
} from 'node:child_process';
88
import type { Readable, Writable } from 'node:stream';
9+
import { ui } from './logging.js';
910
import { calcDuration } from './reports/utils.js';
1011

1112
/**
@@ -148,6 +149,10 @@ export function executeProcess(cfg: ProcessConfig): Promise<ProcessResult> {
148149
const date = new Date().toISOString();
149150
const start = performance.now();
150151

152+
ui().logger.log(
153+
`Executing command:\n${[command, ...(args || [])].join(' ')}`,
154+
);
155+
151156
return new Promise((resolve, reject) => {
152157
// shell:true tells Windows to use shell command for spawning a child process
153158
const spawnedProcess = spawn(command, args ?? [], {
@@ -179,6 +184,8 @@ export function executeProcess(cfg: ProcessConfig): Promise<ProcessResult> {
179184
const timings = { date, duration: calcDuration(start) };
180185
if (code === 0 || ignoreExitCode) {
181186
onComplete?.();
187+
// todo: maybe if I update spinner instead of logging it will appear with a command it was supposed to be grouped with
188+
ui().logger.log(`Command execution took ${calcDuration(start)}ms`);
182189
resolve({ code, stdout, stderr, ...timings });
183190
} else {
184191
const errorMsg = new ProcessError({ code, stdout, stderr, ...timings });

0 commit comments

Comments
 (0)