@appland/appmap 3.86.0 → 3.87.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 +18 -0
- package/built/cmds/archive/analyze.js +7 -61
- package/built/cmds/archive/analyze.js.map +1 -1
- package/built/cmds/archive/analyzeWorker.js +9 -1
- package/built/cmds/archive/analyzeWorker.js.map +1 -1
- package/built/cmds/archive/archive.js +46 -10
- package/built/cmds/archive/archive.js.map +1 -1
- package/built/cmds/archive/buildWorkerPool.js +21 -0
- package/built/cmds/archive/buildWorkerPool.js.map +1 -0
- package/built/cmds/archive/generateOpenAPI.js +4 -0
- package/built/cmds/archive/generateOpenAPI.js.map +1 -1
- package/built/cmds/archive/generateSequenceDiagrams.js +29 -0
- package/built/cmds/archive/generateSequenceDiagrams.js.map +1 -0
- package/built/cmds/archive/index.js +33 -0
- package/built/cmds/archive/index.js.map +1 -0
- package/built/cmds/compare/ChangeReporter.js +40 -19
- package/built/cmds/compare/ChangeReporter.js.map +1 -1
- package/built/cmds/compare/Digests.js +3 -0
- package/built/cmds/compare/Digests.js.map +1 -1
- package/built/cmds/compare/compare.js +0 -11
- package/built/cmds/compare/compare.js.map +1 -1
- package/built/cmds/compare-report/MarkdownReport.js +9 -0
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -1
- package/built/cmds/index/IndexResult.js +3 -0
- package/built/cmds/index/IndexResult.js.map +1 -0
- package/built/cmds/index/IndexTask.js +8 -0
- package/built/cmds/index/IndexTask.js.map +1 -0
- package/built/cmds/scan/ScanTask.js.map +1 -1
- package/built/cmds/sequenceDiagram/SequenceDiagramTask.js.map +1 -1
- package/built/fingerprint/fingerprinter.js +1 -1
- package/built/fingerprint/fingerprinter.js.map +1 -1
- package/built/html/appmap.js +11 -11
- package/built/html/appmap.js.map +2 -2
- package/built/html/sequenceDiagram.js +11 -11
- package/built/html/sequenceDiagram.js.map +2 -2
- package/built/lib/processAppMapDir.js +14 -2
- package/built/lib/processAppMapDir.js.map +1 -1
- package/package.json +1 -1
- package/resources/change-report.hbs +4 -0
- package/built/cmds/archive/indexAppMaps.js +0 -22
- package/built/cmds/archive/indexAppMaps.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
# [@appland/appmap-v3.87.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.86.1...@appland/appmap-v3.87.0) (2023-08-21)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Adjust and test analysis with failed tests ([f1bd786](https://github.com/getappmap/appmap-js/commit/f1bd78696f55997c94932a9795da334420e55c1f))
|
|
7
|
+
* Index appmaps in worker threads ([6451d37](https://github.com/getappmap/appmap-js/commit/6451d3730e764bd574076a0f2539660f0930a249))
|
|
8
|
+
* Limit analysis when there are test failures ([c53982a](https://github.com/getappmap/appmap-js/commit/c53982a6b6c3dce7d2068a9108a401b5854f1363))
|
|
9
|
+
* Limit metadata in report ([7e4d76d](https://github.com/getappmap/appmap-js/commit/7e4d76d47be0969a22f643f05a031641f8f08bad))
|
|
10
|
+
* Skip apiDiff if there are test failures ([a623c2f](https://github.com/getappmap/appmap-js/commit/a623c2ff75ff1005748179f6c788e49067c64985))
|
|
11
|
+
|
|
12
|
+
# [@appland/appmap-v3.86.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.86.0...@appland/appmap-v3.86.1) (2023-08-18)
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
### Bug Fixes
|
|
16
|
+
|
|
17
|
+
* `appmap compare` retains new AppMaps ([1983144](https://github.com/getappmap/appmap-js/commit/19831441f05adf310d0acaf583939a568c649135))
|
|
18
|
+
|
|
1
19
|
# [@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
20
|
|
|
3
21
|
|
|
@@ -4,69 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const generateOpenAPI_1 = __importDefault(require("./generateOpenAPI"));
|
|
7
|
-
const indexAppMaps_1 = require("./indexAppMaps");
|
|
8
|
-
const workerPool_1 = __importDefault(require("../../lib/workerPool"));
|
|
9
|
-
const path_1 = require("path");
|
|
10
7
|
const processAppMapDir_1 = __importDefault(require("../../lib/processAppMapDir"));
|
|
11
8
|
const utils_1 = require("../../utils");
|
|
12
|
-
const
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// This import is used to ensure that the packaging follows the dependency.
|
|
16
|
-
require('./analyzeWorkerWrapper');
|
|
17
|
-
const TEST_ENV_WORKER_FILE = (0, path_1.join)(__dirname, '../../../built/cmds/archive/analyzeWorkerWrapper.js');
|
|
18
|
-
const WORKER_FILE = (0, fs_1.existsSync)(TEST_ENV_WORKER_FILE)
|
|
19
|
-
? TEST_ENV_WORKER_FILE
|
|
20
|
-
: (0, path_1.join)(__dirname, 'analyzeWorkerWrapper.js');
|
|
21
|
-
async function analyze(threadCount, maxAppMapSizeInBytes, compareFilter, appMapDir) {
|
|
22
|
-
(0, console_1.warn)(`Analyzing AppMaps using ${threadCount} worker threads`);
|
|
23
|
-
const oversizedAppMaps = new Set();
|
|
24
|
-
// This could be done in worker threads as well, but the timing data indicates that it's not currently a bottleneck.
|
|
25
|
-
{
|
|
26
|
-
console.log(`Indexing AppMaps...`);
|
|
27
|
-
const startTime = new Date().getTime();
|
|
28
|
-
const numIndexed = await (0, indexAppMaps_1.indexAppMaps)(appMapDir, maxAppMapSizeInBytes);
|
|
29
|
-
const elapsed = new Date().getTime() - startTime;
|
|
30
|
-
console.log(`Indexed ${numIndexed} AppMaps in ${elapsed}ms`);
|
|
31
|
-
}
|
|
32
|
-
{
|
|
33
|
-
const startTime = new Date().getTime();
|
|
34
|
-
console.log('Generating OpenAPI...');
|
|
35
|
-
await (0, generateOpenAPI_1.default)(appMapDir, maxAppMapSizeInBytes);
|
|
36
|
-
const elapsed = new Date().getTime() - startTime;
|
|
37
|
-
console.log(`Generated OpenAPI in ${elapsed}ms`);
|
|
38
|
-
}
|
|
39
|
-
const generateSequenceDiagrams = async () => {
|
|
40
|
-
const specOptions = {
|
|
41
|
-
loops: true,
|
|
42
|
-
};
|
|
43
|
-
const task = (file) => ({
|
|
44
|
-
name: 'sequence-diagram',
|
|
45
|
-
verbose: (0, utils_1.verbose)(),
|
|
46
|
-
appmapFile: file,
|
|
47
|
-
maxSize: maxAppMapSizeInBytes,
|
|
48
|
-
compareFilter,
|
|
49
|
-
specOptions,
|
|
50
|
-
});
|
|
51
|
-
console.log('Generating sequence diagrams...');
|
|
52
|
-
const startTime = new Date().getTime();
|
|
53
|
-
const result = await (0, processAppMapDir_1.default)('Generate sequence diagrams', workerPool, task, appMapDir);
|
|
54
|
-
const elapsed = new Date().getTime() - startTime;
|
|
55
|
-
console.log(`Generated ${result.numProcessed} sequence diagrams in ${elapsed}ms`);
|
|
56
|
-
for (const file of result.oversized)
|
|
57
|
-
oversizedAppMaps.add(file);
|
|
58
|
-
};
|
|
9
|
+
const generateSequenceDiagrams_1 = require("./generateSequenceDiagrams");
|
|
10
|
+
// Performs scan, sequence diagram generation, and OpenAPI generation for all AppMaps.
|
|
11
|
+
async function analyze(workerPool, maxAppMapSizeInBytes, compareFilter, appMapDir, oversizedAppMaps, doScan) {
|
|
59
12
|
const scan = async () => {
|
|
60
13
|
let findingsCount = 0;
|
|
61
14
|
const startTime = new Date().getTime();
|
|
62
|
-
console.log('Scanning...');
|
|
63
15
|
const task = (file) => ({
|
|
64
16
|
name: 'scan',
|
|
65
17
|
verbose: (0, utils_1.verbose)(),
|
|
66
18
|
appmapFile: file,
|
|
67
19
|
maxSize: maxAppMapSizeInBytes,
|
|
68
20
|
});
|
|
69
|
-
const result = await (0, processAppMapDir_1.default)('Scanning', workerPool, task, appMapDir, (_appmapFile, result) => {
|
|
21
|
+
const result = await (0, processAppMapDir_1.default)('Scanning', workerPool, task, appMapDir, undefined, (_appmapFile, result) => {
|
|
70
22
|
if (result.findingsCount)
|
|
71
23
|
findingsCount += result.findingsCount;
|
|
72
24
|
});
|
|
@@ -75,16 +27,10 @@ async function analyze(threadCount, maxAppMapSizeInBytes, compareFilter, appMapD
|
|
|
75
27
|
for (const file of result.oversized)
|
|
76
28
|
oversizedAppMaps.add(file);
|
|
77
29
|
};
|
|
78
|
-
(0,
|
|
79
|
-
|
|
80
|
-
try {
|
|
81
|
-
await generateSequenceDiagrams();
|
|
30
|
+
await (0, generateSequenceDiagrams_1.generateSequenceDiagrams)(workerPool, maxAppMapSizeInBytes, compareFilter, oversizedAppMaps, appMapDir);
|
|
31
|
+
if (doScan)
|
|
82
32
|
await scan();
|
|
83
|
-
|
|
84
|
-
finally {
|
|
85
|
-
workerPool.close();
|
|
86
|
-
}
|
|
87
|
-
return { oversizedAppMaps: [...oversizedAppMaps].sort() };
|
|
33
|
+
await (0, generateOpenAPI_1.default)(appMapDir, maxAppMapSizeInBytes);
|
|
88
34
|
}
|
|
89
35
|
exports.default = analyze;
|
|
90
36
|
//# sourceMappingURL=analyze.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":";;;;;AAAA,wEAAgD;
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyze.ts"],"names":[],"mappings":";;;;;AAAA,wEAAgD;AAGhD,kFAA0D;AAC1D,uCAAsC;AAGtC,yEAAsE;AAEtE,sFAAsF;AACvE,KAAK,UAAU,OAAO,CACnC,UAAsB,EACtB,oBAA4B,EAC5B,aAA4B,EAC5B,SAAiB,EACjB,gBAA6B,EAC7B,MAAe;IAEf,MAAM,IAAI,GAAG,KAAK,IAAI,EAAE;QACtB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;QAEvC,MAAM,IAAI,GAAG,CAAC,IAAY,EAAY,EAAE,CAAC,CAAC;YACxC,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,IAAA,eAAO,GAAE;YAClB,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,oBAAoB;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EACnC,UAAU,EACV,UAAU,EACV,IAAI,EACJ,SAAS,EACT,SAAS,EACT,CAAC,WAAmB,EAAE,MAAkB,EAAE,EAAE;YAC1C,IAAI,MAAM,CAAC,aAAa;gBAAE,aAAa,IAAI,MAAM,CAAC,aAAa,CAAC;QAClE,CAAC,CACF,CAAC;QAEF,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;QACjD,OAAO,CAAC,GAAG,CACT,WAAW,MAAM,CAAC,YAAY,eAAe,OAAO,aAAa,aAAa,WAAW,CAC1F,CAAC;QACF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,SAAS;YAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAClE,CAAC,CAAC;IAEF,MAAM,IAAA,mDAAwB,EAC5B,UAAU,EACV,oBAAoB,EACpB,aAAa,EACb,gBAAgB,EAChB,SAAS,CACV,CAAC;IACF,IAAI,MAAM;QAAE,MAAM,IAAI,EAAE,CAAC;IACzB,MAAM,IAAA,yBAAe,EAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;AACzD,CAAC;AA9CD,0BA8CC"}
|
|
@@ -16,6 +16,8 @@ const scanner_1 = require("@appland/scanner");
|
|
|
16
16
|
const path_1 = require("path");
|
|
17
17
|
const buildFilter_1 = __importDefault(require("./buildFilter"));
|
|
18
18
|
const sequence_diagram_1 = require("@appland/sequence-diagram");
|
|
19
|
+
const IndexTask_1 = require("../index/IndexTask");
|
|
20
|
+
const fingerprinter_1 = __importDefault(require("../../fingerprint/fingerprinter"));
|
|
19
21
|
(0, models_1.setSQLErrorHandler)(sqlErrorLog_1.default);
|
|
20
22
|
worker_threads_1.parentPort.on('message', async (task) => {
|
|
21
23
|
var _a, _b;
|
|
@@ -33,7 +35,13 @@ worker_threads_1.parentPort.on('message', async (task) => {
|
|
|
33
35
|
return;
|
|
34
36
|
}
|
|
35
37
|
let result;
|
|
36
|
-
if ((0,
|
|
38
|
+
if ((0, IndexTask_1.isIndexTask)(task)) {
|
|
39
|
+
const handler = new fingerprinter_1.default();
|
|
40
|
+
handler.maxFileSizeInBytes = undefined; // This has already been checked
|
|
41
|
+
await handler.fingerprint(task.appmapFile);
|
|
42
|
+
result = {};
|
|
43
|
+
}
|
|
44
|
+
else if ((0, ScanTask_1.isScanTask)(task)) {
|
|
37
45
|
const scanResults = await (0, scanner_1.scan)(task.appmapFile, 'appmap-scanner.yml');
|
|
38
46
|
await writeIndexFile(JSON.stringify(scanResults, null, 2), 'appmap-findings.json');
|
|
39
47
|
result = { findingsCount: scanResults.findings.length };
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"analyzeWorker.js","sourceRoot":"","sources":["../../../src/cmds/archive/analyzeWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,11 @@ const gitRevision_1 = __importDefault(require("./gitRevision"));
|
|
|
18
18
|
const analyze_1 = __importDefault(require("./analyze"));
|
|
19
19
|
const parseFilterArgs_1 = __importDefault(require("./parseFilterArgs"));
|
|
20
20
|
const os_1 = require("os");
|
|
21
|
+
const console_1 = require("console");
|
|
22
|
+
const buildWorkerPool_1 = __importDefault(require("./buildWorkerPool"));
|
|
23
|
+
const _1 = require(".");
|
|
24
|
+
const fs_1 = require("fs");
|
|
25
|
+
const generateOpenAPI_1 = __importDefault(require("./generateOpenAPI"));
|
|
21
26
|
// ## 1.3.0
|
|
22
27
|
//
|
|
23
28
|
// * AppMap scanner is run on all AppMaps, with an appmap-findings.json file stored in each index directory.
|
|
@@ -116,10 +121,35 @@ const handler = async (argv) => {
|
|
|
116
121
|
const versions = { archive: exports.ArchiveVersion, index: fingerprinter_1.VERSION };
|
|
117
122
|
if (exports.PackageVersion.version)
|
|
118
123
|
versions[exports.PackageVersion.name] = exports.PackageVersion.version;
|
|
119
|
-
|
|
124
|
+
const failedTests = new Set();
|
|
125
|
+
const oversizedAppMaps = new Set();
|
|
120
126
|
if (doAnalyze) {
|
|
121
|
-
|
|
122
|
-
|
|
127
|
+
(0, console_1.warn)(`Analyzing AppMaps using ${threadCount} worker threads`);
|
|
128
|
+
const workerPool = (0, buildWorkerPool_1.default)(threadCount);
|
|
129
|
+
// Index all AppMaps first, so that we can determine which AppMaps are failed tests.
|
|
130
|
+
// If there are test failures, perform a limited analysis that only includes sequence diagrams
|
|
131
|
+
// of the failed tests. Otherwise, perform a full analysis.
|
|
132
|
+
//
|
|
133
|
+
// Scanner findings are not meaningful for failed tests, so we skip doing that
|
|
134
|
+
// work and avoid misleading or confusing the user.
|
|
135
|
+
try {
|
|
136
|
+
await (0, _1.index)(workerPool, maxAppMapSizeInBytes, appMapDir, oversizedAppMaps, failedTests);
|
|
137
|
+
let doScan = true;
|
|
138
|
+
if (failedTests.size > 0) {
|
|
139
|
+
(0, console_1.warn)(`${failedTests.size} AppMaps are failed tests. Analysis which depends on all tests passing will be skipped.`);
|
|
140
|
+
doScan = false;
|
|
141
|
+
}
|
|
142
|
+
else {
|
|
143
|
+
(0, console_1.log)(`No AppMaps are failed tests, so all AppMaps will be analyzed.`);
|
|
144
|
+
}
|
|
145
|
+
await (0, analyze_1.default)(workerPool, maxAppMapSizeInBytes, compareFilter, appMapDir, oversizedAppMaps, doScan);
|
|
146
|
+
}
|
|
147
|
+
finally {
|
|
148
|
+
workerPool.close();
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
else {
|
|
152
|
+
await (0, generateOpenAPI_1.default)(appMapDir, maxAppMapSizeInBytes);
|
|
123
153
|
}
|
|
124
154
|
process.chdir(appMapDir);
|
|
125
155
|
const metadata = {
|
|
@@ -129,7 +159,8 @@ const handler = async (argv) => {
|
|
|
129
159
|
commandArguments: argv,
|
|
130
160
|
revision,
|
|
131
161
|
timestamp: Date.now().toString(),
|
|
132
|
-
|
|
162
|
+
failedTests: [...failedTests].sort(),
|
|
163
|
+
oversizedAppMaps: [...oversizedAppMaps].sort(),
|
|
133
164
|
config: appmapConfig,
|
|
134
165
|
};
|
|
135
166
|
let type;
|
|
@@ -174,13 +205,18 @@ The base revision cannot be determined, so either use --type=auto or --type=full
|
|
|
174
205
|
const defaultOutputDir = () => (0, path_1.join)('.appmap', 'archive', type);
|
|
175
206
|
const outputDir = outputDirArg || defaultOutputDir();
|
|
176
207
|
await (0, promises_1.mkdir)((0, path_1.resolve)(workingDirectory, outputDir), { recursive: true });
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
208
|
+
{
|
|
209
|
+
let tarCommand = `tar cf ${(0, path_1.join)((0, path_1.resolve)(workingDirectory, outputDir), outputFileName)} appmap_archive.json appmaps.tar.gz`;
|
|
210
|
+
if ((0, fs_1.existsSync)('openapi.yml'))
|
|
211
|
+
tarCommand += ' openapi.yml';
|
|
212
|
+
await new Promise((resolveCB, rejectCB) => {
|
|
213
|
+
(0, child_process_1.exec)(tarCommand, (error) => {
|
|
214
|
+
if (error)
|
|
215
|
+
return rejectCB(error);
|
|
216
|
+
resolveCB();
|
|
217
|
+
});
|
|
182
218
|
});
|
|
183
|
-
}
|
|
219
|
+
}
|
|
184
220
|
console.log(`Created AppMap archive ${(0, path_1.join)(outputDir, outputFileName)}`);
|
|
185
221
|
};
|
|
186
222
|
exports.handler = handler;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/cmds/archive/archive.ts"],"names":[],"mappings":";;;;;;AAAA,iDAAqC;AACrC,+BAAqC;AAErC,6EAA0E;AAC1E,+DAA4D;AAC5D,uCAA8C;AAC9C,0CAAuE;AACvE,6DAAoE;AACpE,kFAA0D;AAC1D,mEAA0E;AAC1E,kDAA0B;AAC1B,gEAAwC;AAExC,wDAAgC;AAChC,wEAAgD;AAChD,2BAA0B;
|
|
1
|
+
{"version":3,"file":"archive.js","sourceRoot":"","sources":["../../../src/cmds/archive/archive.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,21 @@
|
|
|
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 assert_1 = __importDefault(require("assert"));
|
|
7
|
+
const workerPool_1 = __importDefault(require("../../lib/workerPool"));
|
|
8
|
+
const path_1 = require("path");
|
|
9
|
+
const fs_1 = require("fs");
|
|
10
|
+
// This import is used to ensure that the packaging follows the dependency.
|
|
11
|
+
require('./analyzeWorkerWrapper');
|
|
12
|
+
const TEST_ENV_WORKER_FILE = (0, path_1.join)(__dirname, '../../../built/cmds/archive/analyzeWorkerWrapper.js');
|
|
13
|
+
const WORKER_FILE = (0, fs_1.existsSync)(TEST_ENV_WORKER_FILE)
|
|
14
|
+
? TEST_ENV_WORKER_FILE
|
|
15
|
+
: (0, path_1.join)(__dirname, 'analyzeWorkerWrapper.js');
|
|
16
|
+
function buildWorkerPool(threadCount) {
|
|
17
|
+
(0, assert_1.default)(WORKER_FILE);
|
|
18
|
+
return new workerPool_1.default(WORKER_FILE, threadCount);
|
|
19
|
+
}
|
|
20
|
+
exports.default = buildWorkerPool;
|
|
21
|
+
//# sourceMappingURL=buildWorkerPool.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildWorkerPool.js","sourceRoot":"","sources":["../../../src/cmds/archive/buildWorkerPool.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,sEAA8C;AAC9C,+BAA4B;AAC5B,2BAAgC;AAEhC,2EAA2E;AAC3E,OAAO,CAAC,wBAAwB,CAAC,CAAC;AAElC,MAAM,oBAAoB,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,qDAAqD,CAAC,CAAC;AACpG,MAAM,WAAW,GAAG,IAAA,eAAU,EAAC,oBAAoB,CAAC;IAClD,CAAC,CAAC,oBAAoB;IACtB,CAAC,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,yBAAyB,CAAC,CAAC;AAE/C,SAAwB,eAAe,CAAC,WAAmB;IACzD,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC;IACpB,OAAO,IAAI,oBAAU,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AAClD,CAAC;AAHD,kCAGC"}
|
|
@@ -6,12 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
const path_1 = require("path");
|
|
7
7
|
const openapi_1 = __importDefault(require("../openapi"));
|
|
8
8
|
async function generateOpenAPI(appMapDir, maxAppMapSizeInBytes) {
|
|
9
|
+
const startTime = new Date().getTime();
|
|
10
|
+
console.log('Generating OpenAPI...');
|
|
9
11
|
const openapiOptions = {
|
|
10
12
|
appmapDir: appMapDir,
|
|
11
13
|
maxSize: maxAppMapSizeInBytes,
|
|
12
14
|
outputFile: (0, path_1.join)(appMapDir, 'openapi.yml'),
|
|
13
15
|
};
|
|
14
16
|
await openapi_1.default.handler(openapiOptions);
|
|
17
|
+
const elapsed = new Date().getTime() - startTime;
|
|
18
|
+
console.log(`Generated OpenAPI in ${elapsed}ms`);
|
|
15
19
|
}
|
|
16
20
|
exports.default = generateOpenAPI;
|
|
17
21
|
//# sourceMappingURL=generateOpenAPI.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateOpenAPI.js","sourceRoot":"","sources":["../../../src/cmds/archive/generateOpenAPI.ts"],"names":[],"mappings":";;;;;AAAA,+BAA4B;AAC5B,yDAAiC;AAElB,KAAK,UAAU,eAAe,CAAC,SAAiB,EAAE,oBAA4B;IAC3F,MAAM,cAAc,GAAG;QACrB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,oBAAoB;QAC7B,UAAU,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC;KAC3C,CAAC;IACF,MAAM,iBAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"generateOpenAPI.js","sourceRoot":"","sources":["../../../src/cmds/archive/generateOpenAPI.ts"],"names":[],"mappings":";;;;;AAAA,+BAA4B;AAC5B,yDAAiC;AAElB,KAAK,UAAU,eAAe,CAAC,SAAiB,EAAE,oBAA4B;IAC3F,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAErC,MAAM,cAAc,GAAG;QACrB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,oBAAoB;QAC7B,UAAU,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC;KAC3C,CAAC;IACF,MAAM,iBAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,wBAAwB,OAAO,IAAI,CAAC,CAAC;AACnD,CAAC;AAbD,kCAaC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
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.generateSequenceDiagrams = void 0;
|
|
7
|
+
const processAppMapDir_1 = __importDefault(require("../../lib/processAppMapDir"));
|
|
8
|
+
const utils_1 = require("../../utils");
|
|
9
|
+
async function generateSequenceDiagrams(workerPool, maxAppMapSizeInBytes, compareFilter, oversizedAppMaps, appMapDir) {
|
|
10
|
+
const specOptions = {
|
|
11
|
+
loops: true,
|
|
12
|
+
};
|
|
13
|
+
const task = (file) => ({
|
|
14
|
+
name: 'sequence-diagram',
|
|
15
|
+
verbose: (0, utils_1.verbose)(),
|
|
16
|
+
appmapFile: file,
|
|
17
|
+
maxSize: maxAppMapSizeInBytes,
|
|
18
|
+
compareFilter,
|
|
19
|
+
specOptions,
|
|
20
|
+
});
|
|
21
|
+
const startTime = new Date().getTime();
|
|
22
|
+
const result = await (0, processAppMapDir_1.default)('Generating sequence diagrams', workerPool, task, appMapDir);
|
|
23
|
+
const elapsed = new Date().getTime() - startTime;
|
|
24
|
+
console.log(`Generated ${result.numProcessed} sequence diagrams in ${elapsed}ms`);
|
|
25
|
+
for (const file of result.oversized)
|
|
26
|
+
oversizedAppMaps.add(file);
|
|
27
|
+
}
|
|
28
|
+
exports.generateSequenceDiagrams = generateSequenceDiagrams;
|
|
29
|
+
//# sourceMappingURL=generateSequenceDiagrams.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generateSequenceDiagrams.js","sourceRoot":"","sources":["../../../src/cmds/archive/generateSequenceDiagrams.ts"],"names":[],"mappings":";;;;;;AAEA,kFAA0D;AAC1D,uCAAsC;AAK/B,KAAK,UAAU,wBAAwB,CAC5C,UAAsB,EACtB,oBAA4B,EAC5B,aAA4B,EAC5B,gBAA6B,EAC7B,SAAiB;IAEjB,MAAM,WAAW,GAAG;QAClB,KAAK,EAAE,IAAI;KACc,CAAC;IAE5B,MAAM,IAAI,GAAG,CAAC,IAAY,EAAuB,EAAE,CAAC,CAAC;QACnD,IAAI,EAAE,kBAAkB;QACxB,OAAO,EAAE,IAAA,eAAO,GAAE;QAClB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,oBAAoB;QAC7B,aAAa;QACb,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EACnC,8BAA8B,EAC9B,UAAU,EACV,IAAI,EACJ,SAAS,CACV,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,aAAa,MAAM,CAAC,YAAY,yBAAyB,OAAO,IAAI,CAAC,CAAC;IAClF,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,SAAS;QAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;AAClE,CAAC;AAhCD,4DAgCC"}
|
|
@@ -0,0 +1,33 @@
|
|
|
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.index = void 0;
|
|
7
|
+
const processAppMapDir_1 = __importDefault(require("../../lib/processAppMapDir"));
|
|
8
|
+
const utils_1 = require("../../utils");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const promises_1 = require("fs/promises");
|
|
11
|
+
async function index(workerPool, maxAppMapSizeInBytes, appMapDir, oversizedAppMaps, failedTests) {
|
|
12
|
+
const task = (file) => ({
|
|
13
|
+
name: 'index',
|
|
14
|
+
verbose: (0, utils_1.verbose)(),
|
|
15
|
+
appmapFile: file,
|
|
16
|
+
maxSize: maxAppMapSizeInBytes,
|
|
17
|
+
});
|
|
18
|
+
const startTime = new Date().getTime();
|
|
19
|
+
const result = await (0, processAppMapDir_1.default)('Indexing AppMaps', workerPool, task, appMapDir);
|
|
20
|
+
const elapsed = new Date().getTime() - startTime;
|
|
21
|
+
console.log(`Indexed ${result.numProcessed} AppMaps in ${elapsed}ms`);
|
|
22
|
+
for (const file of result.oversized)
|
|
23
|
+
oversizedAppMaps.add(file);
|
|
24
|
+
const metadataFiles = await (0, utils_1.findFiles)(appMapDir, (file) => (0, path_1.basename)(file) === 'metadata.json');
|
|
25
|
+
for (const file of metadataFiles) {
|
|
26
|
+
const metadata = JSON.parse(await (0, promises_1.readFile)(file, 'utf-8'));
|
|
27
|
+
const appmapFile = [(0, path_1.dirname)(file), '.appmap.json'].join('');
|
|
28
|
+
if (metadata.test_status === 'failed')
|
|
29
|
+
failedTests.add(appmapFile);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
exports.index = index;
|
|
33
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cmds/archive/index.ts"],"names":[],"mappings":";;;;;;AACA,kFAA0D;AAC1D,uCAAiD;AAGjD,+BAA+C;AAC/C,0CAAuC;AAGhC,KAAK,UAAU,KAAK,CACzB,UAAsB,EACtB,oBAA4B,EAC5B,SAAiB,EACjB,gBAA6B,EAC7B,WAAwB;IAExB,MAAM,IAAI,GAAG,CAAC,IAAY,EAAa,EAAE,CAAC,CAAC;QACzC,IAAI,EAAE,OAAO;QACb,OAAO,EAAE,IAAA,eAAO,GAAE;QAClB,UAAU,EAAE,IAAI;QAChB,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IAEvC,MAAM,MAAM,GAAG,MAAM,IAAA,0BAAgB,EACnC,kBAAkB,EAClB,UAAU,EACV,IAAI,EACJ,SAAS,CACV,CAAC;IAEF,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,WAAW,MAAM,CAAC,YAAY,eAAe,OAAO,IAAI,CAAC,CAAC;IACtE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,SAAS;QAAE,gBAAgB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEhE,MAAM,aAAa,GAAG,MAAM,IAAA,iBAAS,EAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,KAAK,eAAe,CAAC,CAAC;IAC/F,KAAK,MAAM,IAAI,IAAI,aAAa,EAAE;QAChC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,OAAO,CAAC,CAAa,CAAC;QACvE,MAAM,UAAU,GAAG,CAAC,IAAA,cAAO,EAAC,IAAI,CAAC,EAAE,cAAc,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5D,IAAI,QAAQ,CAAC,WAAW,KAAK,QAAQ;YAAE,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;KACpE;AACH,CAAC;AAjCD,sBAiCC"}
|
|
@@ -131,8 +131,8 @@ class ChangeReporter {
|
|
|
131
131
|
(0, assert_1.default)(baseAppMaps);
|
|
132
132
|
(0, assert_1.default)(headAppMaps);
|
|
133
133
|
(0, assert_1.default)(failedAppMaps);
|
|
134
|
+
let apiDiff;
|
|
134
135
|
const generator = new ReportFieldCalculator(this);
|
|
135
|
-
const apiDiff = await generator.apiDiff(options.reportRemoved);
|
|
136
136
|
const isNewFn = isNew(baseAppMaps, isTest(appMapMetadata));
|
|
137
137
|
const isChangedFn = isChanged(baseAppMaps, isTest(appMapMetadata), this.digests);
|
|
138
138
|
const referenceAppMapFn = (appmap) => [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head].forEach((revisionName) => this.referencedAppMaps.add(revisionName, appmap));
|
|
@@ -147,6 +147,9 @@ class ChangeReporter {
|
|
|
147
147
|
};
|
|
148
148
|
const newAppMaps = [...headAppMaps].filter(isNewFn);
|
|
149
149
|
const changedAppMaps = [...headAppMaps].filter(isChangedFn).map((appmap) => ({ appmap }));
|
|
150
|
+
newAppMaps.forEach((appmap) => {
|
|
151
|
+
this.referencedAppMaps.add(RevisionName_1.RevisionName.Head, appmap);
|
|
152
|
+
});
|
|
150
153
|
changedAppMaps.forEach(({ appmap }) => referenceAppMapFn(appmap));
|
|
151
154
|
const failureFn = buildFailure(appMapMetadata, options.snippetWidth);
|
|
152
155
|
const testFailures = new Array();
|
|
@@ -157,19 +160,39 @@ class ChangeReporter {
|
|
|
157
160
|
referenceAppMapFn(appmap);
|
|
158
161
|
}
|
|
159
162
|
}
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
163
|
+
let findingDiff;
|
|
164
|
+
if (testFailures.length === 0) {
|
|
165
|
+
apiDiff = await generator.apiDiff(options.reportRemoved);
|
|
166
|
+
findingDiff = await generator.findingDiff(options.reportRemoved);
|
|
167
|
+
for (const finding of findingDiff.new || [])
|
|
168
|
+
referenceFindingAppMapFn(RevisionName_1.RevisionName.Head, finding);
|
|
169
|
+
for (const finding of findingDiff.resolved || [])
|
|
170
|
+
referenceFindingAppMapFn(RevisionName_1.RevisionName.Base, finding);
|
|
171
|
+
}
|
|
172
|
+
const sequenceDiagramExists = async (revisionName, appmap) => {
|
|
173
|
+
const path = this.paths.sequenceDiagramPath(revisionName, appmap);
|
|
174
|
+
return await (0, utils_1.exists)(path);
|
|
175
|
+
};
|
|
176
|
+
// Limit AppMap metadata to only those AppMaps that have a sequence diagram.
|
|
177
|
+
for (const revisionName of [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head]) {
|
|
178
|
+
const metadataByPath = appMapMetadata[revisionName];
|
|
179
|
+
for (const appmap of metadataByPath.keys()) {
|
|
180
|
+
if (!(await sequenceDiagramExists(revisionName, appmap)))
|
|
181
|
+
metadataByPath.delete(appmap);
|
|
182
|
+
}
|
|
183
|
+
}
|
|
165
184
|
const result = {
|
|
166
185
|
testFailures,
|
|
167
186
|
newAppMaps,
|
|
168
187
|
changedAppMaps,
|
|
169
|
-
findingDiff,
|
|
170
188
|
sequenceDiagramDiff: await generator.sequenceDiagramDiff(changedAppMaps),
|
|
171
|
-
appMapMetadata:
|
|
189
|
+
appMapMetadata: {
|
|
190
|
+
[RevisionName_1.RevisionName.Base]: (0, mapToRecord_1.default)(appMapMetadata[RevisionName_1.RevisionName.Base]),
|
|
191
|
+
[RevisionName_1.RevisionName.Head]: (0, mapToRecord_1.default)(appMapMetadata[RevisionName_1.RevisionName.Head]),
|
|
192
|
+
},
|
|
172
193
|
};
|
|
194
|
+
if (findingDiff)
|
|
195
|
+
result.findingDiff = findingDiff;
|
|
173
196
|
if (apiDiff)
|
|
174
197
|
result.apiDiff = apiDiff;
|
|
175
198
|
return result;
|
|
@@ -231,10 +254,15 @@ function isNew(baseAppMaps, isTestFn) {
|
|
|
231
254
|
exports.isNew = isNew;
|
|
232
255
|
// Selects AppMaps that are present in both the base and head revisions, and have different digests.
|
|
233
256
|
function isChanged(baseAppMaps, isTestFn, digests) {
|
|
234
|
-
return (appmap) =>
|
|
235
|
-
|
|
236
|
-
digests.appmapDigest(RevisionName_1.RevisionName.
|
|
237
|
-
|
|
257
|
+
return (appmap) => {
|
|
258
|
+
const baseDigest = digests.appmapDigest(RevisionName_1.RevisionName.Base, appmap);
|
|
259
|
+
const headDigest = digests.appmapDigest(RevisionName_1.RevisionName.Head, appmap);
|
|
260
|
+
return (isTestFn(appmap) &&
|
|
261
|
+
baseAppMaps.has(appmap) &&
|
|
262
|
+
!!baseDigest &&
|
|
263
|
+
!!headDigest &&
|
|
264
|
+
baseDigest !== headDigest);
|
|
265
|
+
};
|
|
238
266
|
}
|
|
239
267
|
exports.isChanged = isChanged;
|
|
240
268
|
function buildFailure(appMapMetadata, snippetWidth = exports.DEFAULT_SNIPPET_WIDTH) {
|
|
@@ -281,13 +309,6 @@ class ReportFieldCalculator {
|
|
|
281
309
|
constructor(reporter) {
|
|
282
310
|
this.reporter = reporter;
|
|
283
311
|
}
|
|
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
312
|
async sequenceDiagramDiff(changedAppMaps) {
|
|
292
313
|
const diffDiagrams = new DiffDiagrams_1.DiffDiagrams();
|
|
293
314
|
const sequenceDiagramDiff = new Map();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangeReporter.js","sourceRoot":"","sources":["../../../src/cmds/compare/ChangeReporter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ChangeReporter.js","sourceRoot":"","sources":["../../../src/cmds/compare/ChangeReporter.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.Digests = void 0;
|
|
|
4
4
|
const async_1 = require("async");
|
|
5
5
|
const RevisionName_1 = require("./RevisionName");
|
|
6
6
|
const SequenceDiagramDigest_1 = require("./SequenceDiagramDigest");
|
|
7
|
+
const utils_1 = require("../../utils");
|
|
7
8
|
class Digests {
|
|
8
9
|
constructor(paths) {
|
|
9
10
|
this.paths = paths;
|
|
@@ -29,6 +30,8 @@ class Digests {
|
|
|
29
30
|
if (baseAppMaps.length === 0 && headAppMaps.length === 0)
|
|
30
31
|
return;
|
|
31
32
|
const q = (0, async_1.queue)(async ({ revisionName, appmap }) => {
|
|
33
|
+
if (!(await (0, utils_1.exists)(this.paths.sequenceDiagramPath(revisionName, appmap))))
|
|
34
|
+
return;
|
|
32
35
|
const digest = await new SequenceDiagramDigest_1.SequenceDiagramDigest(this.paths, revisionName, appmap).digest();
|
|
33
36
|
this.digests[revisionName].add(digest);
|
|
34
37
|
if (!this.appmapsByDigest[revisionName].has(digest))
|