Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: reduce mutation, honest TS as, reduce => object.fromEntries #341

Merged
merged 1 commit into from
Dec 13, 2023
Merged

refactor: reduce mutation, honest TS as, reduce => object.fromEntries #341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 53 additions & 57 deletions src/reporters/coverageReporter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,7 @@
* Licensed under the BSD 3-Clause license.
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/
import {
ApexCodeCoverage,
ApexCodeCoverageAggregate,
ApexCodeCoverageAggregateRecord,
ApexCodeCoverageRecord
} from '../tests/types';
import { ApexCodeCoverage, ApexCodeCoverageAggregate } from '../tests/types';
import * as libReport from 'istanbul-lib-report';
import * as reports from 'istanbul-reports';
import * as libCoverage from 'istanbul-lib-coverage';
Expand Down Expand Up @@ -125,63 +120,64 @@ export class CoverageReporter {
cwd: this.sourceDir
});
const coverageMap = libCoverage.createCoverageMap();
this.coverage.records.forEach(
(record: ApexCodeCoverageRecord | ApexCodeCoverageAggregateRecord) => {
const fileCoverageData: libCoverage.FileCoverageData = {} as libCoverage.FileCoverageData;

this.coverage.records
.map((record): libCoverage.FileCoverageData => {
const fileNameWithExtension = `${record.ApexClassOrTrigger.Name}.${
record.ApexClassOrTrigger.Id?.startsWith('01p') ? 'cls' : 'trigger'
}`;

fileCoverageData.fnMap = {};
fileCoverageData.branchMap = {};
fileCoverageData.path = path.join(
const coveragePath = path.join(
this.sourceDir,
pathsToFiles.find(file => file === fileNameWithExtension) ||
pathsToFiles.find((file) => file === fileNameWithExtension) ??
fileNameWithExtension
);
fileCoverageData.f = {};
fileCoverageData.b = {};
fileCoverageData.s = [
...record.Coverage.coveredLines.map((line) => [line, 1]),
...record.Coverage.uncoveredLines.map((line) => [line, 0])
]
.map(([line, covered]) => [Number(line).toString(10), covered])
.reduce((acc, [line, value]) => {
return Object.assign(acc, { [line]: value });
}, {});
let sourceLines: string[] = [];
try {
sourceLines = fs
.readFileSync(fileCoverageData.path, 'utf8')
.split('\n');
} catch {
// file not found
}
fileCoverageData.statementMap = [
...record.Coverage.coveredLines,
...record.Coverage.uncoveredLines
]
.sort()
.map((line) => {
const statement: libCoverage.Range = {
start: {
line,
column: startOfSource(sourceLines[line - 1])
},
end: {
line,
column: endOfSource(sourceLines[line - 1])
}
};

return [Number(line).toString(10), statement];
})
.reduce((acc, [line, value]) => {
return Object.assign(acc, { [Number(line).toString()]: value });
}, {});
coverageMap.addFileCoverage(fileCoverageData);
}
);
const sourceLines = getSourceLines(coveragePath);
return {
fnMap: {},
branchMap: {},
path: coveragePath,
f: {},
b: {},
s: Object.fromEntries(
[
...record.Coverage.coveredLines.map((line) => [line, 1]),
...record.Coverage.uncoveredLines.map((line) => [line, 0])
].map(([line, covered]) => [Number(line).toString(10), covered])
),
statementMap: Object.fromEntries(
[...record.Coverage.coveredLines, ...record.Coverage.uncoveredLines]
// TODO: use asSorted when node18 is no longer supported
.sort()
.map(lineToRange(sourceLines))
)
};
})
.map((fc) => coverageMap.addFileCoverage(fc));
return coverageMap;
}
}

const getSourceLines = (coveragePath: string): string[] => {
try {
return fs.readFileSync(coveragePath, 'utf8').split('\n');
} catch {
// file not found
return [];
}
};

const lineToRange =
(sourceLines: string[]) =>
(line: number): [string, libCoverage.Range] => [
Number(line).toString(10),
{
start: {
line,
column: startOfSource(sourceLines[line - 1])
},
end: {
line,
column: endOfSource(sourceLines[line - 1])
}
}
];
16 changes: 6 additions & 10 deletions test/reporters/coverageReporter.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,14 +108,12 @@ const multipleCoverageAggregate = {
{
attributes: {
type: 'ApexCodeCoverageAggregate',
url:
'/services/data/v56.0/tooling/sobjects/ApexCodeCoverageAggregate/7153M000000ADC6QAO'
url: '/services/data/v56.0/tooling/sobjects/ApexCodeCoverageAggregate/7153M000000ADC6QAO'
},
ApexClassOrTrigger: {
attributes: {
type: 'Name',
url:
'/services/data/v56.0/tooling/sobjects/ApexTrigger/01q3M000000CzMWQA0'
url: '/services/data/v56.0/tooling/sobjects/ApexTrigger/01q3M000000CzMWQA0'
},
Id: '01q3M000000CzMWQA0',
Name: 'Bla'
Expand All @@ -130,14 +128,12 @@ const multipleCoverageAggregate = {
{
attributes: {
type: 'ApexCodeCoverageAggregate',
url:
'/services/data/v56.0/tooling/sobjects/ApexCodeCoverageAggregate/7153M000000ADBwQAO'
url: '/services/data/v56.0/tooling/sobjects/ApexCodeCoverageAggregate/7153M000000ADBwQAO'
},
ApexClassOrTrigger: {
attributes: {
type: 'Name',
url:
'/services/data/v56.0/tooling/sobjects/ApexClass/01p3M000000MLgJQAW'
url: '/services/data/v56.0/tooling/sobjects/ApexClass/01p3M000000MLgJQAW'
},
Id: '01p3M000000MLgJQAW',
Name: 'Bla'
Expand Down Expand Up @@ -270,14 +266,14 @@ describe('coverageReports', () => {
);

const files = multipleCoverageAggregate.records
.map(record => {
.map((record) => {
return `${record.ApexClassOrTrigger.Name}.${
record.ApexClassOrTrigger.Id.startsWith('01p') ? 'cls' : 'trigger'
}`;
})
.sort();

Object.keys(codeCoverage).forEach(codeCoverageEntry => {
Object.keys(codeCoverage).forEach((codeCoverageEntry) => {
expect(files).to.include(path.basename(codeCoverageEntry));
});
});
Expand Down