@code-pushup/cli 0.46.0 → 0.48.0

package/README.md

@@ -198,9 +198,10 @@ Each example is fully tested to demonstrate best practices for plugin testing as
 | **`--upload.server`**       | `string`             | n/a      | URL to your portal server.                                                  |
 | **`--upload.apiKey`**       | `string`             | n/a      | API key for the portal server.                                              |
 | **`--onlyPlugins`**         | `string[]`           | `[]`     | Only run the specified plugins. Applicable to all commands except `upload`. |
+| **`--skipPlugins`**         | `string[]`           | `[]`     | Skip the specified plugins. Applicable to all commands except `upload`.     |
 
 > [!NOTE]  
-> All common options, except `--onlyPlugins`, can be specified in the configuration file as well.
+> All common options, except `--onlyPlugins` and `--skipPlugins`, can be specified in the configuration file as well.
 > CLI arguments take precedence over configuration file options.
 
 > [!NOTE]  

package/index.js

@@ -71,7 +71,7 @@ function missingRefsForCategoriesErrorMsg(categories, plugins) {
 }
 
 // packages/models/src/lib/implementation/schemas.ts
-var primitiveValueSchema = z.union([z.string(), z.number()]);
+var tableCellValueSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]).default(null);
 function executionMetaSchema(options2 = {
   descriptionDate: "Execution start date and time",
   descriptionDuration: "Execution duration in ms"
@@ -235,10 +235,10 @@ var tableColumnObjectSchema = z4.object({
   label: z4.string().optional(),
   align: tableAlignmentSchema.optional()
 });
-var tableRowObjectSchema = z4.record(primitiveValueSchema, {
+var tableRowObjectSchema = z4.record(tableCellValueSchema, {
   description: "Object row"
 });
-var tableRowPrimitiveSchema = z4.array(primitiveValueSchema, {
+var tableRowPrimitiveSchema = z4.array(tableCellValueSchema, {
   description: "Primitive row"
 });
 var tableSharedSchema = z4.object({
@@ -793,9 +793,9 @@ function formatBytes(bytes, decimals = 2) {
 function pluralizeToken(token, times) {
   return `${times} ${Math.abs(times) === 1 ? token : pluralize(token)}`;
 }
-function formatDuration(duration) {
+function formatDuration(duration, granularity = 0) {
   if (duration < 1e3) {
-    return `${duration} ms`;
+    return `${granularity ? duration.toFixed(granularity) : duration} ms`;
   }
   return `${(duration / 1e3).toFixed(2)} s`;
 }
@@ -981,20 +981,12 @@ function logMultipleFileResults(fileResults, messagePrefix) {
     failedTransform
   );
 }
-var NoExportError = class extends Error {
-  constructor(filepath) {
-    super(`No default export found in ${filepath}`);
+async function importModule(options2) {
+  const { mod } = await bundleRequire(options2);
+  if (typeof mod === "object" && "default" in mod) {
+    return mod.default;
   }
-};
-async function importEsmModule(options2) {
-  const { mod } = await bundleRequire({
-    format: "esm",
-    ...options2
-  });
-  if (!("default" in mod)) {
-    throw new NoExportError(options2.filepath);
-  }
-  return mod.default;
+  return mod;
 }
 
 // packages/utils/src/lib/text-formats/constants.ts
@@ -1027,7 +1019,7 @@ function code(text) {
 
 // packages/utils/src/lib/text-formats/html/link.ts
 function link2(href, text) {
-  return `<a href="${href}">${text || href}"</a>`;
+  return `<a href="${href}">${text || href}</a>`;
 }
 
 // packages/utils/src/lib/transform.ts
@@ -1049,7 +1041,7 @@ function capitalize(text) {
   )}`;
 }
 
-// packages/utils/src/lib/table.ts
+// packages/utils/src/lib/text-formats/table.ts
 function rowToStringArray({ rows, columns = [] }) {
   if (Array.isArray(rows.at(0)) && typeof columns.at(0) === "object") {
     throw new TypeError(
@@ -1062,14 +1054,19 @@ function rowToStringArray({ rows, columns = [] }) {
     }
     const objectRow = row;
     if (columns.length === 0 || typeof columns.at(0) === "string") {
-      return Object.values(objectRow).map(String);
+      return Object.values(objectRow).map(
+        (value) => value == null ? "" : String(value)
+      );
     }
     return columns.map(
-      ({ key }) => String(objectRow[key])
+      ({ key }) => objectRow[key] == null ? "" : String(objectRow[key])
     );
   });
 }
-function columnsToStringArray({ rows, columns = [] }) {
+function columnsToStringArray({
+  rows,
+  columns = []
+}) {
   const firstRow = rows.at(0);
   const primitiveRows = Array.isArray(firstRow);
   if (typeof columns.at(0) === "string" && !primitiveRows) {
@@ -1109,10 +1106,8 @@ function getColumnAlignmentForIndex(targetIdx, columns = []) {
     return "center";
   }
 }
-function getColumnAlignments({
-  rows,
-  columns = []
-}) {
+function getColumnAlignments(tableData) {
+  const { rows, columns = [] } = tableData;
   if (rows.at(0) == null) {
     throw new Error("first row can`t be undefined.");
   }
@@ -1122,10 +1117,17 @@ function getColumnAlignments({
       (_, idx) => getColumnAlignmentForIndex(idx, columns)
     );
   }
-  const firstObject = rows.at(0);
-  return Object.keys(firstObject).map(
-    (key, idx) => getColumnAlignmentForKeyAndIndex(key, idx, columns)
-  );
+  const biggestRow = [...rows].sort((a, b) => Object.keys(a).length - Object.keys(b).length).at(-1);
+  if (columns.length > 0) {
+    return columns.map(
+      (column, idx) => typeof column === "string" ? column : getColumnAlignmentForKeyAndIndex(
+        column.key,
+        idx,
+        columns
+      )
+    );
+  }
+  return Object.keys(biggestRow ?? {}).map((_) => "center");
 }
 
 // packages/utils/src/lib/text-formats/html/table.ts
@@ -1222,7 +1224,10 @@ function section(...contents) {
   return `${lines(...contents)}${NEW_LINE}`;
 }
 function lines(...contents) {
-  return `${contents.filter(Boolean).join(NEW_LINE)}`;
+  const filteredContent = contents.filter(
+    (value) => value != null && value !== "" && value !== false
+  );
+  return `${filteredContent.join(NEW_LINE)}`;
 }
 
 // packages/utils/src/lib/text-formats/md/table.ts
@@ -2134,8 +2139,8 @@ function formatDiffCategoriesSection(diff) {
   }
   const columns = [
     { key: "category", label: "\u{1F3F7}\uFE0F Category", align: "left" },
-    { key: "after", label: hasChanges ? "\u2B50 Current score" : "\u2B50 Score" },
-    { key: "before", label: "\u2B50 Previous score" },
+    { key: "before", label: hasChanges ? "\u2B50 Previous score" : "\u2B50 Score" },
+    { key: "after", label: "\u2B50 Current score" },
     { key: "change", label: "\u{1F504} Score change" }
   ];
   return lines5(
@@ -2164,7 +2169,7 @@ function formatDiffCategoriesSection(diff) {
           change: "\u2013"
         }))
       ].map(
-        (row) => hasChanges ? row : { category: row.category, after: row.after }
+        (row) => hasChanges ? row : { category: row.category, before: row.before }
       )
     }),
     added.length > 0 && section5(italicMd("(\\*) New category."))
@@ -2180,8 +2185,8 @@ function formatDiffGroupsSection(diff) {
       columns: [
         { key: "plugin", label: "\u{1F50C} Plugin", align: "left" },
         { key: "group", label: "\u{1F5C3}\uFE0F Group", align: "left" },
-        { key: "after", label: "\u2B50 Current score" },
         { key: "before", label: "\u2B50 Previous score" },
+        { key: "after", label: "\u2B50 Current score" },
         { key: "change", label: "\u{1F504} Score change" }
       ],
       rows: sortChanges(diff.groups.changed).map((group) => ({
@@ -2201,8 +2206,8 @@ function formatDiffAuditsSection(diff) {
       columns: [
         { key: "plugin", label: "\u{1F50C} Plugin", align: "left" },
         { key: "audit", label: "\u{1F6E1}\uFE0F Audit", align: "left" },
-        { key: "after", label: "\u{1F4CF} Current value" },
         { key: "before", label: "\u{1F4CF} Previous value" },
+        { key: "after", label: "\u{1F4CF} Current value" },
         { key: "change", label: "\u{1F504} Value change" }
       ],
       rows: sortChanges(diff.audits.changed).map((audit) => ({
@@ -2573,7 +2578,7 @@ var verboseUtils = (verbose = false) => ({
 
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.46.0";
+var version = "0.48.0";
 
 // packages/core/src/lib/implementation/execute-plugin.ts
 import chalk5 from "chalk";
@@ -3118,9 +3123,9 @@ function tableToGQL(table5) {
       )
     },
     rows: table5.rows.map(
-      (row) => Array.isArray(row) ? row.map((content) => ({ content: content.toString() })) : Object.entries(row).map(([key, content]) => ({
+      (row) => Array.isArray(row) ? row.map((content) => ({ content: content?.toString() ?? "" })) : Object.entries(row).map(([key, content]) => ({
         key,
-        content: content.toString()
+        content: content?.toString() ?? ""
       }))
     )
   };
@@ -3238,7 +3243,7 @@ async function readRcByPath(filepath, tsconfig) {
   if (!await fileExists(filepath)) {
     throw new ConfigPathError(filepath);
   }
-  const cfg = await importEsmModule({ filepath, tsconfig });
+  const cfg = await importModule({ filepath, tsconfig, format: "esm" });
   return coreConfigSchema.parse(cfg);
 }
 async function autoloadRc(tsconfig) {
@@ -3464,6 +3469,19 @@ function yargsOnlyPluginsOptionsDefinition() {
   };
 }
 
+// packages/cli/src/lib/implementation/skip-plugins.options.ts
+var skipPluginsOption = {
+  describe: "List of plugins to skip. If not set all plugins are run.",
+  type: "array",
+  default: [],
+  coerce: coerceArray
+};
+function yargsSkipPluginsOptionsDefinition() {
+  return {
+    skipPlugins: skipPluginsOption
+  };
+}
+
 // packages/cli/src/lib/history/history.options.ts
 function yargsHistoryOptionsDefinition() {
   return {
@@ -3574,7 +3592,8 @@ function yargsHistoryCommandObject() {
     builder: (yargs2) => {
       yargs2.options({
         ...yargsHistoryOptionsDefinition(),
-        ...yargsOnlyPluginsOptionsDefinition()
+        ...yargsOnlyPluginsOptionsDefinition(),
+        ...yargsSkipPluginsOptionsDefinition()
       });
       yargs2.group(
         Object.keys(yargsHistoryOptionsDefinition()),
@@ -3669,35 +3688,37 @@ async function coreConfigMiddleware(processArgs) {
   };
 }
 
-// packages/cli/src/lib/implementation/only-plugins.utils.ts
+// packages/cli/src/lib/implementation/validate-plugin-filter-options.utils.ts
 import chalk12 from "chalk";
-function validateOnlyPluginsOption({
+function validatePluginFilterOption(filterOption, {
   plugins,
   categories
 }, {
-  onlyPlugins = [],
+  pluginsToFilter = [],
   verbose = false
 } = {}) {
-  const onlyPluginsSet = new Set(onlyPlugins);
-  const missingPlugins = onlyPlugins.filter(
+  const pluginsToFilterSet = new Set(pluginsToFilter);
+  const missingPlugins = pluginsToFilter.filter(
     (plugin) => !plugins.some(({ slug }) => slug === plugin)
   );
+  const isSkipOption = filterOption === "skipPlugins";
+  const filterFunction = (plugin) => isSkipOption ? pluginsToFilterSet.has(plugin) : !pluginsToFilterSet.has(plugin);
   if (missingPlugins.length > 0 && verbose) {
     ui().logger.info(
       `${chalk12.yellow(
         "\u26A0"
-      )} The --onlyPlugin argument references plugins with "${missingPlugins.join(
+      )} The --${filterOption} argument references plugins with "${missingPlugins.join(
         '", "'
       )}" slugs, but no such plugins are present in the configuration. Expected one of the following plugin slugs: "${plugins.map(({ slug }) => slug).join('", "')}".`
     );
   }
-  if (categories.length > 0) {
-    const removedCategorieSlugs = filterItemRefsBy(
+  if (categories.length > 0 && verbose) {
+    const removedCategorySlugs = filterItemRefsBy(
       categories,
-      ({ plugin }) => !onlyPluginsSet.has(plugin)
+      ({ plugin }) => filterFunction(plugin)
     ).map(({ slug }) => slug);
     ui().logger.info(
-      `The --onlyPlugin argument removed categories with "${removedCategorieSlugs.join(
+      `The --${filterOption} argument removed categories with "${removedCategorySlugs.join(
         '", "'
       )}" slugs.
     `
@@ -3710,9 +3731,10 @@ function onlyPluginsMiddleware(originalProcessArgs) {
   const { categories = [], onlyPlugins: originalOnlyPlugins } = originalProcessArgs;
   if (originalOnlyPlugins && originalOnlyPlugins.length > 0) {
     const { verbose, plugins, onlyPlugins = [] } = originalProcessArgs;
-    validateOnlyPluginsOption(
+    validatePluginFilterOption(
+      "onlyPlugins",
       { plugins, categories },
-      { onlyPlugins, verbose }
+      { pluginsToFilter: onlyPlugins, verbose }
     );
     const validOnlyPlugins = onlyPlugins.filter(
       (oP) => plugins.find((p) => p.slug === oP)
@@ -3734,6 +3756,36 @@ function onlyPluginsMiddleware(originalProcessArgs) {
   };
 }
 
+// packages/cli/src/lib/implementation/skip-plugins.middleware.ts
+function skipPluginsMiddleware(originalProcessArgs) {
+  const { categories = [], skipPlugins: originalSkipPlugins } = originalProcessArgs;
+  if (originalSkipPlugins && originalSkipPlugins.length > 0) {
+    const { verbose, plugins, skipPlugins = [] } = originalProcessArgs;
+    validatePluginFilterOption(
+      "skipPlugins",
+      { plugins, categories },
+      { pluginsToFilter: skipPlugins, verbose }
+    );
+    const validSkipPlugins = skipPlugins.filter(
+      (sP) => plugins.find((p) => p.slug === sP)
+    );
+    const skipPluginsSet = new Set(validSkipPlugins);
+    return {
+      ...originalProcessArgs,
+      plugins: skipPluginsSet.size > 0 ? plugins.filter(({ slug }) => !skipPluginsSet.has(slug)) : plugins,
+      categories: skipPluginsSet.size > 0 ? filterItemRefsBy(
+        categories,
+        ({ plugin }) => !skipPluginsSet.has(plugin)
+      ) : categories
+    };
+  }
+  return {
+    ...originalProcessArgs,
+    // if undefined fill categories with empty array
+    categories
+  };
+}
+
 // packages/cli/src/lib/middlewares.ts
 var middlewares = [
   {
@@ -3743,6 +3795,10 @@ var middlewares = [
   {
     middlewareFunction: onlyPluginsMiddleware,
     applyBeforeValidation: false
+  },
+  {
+    middlewareFunction: skipPluginsMiddleware,
+    applyBeforeValidation: false
   }
 ];
 
@@ -3818,12 +3874,14 @@ function yargsGlobalOptionsDefinition() {
 var options = {
   ...yargsGlobalOptionsDefinition(),
   ...yargsCoreConfigOptionsDefinition(),
-  ...yargsOnlyPluginsOptionsDefinition()
+  ...yargsOnlyPluginsOptionsDefinition(),
+  ...yargsSkipPluginsOptionsDefinition()
 };
 var groups = {
   "Global Options:": [
     ...Object.keys(yargsGlobalOptionsDefinition()),
-    ...Object.keys(yargsOnlyPluginsOptionsDefinition())
+    ...Object.keys(yargsOnlyPluginsOptionsDefinition()),
+    ...Object.keys(yargsSkipPluginsOptionsDefinition())
   ],
   "Persist Options:": Object.keys(yargsPersistConfigOptionsDefinition()),
   "Upload Options:": Object.keys(yargsUploadConfigOptionsDefinition())
@@ -3915,6 +3973,10 @@ var cli = (args) => yargsCli(args, {
       "code-pushup collect --onlyPlugins=coverage",
       "Run collect with only coverage plugin, other plugins from config file will be skipped."
     ],
+    [
+      "code-pushup collect --skipPlugins=coverage",
+      "Run collect skiping the coverage plugin, other plugins from config file will be included."
+    ],
     [
       "code-pushup upload --persist.outputDir=dist --persist.filename=cp-report --upload.apiKey=$CP_API_KEY",
       "Upload dist/cp-report.json to portal using API key from environment variable"

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@code-pushup/cli",
-  "version": "0.46.0",
+  "version": "0.48.0",
   "license": "MIT",
   "bin": {
     "code-pushup": "index.js"
   },
   "dependencies": {
-    "@code-pushup/models": "0.46.0",
-    "@code-pushup/core": "0.46.0",
-    "@code-pushup/utils": "0.46.0",
+    "@code-pushup/models": "0.48.0",
+    "@code-pushup/core": "0.48.0",
+    "@code-pushup/utils": "0.48.0",
     "yargs": "^17.7.2",
     "chalk": "^5.3.0",
     "simple-git": "^3.20.0"

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

@@ -2,4 +2,5 @@ import { CoreConfig } from '@code-pushup/models';
 import { CoreConfigCliOptions } from './core-config.model';
 import { GeneralCliOptions } from './global.model';
 import { OnlyPluginsOptions } from './only-plugins.model';
-export declare function coreConfigMiddleware<T extends GeneralCliOptions & CoreConfigCliOptions & OnlyPluginsOptions>(processArgs: T): Promise<GeneralCliOptions & CoreConfig & OnlyPluginsOptions>;
+import { SkipPluginsOptions } from './skip-plugins.model';
+export declare function coreConfigMiddleware<T extends GeneralCliOptions & CoreConfigCliOptions & OnlyPluginsOptions & SkipPluginsOptions>(processArgs: T): Promise<GeneralCliOptions & CoreConfig & OnlyPluginsOptions & SkipPluginsOptions>;

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

@@ -0,0 +1,2 @@
+import { SkipPluginsOptions } from './skip-plugins.model';
+export declare function skipPluginsMiddleware<T extends SkipPluginsOptions>(originalProcessArgs: T): T;

package/src/lib/implementation/skip-plugins.model.d.ts

@@ -0,0 +1,6 @@
+import { GlobalOptions } from '@code-pushup/core';
+import { CoreConfig } from '@code-pushup/models';
+export type SkipPluginsCliOptions = {
+    skipPlugins?: string[];
+};
+export type SkipPluginsOptions = Partial<GlobalOptions> & Pick<CoreConfig, 'categories' | 'plugins'> & SkipPluginsCliOptions;

package/src/lib/implementation/skip-plugins.options.d.ts

@@ -0,0 +1,3 @@
+import { Options } from 'yargs';
+export declare const skipPluginsOption: Options;
+export declare function yargsSkipPluginsOptionsDefinition(): Record<'skipPlugins', Options>;

package/src/lib/implementation/validate-plugin-filter-options.utils.d.ts

@@ -0,0 +1,8 @@
+import type { CategoryConfig, PluginConfig } from '@code-pushup/models';
+export declare function validatePluginFilterOption(filterOption: 'onlyPlugins' | 'skipPlugins', { plugins, categories, }: {
+    plugins: PluginConfig[];
+    categories: CategoryConfig[];
+}, { pluginsToFilter, verbose, }?: {
+    pluginsToFilter?: string[];
+    verbose?: boolean;
+}): void;

package/src/lib/options.d.ts

@@ -1,4 +1,5 @@
 export declare const options: {
+    skipPlugins: import("yargs").Options;
     onlyPlugins: import("yargs").Options;
     "persist.outputDir": import("yargs").Options;
     "persist.filename": import("yargs").Options;

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

@@ -1,8 +0,0 @@
-import type { CategoryConfig, PluginConfig } from '@code-pushup/models';
-export declare function validateOnlyPluginsOption({ plugins, categories, }: {
-    plugins: PluginConfig[];
-    categories: CategoryConfig[];
-}, { onlyPlugins, verbose, }?: {
-    onlyPlugins?: string[];
-    verbose?: boolean;
-}): void;