Skip to content

Commit 65a08ea

Browse files
committed
feat(cli): include md format by default
1 parent a8295a5 commit 65a08ea

File tree

7 files changed

+43
-31
lines changed

7 files changed

+43
-31
lines changed

packages/cli/src/lib/collect/collect-command.unit.test.ts

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
import { describe, expect, it, vi } from 'vitest';
22
import { collectAndPersistReports, readRcByPath } from '@code-pushup/core';
3+
import {
4+
DEFAULT_PERSIST_FILENAME,
5+
DEFAULT_PERSIST_FORMAT,
6+
DEFAULT_PERSIST_OUTPUT_DIR,
7+
PersistConfig,
8+
} from '@code-pushup/models';
39
import { DEFAULT_CLI_CONFIGURATION } from '../../../mocks/constants';
410
import { yargsCli } from '../yargs-cli';
511
import { yargsCollectCommandObject } from './collect-command';
@@ -31,10 +37,10 @@ describe('collect-command', () => {
3137
expect(collectAndPersistReports).toHaveBeenCalledWith(
3238
expect.objectContaining({
3339
config: '/test/code-pushup.config.ts',
34-
persist: expect.objectContaining({
35-
filename: 'report',
36-
outputDir: '.code-pushup',
37-
format: ['json'],
40+
persist: expect.objectContaining<Required<PersistConfig>>({
41+
filename: DEFAULT_PERSIST_FILENAME,
42+
outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
43+
format: DEFAULT_PERSIST_FORMAT,
3844
}),
3945
}),
4046
);

packages/cli/src/lib/compare/compare-command.unit.test.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import { join } from 'node:path';
22
import { compareReportFiles } from '@code-pushup/core';
3-
import { PERSIST_FILENAME, PERSIST_OUTPUT_DIR } from '@code-pushup/models';
3+
import {
4+
DEFAULT_PERSIST_FILENAME,
5+
DEFAULT_PERSIST_OUTPUT_DIR,
6+
} from '@code-pushup/models';
47
import { DEFAULT_CLI_CONFIGURATION } from '../../../mocks/constants';
58
import { yargsCli } from '../yargs-cli';
69
import { yargsCompareCommandObject } from './compare-command';
@@ -27,7 +30,7 @@ describe('compare-command', () => {
2730
Parameters<typeof compareReportFiles>
2831
>(
2932
{ before: 'source-report.json', after: 'target-report.json' },
30-
join(PERSIST_OUTPUT_DIR, `${PERSIST_FILENAME}-diff.json`),
33+
join(DEFAULT_PERSIST_OUTPUT_DIR, `${DEFAULT_PERSIST_FILENAME}-diff.json`),
3134
);
3235
});
3336
});

packages/cli/src/lib/implementation/core-config.integration.test.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { describe, expect, vi } from 'vitest';
22
import {
33
CoreConfig,
4-
PERSIST_FILENAME,
5-
PERSIST_FORMAT,
6-
PERSIST_OUTPUT_DIR,
4+
DEFAULT_PERSIST_FILENAME,
5+
DEFAULT_PERSIST_FORMAT,
6+
DEFAULT_PERSIST_OUTPUT_DIR,
77
PersistConfig,
88
UploadConfig,
99
} from '@code-pushup/models';
@@ -61,9 +61,9 @@ describe('parsing values from CLI and middleware', () => {
6161
).parseAsync();
6262

6363
expect(persist).toEqual<PersistConfig>({
64-
filename: PERSIST_FILENAME,
65-
format: PERSIST_FORMAT,
66-
outputDir: PERSIST_OUTPUT_DIR,
64+
filename: DEFAULT_PERSIST_FILENAME,
65+
format: DEFAULT_PERSIST_FORMAT,
66+
outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
6767
});
6868
});
6969

@@ -139,7 +139,7 @@ describe('parsing values from CLI and middleware', () => {
139139

140140
expect(persist).toEqual<PersistConfig>({
141141
filename: 'rc-filename',
142-
format: PERSIST_FORMAT,
142+
format: DEFAULT_PERSIST_FORMAT,
143143
outputDir: 'cli-outputdir',
144144
});
145145
});

packages/cli/src/lib/implementation/core-config.middleware.ts

+9-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { autoloadRc, readRcByPath } from '@code-pushup/core';
22
import {
33
CoreConfig,
4-
PERSIST_FILENAME,
5-
PERSIST_FORMAT,
6-
PERSIST_OUTPUT_DIR,
4+
DEFAULT_PERSIST_FILENAME,
5+
DEFAULT_PERSIST_FORMAT,
6+
DEFAULT_PERSIST_OUTPUT_DIR,
77
uploadConfigSchema,
88
} from '@code-pushup/models';
99
import { CoreConfigCliOptions } from './core-config.model';
@@ -46,9 +46,12 @@ export async function coreConfigMiddleware<
4646
...(config != null && { config }),
4747
persist: {
4848
outputDir:
49-
cliPersist?.outputDir ?? rcPersist?.outputDir ?? PERSIST_OUTPUT_DIR,
50-
format: cliPersist?.format ?? rcPersist?.format ?? PERSIST_FORMAT,
51-
filename: cliPersist?.filename ?? rcPersist?.filename ?? PERSIST_FILENAME,
49+
cliPersist?.outputDir ??
50+
rcPersist?.outputDir ??
51+
DEFAULT_PERSIST_OUTPUT_DIR,
52+
filename:
53+
cliPersist?.filename ?? rcPersist?.filename ?? DEFAULT_PERSIST_FILENAME,
54+
format: cliPersist?.format ?? rcPersist?.format ?? DEFAULT_PERSIST_FORMAT,
5255
},
5356
...(upload != null && { upload }),
5457
categories: rcCategories ?? [],

packages/models/src/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ export {
2121
SUPPORTED_CONFIG_FILE_FORMATS,
2222
} from './lib/implementation/configuration';
2323
export {
24-
PERSIST_FILENAME,
25-
PERSIST_FORMAT,
26-
PERSIST_OUTPUT_DIR,
24+
DEFAULT_PERSIST_FILENAME,
25+
DEFAULT_PERSIST_FORMAT,
26+
DEFAULT_PERSIST_OUTPUT_DIR,
2727
} from './lib/implementation/constants';
2828
export {
2929
MAX_DESCRIPTION_LENGTH,
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Format } from '../persist-config';
22

3-
export const PERSIST_OUTPUT_DIR = '.code-pushup';
4-
export const PERSIST_FORMAT: Format[] = ['json'];
5-
export const PERSIST_FILENAME = 'report';
3+
export const DEFAULT_PERSIST_OUTPUT_DIR = '.code-pushup';
4+
export const DEFAULT_PERSIST_FILENAME = 'report';
5+
export const DEFAULT_PERSIST_FORMAT: Format[] = ['json', 'md'];
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {
2-
PERSIST_FILENAME,
3-
PERSIST_FORMAT,
4-
PERSIST_OUTPUT_DIR,
2+
DEFAULT_PERSIST_FILENAME,
3+
DEFAULT_PERSIST_FORMAT,
4+
DEFAULT_PERSIST_OUTPUT_DIR,
55
PersistConfig,
66
persistConfigSchema,
77
} from '@code-pushup/models';
@@ -10,9 +10,9 @@ export function persistConfigMock(
1010
opt?: Partial<PersistConfig>,
1111
): Required<PersistConfig> {
1212
return persistConfigSchema.parse({
13-
outputDir: PERSIST_OUTPUT_DIR,
14-
filename: PERSIST_FILENAME,
15-
format: PERSIST_FORMAT,
13+
outputDir: DEFAULT_PERSIST_OUTPUT_DIR,
14+
filename: DEFAULT_PERSIST_FILENAME,
15+
format: DEFAULT_PERSIST_FORMAT,
1616
...opt,
1717
}) as Required<PersistConfig>;
1818
}

0 commit comments

Comments
 (0)