@code-pushup/core 0.71.0 → 0.72.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +3 -3
- package/src/index.d.ts +8 -8
- package/src/index.js +5 -5
- package/src/index.js.map +1 -1
- package/src/lib/compare.d.ts +9 -1
- package/src/lib/compare.js +28 -16
- package/src/lib/compare.js.map +1 -1
- package/src/lib/implementation/persist.js +3 -4
- package/src/lib/implementation/persist.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@code-pushup/core",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.72.1",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"description": "Core business logic for the used by the Code PushUp CLI",
|
|
6
6
|
"homepage": "https://github.com/code-pushup/cli/tree/main/packages/core#readme",
|
|
@@ -39,8 +39,8 @@
|
|
|
39
39
|
},
|
|
40
40
|
"type": "module",
|
|
41
41
|
"dependencies": {
|
|
42
|
-
"@code-pushup/models": "0.
|
|
43
|
-
"@code-pushup/utils": "0.
|
|
42
|
+
"@code-pushup/models": "0.72.1",
|
|
43
|
+
"@code-pushup/utils": "0.72.1",
|
|
44
44
|
"ansis": "^3.3.0"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
package/src/index.d.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
export { type CollectAndPersistReportsOptions,
|
|
2
|
-
export { compareReportFiles, compareReports } from './lib/compare.js';
|
|
3
|
-
export { type
|
|
1
|
+
export { collectAndPersistReports, type CollectAndPersistReportsOptions, } from './lib/collect-and-persist.js';
|
|
2
|
+
export { compareReportFiles, compareReports, type CompareOptions, } from './lib/compare.js';
|
|
3
|
+
export { history, type HistoryOnlyOptions, type HistoryOptions, } from './lib/history.js';
|
|
4
|
+
export { collect, type CollectOptions } from './lib/implementation/collect.js';
|
|
4
5
|
export type { ReportsToCompare } from './lib/implementation/compare-scorables.js';
|
|
5
|
-
export {
|
|
6
|
+
export { executePlugin, executePlugins, PluginOutputMissingAuditError, } from './lib/implementation/execute-plugin.js';
|
|
6
7
|
export { PersistDirError, PersistError, persistReport, } from './lib/implementation/persist.js';
|
|
7
|
-
export {
|
|
8
|
-
export { ConfigPathError, autoloadRc, readRcByPath, } from './lib/implementation/read-rc-file.js';
|
|
9
|
-
export type { GlobalOptions } from './lib/types.js';
|
|
10
|
-
export { type UploadOptions, upload } from './lib/upload.js';
|
|
8
|
+
export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
|
|
11
9
|
export { mergeDiffs } from './lib/merge-diffs.js';
|
|
10
|
+
export type { GlobalOptions } from './lib/types.js';
|
|
11
|
+
export { upload, type UploadOptions } from './lib/upload.js';
|
package/src/index.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
export { collectAndPersistReports, } from './lib/collect-and-persist.js';
|
|
2
|
-
export { compareReportFiles, compareReports } from './lib/compare.js';
|
|
2
|
+
export { compareReportFiles, compareReports, } from './lib/compare.js';
|
|
3
|
+
export { history, } from './lib/history.js';
|
|
3
4
|
export { collect } from './lib/implementation/collect.js';
|
|
4
|
-
export {
|
|
5
|
+
export { executePlugin, executePlugins, PluginOutputMissingAuditError, } from './lib/implementation/execute-plugin.js';
|
|
5
6
|
export { PersistDirError, PersistError, persistReport, } from './lib/implementation/persist.js';
|
|
6
|
-
export {
|
|
7
|
-
export { ConfigPathError, autoloadRc, readRcByPath, } from './lib/implementation/read-rc-file.js';
|
|
8
|
-
export { upload } from './lib/upload.js';
|
|
7
|
+
export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
|
|
9
8
|
export { mergeDiffs } from './lib/merge-diffs.js';
|
|
9
|
+
export { upload } from './lib/upload.js';
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
package/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/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,OAAO,GAGR,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,OAAO,EAAuB,MAAM,iCAAiC,CAAC;AAE/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,6BAA6B,GAC9B,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,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD,OAAO,EAAE,MAAM,EAAsB,MAAM,iBAAiB,CAAC"}
|
package/src/lib/compare.d.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import { type PersistConfig, type Report, type ReportsDiff, type UploadConfig } from '@code-pushup/models';
|
|
2
2
|
import { type Diff } from '@code-pushup/utils';
|
|
3
|
-
export
|
|
3
|
+
export type CompareOptions = {
|
|
4
|
+
before?: string;
|
|
5
|
+
after?: string;
|
|
6
|
+
label?: string;
|
|
7
|
+
};
|
|
8
|
+
export declare function compareReportFiles(config: {
|
|
9
|
+
persist: Required<PersistConfig>;
|
|
10
|
+
upload?: UploadConfig;
|
|
11
|
+
}, options?: CompareOptions): Promise<string[]>;
|
|
4
12
|
export declare function compareReports(reports: Diff<Report>): ReportsDiff;
|
package/src/lib/compare.js
CHANGED
|
@@ -1,32 +1,36 @@
|
|
|
1
1
|
import { writeFile } from 'node:fs/promises';
|
|
2
2
|
import { createRequire } from 'node:module';
|
|
3
|
-
import path from 'node:path';
|
|
4
3
|
import { reportSchema, } from '@code-pushup/models';
|
|
5
|
-
import { calcDuration, ensureDirectoryExists, generateMdReportsDiff, readJsonFile, scoreReport, ui, } from '@code-pushup/utils';
|
|
4
|
+
import { calcDuration, createReportPath, ensureDirectoryExists, generateMdReportsDiff, readJsonFile, scoreReport, ui, } from '@code-pushup/utils';
|
|
6
5
|
import { compareAudits, compareCategories, compareGroups, } from './implementation/compare-scorables.js';
|
|
7
6
|
import { loadPortalClient } from './load-portal-client.js';
|
|
8
|
-
export async function compareReportFiles(
|
|
9
|
-
const { outputDir, filename, format } =
|
|
7
|
+
export async function compareReportFiles(config, options) {
|
|
8
|
+
const { outputDir, filename, format } = config.persist;
|
|
9
|
+
const defaultInputPath = (suffix) => createReportPath({ outputDir, filename, format: 'json', suffix });
|
|
10
10
|
const [reportBefore, reportAfter] = await Promise.all([
|
|
11
|
-
readJsonFile(
|
|
12
|
-
readJsonFile(
|
|
11
|
+
readJsonFile(options?.before ?? defaultInputPath('before')),
|
|
12
|
+
readJsonFile(options?.after ?? defaultInputPath('after')),
|
|
13
13
|
]);
|
|
14
14
|
const reports = {
|
|
15
15
|
before: reportSchema.parse(reportBefore),
|
|
16
16
|
after: reportSchema.parse(reportAfter),
|
|
17
17
|
};
|
|
18
18
|
const diff = compareReports(reports);
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
diff.
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
}
|
|
19
|
+
const label = options?.label ?? getLabelFromReports(reports);
|
|
20
|
+
const portalUrl = config.upload &&
|
|
21
|
+
diff.commits &&
|
|
22
|
+
(await fetchPortalComparisonLink(config.upload, diff.commits));
|
|
23
|
+
const diffWithLinks = label || portalUrl
|
|
24
|
+
? { ...diff, ...(label && { label }), ...(portalUrl && { portalUrl }) }
|
|
25
|
+
: diff;
|
|
27
26
|
return Promise.all(format.map(async (fmt) => {
|
|
28
|
-
const outputPath =
|
|
29
|
-
|
|
27
|
+
const outputPath = createReportPath({
|
|
28
|
+
outputDir,
|
|
29
|
+
filename,
|
|
30
|
+
format: fmt,
|
|
31
|
+
suffix: 'diff',
|
|
32
|
+
});
|
|
33
|
+
const content = reportsDiffToFileContent(diffWithLinks, fmt);
|
|
30
34
|
await ensureDirectoryExists(outputDir);
|
|
31
35
|
await writeFile(outputPath, content);
|
|
32
36
|
return outputPath;
|
|
@@ -93,4 +97,12 @@ async function fetchPortalComparisonLink(uploadConfig, commits) {
|
|
|
93
97
|
throw error;
|
|
94
98
|
}
|
|
95
99
|
}
|
|
100
|
+
function getLabelFromReports(reports) {
|
|
101
|
+
if (reports.before.label &&
|
|
102
|
+
reports.after.label &&
|
|
103
|
+
reports.before.label === reports.after.label) {
|
|
104
|
+
return reports.after.label;
|
|
105
|
+
}
|
|
106
|
+
return undefined;
|
|
107
|
+
}
|
|
96
108
|
//# sourceMappingURL=compare.js.map
|
package/src/lib/compare.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/compare.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,
|
|
1
|
+
{"version":3,"file":"compare.js","sourceRoot":"","sources":["../../../../../packages/core/src/lib/compare.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { mkdir, stat, writeFile } from 'node:fs/promises';
|
|
2
|
-
import
|
|
3
|
-
import { directoryExists, generateMdReport, logMultipleFileResults, ui, } from '@code-pushup/utils';
|
|
2
|
+
import { createReportPath, directoryExists, generateMdReport, logMultipleFileResults, ui, } from '@code-pushup/utils';
|
|
4
3
|
export class PersistDirError extends Error {
|
|
5
4
|
constructor(outputDir) {
|
|
6
5
|
super(`outPath: ${outputDir} is no directory.`);
|
|
@@ -14,7 +13,7 @@ export class PersistError extends Error {
|
|
|
14
13
|
export async function persistReport(report, sortedScoredReport, options) {
|
|
15
14
|
const { outputDir, filename, format } = options;
|
|
16
15
|
// collect physical format outputs
|
|
17
|
-
const results = format.map(reportType => {
|
|
16
|
+
const results = format.map((reportType) => {
|
|
18
17
|
switch (reportType) {
|
|
19
18
|
case 'json':
|
|
20
19
|
return {
|
|
@@ -38,7 +37,7 @@ export async function persistReport(report, sortedScoredReport, options) {
|
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
// write relevant format outputs to file system
|
|
41
|
-
return Promise.allSettled(results.map(result => persistResult(
|
|
40
|
+
return Promise.allSettled(results.map(result => persistResult(createReportPath({ outputDir, filename, format: result.format }), result.content)));
|
|
42
41
|
}
|
|
43
42
|
async function persistResult(reportPath, content) {
|
|
44
43
|
return (writeFile(reportPath, content)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/implementation/persist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../../../packages/core/src/lib/implementation/persist.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAGL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,EAAE,GACH,MAAM,oBAAoB,CAAC;AAE5B,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,YAAY,SAAiB;QAC3B,KAAK,CAAC,YAAY,SAAS,mBAAmB,CAAC,CAAC;IAClD,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,KAAK;IACrC,YAAY,UAAkB;QAC5B,KAAK,CAAC,aAAa,UAAU,sBAAsB,CAAC,CAAC;IACvD,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,kBAAgC,EAChC,OAAgC;IAEhC,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;IAEhD,kCAAkC;IAClC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CACxB,CAAC,UAAU,EAAuC,EAAE;QAClD,QAAQ,UAAU,EAAE,CAAC;YACnB,KAAK,MAAM;gBACT,OAAO;oBACL,MAAM,EAAE,MAAM;oBACd,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;iBACzC,CAAC;YACJ,KAAK,IAAI;gBACP,OAAO;oBACL,MAAM,EAAE,IAAI;oBACZ,OAAO,EAAE,gBAAgB,CAAC,kBAAkB,EAAE,EAAE,SAAS,EAAE,CAAC;iBAC7D,CAAC;QACN,CAAC;IACH,CAAC,CACF,CAAC;IAEF,IAAI,CAAC,CAAC,MAAM,eAAe,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QACxC,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9C,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAE,KAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjD,MAAM,IAAI,eAAe,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;IAED,+CAA+C;IAC/C,OAAO,OAAO,CAAC,UAAU,CACvB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CACnB,aAAa,CACX,gBAAgB,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,EAChE,MAAM,CAAC,OAAO,CACf,CACF,CACF,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,UAAkB,EAAE,OAAe;IAC9D,OAAO,CACL,SAAS,CAAC,UAAU,EAAE,OAAO,CAAC;QAC5B,oCAAoC;SACnC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC5B,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,KAAK,CAAC,IAAI,CAAU,CAAC;SAChD,KAAK,CAAC,KAAK,CAAC,EAAE;QACb,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAE,KAAe,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjD,MAAM,IAAI,YAAY,CAAC,UAAU,CAAC,CAAC;IACrC,CAAC,CAAC,CACL,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,cAAmC;IACrE,sBAAsB,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;AAC9D,CAAC"}
|