@code-pushup/cli 0.93.0 → 0.94.0

package/README.md

@@ -331,9 +331,9 @@ Print the resolved configuration.
 
 In addition to the [Common Command Options](#common-command-options), the following options are recognized by the `print-config` command:
 
-| Option         | Required | Type     | Description                                              |
-| -------------- | :------: | -------- | -------------------------------------------------------- |
-| **`--output`** |    no    | `string` | Path to output file to print config (default is stdout). |
+| Option         | Required | Type     | Description                          |
+| -------------- | :------: | -------- | ------------------------------------ |
+| **`--output`** |   yes    | `string` | Path to output file to print config. |
 
 #### `merge-diffs` command
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/cli",
-  "version": "0.93.0",
+  "version": "0.94.0",
   "license": "MIT",
   "description": "A CLI to run all kinds of code quality measurements to align your team with company goals",
   "homepage": "https://code-pushup.dev",
@@ -45,9 +45,9 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@code-pushup/models": "0.93.0",
-    "@code-pushup/core": "0.93.0",
-    "@code-pushup/utils": "0.93.0",
+    "@code-pushup/models": "0.94.0",
+    "@code-pushup/core": "0.94.0",
+    "@code-pushup/utils": "0.94.0",
     "yargs": "^17.7.2",
     "ansis": "^3.3.0",
     "simple-git": "^3.20.0"

package/src/lib/autorun/autorun-command.js

@@ -1,16 +1,13 @@
-import ansis from 'ansis';
 import { collectAndPersistReports, upload, } from '@code-pushup/core';
 import { logger } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
-import { collectSuccessfulLog, renderConfigureCategoriesHint, renderIntegratePortalHint, uploadSuccessfulLog, } from '../implementation/logging.js';
+import { printCliCommand, renderCategoriesHint, renderPortalHint, } from '../implementation/logging.js';
 export function yargsAutorunCommandObject() {
     const command = 'autorun';
     return {
         command,
         describe: 'Shortcut for running collect followed by upload',
         handler: async (args) => {
-            logger.info(ansis.bold(CLI_NAME));
-            logger.debug(`Running ${ansis.bold(command)} command`);
+            printCliCommand(command);
             const options = args;
             // we need to ensure `json` is part of the formats as we want to upload
             const optionsWithFormat = {
@@ -23,19 +20,17 @@ export function yargsAutorunCommandObject() {
                 },
             };
             await collectAndPersistReports(optionsWithFormat);
-            collectSuccessfulLog();
-            if (!options.categories || options.categories.length === 0) {
-                renderConfigureCategoriesHint();
+            if (!options.categories?.length) {
+                renderCategoriesHint();
+                logger.newline();
             }
             if (options.upload) {
-                const report = await upload(options);
-                if (report?.url) {
-                    uploadSuccessfulLog(report.url);
-                }
+                await upload(options);
             }
             else {
-                logger.warn('Upload skipped because configuration is not set.');
-                renderIntegratePortalHint();
+                logger.warn('Upload skipped because Portal is not configured.');
+                logger.newline();
+                renderPortalHint();
             }
         },
     };

package/src/lib/autorun/autorun-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"autorun-command.js","sourceRoot":"","sources":["../../../../src/lib/autorun/autorun-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAGL,wBAAwB,EACxB,MAAM,GACP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,oBAAoB,EACpB,6BAA6B,EAC7B,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,8BAA8B,CAAC;AAItC,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,iDAAiD;QAC3D,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,IAAiC,CAAC;YAElD,uEAAuE;YACvE,MAAM,iBAAiB,GAAmB;gBACxC,GAAG,OAAO;gBACV,OAAO,EAAE;oBACP,GAAG,OAAO,CAAC,OAAO;oBAClB,MAAM,EAAE;wBACN,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBACT;iBACzC;aACF,CAAC;YAEF,MAAM,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YAClD,oBAAoB,EAAE,CAAC;YAEvB,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3D,6BAA6B,EAAE,CAAC;YAClC,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;gBACrC,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC;oBAChB,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAClC,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBAChE,yBAAyB,EAAE,CAAC;YAC9B,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"autorun-command.js","sourceRoot":"","sources":["../../../../src/lib/autorun/autorun-command.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,wBAAwB,EACxB,MAAM,GACP,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AAItC,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,iDAAiD;QAC3D,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAAiC,CAAC;YAElD,uEAAuE;YACvE,MAAM,iBAAiB,GAAmB;gBACxC,GAAG,OAAO;gBACV,OAAO,EAAE;oBACP,GAAG,OAAO,CAAC,OAAO;oBAClB,MAAM,EAAE;wBACN,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;qBACT;iBACzC;aACF,CAAC;YAEF,MAAM,wBAAwB,CAAC,iBAAiB,CAAC,CAAC;YAElD,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;gBAChC,oBAAoB,EAAE,CAAC;gBACvB,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;YACxB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;gBAChE,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,gBAAgB,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/cli.js

@@ -1,10 +1,10 @@
 import { commands } from './commands.js';
-import { CLI_NAME, CLI_SCRIPT_NAME } from './constants.js';
+import { CLI_DISPLAY_NAME, CLI_SCRIPT_NAME } from './constants.js';
 import { middlewares } from './middlewares.js';
 import { groups, options } from './options.js';
 import { yargsCli } from './yargs-cli.js';
 export const cli = (args) => yargsCli(args, {
-    usageMessage: CLI_NAME,
+    usageMessage: CLI_DISPLAY_NAME,
     scriptName: CLI_SCRIPT_NAME,
     options,
     groups,

package/src/lib/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/lib/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAc,EAAE,EAAE,CACpC,QAAQ,CAAC,IAAI,EAAE;IACb,YAAY,EAAE,QAAQ;IACtB,UAAU,EAAE,eAAe;IAC3B,OAAO;IACP,MAAM;IACN,QAAQ,EAAE;QACR;YACE,aAAa;YACb,uFAAuF;SACxF;QACD;YACE,mDAAmD;YACnD,wEAAwE;SACzE;QACD;YACE,4CAA4C;YAC5C,wFAAwF;SACzF;QACD;YACE,4CAA4C;YAC5C,4FAA4F;SAC7F;QACD;YACE,yEAAyE;YACzE,2EAA2E;SAC5E;QACD;YACE,8DAA8D;YAC9D,iEAAiE;SAClE;KACF;IACD,WAAW;IACX,QAAQ;CACT,CAAC,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../../src/lib/cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAc,EAAE,EAAE,CACpC,QAAQ,CAAC,IAAI,EAAE;IACb,YAAY,EAAE,gBAAgB;IAC9B,UAAU,EAAE,eAAe;IAC3B,OAAO;IACP,MAAM;IACN,QAAQ,EAAE;QACR;YACE,aAAa;YACb,uFAAuF;SACxF;QACD;YACE,mDAAmD;YACnD,wEAAwE;SACzE;QACD;YACE,4CAA4C;YAC5C,wFAAwF;SACzF;QACD;YACE,4CAA4C;YAC5C,4FAA4F;SAC7F;QACD;YACE,yEAAyE;YACzE,2EAA2E;SAC5E;QACD;YACE,8DAA8D;YAC9D,iEAAiE;SAClE;KACF;IACD,WAAW;IACX,QAAQ;CACT,CAAC,CAAC"}

package/src/lib/collect/collect-command.d.ts

@@ -1,3 +1,2 @@
 import type { CommandModule } from 'yargs';
 export declare function yargsCollectCommandObject(): CommandModule;
-export declare function renderUploadAutorunHint(): void;

package/src/lib/collect/collect-command.js

@@ -1,37 +1,25 @@
-import ansis from 'ansis';
 import { collectAndPersistReports, } from '@code-pushup/core';
-import { formatAsciiLink, formatAsciiSticker, logger, } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
-import { collectSuccessfulLog, renderConfigureCategoriesHint, } from '../implementation/logging.js';
+import { printCliCommand, renderCategoriesHint, renderPortalHint, renderUploadHint, } from '../implementation/logging.js';
 export function yargsCollectCommandObject() {
     const command = 'collect';
     return {
         command,
-        describe: 'Run Plugins and collect results',
+        describe: 'Run plugins and collect results',
         handler: async (args) => {
+            printCliCommand(command);
             const options = args;
-            logger.info(ansis.bold(CLI_NAME));
-            logger.debug(`Running ${ansis.bold(command)} command`);
             await collectAndPersistReports(options);
-            collectSuccessfulLog();
-            if (!options.categories || options.categories.length === 0) {
-                renderConfigureCategoriesHint();
+            if (!options.categories?.length) {
+                renderCategoriesHint();
             }
-            const { upload = {} } = args;
-            if (Object.keys(upload).length === 0) {
-                renderUploadAutorunHint();
+            const { upload } = args;
+            if (upload) {
+                renderUploadHint();
+            }
+            else {
+                renderPortalHint();
             }
         },
     };
 }
-export function renderUploadAutorunHint() {
-    logger.info(formatAsciiSticker([
-        ansis.bold.gray('💡 Visualize your reports'),
-        '',
-        `${ansis.gray('❯')} npx code-pushup upload - ${ansis.gray('Run upload to upload the created report to the server')}`,
-        `  ${formatAsciiLink('https://github.com/code-pushup/cli/tree/main/packages/cli#upload-command')}`,
-        `${ansis.gray('❯')} npx code-pushup autorun - ${ansis.gray('Run collect & upload')}`,
-        `  ${formatAsciiLink('https://github.com/code-pushup/cli/tree/main/packages/cli#autorun-command')}`,
-    ]));
-}
 //# sourceMappingURL=collect-command.js.map

package/src/lib/collect/collect-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"collect-command.js","sourceRoot":"","sources":["../../../../src/lib/collect/collect-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAEL,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,MAAM,GACP,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,oBAAoB,EACpB,6BAA6B,GAC9B,MAAM,8BAA8B,CAAC;AAEtC,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,MAAM,OAAO,GAAG,IAAkD,CAAC;YACnE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC;YACxC,oBAAoB,EAAE,CAAC;YAEvB,IAAI,CAAC,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC3D,6BAA6B,EAAE,CAAC;YAClC,CAAC;YAED,MAAM,EAAE,MAAM,GAAG,EAAE,EAAE,GAAG,IAGvB,CAAC;YACF,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrC,uBAAuB,EAAE,CAAC;YAC5B,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,uBAAuB;IACrC,MAAM,CAAC,IAAI,CACT,kBAAkB,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,2BAA2B,CAAC;QAC5C,EAAE;QACF,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,6BAA6B,KAAK,CAAC,IAAI,CACvD,uDAAuD,CACxD,EAAE;QACH,KAAK,eAAe,CAClB,0EAA0E,CAC3E,EAAE;QACH,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,8BAA8B,KAAK,CAAC,IAAI,CAAC,sBAAsB,CAAC,EAAE;QACpF,KAAK,eAAe,CAClB,2EAA2E,CAC5E,EAAE;KACJ,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"collect-command.js","sourceRoot":"","sources":["../../../../src/lib/collect/collect-command.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,wBAAwB,GACzB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,iCAAiC;QAC3C,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAAkD,CAAC;YAEnE,MAAM,wBAAwB,CAAC,OAAO,CAAC,CAAC;YAExC,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,MAAM,EAAE,CAAC;gBAChC,oBAAoB,EAAE,CAAC;YACzB,CAAC;YAED,MAAM,EAAE,MAAM,EAAE,GAAG,IAGlB,CAAC;YACF,IAAI,MAAM,EAAE,CAAC;gBACX,gBAAgB,EAAE,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,gBAAgB,EAAE,CAAC;YACrB,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/compare/compare-command.js

@@ -1,8 +1,8 @@
 import ansis from 'ansis';
 import { compareReportFiles } from '@code-pushup/core';
 import { logger } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
 import { yargsCompareOptionsDefinition } from '../implementation/compare.options.js';
+import { printCliCommand } from '../implementation/logging.js';
 export function yargsCompareCommandObject() {
     const command = 'compare';
     return {
@@ -10,8 +10,7 @@ export function yargsCompareCommandObject() {
         describe: 'Compare 2 report files and create a diff file',
         builder: yargsCompareOptionsDefinition(),
         handler: async (args) => {
-            logger.info(ansis.bold(CLI_NAME));
-            logger.debug(`Running ${ansis.bold(command)} command`);
+            printCliCommand(command);
             const options = args;
             const { before, after, label, persist, upload } = options;
             const outputPaths = await compareReportFiles({ persist, upload }, { before, after, label });

package/src/lib/compare/compare-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"compare-command.js","sourceRoot":"","sources":["../../../../src/lib/compare/compare-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAuB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AAErF,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,+CAA+C;QACzD,OAAO,EAAE,6BAA6B,EAAE;QACxC,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;YAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAG,IAGf,CAAC;YAEF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAE1D,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CACzB,CAAC;YAEF,MAAM,CAAC,IAAI,CACT,2BAA2B,WAAW;iBACnC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,CACnB,CAAC;QACJ,CAAC;KACsB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"compare-command.js","sourceRoot":"","sources":["../../../../src/lib/compare/compare-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAuB,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAE5E,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,yBAAyB;IACvC,MAAM,OAAO,GAAG,SAAS,CAAC;IAC1B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,+CAA+C;QACzD,OAAO,EAAE,6BAA6B,EAAE;QACxC,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;YAC/B,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAGf,CAAC;YAEF,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC;YAE1D,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAC1C,EAAE,OAAO,EAAE,MAAM,EAAE,EACnB,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,CACzB,CAAC;YAEF,MAAM,CAAC,IAAI,CACT,2BAA2B,WAAW;iBACnC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,CACnB,CAAC;QACJ,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/constants.d.ts

@@ -1,2 +1,2 @@
-export declare const CLI_NAME = "Code PushUp CLI";
+export declare const CLI_DISPLAY_NAME = "Code PushUp CLI";
 export declare const CLI_SCRIPT_NAME = "code-pushup";

package/src/lib/constants.js

@@ -1,3 +1,3 @@
-export const CLI_NAME = 'Code PushUp CLI';
+export const CLI_DISPLAY_NAME = 'Code PushUp CLI';
 export const CLI_SCRIPT_NAME = 'code-pushup';
 //# sourceMappingURL=constants.js.map

package/src/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,QAAQ,GAAG,iBAAiB,CAAC;AAC1C,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/lib/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;AAClD,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC"}

package/src/lib/history/history-command.js

@@ -1,14 +1,12 @@
-import ansis from 'ansis';
 import { history } from '@code-pushup/core';
 import { getCurrentBranchOrTag, getHashes, getSemverTags, logger, safeCheckout, } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
 import { yargsFilterOptionsDefinition } from '../implementation/filter.options.js';
+import { printCliCommand } from '../implementation/logging.js';
 import { yargsHistoryOptionsDefinition } from './history.options.js';
 import { normalizeHashOptions } from './utils.js';
 const command = 'history';
 async function handler(args) {
-    logger.info(ansis.bold(CLI_NAME));
-    logger.debug(`Running ${ansis.bold(command)} command`);
+    printCliCommand(command);
     const currentBranch = await getCurrentBranchOrTag();
     const { targetBranch: rawTargetBranch, ...opt } = args;
     const { targetBranch, from, to, maxCount, onlySemverTags, ...historyOptions } = await normalizeHashOptions({

package/src/lib/history/history-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"history-command.js","sourceRoot":"","sources":["../../../../src/lib/history/history-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAuB,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,qBAAqB,EACrB,SAAS,EACT,aAAa,EACb,MAAM,EACN,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AAEnF,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,OAAO,GAAG,SAAS,CAAC;AAC1B,KAAK,UAAU,OAAO,CAAC,IAAa;IAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;IAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAEvD,MAAM,aAAa,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACpD,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,GAAG,EAAE,GAAG,IAClC,CAAC;IACjB,MAAM,EACJ,YAAY,EACZ,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,cAAc,EACd,GAAG,cAAc,EAClB,GAAG,MAAM,oBAAoB,CAAC;QAC7B,GAAG,GAAG;QACN,YAAY,EAAE,eAAe,IAAI,aAAa;KAC/C,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;IAC3D,MAAM,OAAO,GAAgB,cAAc;QACzC,CAAC,CAAC,MAAM,aAAa,CAAC,aAAa,CAAC;QACpC,CAAC,CAAC,MAAM,SAAS,CAAC,aAAa,CAAC,CAAC;IAEnC,IAAI,CAAC;QACH,oBAAoB;QACpB,MAAM,OAAO,GAAG,MAAM,OAAO,CAC3B;YACE,YAAY;YACZ,GAAG,cAAc;SAClB,EACD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAChC,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;YAAS,CAAC;QACT,4BAA4B;QAC5B,MAAM,YAAY,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,KAAK,CAAC,EAAE;YACf,KAAK,CAAC,OAAO,CAAC;gBACZ,GAAG,6BAA6B,EAAE;gBAClC,GAAG,4BAA4B,EAAE;aAClC,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CACT,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,EAC5C,kBAAkB,CACnB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO;KACgB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"history-command.js","sourceRoot":"","sources":["../../../../src/lib/history/history-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,OAAO,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAEL,qBAAqB,EACrB,SAAS,EACT,aAAa,EACb,MAAM,EACN,YAAY,GACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,4BAA4B,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,6BAA6B,EAAE,MAAM,sBAAsB,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,OAAO,GAAG,SAAS,CAAC;AAC1B,KAAK,UAAU,OAAO,CAAC,IAAa;IAClC,eAAe,CAAC,OAAO,CAAC,CAAC;IAEzB,MAAM,aAAa,GAAG,MAAM,qBAAqB,EAAE,CAAC;IACpD,MAAM,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,GAAG,EAAE,GAAG,IAClC,CAAC;IACjB,MAAM,EACJ,YAAY,EACZ,IAAI,EACJ,EAAE,EACF,QAAQ,EACR,cAAc,EACd,GAAG,cAAc,EAClB,GAAG,MAAM,oBAAoB,CAAC;QAC7B,GAAG,GAAG;QACN,YAAY,EAAE,eAAe,IAAI,aAAa;KAC/C,CAAC,CAAC;IAEH,MAAM,aAAa,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;IAC3D,MAAM,OAAO,GAAgB,cAAc;QACzC,CAAC,CAAC,MAAM,aAAa,CAAC,aAAa,CAAC;QACpC,CAAC,CAAC,MAAM,SAAS,CAAC,aAAa,CAAC,CAAC;IAEnC,IAAI,CAAC;QACH,oBAAoB;QACpB,MAAM,OAAO,GAAG,MAAM,OAAO,CAC3B;YACE,YAAY;YACZ,GAAG,cAAc;SAClB,EACD,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAChC,CAAC;QAEF,MAAM,CAAC,IAAI,CAAC,YAAY,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5C,CAAC;YAAS,CAAC;QACT,4BAA4B;QAC5B,MAAM,YAAY,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,oCAAoC;QAC9C,OAAO,EAAE,KAAK,CAAC,EAAE;YACf,KAAK,CAAC,OAAO,CAAC;gBACZ,GAAG,6BAA6B,EAAE;gBAClC,GAAG,4BAA4B,EAAE;aAClC,CAAC,CAAC;YACH,KAAK,CAAC,KAAK,CACT,MAAM,CAAC,IAAI,CAAC,6BAA6B,EAAE,CAAC,EAC5C,kBAAkB,CACnB,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QACD,OAAO;KACgB,CAAC;AAC5B,CAAC"}

package/src/lib/implementation/core-config.middleware.d.ts

@@ -4,6 +4,5 @@ import type { FilterOptions } from './filter.model.js';
 import type { GlobalOptions } from './global.model.js';
 export type CoreConfigMiddlewareOptions = GlobalOptions & CoreConfigCliOptions & FilterOptions;
 export declare function coreConfigMiddleware<T extends CoreConfigMiddlewareOptions>(processArgs: T): Promise<GlobalOptions & CoreConfig & FilterOptions>;
-export declare const normalizeBooleanWithNegation: <T extends string>(propertyName: T, cliOptions?: Record<T, unknown>, rcOptions?: Record<T, unknown>) => boolean;
 export declare const normalizeCache: (cache?: CacheConfig) => CacheConfigObject;
 export declare const normalizeFormats: (formats?: string[]) => Format[];

package/src/lib/implementation/core-config.middleware.js

@@ -1,5 +1,6 @@
 import { autoloadRc, readRcByPath } from '@code-pushup/core';
 import { DEFAULT_PERSIST_FILENAME, DEFAULT_PERSIST_FORMAT, DEFAULT_PERSIST_OUTPUT_DIR, uploadConfigSchema, validate, } from '@code-pushup/models';
+import { logger, pluralizeToken } from '@code-pushup/utils';
 function buildPersistConfig(cliPersist, rcPersist) {
     return {
         outputDir: cliPersist?.outputDir ??
@@ -12,28 +13,36 @@ function buildPersistConfig(cliPersist, rcPersist) {
 }
 export async function coreConfigMiddleware(processArgs) {
     const { config, tsconfig, persist: cliPersist, upload: cliUpload, cache: cliCache, ...remainingCliOptions } = processArgs;
-    // Search for possible configuration file extensions if path is not given
-    const importedRc = config
-        ? await readRcByPath(config, tsconfig)
-        : await autoloadRc(tsconfig);
-    const { persist: rcPersist, upload: rcUpload, ...remainingRcConfig } = importedRc;
-    const upload = rcUpload == null && cliUpload == null
-        ? undefined
-        : validate(uploadConfigSchema, { ...rcUpload, ...cliUpload });
-    return {
-        ...(config != null && { config }),
-        cache: normalizeCache(cliCache),
-        persist: buildPersistConfig(cliPersist, rcPersist),
-        ...(upload != null && { upload }),
-        ...remainingRcConfig,
-        ...remainingCliOptions,
-    };
+    return logger.group('Loading configuration', async () => {
+        // Search for possible configuration file extensions if path is not given
+        const importedRc = config
+            ? await readRcByPath(config, tsconfig)
+            : await autoloadRc(tsconfig);
+        const { persist: rcPersist, upload: rcUpload, ...remainingRcConfig } = importedRc;
+        const upload = rcUpload == null && cliUpload == null
+            ? undefined
+            : validate(uploadConfigSchema, { ...rcUpload, ...cliUpload });
+        const result = {
+            ...(config != null && { config }),
+            cache: normalizeCache(cliCache),
+            persist: buildPersistConfig(cliPersist, rcPersist),
+            ...(upload != null && { upload }),
+            ...remainingRcConfig,
+            ...remainingCliOptions,
+        };
+        return {
+            message: `Parsed config: ${summarizeConfig(result)}`,
+            result,
+        };
+    });
+}
+function summarizeConfig(config) {
+    return [
+        pluralizeToken('plugin', config.plugins.length),
+        pluralizeToken('category', config.categories?.length ?? 0),
+        `upload ${config.upload ? 'enabled' : 'disabled'}`,
+    ].join(', ');
 }
-export const normalizeBooleanWithNegation = (propertyName, cliOptions, rcOptions) => propertyName in (cliOptions ?? {})
-    ? cliOptions?.[propertyName]
-    : `no-${propertyName}` in (cliOptions ?? {})
-        ? false
-        : (rcOptions?.[propertyName] ?? true);
 export const normalizeCache = (cache) => {
     if (cache == null) {
         return { write: false, read: false };

package/src/lib/implementation/core-config.middleware.js.map

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

package/src/lib/implementation/log-intro.middleware.d.ts

@@ -0,0 +1,2 @@
+import type { ArgumentsCamelCase } from 'yargs';
+export declare function logIntroMiddleware(args: ArgumentsCamelCase): ArgumentsCamelCase;

package/src/lib/implementation/log-intro.middleware.js

@@ -0,0 +1,9 @@
+import ansis from 'ansis';
+import { CODE_PUSHUP_UNICODE_LOGO, logger } from '@code-pushup/utils';
+import { CLI_DISPLAY_NAME } from '../constants.js';
+import { getVersion } from './version.js';
+export function logIntroMiddleware(args) {
+    logger.info(ansis.bold.blue(`${CODE_PUSHUP_UNICODE_LOGO} ${CLI_DISPLAY_NAME} v${getVersion()}`));
+    return args;
+}
+//# sourceMappingURL=log-intro.middleware.js.map

package/src/lib/implementation/log-intro.middleware.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"log-intro.middleware.js","sourceRoot":"","sources":["../../../../src/lib/implementation/log-intro.middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,wBAAwB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,UAAU,kBAAkB,CAChC,IAAwB;IAExB,MAAM,CAAC,IAAI,CACT,KAAK,CAAC,IAAI,CAAC,IAAI,CACb,GAAG,wBAAwB,IAAI,gBAAgB,KAAK,UAAU,EAAE,EAAE,CACnE,CACF,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -1,4 +1,4 @@
-export declare function renderConfigureCategoriesHint(): void;
-export declare function uploadSuccessfulLog(url: string): void;
-export declare function collectSuccessfulLog(): void;
-export declare function renderIntegratePortalHint(): void;
+export declare function printCliCommand(command: string): void;
+export declare function renderCategoriesHint(): void;
+export declare function renderPortalHint(): void;
+export declare function renderUploadHint(): void;

package/src/lib/implementation/logging.js

@@ -1,23 +1,30 @@
 import ansis from 'ansis';
 import { formatAsciiLink, formatAsciiSticker, logger, } from '@code-pushup/utils';
-export function renderConfigureCategoriesHint() {
-    logger.debug(`💡 Configure categories to see the scores in an overview table. See: ${formatAsciiLink('https://github.com/code-pushup/cli/blob/main/packages/cli/README.md')}`, { force: true });
+export function printCliCommand(command) {
+    logger.debug(`Running ${ansis.bold(command)} command`);
 }
-export function uploadSuccessfulLog(url) {
-    logger.info(ansis.green('Upload successful!'));
-    logger.info(formatAsciiLink(url));
+export function renderCategoriesHint() {
+    logger.info(formatAsciiSticker([
+        ansis.bold.gray('💡 Configure categories'),
+        '',
+        ansis.gray('❯ Aggregate audit scores to get a high-level overview'),
+        `${ansis.gray('❯')} ${formatAsciiLink('https://www.npmjs.com/package/@code-pushup/cli')}`,
+    ]));
 }
-export function collectSuccessfulLog() {
-    logger.info(ansis.green('Collecting report successful!'));
+export function renderPortalHint() {
+    logger.info(formatAsciiSticker([
+        ansis.bold.gray('💡 Upload report to Portal'),
+        '',
+        ansis.gray('❯ Visualize reports in an interactive UI'),
+        ansis.gray('❯ Track long-term progress via reports history'),
+        `${ansis.gray('❯')} ${formatAsciiLink('https://code-pushup.dev/')}`,
+    ]));
 }
-export function renderIntegratePortalHint() {
+export function renderUploadHint() {
     logger.info(formatAsciiSticker([
-        ansis.bold.gray('💡 Integrate the portal'),
+        ansis.bold.gray('💡 Upload report to Portal'),
         '',
-        `${ansis.gray('❯')} Upload a report to the server - ${ansis.gray('npx code-pushup upload')}`,
-        `  ${formatAsciiLink('https://github.com/code-pushup/cli/tree/main/packages/cli#upload-command')}`,
-        `${ansis.gray('❯')} ${ansis.gray('Portal Integration')} - ${formatAsciiLink('https://github.com/code-pushup/cli/blob/main/packages/cli/README.md#portal-integration')}`,
-        `${ansis.gray('❯')} ${ansis.gray('Upload Command')} - ${formatAsciiLink('https://github.com/code-pushup/cli/blob/main/packages/cli/README.md#portal-integration')}`,
+        `${ansis.gray('❯')} npx code-pushup upload`,
     ]));
 }
 //# sourceMappingURL=logging.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../src/lib/implementation/logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,MAAM,GACP,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,6BAA6B;IAC3C,MAAM,CAAC,KAAK,CACV,wEAAwE,eAAe,CACrF,qEAAqE,CACtE,EAAE,EACH,EAAE,KAAK,EAAE,IAAI,EAAE,CAChB,CAAC;AACJ,CAAC;AACD,MAAM,UAAU,mBAAmB,CAAC,GAAW;IAC7C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC/C,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,+BAA+B,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,MAAM,UAAU,yBAAyB;IACvC,MAAM,CAAC,IAAI,CACT,kBAAkB,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC;QAC1C,EAAE;QACF,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,oCAAoC,KAAK,CAAC,IAAI,CAC9D,wBAAwB,CACzB,EAAE;QACH,KAAK,eAAe,CAClB,0EAA0E,CAC3E,EAAE;QACH,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,oBAAoB,CAAC,MAAM,eAAe,CACzE,wFAAwF,CACzF,EAAE;QACH,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,eAAe,CACrE,wFAAwF,CACzF,EAAE;KACJ,CAAC,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"logging.js","sourceRoot":"","sources":["../../../../src/lib/implementation/logging.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EACL,eAAe,EACf,kBAAkB,EAClB,MAAM,GACP,MAAM,oBAAoB,CAAC;AAE5B,MAAM,UAAU,eAAe,CAAC,OAAe;IAC7C,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,MAAM,CAAC,IAAI,CACT,kBAAkB,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC;QAC1C,EAAE;QACF,KAAK,CAAC,IAAI,CAAC,uDAAuD,CAAC;QACnE,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,gDAAgD,CAAC,EAAE;KAC1F,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,CAAC,IAAI,CACT,kBAAkB,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC;QAC7C,EAAE;QACF,KAAK,CAAC,IAAI,CAAC,0CAA0C,CAAC;QACtD,KAAK,CAAC,IAAI,CAAC,gDAAgD,CAAC;QAC5D,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,eAAe,CAAC,0BAA0B,CAAC,EAAE;KACpE,CAAC,CACH,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB;IAC9B,MAAM,CAAC,IAAI,CACT,kBAAkB,CAAC;QACjB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,4BAA4B,CAAC;QAC7C,EAAE;QACF,GAAG,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,yBAAyB;KAC5C,CAAC,CACH,CAAC;AACJ,CAAC"}

package/src/lib/implementation/print-config.model.d.ts

@@ -1,3 +1,3 @@
 export type PrintConfigOptions = {
-    output?: string;
+    output: string;
 };

package/src/lib/implementation/print-config.options.js

@@ -1,8 +1,9 @@
 export function yargsPrintConfigOptionsDefinition() {
     return {
         output: {
-            describe: 'Output file path to use instead of stdout',
+            describe: 'Output file path for resolved JSON config',
             type: 'string',
+            demandOption: true,
         },
     };
 }

package/src/lib/implementation/print-config.options.js.map

@@ -1 +1 @@
-{"version":3,"file":"print-config.options.js","sourceRoot":"","sources":["../../../../src/lib/implementation/print-config.options.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,iCAAiC;IAI/C,OAAO;QACL,MAAM,EAAE;YACN,QAAQ,EAAE,2CAA2C;YACrD,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"print-config.options.js","sourceRoot":"","sources":["../../../../src/lib/implementation/print-config.options.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,iCAAiC;IAI/C,OAAO;QACL,MAAM,EAAE;YACN,QAAQ,EAAE,2CAA2C;YACrD,IAAI,EAAE,QAAQ;YACd,YAAY,EAAE,IAAI;SACnB;KACF,CAAC;AACJ,CAAC"}

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

@@ -0,0 +1 @@
+export declare function getVersion(): string;

package/src/lib/implementation/version.js

@@ -0,0 +1,6 @@
+import { createRequire } from 'node:module';
+export function getVersion() {
+    const packageJson = createRequire(import.meta.url)('../../../package.json');
+    return packageJson.version;
+}
+//# sourceMappingURL=version.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../../../src/lib/implementation/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,UAAU,UAAU;IACxB,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAChD,uBAAuB,CACkB,CAAC;IAC5C,OAAO,WAAW,CAAC,OAAO,CAAC;AAC7B,CAAC"}

package/src/lib/merge-diffs/merge-diffs-command.js

@@ -1,7 +1,7 @@
 import ansis from 'ansis';
 import { mergeDiffs } from '@code-pushup/core';
 import { logger } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
+import { printCliCommand } from '../implementation/logging.js';
 import { yargsMergeDiffsOptionsDefinition } from '../implementation/merge-diffs.options.js';
 export function yargsMergeDiffsCommandObject() {
     const command = 'merge-diffs';
@@ -10,8 +10,7 @@ export function yargsMergeDiffsCommandObject() {
         describe: 'Combine many report diffs into a single diff file',
         builder: yargsMergeDiffsOptionsDefinition(),
         handler: async (args) => {
-            logger.info(ansis.bold(CLI_NAME));
-            logger.debug(`Running ${ansis.bold(command)} command`);
+            printCliCommand(command);
             const options = args;
             const { files, persist } = options;
             const outputPath = await mergeDiffs(files, persist);

package/src/lib/merge-diffs/merge-diffs-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"merge-diffs-command.js","sourceRoot":"","sources":["../../../../src/lib/merge-diffs/merge-diffs-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE3C,OAAO,EAAE,gCAAgC,EAAE,MAAM,0CAA0C,CAAC;AAE5F,MAAM,UAAU,4BAA4B;IAC1C,MAAM,OAAO,GAAG,aAAa,CAAC;IAC9B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,mDAAmD;QAC7D,OAAO,EAAE,gCAAgC,EAAE;QAC3C,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;YAC/B,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAG,IAEf,CAAC;YACF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAEnC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEpD,MAAM,CAAC,IAAI,CAAC,2BAA2B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;KACsB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"merge-diffs-command.js","sourceRoot":"","sources":["../../../../src/lib/merge-diffs/merge-diffs-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAE/C,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,gCAAgC,EAAE,MAAM,0CAA0C,CAAC;AAE5F,MAAM,UAAU,4BAA4B;IAC1C,MAAM,OAAO,GAAG,aAAa,CAAC;IAC9B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,mDAAmD;QAC7D,OAAO,EAAE,gCAAgC,EAAE;QAC3C,OAAO,EAAE,KAAK,EAAE,IAAa,EAAE,EAAE;YAC/B,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAEf,CAAC;YACF,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;YAEnC,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;YAEpD,MAAM,CAAC,IAAI,CAAC,2BAA2B,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/middlewares.js

@@ -1,7 +1,12 @@
 import { coreConfigMiddleware } from './implementation/core-config.middleware.js';
 import { filterMiddleware } from './implementation/filter.middleware.js';
+import { logIntroMiddleware } from './implementation/log-intro.middleware.js';
 import { setVerboseMiddleware } from './implementation/set-verbose.middleware.js';
 export const middlewares = [
+    {
+        middlewareFunction: logIntroMiddleware,
+        applyBeforeValidation: true,
+    },
     {
         middlewareFunction: setVerboseMiddleware,
         applyBeforeValidation: false,

package/src/lib/middlewares.js.map

@@ -1 +1 @@
-{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../../../src/lib/middlewares.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAElF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB;QACE,kBAAkB,EAAE,oBAAqD;QACzE,qBAAqB,EAAE,KAAK;KAC7B;IACD;QACE,kBAAkB,EAAE,oBAAqD;QACzE,qBAAqB,EAAE,KAAK;KAC7B;IACD;QACE,kBAAkB,EAAE,gBAAiD;QACrE,qBAAqB,EAAE,KAAK;KAC7B;CACF,CAAC"}
+{"version":3,"file":"middlewares.js","sourceRoot":"","sources":["../../../src/lib/middlewares.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,4CAA4C,CAAC;AAElF,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB;QACE,kBAAkB,EAAE,kBAAmD;QACvE,qBAAqB,EAAE,IAAI;KAC5B;IACD;QACE,kBAAkB,EAAE,oBAA0C;QAC9D,qBAAqB,EAAE,KAAK;KAC7B;IACD;QACE,kBAAkB,EAAE,oBAAqD;QACzE,qBAAqB,EAAE,KAAK;KAC7B;IACD;QACE,kBAAkB,EAAE,gBAAiD;QACrE,qBAAqB,EAAE,KAAK;KAC7B;CACF,CAAC"}

package/src/lib/print-config/print-config-command.js

@@ -3,6 +3,7 @@ import { mkdir, writeFile } from 'node:fs/promises';
 import path from 'node:path';
 import { logger } from '@code-pushup/utils';
 import { filterKebabCaseKeys } from '../implementation/global.utils.js';
+import { printCliCommand } from '../implementation/logging.js';
 import { yargsPrintConfigOptionsDefinition } from '../implementation/print-config.options.js';
 export function yargsPrintConfigCommandObject() {
     const command = 'print-config';
@@ -11,19 +12,15 @@ export function yargsPrintConfigCommandObject() {
         describe: 'Print config',
         builder: yargsPrintConfigOptionsDefinition(),
         handler: async (yargsArgs) => {
+            printCliCommand(command);
             // it is important to filter out kebab case keys
             // because yargs duplicates options in camel case and kebab case
             const { _, $0, ...args } = filterKebabCaseKeys(yargsArgs);
             const { output, ...config } = args;
             const content = JSON.stringify(config, null, 2);
-            if (output) {
-                await mkdir(path.dirname(output), { recursive: true });
-                await writeFile(output, content);
-                logger.info(`Config printed to file ${ansis.bold(output)}`);
-            }
-            else {
-                logger.info(content);
-            }
+            await mkdir(path.dirname(output), { recursive: true });
+            await writeFile(output, content);
+            logger.info(`Config printed to file ${ansis.bold(output)}`);
         },
     };
 }

package/src/lib/print-config/print-config-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"print-config-command.js","sourceRoot":"","sources":["../../../../src/lib/print-config/print-config-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAE9F,MAAM,UAAU,6BAA6B;IAC3C,MAAM,OAAO,GAAG,cAAc,CAAC;IAC/B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,cAAc;QACxB,OAAO,EAAE,iCAAiC,EAAE;QAC5C,OAAO,EAAE,KAAK,EAAC,SAAS,EAAC,EAAE;YACzB,gDAAgD;YAChD,gEAAgE;YAChE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,IACL,CAAC;YAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAEhD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;gBACvD,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACjC,MAAM,CAAC,IAAI,CAAC,0BAA0B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC9D,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"print-config-command.js","sourceRoot":"","sources":["../../../../src/lib/print-config/print-config-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,OAAO,EAAE,iCAAiC,EAAE,MAAM,2CAA2C,CAAC;AAE9F,MAAM,UAAU,6BAA6B;IAC3C,MAAM,OAAO,GAAG,cAAc,CAAC;IAC/B,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,cAAc;QACxB,OAAO,EAAE,iCAAiC,EAAE;QAC5C,OAAO,EAAE,KAAK,EAAC,SAAS,EAAC,EAAE;YACzB,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,gDAAgD;YAChD,gEAAgE;YAChE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,mBAAmB,CAAC,SAAS,CAAC,CAAC;YAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,IACL,CAAC;YAE1B,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;YAEhD,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YACvD,MAAM,SAAS,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACjC,MAAM,CAAC,IAAI,CAAC,0BAA0B,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC9D,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/upload/upload-command.js

@@ -1,25 +1,21 @@
-import ansis from 'ansis';
 import { upload } from '@code-pushup/core';
 import { logger } from '@code-pushup/utils';
-import { CLI_NAME } from '../constants.js';
-import { renderIntegratePortalHint, uploadSuccessfulLog, } from '../implementation/logging.js';
+import { printCliCommand, renderPortalHint, } from '../implementation/logging.js';
 export function yargsUploadCommandObject() {
     const command = 'upload';
     return {
         command,
         describe: 'Upload report results to the portal',
         handler: async (args) => {
-            logger.info(ansis.bold(CLI_NAME));
-            logger.debug(`Running ${ansis.bold(command)} command`);
+            printCliCommand(command);
             const options = args;
             if (options.upload == null) {
-                renderIntegratePortalHint();
-                throw new Error('Upload configuration not set');
-            }
-            const report = await upload(options);
-            if (report?.url) {
-                uploadSuccessfulLog(report.url);
+                logger.newline();
+                renderPortalHint();
+                logger.newline();
+                throw new Error('Upload to Portal is missing configuration');
             }
+            await upload(options);
         },
     };
 }

package/src/lib/upload/upload-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"upload-command.js","sourceRoot":"","sources":["../../../../src/lib/upload/upload-command.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAsB,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GACpB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,UAAU,wBAAwB;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC;IACzB,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,KAAK,CAAC,WAAW,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAEvD,MAAM,OAAO,GAAG,IAAgC,CAAC;YACjD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3B,yBAAyB,EAAE,CAAC;gBAC5B,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;YACrC,IAAI,MAAM,EAAE,GAAG,EAAE,CAAC;gBAChB,mBAAmB,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAClC,CAAC;QACH,CAAC;KACsB,CAAC;AAC5B,CAAC"}
+{"version":3,"file":"upload-command.js","sourceRoot":"","sources":["../../../../src/lib/upload/upload-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAsB,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EACL,eAAe,EACf,gBAAgB,GACjB,MAAM,8BAA8B,CAAC;AAEtC,MAAM,UAAU,wBAAwB;IACtC,MAAM,OAAO,GAAG,QAAQ,CAAC;IACzB,OAAO;QACL,OAAO;QACP,QAAQ,EAAE,qCAAqC;QAC/C,OAAO,EAAE,KAAK,EAAK,IAA2B,EAAE,EAAE;YAChD,eAAe,CAAC,OAAO,CAAC,CAAC;YAEzB,MAAM,OAAO,GAAG,IAAgC,CAAC;YACjD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,gBAAgB,EAAE,CAAC;gBACnB,MAAM,CAAC,OAAO,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC;QACxB,CAAC;KACsB,CAAC;AAC5B,CAAC"}

package/src/lib/yargs-cli.d.ts

@@ -1,4 +1,4 @@
-import { type Argv, type CommandModule, type Options } from 'yargs';
+import { type Argv, type CommandModule, type MiddlewareFunction, type Options } from 'yargs';
 export declare const yargsDecorator: {
     'Commands:': string;
     'Options:': string;
@@ -31,7 +31,7 @@ export declare function yargsCli<T = unknown>(argv: string[], cfg: {
     };
     examples?: [string, string][];
     middlewares?: {
-        middlewareFunction: unknown;
+        middlewareFunction: MiddlewareFunction;
         applyBeforeValidation?: boolean;
     }[];
     noExitProcess?: boolean;

package/src/lib/yargs-cli.js

@@ -1,11 +1,11 @@
 /* eslint-disable max-lines-per-function */
 import ansis from 'ansis';
-import { createRequire } from 'node:module';
 import yargs, {} from 'yargs';
 import { formatSchema, validate, } from '@code-pushup/models';
 import { TERMINAL_WIDTH, isRecord } from '@code-pushup/utils';
 import { descriptionStyle, formatNestedValues, formatObjectValue, headerStyle, titleStyle, } from './implementation/formatting.js';
 import { logErrorBeforeThrow } from './implementation/global.utils.js';
+import { getVersion } from './implementation/version.js';
 export const yargsDecorator = {
     'Commands:': `${ansis.green('Commands')}:`,
     'Options:': `${ansis.green('Options')}:`,
@@ -34,7 +34,6 @@ export function yargsCli(argv, cfg) {
     const groups = cfg.groups ?? {};
     const examples = cfg.examples ?? [];
     const cli = yargs(argv);
-    const packageJson = createRequire(import.meta.url)('../../package.json');
     // setup yargs
     cli
         .updateLocale(yargsDecorator)
@@ -43,7 +42,7 @@ export function yargsCli(argv, cfg) {
         .help('help', descriptionStyle('Show help'))
         .alias('h', 'help')
         .showHelpOnFail(false)
-        .version('version', ansis.dim('Show version'), packageJson.version)
+        .version('version', ansis.dim('Show version'), getVersion())
         .check(args => {
         const persist = args['persist'];
         return persist == null || validatePersistFormat(persist);

package/src/lib/yargs-cli.js.map

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