@appland/appmap 3.85.0 → 3.86.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 +15 -0
- package/built/cli.js +4 -0
- package/built/cli.js.map +1 -1
- package/built/cmds/archive/analyze.js.map +1 -1
- package/built/cmds/archive/analyzeWorker.js +3 -3
- package/built/cmds/archive/analyzeWorker.js.map +1 -1
- package/built/cmds/compare/ArchiveAnalyzer.js +69 -0
- package/built/cmds/compare/ArchiveAnalyzer.js.map +1 -0
- package/built/cmds/compare/ChangeReport.js +3 -0
- package/built/cmds/compare/ChangeReport.js.map +1 -0
- package/built/cmds/compare/ChangeReporter.js +398 -0
- package/built/cmds/compare/ChangeReporter.js.map +1 -0
- package/built/cmds/compare/Digests.js +50 -0
- package/built/cmds/compare/Digests.js.map +1 -0
- package/built/cmds/compare/Paths.js +45 -0
- package/built/cmds/compare/Paths.js.map +1 -0
- package/built/cmds/compare/RevisionName.js +10 -0
- package/built/cmds/compare/RevisionName.js.map +1 -0
- package/built/cmds/compare/SequenceDiagramDigest.js +20 -0
- package/built/cmds/compare/SequenceDiagramDigest.js.map +1 -0
- package/built/cmds/compare/ValidationError.js +7 -0
- package/built/cmds/compare/ValidationError.js.map +1 -0
- package/built/cmds/compare/checkout.js +36 -0
- package/built/cmds/compare/checkout.js.map +1 -0
- package/built/cmds/compare/compare.js +121 -0
- package/built/cmds/compare/compare.js.map +1 -0
- package/built/cmds/compare/detectRevisions.js +19 -0
- package/built/cmds/compare/detectRevisions.js.map +1 -0
- package/built/cmds/compare/loadFindings.js +45 -0
- package/built/cmds/compare/loadFindings.js.map +1 -0
- package/built/cmds/compare/loadSequenceDiagram.js +11 -0
- package/built/cmds/compare/loadSequenceDiagram.js.map +1 -0
- package/built/cmds/compare/mapToRecord.js +11 -0
- package/built/cmds/compare/mapToRecord.js.map +1 -0
- package/built/cmds/compare/prepareOutputDir.js +34 -0
- package/built/cmds/compare/prepareOutputDir.js.map +1 -0
- package/built/cmds/compare/ui.js +38 -0
- package/built/cmds/compare/ui.js.map +1 -0
- package/built/cmds/compare-report/MarkdownReport.js +197 -0
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -0
- package/built/cmds/compare-report/Report.js +3 -0
- package/built/cmds/compare-report/Report.js.map +1 -0
- package/built/cmds/compare-report/compareReport.js +47 -0
- package/built/cmds/compare-report/compareReport.js.map +1 -0
- package/built/html/appmap.js +6 -6
- package/built/html/appmap.js.map +1 -1
- package/built/html/sequenceDiagram.js +6 -6
- package/built/html/sequenceDiagram.js.map +1 -1
- package/built/lib/findings.js +6 -0
- package/built/lib/findings.js.map +1 -0
- package/package.json +4 -1
- package/resources/change-report.hbs +259 -0
- package/built/cmds/archive/updateSequenceDiagrams.js +0 -49
- package/built/cmds/archive/updateSequenceDiagrams.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,18 @@
|
|
|
1
|
+
# [@appland/appmap-v3.86.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.85.0...@appland/appmap-v3.86.0) (2023-08-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Build diagram from filtered AppMap ([d6f2edc](https://github.com/getappmap/appmap-js/commit/d6f2edcf0d76a146a53a3d90693d436b5c645e74))
|
|
7
|
+
* Processing of sequenceDiagramDiffSnippetCount ([d20965d](https://github.com/getappmap/appmap-js/commit/d20965d0692510a8f96c8fe8ae8c83261616758b))
|
|
8
|
+
* Wait for index file update ([4b7f558](https://github.com/getappmap/appmap-js/commit/4b7f5582451097e43c52d544b6280dc902acef43))
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* compare command ([584d648](https://github.com/getappmap/appmap-js/commit/584d648718800478a9337962cdc33b62b33d03dc))
|
|
14
|
+
* compare-report command ([267d63a](https://github.com/getappmap/appmap-js/commit/267d63a33c88b4cde213623b3941443117ee80de))
|
|
15
|
+
|
|
1
16
|
# [@appland/appmap-v3.85.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.84.2...@appland/appmap-v3.85.0) (2023-08-11)
|
|
2
17
|
|
|
3
18
|
|
package/built/cli.js
CHANGED
|
@@ -36,6 +36,8 @@ const SequenceDiagramDiffCommand = require('./cmds/sequenceDiagramDiff');
|
|
|
36
36
|
const StatsCommand = require('./cmds/stats/stats');
|
|
37
37
|
const ArchiveCommand = require('./cmds/archive/archive');
|
|
38
38
|
const RestoreCommand = require('./cmds/archive/restore');
|
|
39
|
+
const CompareCommand = require('./cmds/compare/compare');
|
|
40
|
+
const CompareReportCommand = require('./cmds/compare-report/compareReport');
|
|
39
41
|
const upload_1 = __importDefault(require("./cmds/upload"));
|
|
40
42
|
const sqlErrorLog_1 = __importDefault(require("./lib/sqlErrorLog"));
|
|
41
43
|
(0, models_1.setSQLErrorHandler)(sqlErrorLog_1.default);
|
|
@@ -211,6 +213,8 @@ yargs(process.argv.slice(2))
|
|
|
211
213
|
.command(upload_1.default)
|
|
212
214
|
.command(ArchiveCommand)
|
|
213
215
|
.command(RestoreCommand)
|
|
216
|
+
.command(CompareCommand)
|
|
217
|
+
.command(CompareReportCommand)
|
|
214
218
|
.strict()
|
|
215
219
|
.demandCommand()
|
|
216
220
|
.help().argv;
|
package/built/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,7 +35,7 @@ worker_threads_1.parentPort.on('message', async (task) => {
|
|
|
35
35
|
let result;
|
|
36
36
|
if ((0, ScanTask_1.isScanTask)(task)) {
|
|
37
37
|
const scanResults = await (0, scanner_1.scan)(task.appmapFile, 'appmap-scanner.yml');
|
|
38
|
-
writeIndexFile(JSON.stringify(scanResults, null, 2), 'appmap-findings.json');
|
|
38
|
+
await writeIndexFile(JSON.stringify(scanResults, null, 2), 'appmap-findings.json');
|
|
39
39
|
result = { findingsCount: scanResults.findings.length };
|
|
40
40
|
}
|
|
41
41
|
else if ((0, SequenceDiagramTask_1.isSequenceDiagramTask)(task)) {
|
|
@@ -46,9 +46,9 @@ worker_threads_1.parentPort.on('message', async (task) => {
|
|
|
46
46
|
const filter = (0, buildFilter_1.default)(language, task.compareFilter);
|
|
47
47
|
const filteredAppMap = filter.filter(appmap, []);
|
|
48
48
|
const specification = sequence_diagram_1.Specification.build(filteredAppMap, task.specOptions);
|
|
49
|
-
const diagram = (0, sequence_diagram_1.buildDiagram)(task.appmapFile,
|
|
49
|
+
const diagram = (0, sequence_diagram_1.buildDiagram)(task.appmapFile, filteredAppMap, specification);
|
|
50
50
|
const diagramData = (0, sequence_diagram_1.format)(sequence_diagram_1.FormatType.JSON, diagram, task.appmapFile).diagram;
|
|
51
|
-
writeIndexFile(diagramData, 'sequence.json');
|
|
51
|
+
await writeIndexFile(diagramData, 'sequence.json');
|
|
52
52
|
result = {};
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyzeWorker.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyzeWorker.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,mDAA4C;AAC5C,IAAA,gBAAM,EAAC,2BAAU,CAAC,CAAC;AAEnB,4CAAkE;AAElE,wEAAgD;AAChD,uCAAsC;AACtC,+CAAwD;AACxD,gFAAoG;AAGpG,0CAAwD;AACxD,8CAAwC;AACxC,+BAA+C;AAC/C,gEAAsD;AACtD,gEAA4F;AAE5F,IAAA,2BAAkB,EAAC,qBAAW,CAAC,CAAC;AAEhC,2BAAU,CAAC,EAAE,CAAC,SAAS,EAAE,KAAK,EAAE,IAAoC,EAAE,EAAE;;IACtE,IAAA,gBAAM,EAAC,2BAAU,CAAC,CAAC;IACnB,IAAI,IAAI,CAAC,OAAO;QAAE,IAAA,eAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAExC,MAAM,cAAc,GAAG,KAAK,EAAE,IAAY,EAAE,QAAgB,EAAE,EAAE;QAC9D,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,IAAA,cAAO,EAAC,IAAI,CAAC,UAAU,CAAC,EAAE,IAAA,eAAQ,EAAC,IAAI,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC;QAC3F,MAAM,IAAA,oBAAS,EAAC,IAAA,WAAI,EAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,IAAI;QACF,MAAM,KAAK,GAAG,MAAM,IAAA,eAAI,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC1C,IAAI,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE;YAC7B,2BAAU,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC5C,OAAO;SACR;QAED,IAAI,MAA0C,CAAC;QAC/C,IAAI,IAAA,qBAAU,EAAC,IAAI,CAAC,EAAE;YACpB,MAAM,WAAW,GAAG,MAAM,IAAA,cAAI,EAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;YACtE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,sBAAsB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"analyzeWorker.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyzeWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const executeCommand_1 = require("../../lib/executeCommand");
|
|
7
|
+
const openapi_1 = __importDefault(require("../openapi"));
|
|
8
|
+
const fileSizeFilter_1 = require("../../lib/fileSizeFilter");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const os_1 = require("os");
|
|
11
|
+
const process_1 = require("process");
|
|
12
|
+
const promises_1 = require("fs/promises");
|
|
13
|
+
async function analyzeArchive(revision, dir, scannerConfig) {
|
|
14
|
+
const analyzer = new ArchiveAnalyzer(revision, dir, scannerConfig);
|
|
15
|
+
return analyzer.analyze();
|
|
16
|
+
}
|
|
17
|
+
exports.default = analyzeArchive;
|
|
18
|
+
class ArchiveAnalyzer {
|
|
19
|
+
constructor(revision, dir, scannerConfig) {
|
|
20
|
+
this.revision = revision;
|
|
21
|
+
this.dir = dir;
|
|
22
|
+
this.scannerConfig = scannerConfig;
|
|
23
|
+
}
|
|
24
|
+
async analyze() {
|
|
25
|
+
await this.checkout();
|
|
26
|
+
// Revert await executeCommand(`git checkout -`); in 'finally' block
|
|
27
|
+
await this.inWorkingDirectory(this.dir, async () => {
|
|
28
|
+
await this.openAPI();
|
|
29
|
+
await this.runtimeAnalysis();
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
async checkout() {
|
|
33
|
+
await (0, executeCommand_1.executeCommand)(`git checkout ${this.revision}`);
|
|
34
|
+
}
|
|
35
|
+
async openAPI() {
|
|
36
|
+
await openapi_1.default.handler({
|
|
37
|
+
appmapDir: '.',
|
|
38
|
+
outputFile: 'openapi.yml',
|
|
39
|
+
maxSize: fileSizeFilter_1.DefaultMaxAppMapSizeInMB,
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
async runtimeAnalysis() {
|
|
43
|
+
let command = `npx @appland/scanner@latest scan --appmap-dir . --all`;
|
|
44
|
+
let scannerConfigFile;
|
|
45
|
+
if (this.scannerConfig) {
|
|
46
|
+
scannerConfigFile = (0, path_1.join)((0, os_1.tmpdir)(), `scanner-config-${process_1.pid}.yml`);
|
|
47
|
+
await (0, promises_1.writeFile)(scannerConfigFile, this.scannerConfig, 'utf-8');
|
|
48
|
+
command += ` -c ${scannerConfigFile}`;
|
|
49
|
+
}
|
|
50
|
+
try {
|
|
51
|
+
await (0, executeCommand_1.executeCommand)(command, true, true, true);
|
|
52
|
+
}
|
|
53
|
+
finally {
|
|
54
|
+
if (scannerConfigFile)
|
|
55
|
+
await (0, promises_1.rm)(scannerConfigFile, { force: true });
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
async inWorkingDirectory(dir, fn) {
|
|
59
|
+
const cwd = process.cwd();
|
|
60
|
+
process.chdir(dir);
|
|
61
|
+
try {
|
|
62
|
+
await fn();
|
|
63
|
+
}
|
|
64
|
+
finally {
|
|
65
|
+
process.chdir(cwd);
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
//# sourceMappingURL=ArchiveAnalyzer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ArchiveAnalyzer.js","sourceRoot":"","sources":["../../../src/cmds/compare/ArchiveAnalyzer.ts"],"names":[],"mappings":";;;;;AAAA,6DAA0D;AAC1D,yDAAmD;AACnD,6DAAoE;AACpE,+BAA4B;AAC5B,2BAA4B;AAC5B,qCAA8B;AAC9B,0CAA4C;AAE7B,KAAK,UAAU,cAAc,CAC1C,QAAgB,EAChB,GAAW,EACX,aAAiC;IAEjC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;IACnE,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;AAC5B,CAAC;AAPD,iCAOC;AAED,MAAM,eAAe;IACnB,YACkB,QAAgB,EAChB,GAAW,EACX,aAAsB;QAFtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,QAAG,GAAH,GAAG,CAAQ;QACX,kBAAa,GAAb,aAAa,CAAS;IACrC,CAAC;IAEJ,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEtB,oEAAoE;QACpE,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,IAAA,+BAAc,EAAC,gBAAgB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,MAAM,iBAAU,CAAC,OAAO,CAAC;YACvB,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,yCAAwB;SAClC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,OAAO,GAAG,uDAAuD,CAAC;QACtE,IAAI,iBAAqC,CAAC;QAC1C,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,iBAAiB,GAAG,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,kBAAkB,aAAG,MAAM,CAAC,CAAC;YAChE,MAAM,IAAA,oBAAS,EAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAChE,OAAO,IAAI,OAAO,iBAAiB,EAAE,CAAC;SACvC;QACD,IAAI;YACF,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SACjD;gBAAS;YACR,IAAI,iBAAiB;gBAAE,MAAM,IAAA,aAAE,EAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAI,GAAW,EAAE,EAAoB;QACnE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI;YACF,MAAM,EAAE,EAAE,CAAC;SACZ;gBAAS;YACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare/ChangeReport.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,398 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.ReportFieldCalculator = exports.buildFailure = exports.isChanged = exports.isNew = exports.ChangeReportOptions = exports.DEFAULT_SNIPPET_WIDTH = void 0;
|
|
7
|
+
const promises_1 = require("fs/promises");
|
|
8
|
+
const openapi_diff_1 = __importDefault(require("openapi-diff"));
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const models_1 = require("@appland/models");
|
|
11
|
+
const sequence_diagram_1 = require("@appland/sequence-diagram");
|
|
12
|
+
const async_1 = require("async");
|
|
13
|
+
const assert_1 = __importDefault(require("assert"));
|
|
14
|
+
const DiffDiagrams_1 = require("../../sequenceDiagramDiff/DiffDiagrams");
|
|
15
|
+
const Paths_1 = require("./Paths");
|
|
16
|
+
const Digests_1 = require("./Digests");
|
|
17
|
+
const RevisionName_1 = require("./RevisionName");
|
|
18
|
+
const utils_1 = require("../../utils");
|
|
19
|
+
const mapToRecord_1 = __importDefault(require("./mapToRecord"));
|
|
20
|
+
const ui_1 = require("./ui");
|
|
21
|
+
const executeCommand_1 = require("../../lib/executeCommand");
|
|
22
|
+
const loadFindings_1 = __importDefault(require("./loadFindings"));
|
|
23
|
+
const loadSequenceDiagram_1 = require("./loadSequenceDiagram");
|
|
24
|
+
const console_1 = require("console");
|
|
25
|
+
exports.DEFAULT_SNIPPET_WIDTH = 10;
|
|
26
|
+
class ReferencedAppMaps {
|
|
27
|
+
constructor() {
|
|
28
|
+
this.referencedAppMaps = new Set();
|
|
29
|
+
}
|
|
30
|
+
add(revisionName, appmap) {
|
|
31
|
+
(0, assert_1.default)(!appmap.endsWith('.appmap.json'), `AppMap ${appmap} must not have an extension`);
|
|
32
|
+
this.referencedAppMaps.add((0, path_1.join)(revisionName, appmap));
|
|
33
|
+
}
|
|
34
|
+
test(revisionName, appmap) {
|
|
35
|
+
(0, assert_1.default)(!appmap.endsWith('.appmap.json'), `AppMap ${appmap} must not have an extension`);
|
|
36
|
+
return this.referencedAppMaps.has((0, path_1.join)(revisionName, appmap));
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
class SourceDiff {
|
|
40
|
+
constructor(reporter) {
|
|
41
|
+
this.reporter = reporter;
|
|
42
|
+
this.diffs = new Map();
|
|
43
|
+
this.classMaps = new Map();
|
|
44
|
+
}
|
|
45
|
+
async get(appmap) {
|
|
46
|
+
[RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head].forEach((revisionName) => (0, assert_1.default)(!appmap.startsWith(revisionName), `AppMap ${appmap} must not start with a revision name`));
|
|
47
|
+
const yieldDiff = (diff) => (diff !== '' ? diff : undefined);
|
|
48
|
+
let diff = this.diffs.get(appmap);
|
|
49
|
+
if (diff)
|
|
50
|
+
return Promise.resolve(yieldDiff(diff));
|
|
51
|
+
diff = await this.loadDiff(appmap);
|
|
52
|
+
this.diffs.set(appmap, diff);
|
|
53
|
+
return yieldDiff(diff);
|
|
54
|
+
}
|
|
55
|
+
async loadDiff(appmap) {
|
|
56
|
+
const loadClassMap = async () => {
|
|
57
|
+
const classMapData = JSON.parse(await (0, promises_1.readFile)((0, path_1.join)(this.reporter.paths.classMapPath(RevisionName_1.RevisionName.Head, appmap)), 'utf-8'));
|
|
58
|
+
return new models_1.ClassMap(classMapData);
|
|
59
|
+
};
|
|
60
|
+
const classMap = this.classMaps.get(appmap) || (await loadClassMap());
|
|
61
|
+
const sourcePaths = new Set();
|
|
62
|
+
classMap.visit((codeObject) => {
|
|
63
|
+
if (!codeObject.location)
|
|
64
|
+
return;
|
|
65
|
+
const path = codeObject.location.split(':')[0];
|
|
66
|
+
if (path.indexOf('.') && !path.startsWith('<') && !(0, path_1.isAbsolute)(path))
|
|
67
|
+
sourcePaths.add(path);
|
|
68
|
+
});
|
|
69
|
+
let diff = '';
|
|
70
|
+
if (sourcePaths.size > 0) {
|
|
71
|
+
const paths = [...sourcePaths]
|
|
72
|
+
.sort()
|
|
73
|
+
.map((p) => [this.reporter.srcDir, p].join('/'))
|
|
74
|
+
.join(' ');
|
|
75
|
+
diff = await (0, executeCommand_1.executeCommand)(`git diff ${this.reporter.baseRevision}..${this.reporter.headRevision} -- ${paths}`);
|
|
76
|
+
}
|
|
77
|
+
return diff;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
class ChangeReportOptions {
|
|
81
|
+
constructor() {
|
|
82
|
+
this.reportRemoved = true;
|
|
83
|
+
this.snippetWidth = exports.DEFAULT_SNIPPET_WIDTH;
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
exports.ChangeReportOptions = ChangeReportOptions;
|
|
87
|
+
class ChangeReporter {
|
|
88
|
+
constructor(baseRevision, headRevision, workingDir, srcDir) {
|
|
89
|
+
this.baseRevision = baseRevision;
|
|
90
|
+
this.headRevision = headRevision;
|
|
91
|
+
this.workingDir = workingDir;
|
|
92
|
+
this.srcDir = srcDir;
|
|
93
|
+
this.referencedAppMaps = new ReferencedAppMaps();
|
|
94
|
+
this.sourceDiff = new SourceDiff(this);
|
|
95
|
+
this.paths = new Paths_1.Paths(workingDir);
|
|
96
|
+
this.digests = new Digests_1.Digests(this.paths);
|
|
97
|
+
}
|
|
98
|
+
async initialize() {
|
|
99
|
+
await this.digests.build();
|
|
100
|
+
this.baseManifest = JSON.parse(await (0, promises_1.readFile)(this.paths.manifestPath(RevisionName_1.RevisionName.Base), 'utf-8'));
|
|
101
|
+
this.headManifest = JSON.parse(await (0, promises_1.readFile)(this.paths.manifestPath(RevisionName_1.RevisionName.Head), 'utf-8'));
|
|
102
|
+
this.baseAppMaps = new Set(await this.paths.appmaps(RevisionName_1.RevisionName.Base));
|
|
103
|
+
this.headAppMaps = new Set(await this.paths.appmaps(RevisionName_1.RevisionName.Head));
|
|
104
|
+
await this.loadMetadata();
|
|
105
|
+
await this.loadFailedAppMaps();
|
|
106
|
+
}
|
|
107
|
+
async deleteUnreferencedAppMaps() {
|
|
108
|
+
const deleteAppMap = async (revisionName, appmap) => {
|
|
109
|
+
if ((0, utils_1.verbose)())
|
|
110
|
+
console.log((0, ui_1.mutedStyle)(`AppMap ${revisionName}/${appmap} is unreferenced so it will be deleted.`));
|
|
111
|
+
const path = this.paths.appmapPath(revisionName, appmap);
|
|
112
|
+
const fileName = [path, 'appmap.json'].join('.');
|
|
113
|
+
await (0, promises_1.rm)(fileName);
|
|
114
|
+
await (0, promises_1.rm)(path, { recursive: true });
|
|
115
|
+
};
|
|
116
|
+
for (const revisionName of [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head]) {
|
|
117
|
+
for (const appmap of await this.paths.appmaps(revisionName)) {
|
|
118
|
+
if (!this.referencedAppMaps.test(revisionName, appmap))
|
|
119
|
+
try {
|
|
120
|
+
await deleteAppMap(revisionName, appmap);
|
|
121
|
+
}
|
|
122
|
+
catch (err) {
|
|
123
|
+
(0, console_1.warn)(`Failed to delete unreferenced AppMap ${revisionName}/${appmap}. Will continue...`);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
}
|
|
128
|
+
async report(options) {
|
|
129
|
+
const { appMapMetadata, baseAppMaps, headAppMaps, failedAppMaps } = this;
|
|
130
|
+
(0, assert_1.default)(appMapMetadata);
|
|
131
|
+
(0, assert_1.default)(baseAppMaps);
|
|
132
|
+
(0, assert_1.default)(headAppMaps);
|
|
133
|
+
(0, assert_1.default)(failedAppMaps);
|
|
134
|
+
const generator = new ReportFieldCalculator(this);
|
|
135
|
+
const apiDiff = await generator.apiDiff(options.reportRemoved);
|
|
136
|
+
const isNewFn = isNew(baseAppMaps, isTest(appMapMetadata));
|
|
137
|
+
const isChangedFn = isChanged(baseAppMaps, isTest(appMapMetadata), this.digests);
|
|
138
|
+
const referenceAppMapFn = (appmap) => [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head].forEach((revisionName) => this.referencedAppMaps.add(revisionName, appmap));
|
|
139
|
+
const referenceFindingAppMapFn = async (revisionName, finding) => {
|
|
140
|
+
const { appMapFile } = finding;
|
|
141
|
+
const appmap = appMapFile.slice(0, -'.appmap.json'.length);
|
|
142
|
+
const path = [this.paths.appmapPath(revisionName, appmap), 'appmap.json'].join('.');
|
|
143
|
+
// A sanity check
|
|
144
|
+
if (!(await (0, utils_1.exists)(path)))
|
|
145
|
+
(0, console_1.warn)(`AppMap ${path}, referenced by finding ${finding.hash_v2}, does not exist.`);
|
|
146
|
+
referenceAppMapFn(appmap);
|
|
147
|
+
};
|
|
148
|
+
const newAppMaps = [...headAppMaps].filter(isNewFn);
|
|
149
|
+
const changedAppMaps = [...headAppMaps].filter(isChangedFn).map((appmap) => ({ appmap }));
|
|
150
|
+
changedAppMaps.forEach(({ appmap }) => referenceAppMapFn(appmap));
|
|
151
|
+
const failureFn = buildFailure(appMapMetadata, options.snippetWidth);
|
|
152
|
+
const testFailures = new Array();
|
|
153
|
+
for (const appmap of failedAppMaps) {
|
|
154
|
+
const testFailure = await failureFn(appmap);
|
|
155
|
+
if (testFailure) {
|
|
156
|
+
testFailures.push(testFailure);
|
|
157
|
+
referenceAppMapFn(appmap);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
const findingDiff = await generator.findingDiff(options.reportRemoved);
|
|
161
|
+
for (const finding of findingDiff.new || [])
|
|
162
|
+
referenceFindingAppMapFn(RevisionName_1.RevisionName.Head, finding);
|
|
163
|
+
for (const finding of findingDiff.resolved || [])
|
|
164
|
+
referenceFindingAppMapFn(RevisionName_1.RevisionName.Base, finding);
|
|
165
|
+
const result = {
|
|
166
|
+
testFailures,
|
|
167
|
+
newAppMaps,
|
|
168
|
+
changedAppMaps,
|
|
169
|
+
findingDiff,
|
|
170
|
+
sequenceDiagramDiff: await generator.sequenceDiagramDiff(changedAppMaps),
|
|
171
|
+
appMapMetadata: await generator.appMapMetadata(),
|
|
172
|
+
};
|
|
173
|
+
if (apiDiff)
|
|
174
|
+
result.apiDiff = apiDiff;
|
|
175
|
+
return result;
|
|
176
|
+
}
|
|
177
|
+
async loadMetadata() {
|
|
178
|
+
const appMapMetadata = {
|
|
179
|
+
base: new Map(),
|
|
180
|
+
head: new Map(),
|
|
181
|
+
};
|
|
182
|
+
const q = (0, async_1.queue)(async (appmap) => {
|
|
183
|
+
const metadataPath = this.paths.metadataPath(appmap.revisionName, appmap.name);
|
|
184
|
+
if (!(await (0, utils_1.exists)(metadataPath))) {
|
|
185
|
+
console.warn(`Metadata file ${metadataPath} does not exist!`);
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
const metadata = JSON.parse(await (0, promises_1.readFile)(metadataPath, 'utf-8'));
|
|
189
|
+
appMapMetadata[appmap.revisionName].set(appmap.name, metadata);
|
|
190
|
+
}, 2);
|
|
191
|
+
q.error(console.warn);
|
|
192
|
+
for (const revisionName of [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head]) {
|
|
193
|
+
(await this.paths.appmaps(revisionName)).forEach((appmap) => q.push({
|
|
194
|
+
revisionName: revisionName,
|
|
195
|
+
name: appmap,
|
|
196
|
+
}));
|
|
197
|
+
}
|
|
198
|
+
if (!q.idle())
|
|
199
|
+
await q.drain();
|
|
200
|
+
this.appMapMetadata = appMapMetadata;
|
|
201
|
+
}
|
|
202
|
+
async loadFailedAppMaps() {
|
|
203
|
+
(0, assert_1.default)(this.appMapMetadata);
|
|
204
|
+
const failedAppMaps = new Set();
|
|
205
|
+
{
|
|
206
|
+
for (const appmap of await this.paths.appmaps(RevisionName_1.RevisionName.Head)) {
|
|
207
|
+
const metadata = this.appMapMetadata[RevisionName_1.RevisionName.Head].get(appmap);
|
|
208
|
+
if (!metadata) {
|
|
209
|
+
console.log((0, ui_1.prominentStyle)(`Metadata for ${appmap} not found!`));
|
|
210
|
+
continue;
|
|
211
|
+
}
|
|
212
|
+
if (metadata.test_status === 'failed')
|
|
213
|
+
failedAppMaps.add(appmap);
|
|
214
|
+
}
|
|
215
|
+
}
|
|
216
|
+
this.failedAppMaps = failedAppMaps;
|
|
217
|
+
}
|
|
218
|
+
}
|
|
219
|
+
exports.default = ChangeReporter;
|
|
220
|
+
// Gets a function that returns true if the given appmap is a test.
|
|
221
|
+
function isTest(appMapMetadata) {
|
|
222
|
+
return (appmap) => {
|
|
223
|
+
const metadata = appMapMetadata[RevisionName_1.RevisionName.Head].get(appmap);
|
|
224
|
+
return !!(metadata && metadata.recorder.type === 'tests');
|
|
225
|
+
};
|
|
226
|
+
}
|
|
227
|
+
// Selects AppMaps that have stable names, and are in the head revision but not in the base revision.
|
|
228
|
+
function isNew(baseAppMaps, isTestFn) {
|
|
229
|
+
return (appmap) => isTestFn(appmap) && !baseAppMaps.has(appmap);
|
|
230
|
+
}
|
|
231
|
+
exports.isNew = isNew;
|
|
232
|
+
// Selects AppMaps that are present in both the base and head revisions, and have different digests.
|
|
233
|
+
function isChanged(baseAppMaps, isTestFn, digests) {
|
|
234
|
+
return (appmap) => isTestFn(appmap) &&
|
|
235
|
+
baseAppMaps.has(appmap) &&
|
|
236
|
+
digests.appmapDigest(RevisionName_1.RevisionName.Base, appmap) !==
|
|
237
|
+
digests.appmapDigest(RevisionName_1.RevisionName.Head, appmap);
|
|
238
|
+
}
|
|
239
|
+
exports.isChanged = isChanged;
|
|
240
|
+
function buildFailure(appMapMetadata, snippetWidth = exports.DEFAULT_SNIPPET_WIDTH) {
|
|
241
|
+
return async (appmap) => {
|
|
242
|
+
var _a;
|
|
243
|
+
const metadata = appMapMetadata[RevisionName_1.RevisionName.Head].get(appmap);
|
|
244
|
+
if (!metadata) {
|
|
245
|
+
(0, console_1.warn)(`No AppMap metadata available for failed test ${appmap}`);
|
|
246
|
+
return;
|
|
247
|
+
}
|
|
248
|
+
const testFailure = {
|
|
249
|
+
appmap,
|
|
250
|
+
name: metadata.name,
|
|
251
|
+
};
|
|
252
|
+
if (metadata.source_location) {
|
|
253
|
+
testFailure.testLocation = (0, path_1.isAbsolute)(metadata.source_location)
|
|
254
|
+
? (0, path_1.relative)(process.cwd(), metadata.source_location)
|
|
255
|
+
: metadata.source_location;
|
|
256
|
+
}
|
|
257
|
+
if (metadata.test_failure) {
|
|
258
|
+
testFailure.failureMessage = metadata.test_failure.message;
|
|
259
|
+
const location = metadata.test_failure.location;
|
|
260
|
+
if (location) {
|
|
261
|
+
testFailure.failureLocation = location;
|
|
262
|
+
const [path, linenoStr] = location.split(':');
|
|
263
|
+
if (linenoStr && (await (0, utils_1.exists)(path))) {
|
|
264
|
+
const lineno = parseInt(linenoStr, 10);
|
|
265
|
+
const testCode = (await (0, promises_1.readFile)(path, 'utf-8')).split('\n');
|
|
266
|
+
const minIndex = Math.max(lineno - snippetWidth, 0);
|
|
267
|
+
const maxIndex = Math.min(lineno + snippetWidth, testCode.length);
|
|
268
|
+
testFailure.testSnippet = {
|
|
269
|
+
codeFragment: testCode.slice(minIndex, maxIndex).join('\n'),
|
|
270
|
+
startLine: minIndex + 1,
|
|
271
|
+
language: (_a = metadata.language) === null || _a === void 0 ? void 0 : _a.name,
|
|
272
|
+
};
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
}
|
|
276
|
+
return testFailure;
|
|
277
|
+
};
|
|
278
|
+
}
|
|
279
|
+
exports.buildFailure = buildFailure;
|
|
280
|
+
class ReportFieldCalculator {
|
|
281
|
+
constructor(reporter) {
|
|
282
|
+
this.reporter = reporter;
|
|
283
|
+
}
|
|
284
|
+
async appMapMetadata() {
|
|
285
|
+
(0, assert_1.default)(this.reporter.appMapMetadata);
|
|
286
|
+
return {
|
|
287
|
+
[RevisionName_1.RevisionName.Base]: (0, mapToRecord_1.default)(this.reporter.appMapMetadata[RevisionName_1.RevisionName.Base]),
|
|
288
|
+
[RevisionName_1.RevisionName.Head]: (0, mapToRecord_1.default)(this.reporter.appMapMetadata[RevisionName_1.RevisionName.Head]),
|
|
289
|
+
};
|
|
290
|
+
}
|
|
291
|
+
async sequenceDiagramDiff(changedAppMaps) {
|
|
292
|
+
const diffDiagrams = new DiffDiagrams_1.DiffDiagrams();
|
|
293
|
+
const sequenceDiagramDiff = new Map();
|
|
294
|
+
{
|
|
295
|
+
const q = (0, async_1.queue)(async (changedAppMap) => {
|
|
296
|
+
var _a;
|
|
297
|
+
const { appmap } = changedAppMap;
|
|
298
|
+
const sourceDiff = await this.reporter.sourceDiff.get(appmap);
|
|
299
|
+
if (sourceDiff)
|
|
300
|
+
changedAppMap.sourceDiff = sourceDiff;
|
|
301
|
+
const baseDiagram = await (0, loadSequenceDiagram_1.loadSequenceDiagram)(this.reporter.paths.sequenceDiagramPath(RevisionName_1.RevisionName.Base, appmap));
|
|
302
|
+
const headDiagram = await (0, loadSequenceDiagram_1.loadSequenceDiagram)(this.reporter.paths.sequenceDiagramPath(RevisionName_1.RevisionName.Head, appmap));
|
|
303
|
+
const diagramDiff = diffDiagrams.diff(baseDiagram, headDiagram);
|
|
304
|
+
if (diagramDiff) {
|
|
305
|
+
const diagramJSON = (0, sequence_diagram_1.format)(sequence_diagram_1.FormatType.JSON, diagramDiff, 'diff');
|
|
306
|
+
const path = this.reporter.paths.sequenceDiagramDiffPath(appmap);
|
|
307
|
+
await (0, promises_1.mkdir)((0, path_1.dirname)(path), { recursive: true });
|
|
308
|
+
await (0, promises_1.writeFile)(path, diagramJSON.diagram);
|
|
309
|
+
changedAppMap.sequenceDiagramDiff = (0, path_1.relative)((0, path_1.join)(this.reporter.workingDir, 'diff'), path);
|
|
310
|
+
// Build a text snippet for each top level context.
|
|
311
|
+
const allActions = [...diagramDiff.rootActions];
|
|
312
|
+
for (let actionIndex = 0; actionIndex < diagramDiff.rootActions.length; actionIndex++) {
|
|
313
|
+
const action = diagramDiff.rootActions[actionIndex];
|
|
314
|
+
diagramDiff.rootActions = [action];
|
|
315
|
+
const snippet = (0, sequence_diagram_1.format)(sequence_diagram_1.FormatType.Text, diagramDiff, 'diff');
|
|
316
|
+
// TODO: nop if this is the empty string
|
|
317
|
+
if (!sequenceDiagramDiff.has(snippet.diagram))
|
|
318
|
+
sequenceDiagramDiff.set(snippet.diagram, []);
|
|
319
|
+
(_a = sequenceDiagramDiff.get(snippet.diagram)) === null || _a === void 0 ? void 0 : _a.push(appmap);
|
|
320
|
+
}
|
|
321
|
+
diagramDiff.rootActions = allActions;
|
|
322
|
+
}
|
|
323
|
+
}, 2);
|
|
324
|
+
q.error(console.warn);
|
|
325
|
+
changedAppMaps.forEach((appmap) => q.push(appmap));
|
|
326
|
+
if (!q.idle())
|
|
327
|
+
await q.drain();
|
|
328
|
+
}
|
|
329
|
+
return (0, mapToRecord_1.default)(sequenceDiagramDiff);
|
|
330
|
+
}
|
|
331
|
+
async findingDiff(reportRemoved) {
|
|
332
|
+
(0, assert_1.default)(this.reporter.baseManifest);
|
|
333
|
+
(0, assert_1.default)(this.reporter.headManifest);
|
|
334
|
+
const baseFindings = await (0, loadFindings_1.default)(this.reporter.paths, RevisionName_1.RevisionName.Base, this.reporter.baseManifest.appMapDir);
|
|
335
|
+
const headFindings = await (0, loadFindings_1.default)(this.reporter.paths, RevisionName_1.RevisionName.Head, this.reporter.headManifest.appMapDir);
|
|
336
|
+
let newFindings;
|
|
337
|
+
let resolvedFindings;
|
|
338
|
+
const baseFindingHashes = baseFindings.reduce((memo, finding) => (memo.add(finding.hash_v2), memo), new Set());
|
|
339
|
+
const headFindingHashes = headFindings.reduce((memo, finding) => (memo.add(finding.hash_v2), memo), new Set());
|
|
340
|
+
const newFindingHashes = [...headFindingHashes].filter((hash) => !baseFindingHashes.has(hash));
|
|
341
|
+
const resolvedFindingHashes = [...baseFindingHashes].filter((hash) => !headFindingHashes.has(hash));
|
|
342
|
+
newFindings = headFindings.filter((finding) => newFindingHashes.includes(finding.hash_v2));
|
|
343
|
+
if (reportRemoved) {
|
|
344
|
+
resolvedFindings = baseFindings.filter((finding) => resolvedFindingHashes.includes(finding.hash_v2));
|
|
345
|
+
}
|
|
346
|
+
else {
|
|
347
|
+
resolvedFindings = [];
|
|
348
|
+
}
|
|
349
|
+
return {
|
|
350
|
+
new: newFindings,
|
|
351
|
+
resolved: resolvedFindings,
|
|
352
|
+
};
|
|
353
|
+
}
|
|
354
|
+
async apiDiff(reportRemoved) {
|
|
355
|
+
const readOpenAPI = async (revision) => {
|
|
356
|
+
const openapiPath = this.reporter.paths.openapiPath(revision);
|
|
357
|
+
try {
|
|
358
|
+
return await (0, promises_1.readFile)(openapiPath, 'utf-8');
|
|
359
|
+
}
|
|
360
|
+
catch (e) {
|
|
361
|
+
if (e.code === 'ENOENT')
|
|
362
|
+
return undefined;
|
|
363
|
+
throw e;
|
|
364
|
+
}
|
|
365
|
+
};
|
|
366
|
+
const baseDefinitions = await readOpenAPI(RevisionName_1.RevisionName.Base);
|
|
367
|
+
const headDefinitions = await readOpenAPI(RevisionName_1.RevisionName.Head);
|
|
368
|
+
if (!baseDefinitions || !headDefinitions)
|
|
369
|
+
return;
|
|
370
|
+
let apiDiff;
|
|
371
|
+
{
|
|
372
|
+
const result = await openapi_diff_1.default.diffSpecs({
|
|
373
|
+
sourceSpec: {
|
|
374
|
+
content: baseDefinitions,
|
|
375
|
+
location: 'base',
|
|
376
|
+
format: 'openapi3',
|
|
377
|
+
},
|
|
378
|
+
destinationSpec: {
|
|
379
|
+
content: headDefinitions,
|
|
380
|
+
location: 'head',
|
|
381
|
+
format: 'openapi3',
|
|
382
|
+
},
|
|
383
|
+
});
|
|
384
|
+
if (!reportRemoved && result.breakingDifferencesFound) {
|
|
385
|
+
const diffOutcomeFailure = result;
|
|
386
|
+
diffOutcomeFailure.breakingDifferencesFound = false;
|
|
387
|
+
delete diffOutcomeFailure['breakingDifferences'];
|
|
388
|
+
}
|
|
389
|
+
if (result.breakingDifferencesFound) {
|
|
390
|
+
console.log('Breaking change found!');
|
|
391
|
+
}
|
|
392
|
+
apiDiff = result;
|
|
393
|
+
}
|
|
394
|
+
return apiDiff;
|
|
395
|
+
}
|
|
396
|
+
}
|
|
397
|
+
exports.ReportFieldCalculator = ReportFieldCalculator;
|
|
398
|
+
//# sourceMappingURL=ChangeReporter.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ChangeReporter.js","sourceRoot":"","sources":["../../../src/cmds/compare/ChangeReporter.ts"],"names":[],"mappings":"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"}
|