@code-pushup/utils 0.47.0 → 0.48.0

package/index.js

@@ -1876,6 +1876,113 @@ function groupByStatus(results) {
   );
 }
 
+// packages/utils/src/lib/merge-configs.ts
+function mergeConfigs(config, ...configs) {
+  return configs.reduce(
+    (acc, obj) => ({
+      ...acc,
+      ...mergeCategories(acc.categories, obj.categories),
+      ...mergePlugins(acc.plugins, obj.plugins),
+      ...mergePersist(acc.persist, obj.persist),
+      ...mergeUpload(acc.upload, obj.upload)
+    }),
+    config
+  );
+}
+function mergeCategories(a, b) {
+  if (!a && !b) {
+    return {};
+  }
+  const mergedMap = /* @__PURE__ */ new Map();
+  const addToMap = (categories) => {
+    categories.forEach((newObject) => {
+      if (mergedMap.has(newObject.slug)) {
+        const existingObject = mergedMap.get(
+          newObject.slug
+        );
+        mergedMap.set(newObject.slug, {
+          ...existingObject,
+          ...newObject,
+          refs: mergeByUniqueCategoryRefCombination(
+            existingObject?.refs,
+            newObject.refs
+          )
+        });
+      } else {
+        mergedMap.set(newObject.slug, newObject);
+      }
+    });
+  };
+  if (a) {
+    addToMap(a);
+  }
+  if (b) {
+    addToMap(b);
+  }
+  return { categories: [...mergedMap.values()] };
+}
+function mergePlugins(a, b) {
+  if (!a && !b) {
+    return { plugins: [] };
+  }
+  const mergedMap = /* @__PURE__ */ new Map();
+  const addToMap = (plugins) => {
+    plugins.forEach((newObject) => {
+      mergedMap.set(newObject.slug, newObject);
+    });
+  };
+  if (a) {
+    addToMap(a);
+  }
+  if (b) {
+    addToMap(b);
+  }
+  return { plugins: [...mergedMap.values()] };
+}
+function mergePersist(a, b) {
+  if (!a && !b) {
+    return {};
+  }
+  if (a) {
+    return b ? { persist: { ...a, ...b } } : {};
+  } else {
+    return { persist: b };
+  }
+}
+function mergeByUniqueCategoryRefCombination(a, b) {
+  const map = /* @__PURE__ */ new Map();
+  const addToMap = (refs) => {
+    refs.forEach((ref) => {
+      const uniqueIdentification = `${ref.type}:${ref.plugin}:${ref.slug}`;
+      if (map.has(uniqueIdentification)) {
+        map.set(uniqueIdentification, {
+          ...map.get(uniqueIdentification),
+          ...ref
+        });
+      } else {
+        map.set(uniqueIdentification, ref);
+      }
+    });
+  };
+  if (a) {
+    addToMap(a);
+  }
+  if (b) {
+    addToMap(b);
+  }
+  return [...map.values()];
+}
+function mergeUpload(a, b) {
+  if (!a && !b) {
+    return {};
+  }
+  if (a) {
+    return b ? { upload: { ...a, ...b } } : {};
+  } else {
+    return { upload: b };
+  }
+}
+
 // packages/utils/src/lib/progress.ts
 import chalk3 from "chalk";
 import { MultiProgressBars } from "multi-progress-bars";
@@ -2281,8 +2388,8 @@ function formatDiffCategoriesSection(diff) {
   }
   const columns = [
     { key: "category", label: "\u{1F3F7}\uFE0F Category", align: "left" },
-    { key: "before", label: "\u2B50 Previous score" },
-    { key: "after", label: hasChanges ? "\u2B50 Current score" : "\u2B50 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(
@@ -2311,7 +2418,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."))
@@ -2772,6 +2879,7 @@ export {
   logStdoutSummary,
   matchArrayItemsByKey,
   md,
+  mergeConfigs,
   normalizeSemver,
   objectFromEntries,
   objectToCliArgs,

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@code-pushup/utils",
-  "version": "0.47.0",
+  "version": "0.48.0",
   "dependencies": {
-    "@code-pushup/models": "0.47.0",
+    "@code-pushup/models": "0.48.0",
     "bundle-require": "^4.0.1",
     "esbuild": "^0.19.2",
     "chalk": "^5.3.0",

package/src/index.d.ts

@@ -10,6 +10,7 @@ export { groupByStatus } from './lib/group-by-status';
 export { isPromiseFulfilledResult, isPromiseRejectedResult, } from './lib/guards';
 export { logMultipleResults } from './lib/log-results';
 export { CliUi, Column, link, ui } from './lib/logging';
+export { mergeConfigs } from './lib/merge-configs';
 export { ProgressBar, getProgressBar } from './lib/progress';
 export { CODE_PUSHUP_DOMAIN, FOOTER_PREFIX, README_LINK, TERMINAL_WIDTH, } from './lib/reports/constants';
 export { listAuditsFromAllPlugins, listGroupsFromAllPlugins, } from './lib/reports/flatten-plugins';

package/src/lib/merge-configs.d.ts

@@ -0,0 +1,2 @@
+import { CoreConfig } from '@code-pushup/models';
+export declare function mergeConfigs(config: CoreConfig, ...configs: Partial<CoreConfig>[]): Partial<CoreConfig>;