@code-pushup/cli 0.23.0 → 0.25.6

package/index.js

@@ -706,8 +706,6 @@ var SCORE_COLOR_RANGE = {
   GREEN_MIN: 0.9,
   YELLOW_MIN: 0.5
 };
-
-// packages/utils/src/lib/reports/utils.ts
 var FOOTER_PREFIX = "Made with \u2764 by";
 var CODE_PUSHUP_DOMAIN = "code-pushup.dev";
 var README_LINK = "https://github.com/flowup/quality-metrics-cli#readme";
@@ -738,6 +736,8 @@ var detailsTableHeaders = [
   "Source file",
   "Line(s)"
 ];
+
+// packages/utils/src/lib/reports/utils.ts
 function formatReportScore(score) {
   return Math.round(score * 100).toString();
 }
@@ -774,7 +774,7 @@ function calcDuration(start, stop) {
 function countCategoryAudits(refs, plugins) {
   const groupLookup = plugins.reduce(
     (lookup, plugin) => {
-      if (plugin.groups.length === 0) {
+      if (plugin.groups == null || plugin.groups.length === 0) {
         return lookup;
       }
       return {
@@ -794,7 +794,7 @@ function countCategoryAudits(refs, plugins) {
     return acc + 1;
   }, 0);
 }
-function getAuditByRef({ slug, weight, plugin }, plugins) {
+function getSortableAuditByRef({ slug, weight, plugin }, plugins) {
   const auditPlugin = plugins.find((p) => p.slug === plugin);
   if (!auditPlugin) {
     throwIsNotPresentError(`Plugin ${plugin}`, "report");
@@ -811,39 +811,51 @@ function getAuditByRef({ slug, weight, plugin }, plugins) {
     plugin
   };
 }
-function getGroupWithAudits(refSlug, refPlugin, plugins) {
-  const plugin = plugins.find(({ slug }) => slug === refPlugin);
-  if (!plugin) {
-    throwIsNotPresentError(`Plugin ${refPlugin}`, "report");
-  }
-  const groupWithAudits = plugin.groups?.find(({ slug }) => slug === refSlug);
-  if (!groupWithAudits) {
-    throwIsNotPresentError(`Group ${refSlug}`, plugin.slug);
+function getSortableGroupByRef({ plugin, slug, weight }, plugins) {
+  const groupPlugin = plugins.find((p) => p.slug === plugin);
+  if (!groupPlugin) {
+    throwIsNotPresentError(`Plugin ${plugin}`, "report");
   }
-  const groupAudits = groupWithAudits.refs.reduce(
-    (acc, ref) => {
-      const audit = getAuditByRef(
-        { ...ref, plugin: refPlugin, type: "audit" },
-        plugins
-      );
-      return [...acc, audit];
-    },
-    []
+  const group = groupPlugin.groups?.find(
+    ({ slug: groupSlug }) => groupSlug === slug
   );
-  const audits = [...groupAudits].sort(compareCategoryAudits);
+  if (!group) {
+    throwIsNotPresentError(`Group ${slug}`, groupPlugin.slug);
+  }
+  const sortedAudits = getSortedGroupAudits(group, groupPlugin.slug, plugins);
+  const sortedAuditRefs = [...group.refs].sort((a, b) => {
+    const aIndex = sortedAudits.findIndex((ref) => ref.slug === a.slug);
+    const bIndex = sortedAudits.findIndex((ref) => ref.slug === b.slug);
+    return aIndex - bIndex;
+  });
   return {
-    ...groupWithAudits,
-    audits
+    ...group,
+    refs: sortedAuditRefs,
+    plugin,
+    weight
   };
 }
-function compareCategoryAudits(a, b) {
+function getSortedGroupAudits(group, plugin, plugins) {
+  return group.refs.map(
+    (ref) => getSortableAuditByRef(
+      {
+        plugin,
+        slug: ref.slug,
+        weight: ref.weight,
+        type: "audit"
+      },
+      plugins
+    )
+  ).sort(compareCategoryAuditsAndGroups);
+}
+function compareCategoryAuditsAndGroups(a, b) {
   if (a.weight !== b.weight) {
     return b.weight - a.weight;
   }
   if (a.score !== b.score) {
     return a.score - b.score;
   }
-  if (a.value !== b.value) {
+  if ("value" in a && "value" in b && a.value !== b.value) {
     return b.value - a.value;
   }
   return a.title.localeCompare(b.title);
@@ -952,6 +964,10 @@ function executeProcess(cfg) {
   });
 }
 
+// packages/utils/src/lib/git.ts
+import { isAbsolute, join as join2, relative } from "node:path";
+import { simpleGit } from "simple-git";
+
 // packages/utils/src/lib/transform.ts
 function toArray(val) {
   return Array.isArray(val) ? val : [val];
@@ -964,8 +980,6 @@ function toUnixPath(path) {
 }
 
 // packages/utils/src/lib/git.ts
-import { isAbsolute, join as join2, relative } from "node:path";
-import { simpleGit } from "simple-git";
 async function getLatestCommit(git = simpleGit()) {
   const log = await git.log({
     maxCount: 1,
@@ -984,7 +998,7 @@ function formatGitPath(path, gitRoot) {
 function validateCommitData(commitData, options2 = {}) {
   if (!commitData) {
     const msg = "no commit data available";
-    if (options2?.throwError) {
+    if (options2.throwError) {
       throw new Error(msg);
     } else {
       console.warn(msg);
@@ -1178,12 +1192,24 @@ function reportToCategoriesSection(report) {
     const categoryDocs = getDocsAndDescription(category);
     const categoryMDItems = category.refs.reduce((refAcc, ref) => {
       if (ref.type === "group") {
-        const group = getGroupWithAudits(ref.slug, ref.plugin, plugins);
-        const mdGroupItem = groupItemToCategorySection(group, plugins);
+        const group = getSortableGroupByRef(ref, plugins);
+        const groupAudits = group.refs.map(
+          (groupRef) => getSortableAuditByRef(
+            { ...groupRef, plugin: group.plugin, type: "audit" },
+            plugins
+          )
+        );
+        const pluginTitle = getPluginNameFromSlug(ref.plugin, plugins);
+        const mdGroupItem = groupItemToCategorySection(
+          group,
+          groupAudits,
+          pluginTitle
+        );
         return refAcc + mdGroupItem + NEW_LINE;
       } else {
-        const audit = getAuditByRef(ref, plugins);
-        const mdAuditItem = auditItemToCategorySection(audit, plugins);
+        const audit = getSortableAuditByRef(ref, plugins);
+        const pluginTitle = getPluginNameFromSlug(ref.plugin, plugins);
+        const mdAuditItem = auditItemToCategorySection(audit, pluginTitle);
         return refAcc + mdAuditItem + NEW_LINE;
       }
     }, "");
@@ -1191,8 +1217,7 @@ function reportToCategoriesSection(report) {
   }, "");
   return h2("\u{1F3F7} Categories") + NEW_LINE + categoryDetails;
 }
-function auditItemToCategorySection(audit, plugins) {
-  const pluginTitle = getPluginNameFromSlug(audit.plugin, plugins);
+function auditItemToCategorySection(audit, pluginTitle) {
   const auditTitle = link2(
     `#${slugify(audit.title)}-${slugify(pluginTitle)}`,
     audit.title
@@ -1203,13 +1228,12 @@ function auditItemToCategorySection(audit, plugins) {
     )} ${auditTitle} (_${pluginTitle}_) - ${getAuditResult(audit)}`
   );
 }
-function groupItemToCategorySection(group, plugins) {
-  const pluginTitle = getPluginNameFromSlug(group.plugin, plugins);
-  const groupScore = Number(formatReportScore(group?.score || 0));
+function groupItemToCategorySection(group, groupAudits, pluginTitle) {
+  const groupScore = Number(formatReportScore(group.score || 0));
   const groupTitle = li(
     `${getRoundScoreMarker(groupScore)} ${group.title} (_${pluginTitle}_)`
   );
-  const groupAudits = group.audits.reduce((acc, audit) => {
+  const auditTitles = groupAudits.reduce((acc, audit) => {
     const auditTitle = link2(
       `#${slugify(audit.title)}-${slugify(pluginTitle)}`,
       audit.title
@@ -1220,13 +1244,13 @@ function groupItemToCategorySection(group, plugins) {
       )}`
     )}${NEW_LINE}`;
   }, "");
-  return groupTitle + NEW_LINE + groupAudits;
+  return groupTitle + NEW_LINE + auditTitles;
 }
 function reportToAuditsSection(report) {
   const auditsSection = report.plugins.reduce((pluginAcc, plugin) => {
     const auditsData = plugin.audits.reduce((auditAcc, audit) => {
       const auditTitle = `${audit.title} (${getPluginNameFromSlug(
-        audit.plugin,
+        plugin.slug,
         report.plugins
       )})`;
       return auditAcc + h3(auditTitle) + NEW_LINE + NEW_LINE + reportToDetailsSection(audit) + NEW_LINE + NEW_LINE + getDocsAndDescription(audit);
@@ -1403,29 +1427,30 @@ var GroupRefInvalidError = class extends Error {
 function scoreReport(report) {
   const allScoredAuditsAndGroups = /* @__PURE__ */ new Map();
   const scoredPlugins = report.plugins.map((plugin) => {
-    const { slug, audits, groups } = plugin;
-    const updatedAudits = audits.map((audit) => ({ ...audit, plugin: slug }));
-    updatedAudits.forEach((audit) => {
-      allScoredAuditsAndGroups.set(`${slug}-${audit.slug}-audit`, audit);
+    const { groups, ...pluginProps } = plugin;
+    plugin.audits.forEach((audit) => {
+      allScoredAuditsAndGroups.set(`${plugin.slug}-${audit.slug}-audit`, audit);
     });
     function groupScoreFn(ref) {
       const score = allScoredAuditsAndGroups.get(
-        `${slug}-${ref.slug}-audit`
+        `${plugin.slug}-${ref.slug}-audit`
       )?.score;
       if (score == null) {
-        throw new GroupRefInvalidError(ref.slug, slug);
+        throw new GroupRefInvalidError(ref.slug, plugin.slug);
       }
       return score;
     }
     const scoredGroups = groups?.map((group) => ({
       ...group,
-      score: calculateScore(group.refs, groupScoreFn),
-      plugin: slug
+      score: calculateScore(group.refs, groupScoreFn)
     })) ?? [];
     scoredGroups.forEach((group) => {
-      allScoredAuditsAndGroups.set(`${slug}-${group.slug}-group`, group);
+      allScoredAuditsAndGroups.set(`${plugin.slug}-${group.slug}-group`, group);
     });
-    return { ...plugin, audits: updatedAudits, groups: scoredGroups };
+    return {
+      ...pluginProps,
+      ...scoredGroups.length > 0 && { groups: scoredGroups }
+    };
   });
   function catScoreFn(ref) {
     const key = `${ref.plugin}-${ref.slug}-${ref.type}`;
@@ -1486,26 +1511,22 @@ function sortReport(report) {
       (acc, ref) => ({
         ...acc,
         ...ref.type === "group" ? {
-          groups: [
-            ...acc.groups,
-            getGroupWithAudits(ref.slug, ref.plugin, plugins)
-          ]
+          groups: [...acc.groups, getSortableGroupByRef(ref, plugins)]
         } : {
-          audits: [...acc.audits, getAuditByRef(ref, plugins)]
+          audits: [...acc.audits, getSortableAuditByRef(ref, plugins)]
         }
       }),
       { groups: [], audits: [] }
     );
-    const sortedAuditsAndGroups = [
-      ...groups,
-      ...[...audits].sort(compareCategoryAudits)
-    ];
+    const sortedAuditsAndGroups = [...audits, ...groups].sort(
+      compareCategoryAuditsAndGroups
+    );
     const sortedRefs = [...category.refs].sort((a, b) => {
       const aIndex = sortedAuditsAndGroups.findIndex(
-        (ref) => ref.slug === a.slug
+        (ref) => ref.slug === a.slug && ref.plugin === a.plugin
       );
       const bIndex = sortedAuditsAndGroups.findIndex(
-        (ref) => ref.slug === b.slug
+        (ref) => ref.slug === b.slug && ref.plugin === b.plugin
       );
       return aIndex - bIndex;
     });
@@ -1554,7 +1575,7 @@ var verboseUtils = (verbose = false) => ({
 
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.23.0";
+var version = "0.25.6";
 
 // packages/core/src/lib/implementation/execute-plugin.ts
 import chalk5 from "chalk";
@@ -1878,9 +1899,7 @@ function auditToGQL(audit) {
     formattedValue: audit.displayValue,
     ...audit.details && {
       details: {
-        ...audit.details.issues && {
-          issues: audit.details.issues.map(issueToGQL)
-        }
+        issues: audit.details.issues.map(issueToGQL)
       }
     }
   };

package/package.json

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