@code-pushup/core 0.16.6 → 0.16.7

package/index.js

@@ -1374,9 +1374,6 @@ function withColor({ score, text }) {
 }
 
 // packages/utils/src/lib/transform.ts
-function toArray(val) {
-  return Array.isArray(val) ? val : [val];
-}
 function deepClone(obj) {
   return obj == null || typeof obj !== "object" ? obj : structuredClone(obj);
 }
@@ -1546,7 +1543,7 @@ import chalk4 from "chalk";
 
 // 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";
@@ -1796,84 +1793,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 auditReportsToGql(audits) {
-  return audits.map((audit) => ({
+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 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;
@@ -1903,7 +1919,7 @@ async function upload(options, uploadFn = uploadToPortal) {
     organization,
     project,
     commit: commitData.hash,
-    ...jsonReportToGql(report)
+    ...reportToGQL(report)
   };
   return uploadFn({ apiKey, server, data, timeout });
 }

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@code-pushup/core",
-  "version": "0.16.6",
+  "version": "0.16.7",
   "license": "MIT",
   "dependencies": {
     "@code-pushup/models": "*",
     "@code-pushup/utils": "*",
-    "@code-pushup/portal-client": "^0.4.1",
+    "@code-pushup/portal-client": "^0.5.0",
     "chalk": "^5.3.0"
   },
   "type": "module",

package/src/lib/implementation/report-to-gql.d.ts

@@ -0,0 +1,4 @@
+import { type AuditReportIssue as PortalIssue, type SaveReportMutationVariables } from '@code-pushup/portal-client';
+import { Issue, Report } from '@code-pushup/models';
+export declare function reportToGQL(report: Report): Omit<SaveReportMutationVariables, 'organization' | 'project' | 'commit'>;
+export declare function issueToGQL(issue: Issue): PortalIssue;

package/src/lib/implementation/json-to-gql.d.ts

@@ -1,70 +0,0 @@
-import { CategoryConfigRefType, IssueSourceType, IssueSeverity as PortalIssueSeverity } from '@code-pushup/portal-client';
-import { Issue, Report } from '@code-pushup/models';
-export declare function jsonReportToGql(report: Report): {
-    packageName: string;
-    packageVersion: string;
-    commandStartDate: string;
-    commandDuration: number;
-    plugins: {
-        audits: {
-            description: string | undefined;
-            details: {
-                issues: {
-                    message: string;
-                    severity: PortalIssueSeverity;
-                    sourceEndColumn: number | undefined;
-                    sourceEndLine: number | undefined;
-                    sourceFilePath: string | undefined;
-                    sourceStartColumn: number | undefined;
-                    sourceStartLine: number | undefined;
-                    sourceType: IssueSourceType;
-                }[];
-            };
-            docsUrl: string | undefined;
-            formattedValue: string | undefined;
-            score: number;
-            slug: string;
-            title: string;
-            value: number;
-        }[];
-        description: string | undefined;
-        docsUrl: string | undefined;
-        groups: {
-            slug: string;
-            title: string;
-            description: string | undefined;
-            refs: {
-                slug: string;
-                weight: number;
-            }[];
-        }[] | undefined;
-        icon: "slug" | "file" | "command" | "search" | "blink" | "key" | "folder-robot" | "folder-src" | "folder-dist" | "folder-css" | "folder-sass" | "folder-images" | "folder-scripts" | "folder-node" | "folder-javascript" | "folder-json" | "folder-font" | "folder-bower" | "folder-test" | "folder-jinja" | "folder-markdown" | "folder-php" | "folder-phpmailer" | "folder-sublime" | "folder-docs" | "folder-git" | "folder-github" | "folder-gitlab" | "folder-vscode" | "folder-views" | "folder-vue" | "folder-vuepress" | "folder-expo" | "folder-config" | "folder-i18n" | "folder-components" | "folder-verdaccio" | "folder-aurelia" | "folder-resource" | "folder-lib" | "folder-theme" | "folder-webpack" | "folder-global" | "folder-public" | "folder-include" | "folder-docker" | "folder-database" | "folder-log" | "folder-target" | "folder-temp" | "folder-aws" | "folder-audio" | "folder-video" | "folder-kubernetes" | "folder-import" | "folder-export" | "folder-wakatime" | "folder-circleci" | "folder-wordpress" | "folder-gradle" | "folder-coverage" | "folder-class" | "folder-other" | "folder-lua" | "folder-typescript" | "folder-graphql" | "folder-routes" | "folder-ci" | "folder-benchmark" | "folder-messages" | "folder-less" | "folder-gulp" | "folder-python" | "folder-mojo" | "folder-moon" | "folder-debug" | "folder-fastlane" | "folder-plugin" | "folder-middleware" | "folder-controller" | "folder-ansible" | "folder-server" | "folder-client" | "folder-tasks" | "folder-android" | "folder-ios" | "folder-upload" | "folder-download" | "folder-tools" | "folder-helper" | "folder-serverless" | "folder-api" | "folder-app" | "folder-apollo" | "folder-archive" | "folder-batch" | "folder-buildkite" | "folder-cluster" | "folder-command" | "folder-constant" | "folder-container" | "folder-content" | "folder-context" | "folder-core" | "folder-delta" | "folder-dump" | "folder-examples" | "folder-environment" | "folder-functions" | "folder-generator" | "folder-hook" | "folder-job" | "folder-keys" | "folder-layout" | "folder-mail" | "folder-mappings" | "folder-meta" | "folder-changesets" | "folder-packages" | "folder-shared" | "folder-shader" | "folder-stack" | "folder-template" | "folder-utils" | "folder-supabase" | "folder-private" | "folder-linux" | "folder-windows" | "folder-macos" | "folder-error" | "folder-event" | "folder-secure" | "folder-custom" | "folder-mock" | "folder-syntax" | "folder-vm" | "folder-stylus" | "folder-flow" | "folder-rules" | "folder-review" | "folder-animation" | "folder-guard" | "folder-prisma" | "folder-pipe" | "folder-svg" | "folder-terraform" | "folder-mobile" | "folder-stencil" | "folder-firebase" | "folder-svelte" | "folder-update" | "folder-intellij" | "folder-azure-pipelines" | "folder-mjml" | "folder-admin" | "folder-scala" | "folder-connection" | "folder-quasar" | "folder-next" | "folder-cobol" | "folder-yarn" | "folder-husky" | "folder-storybook" | "folder-base" | "folder-cart" | "folder-home" | "folder-project" | "folder-interface" | "folder-netlify" | "folder-enum" | "folder-contract" | "folder-queue" | "folder-vercel" | "folder-cypress" | "folder-decorators" | "folder-java" | "folder-resolver" | "folder-angular" | "folder-unity" | "folder-pdf" | "folder-proto" | "folder-plastic" | "folder-gamemaker" | "folder-mercurial" | "folder-godot" | "folder-lottie" | "folder-taskfile" | "folder-robot-open" | "folder-src-open" | "folder-dist-open" | "folder-css-open" | "folder-sass-open" | "folder-images-open" | "folder-scripts-open" | "folder-node-open" | "folder-javascript-open" | "folder-json-open" | "folder-font-open" | "folder-bower-open" | "folder-test-open" | "folder-jinja-open" | "folder-markdown-open" | "folder-php-open" | "folder-phpmailer-open" | "folder-sublime-open" | "folder-docs-open" | "folder-git-open" | "folder-github-open" | "folder-gitlab-open" | "folder-vscode-open" | "folder-views-open" | "folder-vue-open" | "folder-vuepress-open" | "folder-expo-open" | "folder-config-open" | "folder-i18n-open" | "folder-components-open" | "folder-verdaccio-open" | "folder-aurelia-open" | "folder-resource-open" | "folder-lib-open" | "folder-theme-open" | "folder-webpack-open" | "folder-global-open" | "folder-public-open" | "folder-include-open" | "folder-docker-open" | "folder-database-open" | "folder-log-open" | "folder-target-open" | "folder-temp-open" | "folder-aws-open" | "folder-audio-open" | "folder-video-open" | "folder-kubernetes-open" | "folder-import-open" | "folder-export-open" | "folder-wakatime-open" | "folder-circleci-open" | "folder-wordpress-open" | "folder-gradle-open" | "folder-coverage-open" | "folder-class-open" | "folder-other-open" | "folder-lua-open" | "folder-typescript-open" | "folder-graphql-open" | "folder-routes-open" | "folder-ci-open" | "folder-benchmark-open" | "folder-messages-open" | "folder-less-open" | "folder-gulp-open" | "folder-python-open" | "folder-mojo-open" | "folder-moon-open" | "folder-debug-open" | "folder-fastlane-open" | "folder-plugin-open" | "folder-middleware-open" | "folder-controller-open" | "folder-ansible-open" | "folder-server-open" | "folder-client-open" | "folder-tasks-open" | "folder-android-open" | "folder-ios-open" | "folder-upload-open" | "folder-download-open" | "folder-tools-open" | "folder-helper-open" | "folder-serverless-open" | "folder-api-open" | "folder-app-open" | "folder-apollo-open" | "folder-archive-open" | "folder-batch-open" | "folder-buildkite-open" | "folder-cluster-open" | "folder-command-open" | "folder-constant-open" | "folder-container-open" | "folder-content-open" | "folder-context-open" | "folder-core-open" | "folder-delta-open" | "folder-dump-open" | "folder-examples-open" | "folder-environment-open" | "folder-functions-open" | "folder-generator-open" | "folder-hook-open" | "folder-job-open" | "folder-keys-open" | "folder-layout-open" | "folder-mail-open" | "folder-mappings-open" | "folder-meta-open" | "folder-changesets-open" | "folder-packages-open" | "folder-shared-open" | "folder-shader-open" | "folder-stack-open" | "folder-template-open" | "folder-utils-open" | "folder-supabase-open" | "folder-private-open" | "folder-linux-open" | "folder-windows-open" | "folder-macos-open" | "folder-error-open" | "folder-event-open" | "folder-secure-open" | "folder-custom-open" | "folder-mock-open" | "folder-syntax-open" | "folder-vm-open" | "folder-stylus-open" | "folder-flow-open" | "folder-rules-open" | "folder-review-open" | "folder-animation-open" | "folder-guard-open" | "folder-prisma-open" | "folder-pipe-open" | "folder-svg-open" | "folder-terraform-open" | "folder-mobile-open" | "folder-stencil-open" | "folder-firebase-open" | "folder-svelte-open" | "folder-update-open" | "folder-intellij-open" | "folder-azure-pipelines-open" | "folder-mjml-open" | "folder-admin-open" | "folder-scala-open" | "folder-connection-open" | "folder-quasar-open" | "folder-next-open" | "folder-cobol-open" | "folder-yarn-open" | "folder-husky-open" | "folder-storybook-open" | "folder-base-open" | "folder-cart-open" | "folder-home-open" | "folder-project-open" | "folder-interface-open" | "folder-netlify-open" | "folder-enum-open" | "folder-contract-open" | "folder-queue-open" | "folder-vercel-open" | "folder-cypress-open" | "folder-decorators-open" | "folder-java-open" | "folder-resolver-open" | "folder-angular-open" | "folder-unity-open" | "folder-pdf-open" | "folder-proto-open" | "folder-plastic-open" | "folder-gamemaker-open" | "folder-mercurial-open" | "folder-godot-open" | "folder-lottie-open" | "folder-taskfile-open" | "html" | "pug" | "markdown" | "css" | "sass" | "less" | "json" | "hjson" | "jinja" | "proto" | "sublime" | "twine" | "yaml" | "xml" | "image" | "javascript" | "react" | "react_ts" | "routing" | "settings" | "typescript-def" | "markojs" | "astro" | "pdf" | "table" | "vscode" | "visualstudio" | "database" | "kusto" | "csharp" | "qsharp" | "zip" | "vala" | "zig" | "exe" | "hex" | "java" | "jar" | "javaclass" | "c" | "h" | "cpp" | "hpp" | "objective-c" | "objective-cpp" | "rc" | "go" | "python" | "python-misc" | "url" | "console" | "powershell" | "gradle" | "word" | "certificate" | "font" | "lib" | "ruby" | "fsharp" | "swift" | "arduino" | "docker" | "tex" | "powerpoint" | "video" | "virtual" | "email" | "audio" | "coffee" | "document" | "graphql" | "rust" | "raml" | "xaml" | "haskell" | "kotlin" | "otne" | "git" | "lua" | "clojure" | "groovy" | "r" | "dart" | "dart_generated" | "actionscript" | "mxml" | "autohotkey" | "flash" | "swc" | "cmake" | "assembly" | "vue" | "ocaml" | "odin" | "javascript-map" | "css-map" | "lock" | "handlebars" | "perl" | "haxe" | "test-ts" | "test-jsx" | "test-js" | "angular" | "angular-component" | "angular-guard" | "angular-service" | "angular-pipe" | "angular-directive" | "angular-resolver" | "puppet" | "elixir" | "livescript" | "erlang" | "twig" | "julia" | "elm" | "purescript" | "smarty" | "stylus" | "reason" | "bucklescript" | "merlin" | "verilog" | "mathematica" | "wolframlanguage" | "nunjucks" | "robot" | "solidity" | "autoit" | "haml" | "yang" | "mjml" | "terraform" | "laravel" | "applescript" | "cake" | "cucumber" | "nim" | "apiblueprint" | "riot" | "vfl" | "kl" | "postcss" | "todo" | "coldfusion" | "cabal" | "nix" | "slim" | "http" | "restql" | "kivy" | "graphcool" | "sbt" | "android" | "tune" | "gitlab" | "jenkins" | "figma" | "crystal" | "drone" | "cuda" | "log" | "dotjs" | "ejs" | "wakatime" | "processing" | "storybook" | "wepy" | "hcl" | "san" | "django" | "red" | "makefile" | "foxpro" | "i18n" | "webassembly" | "jupyter" | "d" | "mdx" | "mdsvex" | "ballerina" | "racket" | "bazel" | "mint" | "velocity" | "godot" | "godot-assets" | "azure-pipelines" | "azure" | "vagrant" | "prisma" | "razor" | "abc" | "asciidoc" | "edge" | "scheme" | "lisp" | "3d" | "svg" | "svelte" | "vim" | "moonscript" | "advpl_prw" | "advpl_ptm" | "advpl_tlpp" | "advpl_include" | "disc" | "fortran" | "tcl" | "liquid" | "prolog" | "coconut" | "sketch" | "pawn" | "forth" | "uml" | "meson" | "dhall" | "sml" | "opam" | "imba" | "drawio" | "pascal" | "shaderlab" | "sas" | "nuget" | "denizenscript" | "nginx" | "minecraft" | "rescript" | "rescript-interface" | "brainfuck" | "bicep" | "cobol" | "grain" | "lolcode" | "idris" | "pipeline" | "opa" | "windicss" | "scala" | "lilypond" | "vlang" | "chess" | "gemini" | "tsconfig" | "tauri" | "jsconfig" | "ada" | "horusec" | "coala" | "dinophp" | "teal" | "template" | "shader" | "siyuan" | "ndst" | "tobi" | "gleam" | "steadybit" | "tree" | "cadence" | "antlr" | "stylable" | "pinejs" | "taskfile" | "gamemaker" | "tldraw" | "typst" | "mermaid" | "mojo" | "roblox" | "spwn" | "templ" | "chrome" | "stan" | "abap" | "lottie" | "apps-script" | "playwright" | "go-mod" | "gemfile" | "rubocop" | "rspec" | "semgrep" | "vue-config" | "nuxt" | "vercel" | "verdaccio" | "next" | "remix" | "posthtml" | "webpack" | "ionic" | "gulp" | "nodejs" | "npm" | "yarn" | "turborepo" | "babel" | "blitz" | "contributing" | "readme" | "changelog" | "architecture" | "credits" | "authors" | "flow" | "favicon" | "karma" | "bithound" | "svgo" | "appveyor" | "travis" | "codecov" | "sonarcloud" | "protractor" | "fusebox" | "heroku" | "editorconfig" | "bower" | "eslint" | "conduct" | "watchman" | "aurelia" | "auto" | "mocha" | "firebase" | "rollup" | "hack" | "hardhat" | "stylelint" | "code-climate" | "prettier" | "renovate" | "apollo" | "nodemon" | "webhint" | "browserlist" | "snyk" | "sequelize" | "gatsby" | "circleci" | "cloudfoundry" | "grunt" | "jest" | "fastlane" | "helm" | "wallaby" | "stencil" | "semantic-release" | "bitbucket" | "istanbul" | "tailwindcss" | "buildkite" | "netlify" | "nest" | "moon" | "percy" | "gitpod" | "codeowners" | "gcp" | "husky" | "tilt" | "capacitor" | "adonis" | "commitlint" | "buck" | "nrwl" | "dune" | "roadmap" | "stryker" | "modernizr" | "stitches" | "replit" | "snowpack" | "quasar" | "dependabot" | "vite" | "vitest" | "lerna" | "textlint" | "sentry" | "phpunit" | "php-cs-fixer" | "robots" | "maven" | "serverless" | "supabase" | "ember" | "poetry" | "parcel" | "astyle" | "lighthouse" | "svgr" | "rome" | "cypress" | "plop" | "tobimake" | "pnpm" | "gridsome" | "caddy" | "bun" | "nano-staged" | "craco" | "mercurial" | "deno" | "plastic" | "unocss" | "ifanr-cloud" | "concourse" | "werf" | "panda" | "biome" | "esbuild" | "puppeteer" | "kubernetes" | "matlab" | "diff" | "typescript" | "php" | "salesforce" | "blink_light" | "jinja_light" | "crystal_light" | "drone_light" | "wakatime_light" | "hcl_light" | "uml_light" | "chess_light" | "tldraw_light" | "rubocop_light" | "vercel_light" | "next_light" | "remix_light" | "turborepo_light" | "auto_light" | "stylelint_light" | "code-climate_light" | "browserlist_light" | "circleci_light" | "semantic-release_light" | "netlify_light" | "stitches_light" | "snowpack_light" | "pnpm_light" | "bun_light" | "nano-staged_light" | "deno_light" | "folder-jinja_light" | "folder-intellij_light" | "folder-jinja-open_light" | "folder-intellij-open_light" | "folder" | "folder-open" | "folder-root" | "folder-root-open" | "php_elephant" | "php_elephant_pink" | "go_gopher" | "nodejs_alt" | "silverstripe";
-        slug: string;
-        title: string;
-        packageName: string | undefined;
-        packageVersion: string | undefined;
-        runnerDuration: number;
-        runnerStartDate: string;
-    }[];
-    categories: {
-        slug: string;
-        title: string;
-        description: string | undefined;
-        refs: {
-            plugin: string;
-            type: CategoryConfigRefType;
-            weight: number;
-            slug: string;
-        }[];
-    }[];
-};
-export declare function issuesToGql(issues: Issue[] | undefined): {
-    message: string;
-    severity: PortalIssueSeverity;
-    sourceEndColumn: number | undefined;
-    sourceEndLine: number | undefined;
-    sourceFilePath: string | undefined;
-    sourceStartColumn: number | undefined;
-    sourceStartLine: number | undefined;
-    sourceType: IssueSourceType;
-}[];