@appland/appmap 3.100.1 → 3.102.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +21 -0
- package/built/cmds/compare/loadFindings.js +1 -23
- package/built/cmds/compare/loadFindings.js.map +1 -1
- package/built/cmds/compare-report/ChangeReport.js +12 -19
- package/built/cmds/compare-report/ChangeReport.js.map +1 -1
- package/built/cmds/compare-report/MarkdownReport.js +11 -2
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -1
- package/built/cmds/compare-report/Preprocessor.js +25 -5
- package/built/cmds/compare-report/Preprocessor.js.map +1 -1
- package/built/cmds/compare-report/ReportSection.js +94 -37
- package/built/cmds/compare-report/ReportSection.js.map +1 -1
- package/built/cmds/compare-report/helpers.js +106 -0
- package/built/cmds/compare-report/helpers.js.map +1 -0
- package/built/cmds/compare-report/normalizeAppMapId.js +15 -0
- package/built/cmds/compare-report/normalizeAppMapId.js.map +1 -0
- package/built/cmds/inventory/inventory.js +1 -15
- package/built/cmds/inventory/inventory.js.map +1 -1
- package/built/cmds/inventory-report/MarkdownReport.js +16 -56
- package/built/cmds/inventory-report/MarkdownReport.js.map +1 -1
- package/built/cmds/inventory-report/inventoryReport.js +10 -3
- package/built/cmds/inventory-report/inventoryReport.js.map +1 -1
- package/built/html/appmap.js +94 -94
- package/built/html/appmap.js.map +4 -4
- package/built/html/sequenceDiagram.js +94 -94
- package/built/html/sequenceDiagram.js.map +4 -4
- package/built/lib/loadAppMapConfig.js.map +1 -1
- package/package.json +1 -1
- package/resources/change-report/changed-appmaps/details.hbs +1 -1
- package/resources/change-report/changed-appmaps/heading.hbs +1 -1
- package/resources/change-report/failed-tests/details.hbs +1 -1
- package/resources/change-report/findings/details.hbs +15 -19
- package/resources/change-report/findings/heading.hbs +7 -9
- package/resources/change-report/new-appmaps/details.hbs +1 -1
- package/resources/change-report/new-appmaps/heading.hbs +2 -2
- package/resources/change-report/openapi-diff/details.hbs +1 -1
- package/resources/change-report/openapi-diff/heading.hbs +1 -1
- package/resources/change-report/removed-appmaps/details.hbs +1 -1
- package/resources/change-report/removed-appmaps/heading.hbs +3 -1
- package/resources/inventory-report/welcome/welcome.hbs +95 -60
- package/resources/inventory-report/default/inventory.hbs +0 -89
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,24 @@
|
|
|
1
|
+
# [@appland/appmap-v3.102.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.101.0...@appland/appmap-v3.102.0) (2023-10-17)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Delete un-maintained report ([caa2afd](https://github.com/getappmap/appmap-js/commit/caa2afdb83cd6e25cc28b15bb83f4f492654d93f))
|
|
7
|
+
* Include Finding examples in inventory output ([a84b0d9](https://github.com/getappmap/appmap-js/commit/a84b0d9f50014ce70b50f3656e39fa09c878607f))
|
|
8
|
+
* Iterate to minimal welcome / configuration report ([fd700f4](https://github.com/getappmap/appmap-js/commit/fd700f4c5f5ff2f4e2cc7532f7ebae682976ee10))
|
|
9
|
+
* Revise the welcome report ([6c682f1](https://github.com/getappmap/appmap-js/commit/6c682f1ecb0b29d2dee555f2e8fdbc2fd1c22d21))
|
|
10
|
+
* Show a sample of Findings in the Welcome message ([496e792](https://github.com/getappmap/appmap-js/commit/496e7922490ef4cf6d42a2bd2436c34e4b36a1b1))
|
|
11
|
+
|
|
12
|
+
# [@appland/appmap-v3.101.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.100.1...@appland/appmap-v3.101.0) (2023-10-13)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* Organize findings by category ([c05c1a1](https://github.com/getappmap/appmap-js/commit/c05c1a16c89a1a7490805657fd57107af1af478c))
|
|
18
|
+
* Report recorder name and type of removed AppMaps ([c8b25ea](https://github.com/getappmap/appmap-js/commit/c8b25eaf743a1d1358f44bd609cf8b9831f81f08))
|
|
19
|
+
* Reword 'so many' -> 'many' ([31e47c6](https://github.com/getappmap/appmap-js/commit/31e47c68e1b0d7f18b0f74f5fde50cc20e2a3c28))
|
|
20
|
+
* Use :zero: instead of :white_check_mark: ([89fa284](https://github.com/getappmap/appmap-js/commit/89fa2845b0aeb33c6cf1fc8427ed4169839469cb))
|
|
21
|
+
|
|
1
22
|
# [@appland/appmap-v3.100.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.100.0...@appland/appmap-v3.100.1) (2023-10-12)
|
|
2
23
|
|
|
3
24
|
|
|
@@ -1,15 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
const assert_1 = __importDefault(require("assert"));
|
|
7
|
-
const semver_1 = require("semver");
|
|
8
3
|
const promises_1 = require("fs/promises");
|
|
9
|
-
const executeCommand_1 = require("../../lib/executeCommand");
|
|
10
4
|
const utils_1 = require("../../utils");
|
|
11
5
|
async function loadFindings(paths, revisionName, appMapDir) {
|
|
12
|
-
const manifest = JSON.parse(await (0, promises_1.readFile)(paths.manifestPath(revisionName), 'utf-8'));
|
|
13
6
|
const findings = new Array();
|
|
14
7
|
const collectFindings = (findings) => {
|
|
15
8
|
return async (findingsFile) => {
|
|
@@ -17,22 +10,7 @@ async function loadFindings(paths, revisionName, appMapDir) {
|
|
|
17
10
|
findings.push(...findingsData.findings);
|
|
18
11
|
};
|
|
19
12
|
};
|
|
20
|
-
|
|
21
|
-
(0, assert_1.default)(archiveVersion);
|
|
22
|
-
if (archiveVersion.split('.').length === 2)
|
|
23
|
-
archiveVersion += '.0';
|
|
24
|
-
if (new semver_1.SemVer(archiveVersion).compare('1.3.0') < 0) {
|
|
25
|
-
const workingDir = paths.revisionPath(revisionName);
|
|
26
|
-
console.info(`Scanning ${revisionName} revision for findings (archive version: ${archiveVersion}).`);
|
|
27
|
-
let command = `npx @appland/scanner@latest scan -d ${workingDir} --all`;
|
|
28
|
-
await (0, executeCommand_1.executeCommand)(command);
|
|
29
|
-
// Pre-1.3.0 archive. Scan and load findings the old way.
|
|
30
|
-
const scanResults = JSON.parse(await (0, promises_1.readFile)(paths.findingsPath(revisionName), 'utf-8'));
|
|
31
|
-
findings.push(...(scanResults.findings || []));
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
await (0, utils_1.processNamedFiles)(paths.revisionPath(revisionName), 'appmap-findings.json', collectFindings(findings));
|
|
35
|
-
}
|
|
13
|
+
await (0, utils_1.processNamedFiles)(paths.revisionPath(revisionName), 'appmap-findings.json', collectFindings(findings));
|
|
36
14
|
console.info(`Found ${findings.length} findings for ${revisionName} revision`);
|
|
37
15
|
for (const finding of findings) {
|
|
38
16
|
if (finding.appMapFile.startsWith(appMapDir)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loadFindings.js","sourceRoot":"","sources":["../../../src/cmds/compare/loadFindings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loadFindings.js","sourceRoot":"","sources":["../../../src/cmds/compare/loadFindings.ts"],"names":[],"mappings":";;AAAA,0CAAuC;AAKvC,uCAAgD;AAEjC,KAAK,UAAU,YAAY,CACxC,KAAY,EACZ,YAA0B,EAC1B,SAAiB;IAEjB,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAW,CAAC;IAEtC,MAAM,eAAe,GAAG,CAAC,QAAmB,EAA6C,EAAE;QACzF,OAAO,KAAK,EAAE,YAAoB,EAAE,EAAE;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;YACvE,QAAQ,CAAC,IAAI,CAAC,GAAI,YAAY,CAAC,QAAsB,CAAC,CAAC;QACzD,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,IAAA,yBAAiB,EACrB,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,EAChC,sBAAsB,EACtB,eAAe,CAAC,QAAQ,CAAC,CAC1B,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,iBAAiB,YAAY,WAAW,CAAC,CAAC;IAE/E,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC5C,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACrE;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AA5BD,+BA4BC"}
|
|
@@ -8,7 +8,7 @@ const RevisionName_1 = require("../compare/RevisionName");
|
|
|
8
8
|
const assert_1 = __importDefault(require("assert"));
|
|
9
9
|
const executeCommand_1 = require("../../lib/executeCommand");
|
|
10
10
|
const utils_1 = require("../../utils");
|
|
11
|
-
const
|
|
11
|
+
const normalizeAppMapId_1 = __importDefault(require("./normalizeAppMapId"));
|
|
12
12
|
class AppMap {
|
|
13
13
|
constructor(
|
|
14
14
|
// id is a unique identifier for the AppMap. It's essentially the path to the AppMap
|
|
@@ -26,6 +26,9 @@ class AppMap {
|
|
|
26
26
|
get name() {
|
|
27
27
|
return this.metadata.name || this.sourceLocation || '<anonymous AppMap>';
|
|
28
28
|
}
|
|
29
|
+
get isTest() {
|
|
30
|
+
return this.metadata.recorder.type === 'tests' || this.metadata.test_status !== undefined;
|
|
31
|
+
}
|
|
29
32
|
get recorderName() {
|
|
30
33
|
return this.metadata.recorder.name;
|
|
31
34
|
}
|
|
@@ -113,34 +116,24 @@ class ChangeReport {
|
|
|
113
116
|
this.changedAppMaps = changedAppMaps;
|
|
114
117
|
this.pruned = pruned;
|
|
115
118
|
}
|
|
116
|
-
static normalizeId(id) {
|
|
117
|
-
let normalizedId = id;
|
|
118
|
-
if (normalizedId.startsWith('./'))
|
|
119
|
-
normalizedId = normalizedId.slice('./'.length);
|
|
120
|
-
if (normalizedId.endsWith('.appmap.json')) {
|
|
121
|
-
(0, console_1.warn)(`AppMap id ${id} should not include the file extension`);
|
|
122
|
-
normalizedId = normalizedId.slice(0, '.appmap.json'.length * -1);
|
|
123
|
-
}
|
|
124
|
-
return normalizedId;
|
|
125
|
-
}
|
|
126
119
|
static async build(changeReportData) {
|
|
127
120
|
var _a, _b, _c;
|
|
128
121
|
const metadata = (revision, appmap) => {
|
|
129
|
-
const appmapId =
|
|
122
|
+
const appmapId = (0, normalizeAppMapId_1.default)(appmap);
|
|
130
123
|
const metadata = changeReportData.appMapMetadata[revision][appmapId];
|
|
131
124
|
if (!metadata) {
|
|
132
125
|
(0, assert_1.default)(metadata);
|
|
133
126
|
}
|
|
134
127
|
return metadata;
|
|
135
128
|
};
|
|
136
|
-
const changedAppMapSet = changeReportData.changedAppMaps.reduce((memo, change) => (memo.add(
|
|
129
|
+
const changedAppMapSet = changeReportData.changedAppMaps.reduce((memo, change) => (memo.add((0, normalizeAppMapId_1.default)(change.appmap)), memo), new Set());
|
|
137
130
|
const sourceDiffs = changeReportData.changedAppMaps.reduce((memo, change) => {
|
|
138
131
|
if (change.sourceDiff)
|
|
139
|
-
memo.set(
|
|
132
|
+
memo.set((0, normalizeAppMapId_1.default)(change.appmap), change.sourceDiff);
|
|
140
133
|
return memo;
|
|
141
134
|
}, new Map());
|
|
142
135
|
const appmap = (revision, appmapId) => {
|
|
143
|
-
appmapId =
|
|
136
|
+
appmapId = (0, normalizeAppMapId_1.default)(appmapId);
|
|
144
137
|
const sourceDiff = sourceDiffs.get(appmapId);
|
|
145
138
|
return new AppMap(appmapId, metadata(revision, appmapId), changedAppMapSet.has(appmapId), sourceDiff);
|
|
146
139
|
};
|
|
@@ -177,7 +170,7 @@ class ChangeReport {
|
|
|
177
170
|
if (appmapId.endsWith('.appmap.json'))
|
|
178
171
|
appmapId = appmapId.slice(0, appmapId.length - '.appmap.json'.length);
|
|
179
172
|
return {
|
|
180
|
-
appmap: appmap(revisionName,
|
|
173
|
+
appmap: appmap(revisionName, (0, normalizeAppMapId_1.default)(appmapId)),
|
|
181
174
|
finding,
|
|
182
175
|
};
|
|
183
176
|
});
|
|
@@ -189,10 +182,10 @@ class ChangeReport {
|
|
|
189
182
|
else {
|
|
190
183
|
findingDiff = new FindingDiff([], []);
|
|
191
184
|
}
|
|
192
|
-
const newAppMaps = changeReportData.newAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Head,
|
|
193
|
-
const removedAppMaps = changeReportData.removedAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Base,
|
|
185
|
+
const newAppMaps = changeReportData.newAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Head, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
186
|
+
const removedAppMaps = changeReportData.removedAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Base, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
194
187
|
const changedAppMaps = Object.keys(changeReportData.sequenceDiagramDiff).reduce((memo, key) => {
|
|
195
|
-
const appmaps = changeReportData.sequenceDiagramDiff[key].map((appmapId) => appmap(RevisionName_1.RevisionName.Head,
|
|
188
|
+
const appmaps = changeReportData.sequenceDiagramDiff[key].map((appmapId) => appmap(RevisionName_1.RevisionName.Head, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
196
189
|
memo[key] = appmaps;
|
|
197
190
|
return memo;
|
|
198
191
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":";;;;;;AAIA,0DAAuD;AACvD,oDAA4B;AAC5B,6DAA0D;AAC1D,uCAAsC;
|
|
1
|
+
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,9 @@ const ReportSection_1 = __importStar(require("./ReportSection"));
|
|
|
33
33
|
exports.SECTIONS = [
|
|
34
34
|
ReportSection_1.Section.FailedTests,
|
|
35
35
|
ReportSection_1.Section.OpenAPIDiff,
|
|
36
|
-
ReportSection_1.Section.
|
|
36
|
+
ReportSection_1.Section.SecurityFlaws,
|
|
37
|
+
ReportSection_1.Section.PerformanceProblems,
|
|
38
|
+
ReportSection_1.Section.CodeAntiPatterns,
|
|
37
39
|
ReportSection_1.Section.NewAppMaps,
|
|
38
40
|
ReportSection_1.Section.RemovedAppMaps,
|
|
39
41
|
];
|
|
@@ -64,7 +66,14 @@ class MarkdownReport {
|
|
|
64
66
|
details.push(detail);
|
|
65
67
|
}
|
|
66
68
|
}
|
|
67
|
-
const heading = [
|
|
69
|
+
const heading = [
|
|
70
|
+
'# AppMap pull request analysis',
|
|
71
|
+
'',
|
|
72
|
+
'| Summary | Status |',
|
|
73
|
+
'| --- | --- |',
|
|
74
|
+
...headings,
|
|
75
|
+
'',
|
|
76
|
+
].join('\n');
|
|
68
77
|
return [heading, ...details].join('\n');
|
|
69
78
|
}
|
|
70
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;
|
|
1
|
+
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;AAE7F,gCAAgC;AACnB,QAAA,QAAQ,GAAc;IACjC,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,aAAa;IACrB,uBAAO,CAAC,mBAAmB;IAC3B,uBAAO,CAAC,gBAAgB;IACxB,uBAAO,CAAC,UAAU;IAClB,uBAAO,CAAC,cAAc;CACvB,CAAC;AACW,QAAA,qBAAqB,GAA0B,CAAC,mCAAmB,CAAC,cAAc,CAAC,CAAC;AAEjG,MAAqB,cAAc;IAIjC,YAAmB,SAAc,EAAS,SAAc;QAArC,cAAS,GAAT,SAAS,CAAK;QAAS,cAAS,GAAT,SAAS,CAAK;IAAG,CAAC;IAE5D,KAAK,CAAC,cAAc,CAAC,gBAAkC;QACrD,MAAM,QAAQ,GAAG;YACf,GAAG,gBAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,CAAC,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA,EAAA,CAAC;YACzE,GAAG,6BAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAA,CAAC;SACtF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEhE,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAU,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,KAAK,EAAU,CAAC;QACpC,MAAM,aAAa,GAAkB;YACnC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QACF,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;YAClC,MAAM,OAAO,GAAG,MAAM,uBAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5E,IAAI,OAAO,EAAE;gBACX,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtB;SACF;QAED,MAAM,OAAO,GAAG;YACd,gCAAgC;YAChC,EAAE;YACF,sBAAsB;YACtB,eAAe;YACf,GAAG,QAAQ;YACX,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,OAAO,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF;AAxCD,iCAwCC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.filterFindings = void 0;
|
|
3
4
|
const console_1 = require("console");
|
|
4
5
|
const ReportSection_1 = require("./ReportSection");
|
|
5
6
|
class FailedTestsPreprocessor {
|
|
@@ -44,15 +45,32 @@ class OpenAPIDiffPreprocessor {
|
|
|
44
45
|
return { openapiDiff };
|
|
45
46
|
}
|
|
46
47
|
}
|
|
48
|
+
const SECTION_INCLUDE_DOMAINS = {
|
|
49
|
+
'performance-problems': ['Performance'],
|
|
50
|
+
'security-flaws': ['Security'],
|
|
51
|
+
};
|
|
52
|
+
const SECTION_EXCLUDE_DOMAINS = {
|
|
53
|
+
'code-antipatterns': ['Security', 'Performance'],
|
|
54
|
+
};
|
|
55
|
+
function filterFindings(findings, section) {
|
|
56
|
+
const includeDomains = SECTION_INCLUDE_DOMAINS[section];
|
|
57
|
+
const excludeDomains = SECTION_EXCLUDE_DOMAINS[section];
|
|
58
|
+
return findings.filter((finding) => (!includeDomains || includeDomains.includes(finding.finding.impactDomain || 'Stability')) &&
|
|
59
|
+
(!excludeDomains || !excludeDomains.includes(finding.finding.impactDomain || 'Stability')));
|
|
60
|
+
}
|
|
61
|
+
exports.filterFindings = filterFindings;
|
|
47
62
|
class FindingDiffPreprocessor {
|
|
48
|
-
constructor(report) {
|
|
63
|
+
constructor(report, section) {
|
|
49
64
|
this.report = report;
|
|
65
|
+
this.section = section;
|
|
66
|
+
this.newFindings = filterFindings(this.report.findingDiff.newFindings || [], section);
|
|
67
|
+
this.resolvedFindings = filterFindings(this.report.findingDiff.resolvedFindings || [], section);
|
|
50
68
|
}
|
|
51
69
|
get numElements() {
|
|
52
|
-
return
|
|
70
|
+
return this.newFindings.length + this.resolvedFindings.length;
|
|
53
71
|
}
|
|
54
72
|
prune(numElements) {
|
|
55
|
-
const findingDiff =
|
|
73
|
+
const findingDiff = { newFindings: this.newFindings, resolvedFindings: this.resolvedFindings };
|
|
56
74
|
let numRemaining = numElements;
|
|
57
75
|
{
|
|
58
76
|
numRemaining -= findingDiff.newFindings.length;
|
|
@@ -114,8 +132,10 @@ function buildPreprocessor(section, report) {
|
|
|
114
132
|
return new FailedTestsPreprocessor(report);
|
|
115
133
|
case ReportSection_1.Section.OpenAPIDiff:
|
|
116
134
|
return new OpenAPIDiffPreprocessor(report);
|
|
117
|
-
case ReportSection_1.Section.
|
|
118
|
-
|
|
135
|
+
case ReportSection_1.Section.SecurityFlaws:
|
|
136
|
+
case ReportSection_1.Section.CodeAntiPatterns:
|
|
137
|
+
case ReportSection_1.Section.PerformanceProblems:
|
|
138
|
+
return new FindingDiffPreprocessor(report, section);
|
|
119
139
|
case ReportSection_1.Section.NewAppMaps:
|
|
120
140
|
return new NewAppMapsPreprocessor(report);
|
|
121
141
|
case ReportSection_1.Section.RemovedAppMaps:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Preprocessor.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/Preprocessor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Preprocessor.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/Preprocessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,39 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
2
25
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
26
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
27
|
};
|
|
5
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ExperimentalSection = exports.Section = exports.DEFAULT_MAX_ELEMENTS = exports.TemplateDirectory = void 0;
|
|
29
|
+
exports.ExperimentalSection = exports.FindingsSections = exports.Section = exports.DEFAULT_MAX_ELEMENTS = exports.TemplateDirectory = void 0;
|
|
7
30
|
const handlebars_1 = __importDefault(require("handlebars"));
|
|
8
31
|
const path_1 = require("path");
|
|
9
32
|
const promises_1 = require("fs/promises");
|
|
10
33
|
const fs_1 = require("fs");
|
|
11
34
|
const assert_1 = __importDefault(require("assert"));
|
|
12
|
-
const Preprocessor_1 =
|
|
35
|
+
const Preprocessor_1 = __importStar(require("./Preprocessor"));
|
|
36
|
+
const helpers_1 = __importDefault(require("./helpers"));
|
|
13
37
|
exports.TemplateDirectory = [
|
|
14
38
|
'../../../resources/change-report',
|
|
15
39
|
'../../../../resources/change-report', // In development
|
|
@@ -22,14 +46,46 @@ var Section;
|
|
|
22
46
|
(function (Section) {
|
|
23
47
|
Section["FailedTests"] = "failed-tests";
|
|
24
48
|
Section["OpenAPIDiff"] = "openapi-diff";
|
|
25
|
-
Section["
|
|
49
|
+
Section["SecurityFlaws"] = "security-flaws";
|
|
50
|
+
Section["PerformanceProblems"] = "performance-problems";
|
|
51
|
+
Section["CodeAntiPatterns"] = "code-antipatterns";
|
|
26
52
|
Section["NewAppMaps"] = "new-appmaps";
|
|
27
53
|
Section["RemovedAppMaps"] = "removed-appmaps";
|
|
28
54
|
})(Section = exports.Section || (exports.Section = {}));
|
|
55
|
+
exports.FindingsSections = [
|
|
56
|
+
Section.SecurityFlaws,
|
|
57
|
+
Section.PerformanceProblems,
|
|
58
|
+
Section.CodeAntiPatterns,
|
|
59
|
+
];
|
|
29
60
|
var ExperimentalSection;
|
|
30
61
|
(function (ExperimentalSection) {
|
|
31
62
|
ExperimentalSection["ChangedAppMaps"] = "changed-appmaps";
|
|
32
63
|
})(ExperimentalSection = exports.ExperimentalSection || (exports.ExperimentalSection = {}));
|
|
64
|
+
const SECTION_DIRECTORY = {
|
|
65
|
+
'performance-problems': 'findings',
|
|
66
|
+
'security-flaws': 'findings',
|
|
67
|
+
'code-antipatterns': 'findings',
|
|
68
|
+
};
|
|
69
|
+
const SECTION_METADATA = {
|
|
70
|
+
'performance-problems': {
|
|
71
|
+
name: 'performance problems',
|
|
72
|
+
title: 'Performance problems',
|
|
73
|
+
anchor: 'performance-problems',
|
|
74
|
+
emoji: '🐌',
|
|
75
|
+
},
|
|
76
|
+
'security-flaws': {
|
|
77
|
+
name: 'security flaws',
|
|
78
|
+
title: 'Security flaws',
|
|
79
|
+
anchor: 'security-flaws',
|
|
80
|
+
emoji: '🔒',
|
|
81
|
+
},
|
|
82
|
+
'code-antipatterns': {
|
|
83
|
+
name: 'code anti-patterns',
|
|
84
|
+
title: 'Code anti-patterns',
|
|
85
|
+
anchor: 'code-antipatterns',
|
|
86
|
+
emoji: '🚨',
|
|
87
|
+
},
|
|
88
|
+
};
|
|
33
89
|
class ReportSection {
|
|
34
90
|
constructor(section, headingTemplate, detailsTemplate) {
|
|
35
91
|
this.section = section;
|
|
@@ -37,7 +93,7 @@ class ReportSection {
|
|
|
37
93
|
this.detailsTemplate = detailsTemplate;
|
|
38
94
|
}
|
|
39
95
|
generateHeading(changeReport, options) {
|
|
40
|
-
return this.headingTemplate(changeReport, {
|
|
96
|
+
return this.headingTemplate(this.buildContext(changeReport), {
|
|
41
97
|
helpers: ReportSection.helpers(options),
|
|
42
98
|
});
|
|
43
99
|
}
|
|
@@ -55,38 +111,27 @@ class ReportSection {
|
|
|
55
111
|
report.pruned = true;
|
|
56
112
|
}
|
|
57
113
|
}
|
|
58
|
-
return this.detailsTemplate(report, {
|
|
114
|
+
return this.detailsTemplate(this.buildContext(report), {
|
|
59
115
|
helpers: ReportSection.helpers(options),
|
|
60
116
|
allowProtoPropertiesByDefault: true,
|
|
61
117
|
});
|
|
62
118
|
}
|
|
119
|
+
buildContext(changeReport) {
|
|
120
|
+
const context = Object.assign({}, changeReport);
|
|
121
|
+
const metadata = SECTION_METADATA[this.section];
|
|
122
|
+
if (metadata)
|
|
123
|
+
context.metadata = metadata;
|
|
124
|
+
if (exports.FindingsSections.includes(this.section)) {
|
|
125
|
+
const newFindings = (0, Preprocessor_1.filterFindings)(changeReport.findingDiff.newFindings, this.section);
|
|
126
|
+
const resolvedFindings = (0, Preprocessor_1.filterFindings)(changeReport.findingDiff.resolvedFindings, this.section);
|
|
127
|
+
context.findingDiff = { newFindings, resolvedFindings };
|
|
128
|
+
}
|
|
129
|
+
return context;
|
|
130
|
+
}
|
|
63
131
|
static helpers(options) {
|
|
64
132
|
let { baseDir } = options;
|
|
65
133
|
if (!baseDir)
|
|
66
134
|
baseDir = process.cwd();
|
|
67
|
-
const inspect = (value) => {
|
|
68
|
-
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
69
|
-
};
|
|
70
|
-
const length = (...list) => {
|
|
71
|
-
const _fn = list.pop();
|
|
72
|
-
let result = 0;
|
|
73
|
-
for (const item of list) {
|
|
74
|
-
if (Array.isArray(item)) {
|
|
75
|
-
result += item.length;
|
|
76
|
-
}
|
|
77
|
-
else if (item.constructor === Map) {
|
|
78
|
-
result += item.size;
|
|
79
|
-
}
|
|
80
|
-
else if (typeof item === 'object') {
|
|
81
|
-
result += Object.keys(item).length;
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
return result;
|
|
85
|
-
};
|
|
86
|
-
const coalesce = (...list) => {
|
|
87
|
-
const _fn = list.pop();
|
|
88
|
-
return list.find((item) => item !== undefined && item !== '');
|
|
89
|
-
};
|
|
90
135
|
const source_url = (location, fileLinenoSeparator = '#L') => {
|
|
91
136
|
if (typeof fileLinenoSeparator === 'object') {
|
|
92
137
|
fileLinenoSeparator = '#L';
|
|
@@ -114,6 +159,21 @@ class ReportSection {
|
|
|
114
159
|
return new handlebars_1.default.SafeString(location);
|
|
115
160
|
}
|
|
116
161
|
};
|
|
162
|
+
const group_appmaps_by_recorder_name = (appmaps) => {
|
|
163
|
+
const recorderGroups = appmaps.reduce((acc, appmap) => {
|
|
164
|
+
const recorderName = appmap.recorderName || 'unknown';
|
|
165
|
+
if (!acc.has(recorderName))
|
|
166
|
+
acc.set(recorderName, {
|
|
167
|
+
recorderName: recorderName,
|
|
168
|
+
isTest: appmap.isTest,
|
|
169
|
+
count: 1,
|
|
170
|
+
});
|
|
171
|
+
else
|
|
172
|
+
acc.get(recorderName).count += 1;
|
|
173
|
+
return acc;
|
|
174
|
+
}, new Map());
|
|
175
|
+
return [...recorderGroups.values()].sort((a, b) => b.count - a.count);
|
|
176
|
+
};
|
|
117
177
|
const appmap_title = (appmap) => {
|
|
118
178
|
const tokens = [];
|
|
119
179
|
if (appmap.recorderName)
|
|
@@ -144,21 +204,18 @@ class ReportSection {
|
|
|
144
204
|
return new handlebars_1.default.SafeString(path);
|
|
145
205
|
}
|
|
146
206
|
};
|
|
147
|
-
return {
|
|
148
|
-
inspect,
|
|
149
|
-
length,
|
|
150
|
-
coalesce,
|
|
207
|
+
return Object.assign({ appmap_diff_url,
|
|
151
208
|
appmap_title,
|
|
152
209
|
appmap_url,
|
|
153
|
-
|
|
154
|
-
source_url,
|
|
155
|
-
};
|
|
210
|
+
group_appmaps_by_recorder_name,
|
|
211
|
+
source_url }, helpers_1.default);
|
|
156
212
|
}
|
|
157
213
|
static async build(section, templateDir = exports.TemplateDirectory) {
|
|
158
214
|
(0, assert_1.default)(templateDir);
|
|
159
|
-
const
|
|
215
|
+
const sectionDir = SECTION_DIRECTORY[section] || section;
|
|
216
|
+
const headingTemplateFile = (0, path_1.join)(templateDir, sectionDir, 'heading.hbs');
|
|
160
217
|
const headingTemplate = handlebars_1.default.compile(await (0, promises_1.readFile)(headingTemplateFile, 'utf8'));
|
|
161
|
-
const detailsTemplateFile = (0, path_1.join)(templateDir,
|
|
218
|
+
const detailsTemplateFile = (0, path_1.join)(templateDir, sectionDir, 'details.hbs');
|
|
162
219
|
const detailsTemplate = handlebars_1.default.compile(await (0, promises_1.readFile)(detailsTemplateFile, 'utf8'));
|
|
163
220
|
return new ReportSection(section, headingTemplate, detailsTemplate);
|
|
164
221
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"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"}
|