@code-pushup/core 0.18.1 → 0.19.0

package/index.js

@@ -956,16 +956,32 @@ function executeProcess(cfg) {
   });
 }
 
+// packages/utils/src/lib/transform.ts
+function deepClone(obj) {
+  return obj == null || typeof obj !== "object" ? obj : structuredClone(obj);
+}
+function toUnixPath(path) {
+  return path.replace(/\\/g, "/");
+}
+
 // packages/utils/src/lib/git.ts
+import { isAbsolute, join as join2, relative } from "node:path";
 import { simpleGit } from "simple-git";
-var git = simpleGit();
-async function getLatestCommit() {
+async function getLatestCommit(git = simpleGit()) {
   const log = await git.log({
     maxCount: 1,
     format: { hash: "%H", message: "%s", author: "%an", date: "%ad" }
   });
   return log.latest;
 }
+function getGitRoot(git = simpleGit()) {
+  return git.revparse("--show-toplevel");
+}
+function formatGitPath(path, gitRoot) {
+  const absolutePath = isAbsolute(path) ? path : join2(process.cwd(), path);
+  const relativePath = relative(gitRoot, absolutePath);
+  return toUnixPath(relativePath);
+}
 function validateCommitData(commitData, options = {}) {
   const { throwError = false } = options;
   if (!commitData) {
@@ -988,18 +1004,21 @@ function groupByStatus(results) {
   );
 }
 
-// packages/utils/src/lib/progress.ts
+// packages/utils/src/lib/logging.ts
 import chalk2 from "chalk";
+
+// packages/utils/src/lib/progress.ts
+import chalk3 from "chalk";
 import { MultiProgressBars } from "multi-progress-bars";
 var barStyles = {
-  active: (s) => chalk2.green(s),
-  done: (s) => chalk2.gray(s),
-  idle: (s) => chalk2.gray(s)
+  active: (s) => chalk3.green(s),
+  done: (s) => chalk3.gray(s),
+  idle: (s) => chalk3.gray(s)
 };
 var messageStyles = {
-  active: (s) => chalk2.black(s),
-  done: (s) => chalk2.green(chalk2.bold(s)),
-  idle: (s) => chalk2.gray(s)
+  active: (s) => chalk3.black(s),
+  done: (s) => chalk3.green(chalk3.bold(s)),
+  idle: (s) => chalk3.gray(s)
 };
 var mpb;
 function getSingletonProgressBars(options) {
@@ -1298,7 +1317,7 @@ function getAuditResult(audit, isHtml = false) {
 
 // packages/utils/src/lib/reports/generate-stdout-summary.ts
 import cliui from "@isaacs/cliui";
-import chalk3 from "chalk";
+import chalk4 from "chalk";
 import CliTable3 from "cli-table3";
 function addLine(line = "") {
   return line + NEW_LINE;
@@ -1309,7 +1328,7 @@ function generateStdoutSummary(report) {
 }
 function reportToHeaderSection2(report) {
   const { packageName, version: version2 } = report;
-  return `${chalk3.bold(reportHeadlineText)} - ${packageName}@${version2}`;
+  return `${chalk4.bold(reportHeadlineText)} - ${packageName}@${version2}`;
 }
 function reportToDetailSection(report) {
   const { plugins } = report;
@@ -1329,13 +1348,13 @@ function reportToDetailSection(report) {
           padding: [0, 3, 0, 0]
         },
         {
-          text: chalk3.cyanBright(audit.displayValue || `${audit.value}`),
+          text: chalk4.cyanBright(audit.displayValue || `${audit.value}`),
           width: 10,
           padding: [0, 0, 0, 0]
         }
       );
     });
-    return acc + addLine() + addLine(chalk3.magentaBright.bold(`${title} audits`)) + addLine() + addLine(ui.toString()) + addLine();
+    return acc + addLine() + addLine(chalk4.magentaBright.bold(`${title} audits`)) + addLine() + addLine(ui.toString()) + addLine();
   }, "");
 }
 function reportToOverviewSection2({
@@ -1358,11 +1377,11 @@ function reportToOverviewSection2({
       countCategoryAudits(refs, plugins)
     ])
   );
-  return addLine(chalk3.magentaBright.bold("Categories")) + addLine() + addLine(table.toString());
+  return addLine(chalk4.magentaBright.bold("Categories")) + addLine() + addLine(table.toString());
 }
 function withColor({ score, text }) {
   const formattedScore = text ?? formatReportScore(score);
-  const style2 = text ? chalk3 : chalk3.bold;
+  const style2 = text ? chalk4 : chalk4.bold;
   if (score >= SCORE_COLOR_RANGE.GREEN_MIN) {
     return style2.green(formattedScore);
   }
@@ -1372,11 +1391,6 @@ function withColor({ score, text }) {
   return style2.red(formattedScore);
 }
 
-// packages/utils/src/lib/transform.ts
-function deepClone(obj) {
-  return obj == null || typeof obj !== "object" ? obj : structuredClone(obj);
-}
-
 // packages/utils/src/lib/reports/scoring.ts
 var GroupRefInvalidError = class extends Error {
   constructor(auditSlug, pluginSlug) {
@@ -1537,18 +1551,48 @@ var verboseUtils = (verbose = false) => ({
   exec: getExecVerbose(verbose)
 });
 
-// packages/utils/src/lib/logging.ts
-import chalk4 from "chalk";
-
 // packages/core/package.json
 var name = "@code-pushup/core";
-var version = "0.18.1";
+var version = "0.19.0";
 
 // packages/core/src/lib/implementation/execute-plugin.ts
 import chalk5 from "chalk";
 
+// packages/core/src/lib/normalize.ts
+function normalizePersistConfig(cfg) {
+  return {
+    outputDir: PERSIST_OUTPUT_DIR,
+    filename: PERSIST_FILENAME,
+    format: PERSIST_FORMAT,
+    ...cfg
+  };
+}
+async function normalizeAuditOutputs(audits) {
+  const gitRoot = await getGitRoot();
+  return audits.map((audit) => {
+    if (audit.details?.issues == null || audit.details.issues.every((issue) => issue.source == null)) {
+      return audit;
+    }
+    return {
+      ...audit,
+      details: {
+        ...audit.details,
+        issues: audit.details.issues.map(
+          (issue) => issue.source == null ? issue : {
+            ...issue,
+            source: {
+              ...issue.source,
+              file: formatGitPath(issue.source.file, gitRoot)
+            }
+          }
+        )
+      }
+    };
+  });
+}
+
 // packages/core/src/lib/implementation/runner.ts
-import { join as join2 } from "node:path";
+import { join as join3 } from "node:path";
 async function executeRunnerConfig(cfg, onProgress) {
   const { args, command, outputFile, outputTransform } = cfg;
   const { duration, date } = await executeProcess({
@@ -1556,7 +1600,7 @@ async function executeRunnerConfig(cfg, onProgress) {
     args,
     observer: { onStdout: onProgress }
   });
-  const outputs = await readJsonFile(join2(process.cwd(), outputFile));
+  const outputs = await readJsonFile(join3(process.cwd(), outputFile));
   const audits = outputTransform ? await outputTransform(outputs) : outputs;
   return {
     duration,
@@ -1594,7 +1638,8 @@ async function executePlugin(pluginConfig, onProgress) {
   const { audits: unvalidatedAuditOutputs, ...executionMeta } = runnerResult;
   const auditOutputs = auditOutputsSchema.parse(unvalidatedAuditOutputs);
   auditOutputsCorrelateWithPluginOutput(auditOutputs, pluginConfigAudits);
-  const auditReports = auditOutputs.map(
+  const normalizedAuditOutputs = await normalizeAuditOutputs(auditOutputs);
+  const auditReports = normalizedAuditOutputs.map(
     (auditOutput) => ({
       ...auditOutput,
       ...pluginConfigAudits.find(
@@ -1672,7 +1717,7 @@ async function collect(options) {
 
 // packages/core/src/lib/implementation/persist.ts
 import { mkdir as mkdir2, stat as stat2, writeFile } from "node:fs/promises";
-import { join as join3 } from "node:path";
+import { join as join4 } from "node:path";
 var PersistDirError = class extends Error {
   constructor(outputDir) {
     super(`outPath: ${outputDir} is no directory.`);
@@ -1716,7 +1761,7 @@ async function persistReport(report, options) {
   return Promise.allSettled(
     results.map(
       (result) => persistResult(
-        join3(outputDir, `${filename}.${result.format}`),
+        join4(outputDir, `${filename}.${result.format}`),
         result.content
       )
     )
@@ -1732,14 +1777,6 @@ function logPersistedResults(persistResults) {
   logMultipleFileResults(persistResults, "Generated reports");
 }
 
-// packages/core/src/lib/normalize.ts
-var normalizePersistConfig = (cfg) => ({
-  outputDir: PERSIST_OUTPUT_DIR,
-  filename: PERSIST_FILENAME,
-  format: PERSIST_FORMAT,
-  ...cfg
-});
-
 // packages/core/src/lib/collect-and-persist.ts
 async function collectAndPersistReports(options) {
   const { exec } = verboseUtils(options.verbose);
@@ -1755,7 +1792,7 @@ async function collectAndPersistReports(options) {
 }
 
 // packages/core/src/lib/implementation/read-rc-file.ts
-import { join as join4 } from "node:path";
+import { join as join5 } from "node:path";
 var ConfigPathError = class extends Error {
   constructor(configPath) {
     super(`Provided path '${configPath}' is not valid.`);
@@ -1788,7 +1825,7 @@ async function autoloadRc() {
       )}) present in ${process.cwd()}`
     );
   }
-  return readRcByPath(join4(process.cwd(), `${CONFIG_FILE_NAME}.${ext}`));
+  return readRcByPath(join5(process.cwd(), `${CONFIG_FILE_NAME}.${ext}`));
 }
 
 // packages/core/src/lib/upload.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/core",
-  "version": "0.18.1",
+  "version": "0.19.0",
   "license": "MIT",
   "dependencies": {
     "@code-pushup/models": "*",

package/src/lib/normalize.d.ts

@@ -1,2 +1,3 @@
-import { PersistConfig } from '@code-pushup/models';
-export declare const normalizePersistConfig: (cfg?: Partial<PersistConfig>) => Required<PersistConfig>;
+import { type AuditOutputs, PersistConfig } from '@code-pushup/models';
+export declare function normalizePersistConfig(cfg?: Partial<PersistConfig>): Required<PersistConfig>;
+export declare function normalizeAuditOutputs(audits: AuditOutputs): Promise<AuditOutputs>;