fix!: remove covered line adjustment in deploy coverage reports

README.md

@@ -53,8 +53,6 @@ sf apex get test --test-run-id <test run id> --code-coverage --result-format jso
 
 The code coverage JSONs created by the Salesforce CLI aren't accepted automatically for Salesforce DX repositories and needs to be converted using this plugin.
 
-**Disclaimer**: Due to existing bugs with how the Salesforce CLI reports covered lines during deployments (see [5511](https://github.com/forcedotcom/salesforcedx-vscode/issues/5511) and [1568](https://github.com/forcedotcom/cli/issues/1568)), to add support for covered lines in this plugin for deployment coverage files, I had to add a function to re-number out-of-range covered lines the CLI may report (ex: line 100 in a 98-line Apex Class is reported back as covered by the Salesforce CLI deploy command). Salesforce's coverage result may also include extra lines as covered (ex: 120 lines are included in the coverage report for a 100 line file), so the coverage percentage may vary based on how many lines the API returns in the coverage report. Once Salesforce fixes the API to correctly return covered lines in the deploy command, this function will be removed.
-
 ## Command
 
 The `apex-code-coverage-transformer` has 1 command:

src/helpers/handleCloverFormat.ts

@@ -0,0 +1,48 @@
+'use strict';
+/* eslint-disable no-param-reassign */
+
+import { CloverCoverageObject, CloverFile } from './types.js';
+import { normalizePathToUnix } from './normalizePathToUnix.js';
+
+export function handleCloverFormat(
+  filePath: string,
+  fileName: string,
+  lines: Record<string, number>,
+  uncoveredLines: number[],
+  coveredLines: number[],
+  coverageObj: CloverCoverageObject
+): void {
+  const cloverFile: CloverFile = {
+    '@name': fileName,
+    '@path': normalizePathToUnix(filePath),
+    metrics: {
+      '@statements': uncoveredLines.length + coveredLines.length,
+      '@coveredstatements': coveredLines.length,
+      '@conditionals': 0,
+      '@coveredconditionals': 0,
+      '@methods': 0,
+      '@coveredmethods': 0,
+    },
+    line: [],
+  };
+
+  for (const [lineNumber, isCovered] of Object.entries(lines)) {
+    cloverFile.line.push({
+      '@num': Number(lineNumber),
+      '@count': isCovered === 1 ? 1 : 0,
+      '@type': 'stmt',
+    });
+  }
+
+  coverageObj.coverage.project.file.push(cloverFile);
+  const projectMetrics = coverageObj.coverage.project.metrics;
+
+  projectMetrics['@statements'] += uncoveredLines.length + coveredLines.length;
+  projectMetrics['@coveredstatements'] += coveredLines.length;
+  projectMetrics['@elements'] += uncoveredLines.length + coveredLines.length;
+  projectMetrics['@coveredelements'] += coveredLines.length;
+  projectMetrics['@files'] += 1;
+  projectMetrics['@classes'] += 1;
+  projectMetrics['@loc'] += uncoveredLines.length + coveredLines.length;
+  projectMetrics['@ncloc'] += uncoveredLines.length + coveredLines.length;
+}

src/helpers/handleCoberturaFormat.ts

@@ -0,0 +1,43 @@
+'use strict';
+/* eslint-disable no-param-reassign */
+
+import { CoberturaCoverageObject, CoberturaClass, CoberturaPackage } from './types.js';
+import { normalizePathToUnix } from './normalizePathToUnix.js';
+
+export function handleCoberturaFormat(
+  filePath: string,
+  fileName: string,
+  lines: Record<string, number>,
+  uncoveredLines: number[],
+  coveredLines: number[],
+  coverageObj: CoberturaCoverageObject,
+  packageObj: CoberturaPackage
+): void {
+  const classObj: CoberturaClass = {
+    '@name': fileName,
+    '@filename': normalizePathToUnix(filePath),
+    '@line-rate': (coveredLines.length / (coveredLines.length + uncoveredLines.length)).toFixed(4),
+    '@branch-rate': '1',
+    methods: {},
+    lines: {
+      line: [],
+    },
+  };
+
+  for (const [lineNumber, isCovered] of Object.entries(lines)) {
+    classObj.lines.line.push({
+      '@number': Number(lineNumber),
+      '@hits': isCovered === 1 ? 1 : 0,
+      '@branch': 'false',
+    });
+  }
+
+  coverageObj.coverage['@lines-valid'] += uncoveredLines.length + coveredLines.length;
+  coverageObj.coverage['@lines-covered'] += coveredLines.length;
+  packageObj.classes.class.push(classObj);
+
+  packageObj['@line-rate'] = Number(
+    (coverageObj.coverage['@lines-covered'] / coverageObj.coverage['@lines-valid']).toFixed(4)
+  );
+  coverageObj.coverage['@line-rate'] = packageObj['@line-rate'];
+}

src/helpers/handleSonarFormat.ts

@@ -0,0 +1,27 @@
+'use strict';
+/* eslint-disable no-param-reassign */
+
+import { SonarCoverageObject, SonarClass } from './types.js';
+import { normalizePathToUnix } from './normalizePathToUnix.js';
+
+export function handleSonarFormat(
+  filePath: string,
+  lines: Record<string, number>,
+  coverageObj: SonarCoverageObject
+): void {
+  const fileObj: SonarClass = {
+    '@path': normalizePathToUnix(filePath),
+    lineToCover: [],
+  };
+
+  for (const lineNumberString in lines) {
+    if (!Object.hasOwn(lines, lineNumberString)) continue;
+    const covered = lines[lineNumberString] === 1 ? 'true' : 'false';
+    fileObj.lineToCover.push({
+      '@lineNumber': Number(lineNumberString),
+      '@covered': covered,
+    });
+  }
+
+  coverageObj.coverage.file.push(fileObj);
+}