@appland/appmap 3.98.0 → 3.99.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 +7 -0
- package/built/cmds/compare/ChangeReporter.js +23 -17
- package/built/cmds/compare/ChangeReporter.js.map +1 -1
- package/built/cmds/compare-report/ChangeReport.js +7 -3
- package/built/cmds/compare-report/ChangeReport.js.map +1 -1
- package/built/cmds/compare-report/MarkdownReport.js +7 -4
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -1
- package/built/cmds/compare-report/Preprocessor.js +15 -0
- package/built/cmds/compare-report/Preprocessor.js.map +1 -1
- package/built/cmds/compare-report/ReportSection.js +1 -0
- package/built/cmds/compare-report/ReportSection.js.map +1 -1
- package/package.json +1 -1
- package/resources/change-report/new-appmaps/details.hbs +1 -1
- package/resources/change-report/removed-appmaps/details.hbs +11 -0
- package/resources/change-report/removed-appmaps/heading.hbs +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
# [@appland/appmap-v3.99.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.98.0...@appland/appmap-v3.99.0) (2023-09-29)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Report removed AppMaps ([e199371](https://github.com/getappmap/appmap-js/commit/e1993717d6f3a99ea1320b2aed80a73ccc9fa4a4))
|
|
7
|
+
|
|
1
8
|
# [@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
9
|
|
|
3
10
|
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ReportFieldCalculator = exports.buildFailure = exports.isChanged = exports.
|
|
6
|
+
exports.ReportFieldCalculator = exports.buildFailure = exports.isChanged = exports.isAdded = exports.ChangeReportOptions = exports.DEFAULT_SNIPPET_WIDTH = void 0;
|
|
7
7
|
const promises_1 = require("fs/promises");
|
|
8
8
|
const openapi_diff_1 = __importDefault(require("openapi-diff"));
|
|
9
9
|
const path_1 = require("path");
|
|
@@ -137,8 +137,9 @@ class ChangeReporter {
|
|
|
137
137
|
(0, assert_1.default)(failedAppMaps);
|
|
138
138
|
let apiDiff;
|
|
139
139
|
const generator = new ReportFieldCalculator(this);
|
|
140
|
-
const isNewFn =
|
|
141
|
-
const
|
|
140
|
+
const isNewFn = isAdded(baseAppMaps, isTest(RevisionName_1.RevisionName.Head, appMapMetadata));
|
|
141
|
+
const isRemovedFn = isAdded(headAppMaps, isTest(RevisionName_1.RevisionName.Base, appMapMetadata));
|
|
142
|
+
const isChangedFn = isChanged(baseAppMaps, isTest(RevisionName_1.RevisionName.Head, appMapMetadata), this.digests);
|
|
142
143
|
const referenceAppMapFn = (appmap) => [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head].forEach((revisionName) => this.referencedAppMaps.add(revisionName, appmap));
|
|
143
144
|
const referenceFindingAppMapFn = async (revisionName, finding) => {
|
|
144
145
|
const { appMapFile } = finding;
|
|
@@ -150,10 +151,10 @@ class ChangeReporter {
|
|
|
150
151
|
referenceAppMapFn(appmap);
|
|
151
152
|
};
|
|
152
153
|
const newAppMaps = [...headAppMaps].filter(isNewFn);
|
|
154
|
+
const removedAppMaps = [...baseAppMaps].filter(isRemovedFn);
|
|
153
155
|
const changedAppMaps = [...headAppMaps].filter(isChangedFn).map((appmap) => ({ appmap }));
|
|
154
|
-
newAppMaps.forEach((appmap) =>
|
|
155
|
-
|
|
156
|
-
});
|
|
156
|
+
newAppMaps.forEach((appmap) => this.referencedAppMaps.add(RevisionName_1.RevisionName.Head, appmap));
|
|
157
|
+
removedAppMaps.forEach((appmap) => referenceAppMapFn(appmap));
|
|
157
158
|
changedAppMaps.forEach(({ appmap }) => referenceAppMapFn(appmap));
|
|
158
159
|
const failureFn = buildFailure(appMapMetadata, options.snippetWidth);
|
|
159
160
|
const testFailures = new Array();
|
|
@@ -188,6 +189,7 @@ class ChangeReporter {
|
|
|
188
189
|
const result = {
|
|
189
190
|
testFailures,
|
|
190
191
|
newAppMaps,
|
|
192
|
+
removedAppMaps,
|
|
191
193
|
changedAppMaps,
|
|
192
194
|
sequenceDiagramDiff: await generator.sequenceDiagramDiff(changedAppMaps),
|
|
193
195
|
appMapMetadata: {
|
|
@@ -233,7 +235,7 @@ class ChangeReporter {
|
|
|
233
235
|
for (const appmap of await this.paths.appmaps(RevisionName_1.RevisionName.Head)) {
|
|
234
236
|
const metadata = this.appMapMetadata[RevisionName_1.RevisionName.Head].get(appmap);
|
|
235
237
|
if (!metadata) {
|
|
236
|
-
console.
|
|
238
|
+
console.warn((0, ui_1.prominentStyle)(`Metadata for ${appmap} not found!`));
|
|
237
239
|
continue;
|
|
238
240
|
}
|
|
239
241
|
if (metadata.test_status === 'failed')
|
|
@@ -245,24 +247,24 @@ class ChangeReporter {
|
|
|
245
247
|
}
|
|
246
248
|
exports.default = ChangeReporter;
|
|
247
249
|
// Gets a function that returns true if the given appmap is a test.
|
|
248
|
-
function isTest(appMapMetadata) {
|
|
250
|
+
function isTest(revisionName, appMapMetadata) {
|
|
249
251
|
return (appmap) => {
|
|
250
|
-
const metadata = appMapMetadata[
|
|
252
|
+
const metadata = appMapMetadata[revisionName].get(appmap);
|
|
251
253
|
return !!(metadata && metadata.recorder.type === 'tests');
|
|
252
254
|
};
|
|
253
255
|
}
|
|
254
|
-
// Selects AppMaps that have stable names, and are
|
|
255
|
-
function
|
|
256
|
-
return (appmap) => isTestFn(appmap) && !
|
|
256
|
+
// Selects AppMaps that have stable names, and are not found in a base reference set.
|
|
257
|
+
function isAdded(referenceSet, isTestFn) {
|
|
258
|
+
return (appmap) => isTestFn(appmap) && !referenceSet.has(appmap);
|
|
257
259
|
}
|
|
258
|
-
exports.
|
|
259
|
-
// Selects AppMaps that
|
|
260
|
-
function isChanged(
|
|
260
|
+
exports.isAdded = isAdded;
|
|
261
|
+
// Selects AppMaps that is present in the reference set, and have different digests.
|
|
262
|
+
function isChanged(referenceSet, isTestFn, digests) {
|
|
261
263
|
return (appmap) => {
|
|
262
264
|
const baseDigest = digests.appmapDigest(RevisionName_1.RevisionName.Base, appmap);
|
|
263
265
|
const headDigest = digests.appmapDigest(RevisionName_1.RevisionName.Head, appmap);
|
|
264
266
|
return (isTestFn(appmap) &&
|
|
265
|
-
|
|
267
|
+
referenceSet.has(appmap) &&
|
|
266
268
|
!!baseDigest &&
|
|
267
269
|
!!headDigest &&
|
|
268
270
|
baseDigest !== headDigest);
|
|
@@ -351,7 +353,11 @@ class ReportFieldCalculator {
|
|
|
351
353
|
if (!q.idle())
|
|
352
354
|
await q.drain();
|
|
353
355
|
}
|
|
354
|
-
|
|
356
|
+
const record = (0, mapToRecord_1.default)(sequenceDiagramDiff);
|
|
357
|
+
for (const key of Object.keys(record)) {
|
|
358
|
+
record[key] = record[key].sort();
|
|
359
|
+
}
|
|
360
|
+
return record;
|
|
355
361
|
}
|
|
356
362
|
async findingDiff(reportRemoved) {
|
|
357
363
|
(0, assert_1.default)(this.reporter.baseManifest);
|
|
@@ -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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"}
|
|
@@ -104,11 +104,12 @@ class FindingDiff {
|
|
|
104
104
|
}
|
|
105
105
|
exports.FindingDiff = FindingDiff;
|
|
106
106
|
class ChangeReport {
|
|
107
|
-
constructor(testFailures, openapiDiff, findingDiff, newAppMaps, changedAppMaps, pruned = false) {
|
|
107
|
+
constructor(testFailures, openapiDiff, findingDiff, newAppMaps, removedAppMaps, changedAppMaps, pruned = false) {
|
|
108
108
|
this.testFailures = testFailures;
|
|
109
109
|
this.openapiDiff = openapiDiff;
|
|
110
110
|
this.findingDiff = findingDiff;
|
|
111
111
|
this.newAppMaps = newAppMaps;
|
|
112
|
+
this.removedAppMaps = removedAppMaps;
|
|
112
113
|
this.changedAppMaps = changedAppMaps;
|
|
113
114
|
this.pruned = pruned;
|
|
114
115
|
}
|
|
@@ -127,7 +128,9 @@ class ChangeReport {
|
|
|
127
128
|
const metadata = (revision, appmap) => {
|
|
128
129
|
const appmapId = this.normalizeId(appmap);
|
|
129
130
|
const metadata = changeReportData.appMapMetadata[revision][appmapId];
|
|
130
|
-
|
|
131
|
+
if (!metadata) {
|
|
132
|
+
(0, assert_1.default)(metadata);
|
|
133
|
+
}
|
|
131
134
|
return metadata;
|
|
132
135
|
};
|
|
133
136
|
const changedAppMapSet = changeReportData.changedAppMaps.reduce((memo, change) => (memo.add(this.normalizeId(change.appmap)), memo), new Set());
|
|
@@ -187,12 +190,13 @@ class ChangeReport {
|
|
|
187
190
|
findingDiff = new FindingDiff([], []);
|
|
188
191
|
}
|
|
189
192
|
const newAppMaps = changeReportData.newAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Head, this.normalizeId(appmapId)));
|
|
193
|
+
const removedAppMaps = changeReportData.removedAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Base, this.normalizeId(appmapId)));
|
|
190
194
|
const changedAppMaps = Object.keys(changeReportData.sequenceDiagramDiff).reduce((memo, key) => {
|
|
191
195
|
const appmaps = changeReportData.sequenceDiagramDiff[key].map((appmapId) => appmap(RevisionName_1.RevisionName.Head, this.normalizeId(appmapId)));
|
|
192
196
|
memo[key] = appmaps;
|
|
193
197
|
return memo;
|
|
194
198
|
}, {});
|
|
195
|
-
return new ChangeReport(testFailures, apiDiff, findingDiff, newAppMaps, changedAppMaps);
|
|
199
|
+
return new ChangeReport(testFailures, apiDiff, findingDiff, newAppMaps, removedAppMaps, changedAppMaps);
|
|
196
200
|
}
|
|
197
201
|
}
|
|
198
202
|
exports.default = ChangeReport;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -35,6 +35,7 @@ exports.SECTIONS = [
|
|
|
35
35
|
ReportSection_1.Section.OpenAPIDiff,
|
|
36
36
|
ReportSection_1.Section.Findings,
|
|
37
37
|
ReportSection_1.Section.NewAppMaps,
|
|
38
|
+
ReportSection_1.Section.RemovedAppMaps
|
|
38
39
|
];
|
|
39
40
|
exports.EXPERIMENTAL_SECTIONS = [ReportSection_1.ExperimentalSection.ChangedAppMaps];
|
|
40
41
|
class MarkdownReport {
|
|
@@ -56,10 +57,12 @@ class MarkdownReport {
|
|
|
56
57
|
};
|
|
57
58
|
for (const sectionName of sections) {
|
|
58
59
|
const section = await ReportSection_1.default.build(sectionName);
|
|
59
|
-
const heading = section.generateHeading(changeReport, reportOptions);
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
60
|
+
const heading = section.generateHeading(changeReport, reportOptions).trim();
|
|
61
|
+
if (heading) {
|
|
62
|
+
const detail = section.generateDetails(changeReport, reportOptions);
|
|
63
|
+
headings.push(heading);
|
|
64
|
+
details.push(detail);
|
|
65
|
+
}
|
|
63
66
|
}
|
|
64
67
|
const heading = ['# AppMap', '', '| Summary | Status |', '| --- | --- |', ...headings, ''].join('\n');
|
|
65
68
|
return [heading, ...details].join('\n');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;AAG7F,gCAAgC;AACnB,QAAA,QAAQ,GAAc;IACjC,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,QAAQ;IAChB,uBAAO,CAAC,UAAU;
|
|
1
|
+
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;AAG7F,gCAAgC;AACnB,QAAA,QAAQ,GAAc;IACjC,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,QAAQ;IAChB,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,CAAC,UAAU,EAAE,EAAE,EAAE,sBAAsB,EAAE,eAAe,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,CAC7F,IAAI,CACL,CAAC;QACF,OAAO,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF;AAnCD,iCAmCC"}
|
|
@@ -81,6 +81,19 @@ class NewAppMapsPreprocessor {
|
|
|
81
81
|
};
|
|
82
82
|
}
|
|
83
83
|
}
|
|
84
|
+
class RemovedAppMapsPreprocessor {
|
|
85
|
+
constructor(report) {
|
|
86
|
+
this.report = report;
|
|
87
|
+
}
|
|
88
|
+
get numElements() {
|
|
89
|
+
return this.report.removedAppMaps.length;
|
|
90
|
+
}
|
|
91
|
+
prune(numElements) {
|
|
92
|
+
return {
|
|
93
|
+
removedAppMaps: this.report.removedAppMaps.slice(0, numElements),
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
}
|
|
84
97
|
class ChangedAppMapsPreprocessor {
|
|
85
98
|
constructor(report) {
|
|
86
99
|
this.report = report;
|
|
@@ -105,6 +118,8 @@ function buildPreprocessor(section, report) {
|
|
|
105
118
|
return new FindingDiffPreprocessor(report);
|
|
106
119
|
case ReportSection_1.Section.NewAppMaps:
|
|
107
120
|
return new NewAppMapsPreprocessor(report);
|
|
121
|
+
case ReportSection_1.Section.RemovedAppMaps:
|
|
122
|
+
return new RemovedAppMapsPreprocessor(report);
|
|
108
123
|
case ReportSection_1.ExperimentalSection.ChangedAppMaps:
|
|
109
124
|
return new ChangedAppMapsPreprocessor(report);
|
|
110
125
|
default:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Preprocessor.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/Preprocessor.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Preprocessor.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/Preprocessor.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,6 +24,7 @@ var Section;
|
|
|
24
24
|
Section["OpenAPIDiff"] = "openapi-diff";
|
|
25
25
|
Section["Findings"] = "findings";
|
|
26
26
|
Section["NewAppMaps"] = "new-appmaps";
|
|
27
|
+
Section["RemovedAppMaps"] = "removed-appmaps";
|
|
27
28
|
})(Section = exports.Section || (exports.Section = {}));
|
|
28
29
|
var ExperimentalSection;
|
|
29
30
|
(function (ExperimentalSection) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoD;AACpD,+BAAkD;AAElD,0CAAuC;AAEvC,2BAAgC;AAChC,oDAA4B;AAE5B,kEAA+C;AAE/C,MAAM,iBAAiB,GAAG;IACxB,kCAAkC;IAClC,qCAAqC,EAAE,iBAAiB;CACzD;KACE,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,OAAO,CAAC,CAAC;KAC1C,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,CAAC,CAAC;AAC1C,IAAA,gBAAM,EAAC,iBAAiB,EAAE,qDAAqD,CAAC,CAAC;AAEpE,QAAA,oBAAoB,GAAG,EAAE,CAAC;AAEvC,IAAY,
|
|
1
|
+
{"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
{{#if removedAppMaps.length }}
|
|
2
|
+
<h2 id="removed-appmaps">✖️ Removed AppMaps</h2>
|
|
3
|
+
{{#each removedAppMaps}}
|
|
4
|
+
|
|
5
|
+
- [{{appmap_title this}}]({{ appmap_url 'base' this }})
|
|
6
|
+
|
|
7
|
+
{{/each}}
|
|
8
|
+
{{#if pruned}}
|
|
9
|
+
Because there are so many removed AppMaps, some of them are not listed in this report.
|
|
10
|
+
{{/if}}
|
|
11
|
+
{{/if}}
|