@appland/appmap 3.97.0 → 3.98.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 +16 -0
- package/built/cmds/compare/ChangeReporter.js +15 -11
- package/built/cmds/compare/ChangeReporter.js.map +1 -1
- package/built/cmds/compare/DiffLoader.js +117 -0
- package/built/cmds/compare/DiffLoader.js.map +1 -0
- package/built/html/appmap.js +17 -17
- package/built/html/appmap.js.map +3 -3
- package/built/html/sequenceDiagram.js +17 -17
- package/built/html/sequenceDiagram.js.map +3 -3
- package/built/lib/executeCommand.js +3 -3
- package/built/lib/executeCommand.js.map +1 -1
- package/package.json +3 -3
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
# [@appland/appmap-v3.98.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.97.1...@appland/appmap-v3.98.0) (2023-09-26)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Cache source diff ([199cd17](https://github.com/getappmap/appmap-js/commit/199cd1793e871ae3ab20ec5ce7e401b95b279f1b))
|
|
7
|
+
* Lookup diff entry for each source file ([5e7afdb](https://github.com/getappmap/appmap-js/commit/5e7afdbfbfab15d41cb5184da647cf4ac2bc0191))
|
|
8
|
+
* Run each unique diff command once ([200e7d7](https://github.com/getappmap/appmap-js/commit/200e7d7090266e205a8efc0a0e256992c198c5e8))
|
|
9
|
+
|
|
10
|
+
# [@appland/appmap-v3.97.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.97.0...@appland/appmap-v3.97.1) (2023-09-25)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Bug Fixes
|
|
14
|
+
|
|
15
|
+
* Package all resources in the native binary ([20269c4](https://github.com/getappmap/appmap-js/commit/20269c401138bf043869821010739ce1fa29bb89))
|
|
16
|
+
|
|
1
17
|
# [@appland/appmap-v3.97.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.96.3...@appland/appmap-v3.97.0) (2023-09-25)
|
|
2
18
|
|
|
3
19
|
|
|
@@ -18,10 +18,10 @@ const RevisionName_1 = require("./RevisionName");
|
|
|
18
18
|
const utils_1 = require("../../utils");
|
|
19
19
|
const mapToRecord_1 = __importDefault(require("./mapToRecord"));
|
|
20
20
|
const ui_1 = require("./ui");
|
|
21
|
-
const executeCommand_1 = require("../../lib/executeCommand");
|
|
22
21
|
const loadFindings_1 = __importDefault(require("./loadFindings"));
|
|
23
22
|
const loadSequenceDiagram_1 = require("./loadSequenceDiagram");
|
|
24
23
|
const console_1 = require("console");
|
|
24
|
+
const DiffLoader_1 = __importDefault(require("./DiffLoader"));
|
|
25
25
|
exports.DEFAULT_SNIPPET_WIDTH = 10;
|
|
26
26
|
class ReferencedAppMaps {
|
|
27
27
|
constructor() {
|
|
@@ -41,6 +41,7 @@ class SourceDiff {
|
|
|
41
41
|
this.reporter = reporter;
|
|
42
42
|
this.diffs = new Map();
|
|
43
43
|
this.classMaps = new Map();
|
|
44
|
+
this.diffLoader = new DiffLoader_1.default(reporter.baseRevision, reporter.headRevision);
|
|
44
45
|
}
|
|
45
46
|
async get(appmap) {
|
|
46
47
|
[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`));
|
|
@@ -59,22 +60,25 @@ class SourceDiff {
|
|
|
59
60
|
};
|
|
60
61
|
const classMap = this.classMaps.get(appmap) || (await loadClassMap());
|
|
61
62
|
const sourcePaths = new Set();
|
|
63
|
+
const sourcePathRoots = new Set();
|
|
62
64
|
classMap.visit((codeObject) => {
|
|
63
65
|
if (!codeObject.location)
|
|
64
66
|
return;
|
|
65
67
|
const path = codeObject.location.split(':')[0];
|
|
66
|
-
if (path.indexOf('.') && !path.startsWith('<') && !(0, path_1.isAbsolute)(path))
|
|
68
|
+
if (path.indexOf('.') && !path.startsWith('<') && !path.includes('#') && !(0, path_1.isAbsolute)(path)) {
|
|
67
69
|
sourcePaths.add(path);
|
|
70
|
+
const pathTokens = path.split('/');
|
|
71
|
+
if (pathTokens.length > 0)
|
|
72
|
+
sourcePathRoots.add(pathTokens[0]);
|
|
73
|
+
}
|
|
68
74
|
});
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
}
|
|
77
|
-
return diff;
|
|
75
|
+
await this.diffLoader.update(sourcePathRoots);
|
|
76
|
+
const result = [...sourcePaths]
|
|
77
|
+
.sort()
|
|
78
|
+
.map((path) => this.diffLoader.lookupDiff(path))
|
|
79
|
+
.join('');
|
|
80
|
+
// warn(`${[...sourcePaths].sort()}: ${result}`);
|
|
81
|
+
return result;
|
|
78
82
|
}
|
|
79
83
|
}
|
|
80
84
|
class ChangeReportOptions {
|
|
@@ -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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"}
|
|
@@ -0,0 +1,117 @@
|
|
|
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.DiffLoaderQueue = exports.MAX_DIFF_LENGTH = void 0;
|
|
7
|
+
const parse_diff_1 = __importDefault(require("parse-diff"));
|
|
8
|
+
const console_1 = require("console");
|
|
9
|
+
const assert_1 = __importDefault(require("assert"));
|
|
10
|
+
const executeCommand_1 = require("../../lib/executeCommand");
|
|
11
|
+
const async_1 = require("async");
|
|
12
|
+
const fs_1 = require("fs");
|
|
13
|
+
exports.MAX_DIFF_LENGTH = 1000 * 1000;
|
|
14
|
+
class DiffLoaderQueue {
|
|
15
|
+
constructor(baseRevision, headRevision) {
|
|
16
|
+
this.baseRevision = baseRevision;
|
|
17
|
+
this.headRevision = headRevision;
|
|
18
|
+
this.diffByRoots = new Map();
|
|
19
|
+
this.diffQueue = (0, async_1.queue)(this.executeDiffCommand.bind(this), 1);
|
|
20
|
+
}
|
|
21
|
+
async diff(sourcePathRoots) {
|
|
22
|
+
// Process only one diff at a time.
|
|
23
|
+
if (this.diffQueue.length())
|
|
24
|
+
await this.diffQueue.drain();
|
|
25
|
+
const roots = [...sourcePathRoots].sort().join(' ');
|
|
26
|
+
this.diffQueue.push(roots);
|
|
27
|
+
await this.diffQueue.drain();
|
|
28
|
+
return this.diffByRoots.get(roots);
|
|
29
|
+
}
|
|
30
|
+
async executeDiffCommand(roots) {
|
|
31
|
+
if (roots === '')
|
|
32
|
+
return;
|
|
33
|
+
if (this.diffByRoots.get(roots))
|
|
34
|
+
return;
|
|
35
|
+
const command = `git diff ${this.baseRevision}..${this.headRevision} -- ${roots}`;
|
|
36
|
+
let diff = { command, files: [] };
|
|
37
|
+
try {
|
|
38
|
+
const diffStr = await (0, executeCommand_1.executeCommand)(command, true);
|
|
39
|
+
if (diffStr.length > exports.MAX_DIFF_LENGTH) {
|
|
40
|
+
(0, console_1.warn)(`Diff is too large to parse. Skipping...`);
|
|
41
|
+
}
|
|
42
|
+
else {
|
|
43
|
+
const files = (0, parse_diff_1.default)(diffStr);
|
|
44
|
+
diff = { command, files };
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
catch (err) {
|
|
48
|
+
// There's no point in trying this command again.
|
|
49
|
+
(0, console_1.warn)(err);
|
|
50
|
+
}
|
|
51
|
+
finally {
|
|
52
|
+
this.diffByRoots.set(roots, diff);
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
exports.DiffLoaderQueue = DiffLoaderQueue;
|
|
57
|
+
class DiffLoader {
|
|
58
|
+
constructor(baseRevision, headRevision) {
|
|
59
|
+
this.baseRevision = baseRevision;
|
|
60
|
+
this.headRevision = headRevision;
|
|
61
|
+
this.sourcePathRoots = new Set();
|
|
62
|
+
this.diffLoaderQueue = new DiffLoaderQueue(baseRevision, headRevision);
|
|
63
|
+
}
|
|
64
|
+
lookupDiff(path) {
|
|
65
|
+
if (!this.diffByFile)
|
|
66
|
+
return;
|
|
67
|
+
const diff = this.diffByFile.get(path);
|
|
68
|
+
if (!diff)
|
|
69
|
+
return;
|
|
70
|
+
const { files: diffFiles } = diff;
|
|
71
|
+
const content = diffFiles
|
|
72
|
+
.map((diffFile) => {
|
|
73
|
+
const fromLine = ['---', diffFile.from].join(' ');
|
|
74
|
+
const toLine = ['+++', diffFile.to].join(' ');
|
|
75
|
+
const content = diffFile.chunks
|
|
76
|
+
.map((chunk) => [chunk.content, chunk.changes.map((change) => change.content).join('\n')].join('\n'))
|
|
77
|
+
.join('\n');
|
|
78
|
+
return [fromLine, toLine, content, ''].join('\n');
|
|
79
|
+
})
|
|
80
|
+
.join('\n');
|
|
81
|
+
return [content].join('\n');
|
|
82
|
+
}
|
|
83
|
+
async update(sourcePathRoots) {
|
|
84
|
+
const diffRoots = new Set();
|
|
85
|
+
for (const root of sourcePathRoots) {
|
|
86
|
+
if (!this.sourcePathRoots.has(root)) {
|
|
87
|
+
this.sourcePathRoots.add(root);
|
|
88
|
+
if (DiffLoader.isEligibleFile(root))
|
|
89
|
+
diffRoots.add(root);
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
const diff = await this.diffLoaderQueue.diff(diffRoots);
|
|
93
|
+
if (diff)
|
|
94
|
+
this.parseDiffStr(diff);
|
|
95
|
+
}
|
|
96
|
+
static isEligibleFile(root) {
|
|
97
|
+
return !['vendor', 'node_modules'].includes(root) && (0, fs_1.existsSync)(root);
|
|
98
|
+
}
|
|
99
|
+
parseDiffStr(diff) {
|
|
100
|
+
if (!this.diffByFile)
|
|
101
|
+
this.diffByFile = new Map();
|
|
102
|
+
diff.files.reduce((memo, diffFile) => {
|
|
103
|
+
[...new Set([diffFile.to, diffFile.from])]
|
|
104
|
+
.filter(Boolean)
|
|
105
|
+
.sort()
|
|
106
|
+
.forEach((path) => {
|
|
107
|
+
(0, assert_1.default)(path);
|
|
108
|
+
if (!memo.has(path))
|
|
109
|
+
memo.set(path, { command: diff.command, files: [] });
|
|
110
|
+
memo.get(path).files.push(diffFile);
|
|
111
|
+
});
|
|
112
|
+
return memo;
|
|
113
|
+
}, this.diffByFile);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
exports.default = DiffLoader;
|
|
117
|
+
//# sourceMappingURL=DiffLoader.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DiffLoader.js","sourceRoot":"","sources":["../../../src/cmds/compare/DiffLoader.ts"],"names":[],"mappings":"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"}
|