@code-pushup/cli 0.10.1 → 0.10.2

package/index.js

@@ -1688,7 +1688,7 @@ function auditOutputsCorrelateWithPluginOutput(auditOutputs, pluginConfigAudits)
 
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.10.1";
+var version = "0.10.2";
 
 // packages/core/src/lib/implementation/collect.ts
 async function collect(options2) {
@@ -1939,11 +1939,6 @@ function logErrorBeforeThrow(fn) {
     }
   };
 }
-function coerceArray(param = []) {
-  return [
-    ...new Set(toArray(param).flatMap((f) => f.split(",")) || [])
-  ];
-}
 
 // packages/cli/src/lib/print-config/print-config-command.ts
 function yargsConfigCommandObject() {
@@ -1996,25 +1991,30 @@ var commands = [
 // packages/cli/src/lib/implementation/core-config.middleware.ts
 async function coreConfigMiddleware(processArgs) {
   const args = processArgs;
-  const { config, ...cliOptions } = args;
-  const importedRc = await readCodePushupConfig(config);
+  const {
+    config,
+    persist: cliPersist,
+    upload: cliUpload,
+    ...remainingCliOptions
+  } = args;
+  const rcOptions = await readCodePushupConfig(config);
+  const {
+    persist: rcPersist,
+    upload: rcUpload,
+    ...remainingRcConfig
+  } = rcOptions;
   const parsedProcessArgs = {
     config,
-    ...importedRc,
-    ...cliOptions,
+    ...remainingRcConfig,
+    ...remainingCliOptions,
     upload: {
-      ...importedRc.upload,
-      ...cliOptions.upload
+      ...rcUpload,
+      ...cliUpload
     },
-    // we can't use a async rc file as yargs does not support it. see: https://github.com/yargs/yargs/issues/2234
-    // therefore this can't live in option defaults as the order would be `config`->`provided options`->default
-    // so we have to manually implement the order
     persist: {
-      outputDir: cliOptions.persist?.outputDir || importedRc.persist?.outputDir || PERSIST_OUTPUT_DIR,
-      filename: cliOptions.persist?.filename || importedRc.persist?.filename || PERSIST_FILENAME,
-      format: coerceArray(
-        cliOptions.persist?.format ?? importedRc.persist?.format ?? PERSIST_FORMAT
-      )
+      outputDir: cliPersist?.outputDir ?? rcPersist?.outputDir ?? PERSIST_OUTPUT_DIR,
+      format: cliPersist?.format ?? rcPersist?.format ?? PERSIST_FORMAT,
+      filename: cliPersist?.filename ?? rcPersist?.filename ?? PERSIST_FILENAME
     }
   };
   return parsedProcessArgs;
@@ -2091,15 +2091,12 @@ var middlewares = [
 // packages/cli/src/lib/implementation/core-config.options.ts
 function yargsCoreConfigOptionsDefinition() {
   return {
-    // persist
     ...yargsPersistConfigOptionsDefinition(),
-    // upload
     ...yargsUploadConfigOptionsDefinition()
   };
 }
 function yargsPersistConfigOptionsDefinition() {
   return {
-    // persist
     "persist.outputDir": {
       describe: "Directory for the produced reports",
       type: "string"
@@ -2116,7 +2113,6 @@ function yargsPersistConfigOptionsDefinition() {
 }
 function yargsUploadConfigOptionsDefinition() {
   return {
-    // upload
     "upload.organization": {
       describe: "Organization slug from portal",
       type: "string"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/cli",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "license": "MIT",
   "bin": {
     "code-pushup": "index.js"

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

@@ -222,6 +222,4 @@ export declare function coreConfigMiddleware<T extends Partial<GeneralCliOptions
         project: string;
         timeout?: number | undefined;
     } | undefined;
-} & {
-    config: string;
-} & import("@code-pushup/core").GlobalOptions>;
+} & import("./core-config.model").ConfigCliOptions & import("@code-pushup/core").GlobalOptions>;

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

@@ -10,4 +10,7 @@ export type UploadConfigCliOptions = {
     'upload.apiKey': string;
     'upload.server': string;
 };
-export type CoreConfigCliOptions = PersistConfigCliOptions & UploadConfigCliOptions;
+export type ConfigCliOptions = {
+    config: string;
+};
+export type CoreConfigCliOptions = ConfigCliOptions & PersistConfigCliOptions & UploadConfigCliOptions;

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

@@ -1,5 +1,5 @@
 import { Options } from 'yargs';
-import { CoreConfigCliOptions, PersistConfigCliOptions, UploadConfigCliOptions } from './core-config.model';
-export declare function yargsCoreConfigOptionsDefinition(): Record<keyof CoreConfigCliOptions, Options>;
+import { PersistConfigCliOptions, UploadConfigCliOptions } from './core-config.model';
+export declare function yargsCoreConfigOptionsDefinition(): Record<keyof (PersistConfigCliOptions & UploadConfigCliOptions), Options>;
 export declare function yargsPersistConfigOptionsDefinition(): Record<keyof PersistConfigCliOptions, Options>;
 export declare function yargsUploadConfigOptionsDefinition(): Record<keyof UploadConfigCliOptions, Options>;

package/src/lib/implementation/global.model.d.ts

@@ -1,4 +1,3 @@
 import { GlobalOptions } from '@code-pushup/core';
-export type GeneralCliOptions = {
-    config: string;
-} & GlobalOptions;
+import { ConfigCliOptions } from './core-config.model';
+export type GeneralCliOptions = ConfigCliOptions & GlobalOptions;

package/src/lib/implementation/only-plugins.middleware.d.ts

@@ -223,6 +223,4 @@ export declare function onlyPluginsMiddleware<T extends Partial<GeneralCliOption
         project: string;
         timeout?: number | undefined;
     } | undefined;
-} & {
-    config: string;
-} & import("@code-pushup/core").GlobalOptions & OnlyPluginsOptions;
+} & import("./core-config.model").ConfigCliOptions & import("@code-pushup/core").GlobalOptions & OnlyPluginsOptions;