@code-pushup/core 0.93.0 → 0.95.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/core",
-  "version": "0.93.0",
+  "version": "0.95.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.93.0",
-    "@code-pushup/utils": "0.93.0",
+    "@code-pushup/models": "0.95.0",
+    "@code-pushup/utils": "0.95.0",
     "ansis": "^3.3.0"
   },
   "peerDependencies": {

package/src/index.d.ts

@@ -6,7 +6,7 @@ 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 { persistReport } from './lib/implementation/persist.js';
-export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
+export { autoloadRc, readRcByPath } from './lib/implementation/read-rc-file.js';
 export { AuditOutputsMissingAuditError } from './lib/implementation/runner.js';
 export { mergeDiffs } from './lib/merge-diffs.js';
 export { upload, type UploadOptions } from './lib/upload.js';

package/src/index.js

@@ -5,7 +5,7 @@ export { history, } from './lib/history.js';
 export { collect } from './lib/implementation/collect.js';
 export { executePlugin, executePlugins, } from './lib/implementation/execute-plugin.js';
 export { persistReport } from './lib/implementation/persist.js';
-export { autoloadRc, ConfigPathError, readRcByPath, } from './lib/implementation/read-rc-file.js';
+export { autoloadRc, 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';

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,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,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;AAClD,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,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,sCAAsC,CAAC;AAChF,OAAO,EAAE,6BAA6B,EAAE,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAsB,MAAM,iBAAiB,CAAC"}

package/src/lib/collect-and-persist.d.ts

@@ -1,4 +1,4 @@
-import { type CacheConfigObject, type CoreConfig, type PersistConfig } from '@code-pushup/models';
+import type { CacheConfigObject, CoreConfig, PersistConfig } from '@code-pushup/models';
 export type CollectAndPersistReportsOptions = Pick<CoreConfig, 'plugins' | 'categories'> & {
     persist: Required<Omit<PersistConfig, 'skipReports'>> & Pick<PersistConfig, 'skipReports'>;
     cache: CacheConfigObject;

package/src/lib/collect-and-persist.js

@@ -1,25 +1,23 @@
-import { pluginReportSchema, validate, } from '@code-pushup/models';
 import { logStdoutSummary, logger, scoreReport, sortReport, } from '@code-pushup/utils';
 import { collect } from './implementation/collect.js';
-import { logPersistedResults, persistReport, } from './implementation/persist.js';
+import { logPersistedReport, persistReport } from './implementation/persist.js';
 export async function collectAndPersistReports(options) {
     const reportResult = await collect(options);
     const sortedScoredReport = sortReport(scoreReport(reportResult));
     const { persist } = options;
     const { skipReports = false, ...persistOptions } = persist ?? {};
     if (skipReports) {
-        logger.info('Skipping saving reports as `persist.skipReports` is true');
+        logger.info('Skipped saving report as persist.skipReports flag is set');
     }
     else {
-        const persistResults = await persistReport(reportResult, sortedScoredReport, persistOptions);
-        logPersistedResults(persistResults);
+        const reportFiles = await persistReport(reportResult, sortedScoredReport, persistOptions);
+        logPersistedReport(reportFiles);
     }
     // terminal output
+    logger.newline();
+    logger.newline();
     logStdoutSummary(sortedScoredReport);
-    // validate report and throw if invalid
-    reportResult.plugins.forEach(plugin => {
-        // Running checks after persisting helps while debugging as you can check the invalid output after the error is thrown
-        validate(pluginReportSchema, plugin);
-    });
+    logger.newline();
+    logger.newline();
 }
 //# sourceMappingURL=collect-and-persist.js.map

package/src/lib/collect-and-persist.js.map

@@ -1 +1 @@
-{"version":3,"file":"collect-and-persist.js","sourceRoot":"","sources":["../../../src/lib/collect-and-persist.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,kBAAkB,EAClB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,UAAU,GACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EACL,mBAAmB,EACnB,aAAa,GACd,MAAM,6BAA6B,CAAC;AAWrC,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAwC;IAExC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEjE,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,MAAM,cAAc,GAAG,MAAM,aAAa,CACxC,YAAY,EACZ,kBAAkB,EAClB,cAAc,CACf,CAAC;QACF,mBAAmB,CAAC,cAAc,CAAC,CAAC;IACtC,CAAC;IAED,kBAAkB;IAClB,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IAErC,uCAAuC;IACvC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;QACpC,sHAAsH;QACtH,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"collect-and-persist.js","sourceRoot":"","sources":["../../../src/lib/collect-and-persist.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,UAAU,GACX,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAWhF,MAAM,CAAC,KAAK,UAAU,wBAAwB,CAC5C,OAAwC;IAExC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IAC5C,MAAM,kBAAkB,GAAG,UAAU,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,CAAC;IAEjE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,GAAG,cAAc,EAAE,GAAG,OAAO,IAAI,EAAE,CAAC;IAEjE,IAAI,WAAW,EAAE,CAAC;QAChB,MAAM,CAAC,IAAI,CAAC,0DAA0D,CAAC,CAAC;IAC1E,CAAC;SAAM,CAAC;QACN,MAAM,WAAW,GAAG,MAAM,aAAa,CACrC,YAAY,EACZ,kBAAkB,EAClB,cAAc,CACf,CAAC;QACF,kBAAkB,CAAC,WAAW,CAAC,CAAC;IAClC,CAAC;IAED,kBAAkB;IAClB,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,gBAAgB,CAAC,kBAAkB,CAAC,CAAC;IACrC,MAAM,CAAC,OAAO,EAAE,CAAC;IACjB,MAAM,CAAC,OAAO,EAAE,CAAC;AACnB,CAAC"}

package/src/lib/history.js

@@ -26,7 +26,7 @@ export async function history(config, commits) {
             logger.info('Upload is skipped because skipUploads is set to true.');
         }
         else {
-            if (currentConfig.upload) {
+            if (hasUpload(currentConfig)) {
                 await upload(currentConfig);
             }
             else {
@@ -39,4 +39,7 @@ export async function history(config, commits) {
     await safeCheckout(initialBranch, forceCleanStatus);
     return reports;
 }
+function hasUpload(config) {
+    return config.upload != null;
+}
 //# sourceMappingURL=history.js.map

package/src/lib/history.js.map

@@ -1 +1 @@
-{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../src/lib/history.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,qBAAqB,EACrB,MAAM,EACN,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAarC,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAsB,EACtB,OAAiB;IAEjB,MAAM,aAAa,GAAW,MAAM,qBAAqB,EAAE,CAAC;IAE5D,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAElE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,yDAAyD;IACzD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC;QAC/C,MAAM,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAE7C,MAAM,aAAa,GAAmB;YACpC,GAAG,MAAM;YACT,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,MAAM,EAAE,CAAC,MAAM,CAAC;gBAChB,QAAQ,EAAE,GAAG,MAAM,SAAS;aAC7B;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,KAAK;aACb;SACF,CAAC;QAEF,MAAM,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAE9C,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,IAAI,aAAa,CAAC,MAAM,EAAE,CAAC;gBACzB,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,YAAY,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC;AACjB,CAAC"}
+{"version":3,"file":"history.js","sourceRoot":"","sources":["../../../src/lib/history.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,qBAAqB,EACrB,MAAM,EACN,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAarC,MAAM,CAAC,KAAK,UAAU,OAAO,CAC3B,MAAsB,EACtB,OAAiB;IAEjB,MAAM,aAAa,GAAW,MAAM,qBAAqB,EAAE,CAAC;IAE5D,MAAM,EAAE,WAAW,GAAG,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC;IAElE,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,yDAAyD;IACzD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,CAAC,IAAI,CAAC,yBAAyB,MAAM,EAAE,CAAC,CAAC;QAC/C,MAAM,YAAY,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QAE7C,MAAM,aAAa,GAAmB;YACpC,GAAG,MAAM;YACT,OAAO,EAAE;gBACP,GAAG,OAAO;gBACV,MAAM,EAAE,CAAC,MAAM,CAAC;gBAChB,QAAQ,EAAE,GAAG,MAAM,SAAS;aAC7B;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,KAAK;gBACX,KAAK,EAAE,KAAK;aACb;SACF,CAAC;QAEF,MAAM,wBAAwB,CAAC,aAAa,CAAC,CAAC;QAE9C,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;QACvE,CAAC;aAAM,CAAC;YACN,IAAI,SAAS,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC7B,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;YAC9B,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,uDAAuD,CAAC,CAAC;YACvE,CAAC;QACH,CAAC;QAED,qDAAqD;QACrD,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAED,MAAM,YAAY,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;IAEpD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,SAAS,SAAS,CAChB,MAAsB;IAEtB,OAAO,MAAM,CAAC,MAAM,IAAI,IAAI,CAAC;AAC/B,CAAC"}

package/src/lib/implementation/collect.js

@@ -1,5 +1,6 @@
+import ansis from 'ansis';
 import { createRequire } from 'node:module';
-import { calcDuration, getLatestCommit } from '@code-pushup/utils';
+import { calcDuration, getLatestCommit, logger, pluralizeToken, } from '@code-pushup/utils';
 import { executePlugins } from './execute-plugin.js';
 /**
  * Run audits, collect plugin output and aggregate it into a JSON object
@@ -9,9 +10,14 @@ export async function collect(options) {
     const { plugins, categories, persist = {}, cache } = options;
     const date = new Date().toISOString();
     const start = performance.now();
+    const packageJson = createRequire(import.meta.url)('../../../package.json');
     const commit = await getLatestCommit();
+    logger.debug(commit
+        ? `Found latest commit ${commit.hash} ("${commit.message}" by ${commit.author})`
+        : 'Latest commit not found');
+    logger.info(`Collecting report from ${pluralizeToken('plugin', plugins.length)} ...`);
     const pluginOutputs = await executePlugins({ plugins, persist, cache });
-    const packageJson = createRequire(import.meta.url)('../../../package.json');
+    logger.info(ansis.green('Collected report ✓'));
     return {
         commit,
         packageName: packageJson.name,

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

@@ -1 +1 @@
-{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../../src/lib/implementation/collect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAO5C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAuB;IACnD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAC7D,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,MAAM,MAAM,GAAG,MAAM,eAAe,EAAE,CAAC;IACvC,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAChD,uBAAuB,CACkB,CAAC;IAC5C,OAAO;QACL,MAAM;QACN,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,IAAI;QACJ,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;QAC7B,UAAU;QACV,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}
+{"version":3,"file":"collect.js","sourceRoot":"","sources":["../../../../src/lib/implementation/collect.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAO5C,OAAO,EACL,YAAY,EACZ,eAAe,EACf,MAAM,EACN,cAAc,GACf,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAOrD;;;GAGG;AACH,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAuB;IACnD,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IAE7D,MAAM,IAAI,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACtC,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAChC,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAChD,uBAAuB,CACkB,CAAC;IAE5C,MAAM,MAAM,GAAG,MAAM,eAAe,EAAE,CAAC;IACvC,MAAM,CAAC,KAAK,CACV,MAAM;QACJ,CAAC,CAAC,uBAAuB,MAAM,CAAC,IAAI,MAAM,MAAM,CAAC,OAAO,QAAQ,MAAM,CAAC,MAAM,GAAG;QAChF,CAAC,CAAC,yBAAyB,CAC9B,CAAC;IAEF,MAAM,CAAC,IAAI,CACT,0BAA0B,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CACzE,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,cAAc,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IACxE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAE/C,OAAO;QACL,MAAM;QACN,WAAW,EAAE,WAAW,CAAC,IAAI;QAC7B,OAAO,EAAE,WAAW,CAAC,OAAO;QAC5B,IAAI;QACJ,QAAQ,EAAE,YAAY,CAAC,KAAK,CAAC;QAC7B,UAAU;QACV,OAAO,EAAE,aAAa;KACvB,CAAC;AACJ,CAAC"}

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

@@ -1,4 +1,9 @@
 import type { PersistConfig, Report } from '@code-pushup/models';
-import { type MultipleFileResults, type ScoredReport } from '@code-pushup/utils';
-export declare function persistReport(report: Report, sortedScoredReport: ScoredReport, options: Required<Omit<PersistConfig, 'skipReports'>>): Promise<MultipleFileResults>;
-export declare function logPersistedResults(persistResults: MultipleFileResults): void;
+import { type ScoredReport } from '@code-pushup/utils';
+type FileSize = {
+    file: string;
+    size: number;
+};
+export declare function persistReport(report: Report, sortedScoredReport: ScoredReport, options: Required<Omit<PersistConfig, 'skipReports'>>): Promise<FileSize[]>;
+export declare function logPersistedReport(reportFiles: FileSize[]): void;
+export {};

package/src/lib/implementation/persist.js

@@ -1,9 +1,10 @@
 import ansis from 'ansis';
 import { mkdir, stat, writeFile } from 'node:fs/promises';
-import { createReportPath, directoryExists, generateMdReport, logMultipleFileResults, stringifyError, } from '@code-pushup/utils';
+import path from 'node:path';
+import { createReportPath, directoryExists, formatBytes, generateMdReport, logger, stringifyError, } from '@code-pushup/utils';
 export async function persistReport(report, sortedScoredReport, options) {
     const { outputDir, filename, format } = options;
-    // collect physical format outputs
+    // format report
     const results = format.map((reportType) => {
         switch (reportType) {
             case 'json':
@@ -27,18 +28,23 @@ export async function persistReport(report, sortedScoredReport, options) {
         }
     }
     // write relevant format outputs to file system
-    return Promise.allSettled(results.map(result => persistResult(createReportPath({ outputDir, filename, format: result.format }), result.content)));
+    return Promise.all(results.map(result => persistResult(createReportPath({ outputDir, filename, format: result.format }), result.content)));
 }
 function persistResult(reportPath, content) {
     return (writeFile(reportPath, content)
         // return reportPath instead of void
         .then(() => stat(reportPath))
-        .then(stats => [reportPath, stats.size])
+        .then((stats) => ({ file: reportPath, size: stats.size }))
         .catch((error) => {
-        throw new Error(`Failed to persist report in ${ansis.bold(reportPath)} - ${stringifyError(error)}`);
+        throw new Error(`Failed to save report in ${ansis.bold(reportPath)} - ${stringifyError(error)}`);
     }));
 }
-export function logPersistedResults(persistResults) {
-    logMultipleFileResults(persistResults, 'Generated reports');
+export function logPersistedReport(reportFiles) {
+    logger.info(`Persisted report to file system:`);
+    reportFiles.forEach(({ file, size }) => {
+        const name = ansis.bold(path.relative(process.cwd(), file));
+        const suffix = ansis.gray(`(${formatBytes(size)})`);
+        logger.info(`• ${name} ${suffix}`);
+    });
 }
 //# sourceMappingURL=persist.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../src/lib/implementation/persist.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAGL,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,sBAAsB,EACtB,cAAc,GACf,MAAM,oBAAoB,CAAC;AAE5B,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,MAAc,EACd,kBAAgC,EAChC,OAAqD;IAErD,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,MAAM,IAAI,KAAK,CACb,wCAAwC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,CAC3F,CAAC;QACJ,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,SAAS,aAAa,CAAC,UAAkB,EAAE,OAAe;IACxD,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,CAAC,KAAc,EAAE,EAAE;QACxB,MAAM,IAAI,KAAK,CACb,+BAA+B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,cAAc,CAAC,KAAK,CAAC,EAAE,CACnF,CAAC;IACJ,CAAC,CAAC,CACL,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,cAAmC;IACrE,sBAAsB,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"persist.js","sourceRoot":"","sources":["../../../../src/lib/implementation/persist.ts"],"names":[],"mappings":"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"}

package/src/lib/implementation/read-rc-file.d.ts

@@ -1,6 +1,3 @@
 import { type CoreConfig } from '@code-pushup/models';
-export declare class ConfigPathError extends Error {
-    constructor(configPath: string);
-}
 export declare function readRcByPath(filePath: string, tsconfig?: string): Promise<CoreConfig>;
 export declare function autoloadRc(tsconfig?: string): Promise<CoreConfig>;

package/src/lib/implementation/read-rc-file.js

@@ -1,26 +1,33 @@
+import ansis from 'ansis';
 import path from 'node:path';
 import { CONFIG_FILE_NAME, SUPPORTED_CONFIG_FILE_FORMATS, coreConfigSchema, validate, } from '@code-pushup/models';
-import { fileExists, importModule } from '@code-pushup/utils';
-export class ConfigPathError extends Error {
-    constructor(configPath) {
-        super(`Provided path '${configPath}' is not valid.`);
-    }
-}
+import { fileExists, importModule, logger } from '@code-pushup/utils';
 export async function readRcByPath(filePath, tsconfig) {
-    if (filePath.length === 0) {
-        throw new Error('The path to the configuration file is empty.');
-    }
-    if (!(await fileExists(filePath))) {
-        throw new ConfigPathError(filePath);
-    }
-    const cfg = await importModule({
-        filepath: filePath,
-        tsconfig,
-        format: 'esm',
+    const formattedTarget = [
+        `${ansis.bold(path.relative(process.cwd(), filePath))}`,
+        tsconfig &&
+            `(paths from ${ansis.bold(path.relative(process.cwd(), tsconfig))})`,
+    ]
+        .filter(Boolean)
+        .join(' ');
+    const value = await logger.task(`Importing config from ${formattedTarget}`, async () => {
+        const result = await importModule({
+            filepath: filePath,
+            tsconfig,
+            format: 'esm',
+        });
+        return { result, message: `Imported config from ${formattedTarget}` };
     });
-    return validate(coreConfigSchema, cfg, { filePath });
+    const config = validate(coreConfigSchema, value, { filePath });
+    logger.info('Configuration is valid ✓');
+    return config;
 }
 export async function autoloadRc(tsconfig) {
+    const configFilePatterns = [
+        CONFIG_FILE_NAME,
+        `{${SUPPORTED_CONFIG_FILE_FORMATS.join(',')}}`,
+    ].join('.');
+    logger.debug(`Looking for default config file ${configFilePatterns}`);
     // eslint-disable-next-line functional/no-let
     let ext = '';
     // eslint-disable-next-line functional/no-loop-statements
@@ -28,12 +35,13 @@ export async function autoloadRc(tsconfig) {
         const filePath = `${CONFIG_FILE_NAME}.${extension}`;
         const exists = await fileExists(filePath);
         if (exists) {
+            logger.debug(`Found default config file ${ansis.bold(filePath)}`);
             ext = extension;
             break;
         }
     }
     if (!ext) {
-        throw new Error(`No file ${CONFIG_FILE_NAME}.(${SUPPORTED_CONFIG_FILE_FORMATS.join('|')}) present in ${process.cwd()}`);
+        throw new Error(`No ${configFilePatterns} file present in ${process.cwd()}`);
     }
     return readRcByPath(path.join(process.cwd(), `${CONFIG_FILE_NAME}.${ext}`), tsconfig);
 }

package/src/lib/implementation/read-rc-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"read-rc-file.js","sourceRoot":"","sources":["../../../../src/lib/implementation/read-rc-file.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAEhB,6BAA6B,EAC7B,gBAAgB,EAChB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAE9D,MAAM,OAAO,eAAgB,SAAQ,KAAK;IACxC,YAAY,UAAkB;QAC5B,KAAK,CAAC,kBAAkB,UAAU,iBAAiB,CAAC,CAAC;IACvD,CAAC;CACF;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAgB,EAChB,QAAiB;IAEjB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,CAAC,CAAC,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,MAAM,GAAG,GAAe,MAAM,YAAY,CAAC;QACzC,QAAQ,EAAE,QAAQ;QAClB,QAAQ;QACR,MAAM,EAAE,KAAK;KACd,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AACvD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAiB;IAChD,6CAA6C;IAC7C,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,yDAAyD;IACzD,KAAK,MAAM,SAAS,IAAI,6BAA6B,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,gBAAgB,IAAI,SAAS,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,MAAM,EAAE,CAAC;YACX,GAAG,GAAG,SAAS,CAAC;YAChB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CACb,WAAW,gBAAgB,KAAK,6BAA6B,CAAC,IAAI,CAChE,GAAG,CACJ,gBAAgB,OAAO,CAAC,GAAG,EAAE,EAAE,CACjC,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,gBAAgB,IAAI,GAAG,EAAE,CAAC,EACtD,QAAQ,CACT,CAAC;AACJ,CAAC"}
+{"version":3,"file":"read-rc-file.js","sourceRoot":"","sources":["../../../../src/lib/implementation/read-rc-file.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EACL,gBAAgB,EAEhB,6BAA6B,EAC7B,gBAAgB,EAChB,QAAQ,GACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEtE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAgB,EAChB,QAAiB;IAEjB,MAAM,eAAe,GAAG;QACtB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,EAAE;QACvD,QAAQ;YACN,eAAe,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,GAAG;KACvE;SACE,MAAM,CAAC,OAAO,CAAC;SACf,IAAI,CAAC,GAAG,CAAC,CAAC;IAEb,MAAM,KAAK,GAAG,MAAM,MAAM,CAAC,IAAI,CAC7B,yBAAyB,eAAe,EAAE,EAC1C,KAAK,IAAI,EAAE;QACT,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC;YAChC,QAAQ,EAAE,QAAQ;YAClB,QAAQ;YACR,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QACH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,eAAe,EAAE,EAAE,CAAC;IACxE,CAAC,CACF,CAAC;IAEF,MAAM,MAAM,GAAG,QAAQ,CAAC,gBAAgB,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC/D,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;IACxC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAiB;IAChD,MAAM,kBAAkB,GAAG;QACzB,gBAAgB;QAChB,IAAI,6BAA6B,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG;KAC/C,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAEZ,MAAM,CAAC,KAAK,CAAC,mCAAmC,kBAAkB,EAAE,CAAC,CAAC;IAEtE,6CAA6C;IAC7C,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,yDAAyD;IACzD,KAAK,MAAM,SAAS,IAAI,6BAA6B,EAAE,CAAC;QACtD,MAAM,QAAQ,GAAG,GAAG,gBAAgB,IAAI,SAAS,EAAE,CAAC;QACpD,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,CAAC;QAE1C,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,CAAC,KAAK,CAAC,6BAA6B,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAClE,GAAG,GAAG,SAAS,CAAC;YAChB,MAAM;QACR,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,EAAE,CAAC;QACT,MAAM,IAAI,KAAK,CACb,MAAM,kBAAkB,oBAAoB,OAAO,CAAC,GAAG,EAAE,EAAE,CAC5D,CAAC;IACJ,CAAC;IAED,OAAO,YAAY,CACjB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,GAAG,gBAAgB,IAAI,GAAG,EAAE,CAAC,EACtD,QAAQ,CACT,CAAC;AACJ,CAAC"}

package/src/lib/implementation/runner.js

@@ -2,7 +2,7 @@ import ansis from 'ansis';
 import { writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { auditOutputsSchema, validate, } from '@code-pushup/models';
-import { calcDuration, ensureDirectoryExists, executeProcess, fileExists, readJsonFile, removeDirectoryIfExists, runnerArgsToEnv, } from '@code-pushup/utils';
+import { calcDuration, ensureDirectoryExists, executeProcess, fileExists, logger, readJsonFile, removeDirectoryIfExists, runnerArgsToEnv, } from '@code-pushup/utils';
 import { normalizeAuditOutputs } from '../normalize.js';
 export async function executeRunnerConfig(config, args) {
     const { outputFile, outputTransform } = config;
@@ -67,17 +67,23 @@ export async function writeRunnerResults(pluginSlug, outputDir, runnerResult) {
     const cacheFilePath = getRunnerOutputsPath(pluginSlug, outputDir);
     await ensureDirectoryExists(path.dirname(cacheFilePath));
     await writeFile(cacheFilePath, JSON.stringify(runnerResult.audits, null, 2));
+    logger.info(`Wrote runner output to cache ${formatCachePathSuffix(cacheFilePath)}`);
 }
 export async function readRunnerResults(pluginSlug, outputDir) {
-    const auditOutputsPath = getRunnerOutputsPath(pluginSlug, outputDir);
-    if (await fileExists(auditOutputsPath)) {
-        const cachedResult = await readJsonFile(auditOutputsPath);
+    const cachePath = getRunnerOutputsPath(pluginSlug, outputDir);
+    if (await fileExists(cachePath)) {
+        const cachedResult = await readJsonFile(cachePath);
+        logger.info(`Read runner output from cache ${formatCachePathSuffix(cachePath)}`);
         return {
             audits: cachedResult,
             duration: 0,
             date: new Date().toISOString(),
         };
     }
+    logger.info(`Cached runner output is not available ${formatCachePathSuffix(cachePath)}`);
     return null;
 }
+function formatCachePathSuffix(cacheFilePath) {
+    return ansis.gray(`(${cacheFilePath})`);
+}
 //# sourceMappingURL=runner.js.map

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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"}

package/src/lib/load-portal-client.d.ts

@@ -1 +1 @@
-export declare function loadPortalClient(): Promise<typeof import('@code-pushup/portal-client') | null>;
+export declare function loadPortalClient(): Promise<typeof import('@code-pushup/portal-client')>;

package/src/lib/load-portal-client.js

@@ -1,12 +1,12 @@
+import ansis from 'ansis';
 import { logger, stringifyError } from '@code-pushup/utils';
 export async function loadPortalClient() {
     try {
         return await import('@code-pushup/portal-client');
     }
     catch (error) {
-        logger.warn(`Failed to import @code-pushup/portal-client - ${stringifyError(error)}`);
-        logger.error('Optional peer dependency @code-pushup/portal-client is not available. Make sure it is installed to enable upload functionality.');
-        return null;
+        logger.error(`Failed to import @code-pushup/portal-client - ${stringifyError(error)}`);
+        throw new Error(`The ${ansis.bold('@code-pushup/portal-client')} peer dependency must be installed to enable uploading to Portal.`);
     }
 }
 //# sourceMappingURL=load-portal-client.js.map

package/src/lib/load-portal-client.js.map

@@ -1 +1 @@
-{"version":3,"file":"load-portal-client.js","sourceRoot":"","sources":["../../../src/lib/load-portal-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAGpC,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,IAAI,CACT,iDAAiD,cAAc,CAAC,KAAK,CAAC,EAAE,CACzE,CAAC;QACF,MAAM,CAAC,KAAK,CACV,iIAAiI,CAClI,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC"}
+{"version":3,"file":"load-portal-client.js","sourceRoot":"","sources":["../../../src/lib/load-portal-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAE5D,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAGpC,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,4BAA4B,CAAC,CAAC;IACpD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,CAAC,KAAK,CACV,iDAAiD,cAAc,CAAC,KAAK,CAAC,EAAE,CACzE,CAAC;QACF,MAAM,IAAI,KAAK,CACb,OAAO,KAAK,CAAC,IAAI,CAAC,4BAA4B,CAAC,mEAAmE,CACnH,CAAC;IACJ,CAAC;AACH,CAAC"}

package/src/lib/upload.d.ts

@@ -1,12 +1,9 @@
 import type { PersistConfig, UploadConfig } from '@code-pushup/models';
 export type UploadOptions = {
-    upload?: UploadConfig;
-} & {
+    upload: UploadConfig;
     persist: Required<PersistConfig>;
 };
 /**
  * Uploads collected audits to the portal
- * @param options
- * @param uploadFn
  */
-export declare function upload(options: UploadOptions): Promise<import("@code-pushup/portal-client").ReportUrlFragment | undefined>;
+export declare function upload(options: UploadOptions): Promise<void>;

package/src/lib/upload.js

@@ -1,34 +1,35 @@
-import { loadReport } from '@code-pushup/utils';
+import { formatAsciiLink, loadReport, logger } from '@code-pushup/utils';
 import { reportToGQL } from './implementation/report-to-gql.js';
 import { loadPortalClient } from './load-portal-client.js';
 /**
  * Uploads collected audits to the portal
- * @param options
- * @param uploadFn
  */
 export async function upload(options) {
-    if (options.upload == null) {
-        throw new Error('Upload configuration is not set.');
-    }
-    const portalClient = await loadPortalClient();
-    if (!portalClient) {
-        return;
-    }
-    const { uploadReportToPortal } = portalClient;
-    const { apiKey, server, organization, project, timeout } = options.upload;
-    const report = await loadReport({
-        ...options.persist,
-        format: 'json',
+    await logger.task('Uploading report to Portal', async () => {
+        const portalClient = await loadPortalClient();
+        const { uploadReportToPortal } = portalClient;
+        const { apiKey, server, organization, project, timeout } = options.upload;
+        const report = await loadReport({
+            ...options.persist,
+            format: 'json',
+        });
+        if (!report.commit) {
+            throw new Error('Commit must be linked in order to upload report');
+        }
+        const data = {
+            organization,
+            project,
+            commit: report.commit.hash,
+            ...reportToGQL(report),
+        };
+        const { url } = await uploadReportToPortal({
+            apiKey,
+            server,
+            data,
+            timeout,
+        });
+        logger.info(formatAsciiLink(url));
+        return `Uploaded report to Portal`;
     });
-    if (!report.commit) {
-        throw new Error('Commit must be linked in order to upload report');
-    }
-    const data = {
-        organization,
-        project,
-        commit: report.commit.hash,
-        ...reportToGQL(report),
-    };
-    return uploadReportToPortal({ apiKey, server, data, timeout });
 }
 //# sourceMappingURL=upload.js.map

package/src/lib/upload.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAM3D;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB;IACjD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACtD,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,gBAAgB,EAAE,CAAC;IAC9C,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,OAAO;IACT,CAAC;IACD,MAAM,EAAE,oBAAoB,EAAE,GAAG,YAAY,CAAC;IAC9C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;IAC1E,MAAM,MAAM,GAAW,MAAM,UAAU,CAAC;QACtC,GAAG,OAAO,CAAC,OAAO;QAClB,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;IACrE,CAAC;IAED,MAAM,IAAI,GAAgC;QACxC,YAAY;QACZ,OAAO;QACP,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;QAC1B,GAAG,WAAW,CAAC,MAAM,CAAC;KACvB,CAAC;IAEF,OAAO,oBAAoB,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../../src/lib/upload.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAChE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAO3D;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAAC,OAAsB;IACjD,MAAM,MAAM,CAAC,IAAI,CAAC,4BAA4B,EAAE,KAAK,IAAI,EAAE;QACzD,MAAM,YAAY,GAAG,MAAM,gBAAgB,EAAE,CAAC;QAC9C,MAAM,EAAE,oBAAoB,EAAE,GAAG,YAAY,CAAC;QAC9C,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC;QAC1E,MAAM,MAAM,GAAW,MAAM,UAAU,CAAC;YACtC,GAAG,OAAO,CAAC,OAAO;YAClB,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACnB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;QACrE,CAAC;QAED,MAAM,IAAI,GAAgC;YACxC,YAAY;YACZ,OAAO;YACP,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI;YAC1B,GAAG,WAAW,CAAC,MAAM,CAAC;SACvB,CAAC;QAEF,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,oBAAoB,CAAC;YACzC,MAAM;YACN,MAAM;YACN,IAAI;YACJ,OAAO;SACR,CAAC,CAAC;QACH,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;QAElC,OAAO,2BAA2B,CAAC;IACrC,CAAC,CAAC,CAAC;AACL,CAAC"}