@code-pushup/cli 0.16.6 → 0.16.7

package/index.js

@@ -1564,7 +1564,7 @@ function link2(text) {
 
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.16.6";
+var version = "0.16.7";
 
 // packages/core/src/lib/implementation/execute-plugin.ts
 import chalk5 from "chalk";
@@ -1814,84 +1814,103 @@ async function autoloadRc() {
 }
 
 // packages/core/src/lib/upload.ts
-import { uploadToPortal } from "@code-pushup/portal-client";
+import {
+  uploadToPortal
+} from "@code-pushup/portal-client";
 
-// packages/core/src/lib/implementation/json-to-gql.ts
+// packages/core/src/lib/implementation/report-to-gql.ts
 import {
-  CategoryConfigRefType,
-  IssueSourceType,
-  IssueSeverity as PortalIssueSeverity
+  CategoryConfigRefType as PortalCategoryRefType,
+  IssueSeverity as PortalIssueSeverity,
+  IssueSourceType as PortalIssueSourceType
 } from "@code-pushup/portal-client";
-function jsonReportToGql(report) {
+function reportToGQL(report) {
   return {
     packageName: report.packageName,
     packageVersion: report.version,
     commandStartDate: report.date,
     commandDuration: report.duration,
-    plugins: pluginReportsToGql(report.plugins),
-    categories: categoryConfigsToGql(toArray(report.categories))
+    plugins: report.plugins.map(pluginToGQL),
+    categories: report.categories.map(categoryToGQL)
   };
 }
-function pluginReportsToGql(plugins) {
-  return plugins.map((plugin) => ({
-    audits: auditReportsToGql(plugin.audits),
-    description: plugin.description,
-    docsUrl: plugin.docsUrl,
-    groups: plugin.groups?.map((group) => ({
-      slug: group.slug,
-      title: group.title,
-      description: group.description,
-      refs: group.refs.map((ref) => ({ slug: ref.slug, weight: ref.weight }))
-    })),
-    icon: plugin.icon,
+function pluginToGQL(plugin) {
+  return {
     slug: plugin.slug,
     title: plugin.title,
+    icon: plugin.icon,
+    description: plugin.description,
+    docsUrl: plugin.docsUrl,
+    audits: plugin.audits.map(auditToGQL),
+    groups: plugin.groups?.map(groupToGQL),
     packageName: plugin.packageName,
     packageVersion: plugin.version,
     runnerDuration: plugin.duration,
     runnerStartDate: plugin.date
-  }));
+  };
+}
+function groupToGQL(group) {
+  return {
+    slug: group.slug,
+    title: group.title,
+    description: group.description,
+    refs: group.refs.map((ref) => ({ slug: ref.slug, weight: ref.weight }))
+  };
 }
-function auditReportsToGql(audits) {
-  return audits.map((audit) => ({
+function auditToGQL(audit) {
+  return {
+    slug: audit.slug,
+    title: audit.title,
     description: audit.description,
-    details: {
-      issues: issuesToGql(audit.details?.issues)
-    },
     docsUrl: audit.docsUrl,
-    formattedValue: audit.displayValue,
     score: audit.score,
-    slug: audit.slug,
-    title: audit.title,
-    value: audit.value
-  }));
+    value: audit.value,
+    formattedValue: audit.displayValue,
+    ...audit.details && {
+      details: {
+        ...audit.details.issues && {
+          issues: audit.details.issues.map(issueToGQL)
+        }
+      }
+    }
+  };
 }
-function issuesToGql(issues) {
-  return issues?.map((issue) => ({
+function issueToGQL(issue) {
+  return {
     message: issue.message,
-    severity: transformSeverity(issue.severity),
-    sourceEndColumn: issue.source?.position?.endColumn,
-    sourceEndLine: issue.source?.position?.endLine,
-    sourceFilePath: issue.source?.file,
-    sourceStartColumn: issue.source?.position?.startColumn,
-    sourceStartLine: issue.source?.position?.startLine,
-    sourceType: IssueSourceType.SourceCode
-  })) ?? [];
-}
-function categoryConfigsToGql(categories) {
-  return categories.map((category) => ({
+    severity: issueSeverityToGQL(issue.severity),
+    ...issue.source?.file && {
+      sourceType: PortalIssueSourceType.SourceCode,
+      sourceFilePath: issue.source.file,
+      sourceStartLine: issue.source.position?.startLine,
+      sourceStartColumn: issue.source.position?.startColumn,
+      sourceEndLine: issue.source.position?.endLine,
+      sourceEndColumn: issue.source.position?.endColumn
+    }
+  };
+}
+function categoryToGQL(category) {
+  return {
     slug: category.slug,
     title: category.title,
     description: category.description,
     refs: category.refs.map((ref) => ({
       plugin: ref.plugin,
-      type: ref.type === "audit" ? CategoryConfigRefType.Audit : CategoryConfigRefType.Group,
+      type: categoryRefTypeToGQL(ref.type),
       weight: ref.weight,
       slug: ref.slug
     }))
-  }));
+  };
+}
+function categoryRefTypeToGQL(type) {
+  switch (type) {
+    case "audit":
+      return PortalCategoryRefType.Audit;
+    case "group":
+      return PortalCategoryRefType.Group;
+  }
 }
-function transformSeverity(severity) {
+function issueSeverityToGQL(severity) {
   switch (severity) {
     case "info":
       return PortalIssueSeverity.Info;
@@ -1921,7 +1940,7 @@ async function upload(options2, uploadFn = uploadToPortal) {
     organization,
     project,
     commit: commitData.hash,
-    ...jsonReportToGql(report)
+    ...reportToGQL(report)
   };
   return uploadFn({ apiKey, server, data, timeout });
 }

package/package.json

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