@appland/appmap 3.101.0 → 3.102.1
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/compare-report/ChangeReport.js +9 -19
- package/built/cmds/compare-report/ChangeReport.js.map +1 -1
- package/built/cmds/compare-report/MarkdownReport.js +8 -1
- package/built/cmds/compare-report/MarkdownReport.js.map +1 -1
- package/built/cmds/compare-report/ReportSection.js +3 -34
- package/built/cmds/compare-report/ReportSection.js.map +1 -1
- package/built/cmds/compare-report/helpers.js +108 -0
- package/built/cmds/compare-report/helpers.js.map +1 -0
- package/built/cmds/compare-report/normalizeAppMapId.js +15 -0
- package/built/cmds/compare-report/normalizeAppMapId.js.map +1 -0
- package/built/cmds/inventory/inventory.js +1 -15
- package/built/cmds/inventory/inventory.js.map +1 -1
- package/built/cmds/inventory-report/MarkdownReport.js +16 -56
- package/built/cmds/inventory-report/MarkdownReport.js.map +1 -1
- package/built/cmds/inventory-report/inventoryReport.js +10 -3
- package/built/cmds/inventory-report/inventoryReport.js.map +1 -1
- package/built/html/appmap.js +94 -94
- package/built/html/appmap.js.map +4 -4
- package/built/html/sequenceDiagram.js +94 -94
- package/built/html/sequenceDiagram.js.map +4 -4
- package/built/lib/loadAppMapConfig.js.map +1 -1
- package/package.json +1 -1
- package/resources/inventory-report/welcome/welcome.hbs +95 -60
- package/resources/inventory-report/default/inventory.hbs +0 -89
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
# [@appland/appmap-v3.102.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.102.0...@appland/appmap-v3.102.1) (2023-10-18)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Drop Handebars-provided arg from helper function ([284b489](https://github.com/getappmap/appmap-js/commit/284b48963f14419bfe053ce4742400e506ec5ca4))
|
|
7
|
+
|
|
8
|
+
# [@appland/appmap-v3.102.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.101.0...@appland/appmap-v3.102.0) (2023-10-17)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* Delete un-maintained report ([caa2afd](https://github.com/getappmap/appmap-js/commit/caa2afdb83cd6e25cc28b15bb83f4f492654d93f))
|
|
14
|
+
* Include Finding examples in inventory output ([a84b0d9](https://github.com/getappmap/appmap-js/commit/a84b0d9f50014ce70b50f3656e39fa09c878607f))
|
|
15
|
+
* Iterate to minimal welcome / configuration report ([fd700f4](https://github.com/getappmap/appmap-js/commit/fd700f4c5f5ff2f4e2cc7532f7ebae682976ee10))
|
|
16
|
+
* Revise the welcome report ([6c682f1](https://github.com/getappmap/appmap-js/commit/6c682f1ecb0b29d2dee555f2e8fdbc2fd1c22d21))
|
|
17
|
+
* Show a sample of Findings in the Welcome message ([496e792](https://github.com/getappmap/appmap-js/commit/496e7922490ef4cf6d42a2bd2436c34e4b36a1b1))
|
|
18
|
+
|
|
1
19
|
# [@appland/appmap-v3.101.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.100.1...@appland/appmap-v3.101.0) (2023-10-13)
|
|
2
20
|
|
|
3
21
|
|
|
@@ -8,7 +8,7 @@ const RevisionName_1 = require("../compare/RevisionName");
|
|
|
8
8
|
const assert_1 = __importDefault(require("assert"));
|
|
9
9
|
const executeCommand_1 = require("../../lib/executeCommand");
|
|
10
10
|
const utils_1 = require("../../utils");
|
|
11
|
-
const
|
|
11
|
+
const normalizeAppMapId_1 = __importDefault(require("./normalizeAppMapId"));
|
|
12
12
|
class AppMap {
|
|
13
13
|
constructor(
|
|
14
14
|
// id is a unique identifier for the AppMap. It's essentially the path to the AppMap
|
|
@@ -116,34 +116,24 @@ class ChangeReport {
|
|
|
116
116
|
this.changedAppMaps = changedAppMaps;
|
|
117
117
|
this.pruned = pruned;
|
|
118
118
|
}
|
|
119
|
-
static normalizeId(id) {
|
|
120
|
-
let normalizedId = id;
|
|
121
|
-
if (normalizedId.startsWith('./'))
|
|
122
|
-
normalizedId = normalizedId.slice('./'.length);
|
|
123
|
-
if (normalizedId.endsWith('.appmap.json')) {
|
|
124
|
-
(0, console_1.warn)(`AppMap id ${id} should not include the file extension`);
|
|
125
|
-
normalizedId = normalizedId.slice(0, '.appmap.json'.length * -1);
|
|
126
|
-
}
|
|
127
|
-
return normalizedId;
|
|
128
|
-
}
|
|
129
119
|
static async build(changeReportData) {
|
|
130
120
|
var _a, _b, _c;
|
|
131
121
|
const metadata = (revision, appmap) => {
|
|
132
|
-
const appmapId =
|
|
122
|
+
const appmapId = (0, normalizeAppMapId_1.default)(appmap);
|
|
133
123
|
const metadata = changeReportData.appMapMetadata[revision][appmapId];
|
|
134
124
|
if (!metadata) {
|
|
135
125
|
(0, assert_1.default)(metadata);
|
|
136
126
|
}
|
|
137
127
|
return metadata;
|
|
138
128
|
};
|
|
139
|
-
const changedAppMapSet = changeReportData.changedAppMaps.reduce((memo, change) => (memo.add(
|
|
129
|
+
const changedAppMapSet = changeReportData.changedAppMaps.reduce((memo, change) => (memo.add((0, normalizeAppMapId_1.default)(change.appmap)), memo), new Set());
|
|
140
130
|
const sourceDiffs = changeReportData.changedAppMaps.reduce((memo, change) => {
|
|
141
131
|
if (change.sourceDiff)
|
|
142
|
-
memo.set(
|
|
132
|
+
memo.set((0, normalizeAppMapId_1.default)(change.appmap), change.sourceDiff);
|
|
143
133
|
return memo;
|
|
144
134
|
}, new Map());
|
|
145
135
|
const appmap = (revision, appmapId) => {
|
|
146
|
-
appmapId =
|
|
136
|
+
appmapId = (0, normalizeAppMapId_1.default)(appmapId);
|
|
147
137
|
const sourceDiff = sourceDiffs.get(appmapId);
|
|
148
138
|
return new AppMap(appmapId, metadata(revision, appmapId), changedAppMapSet.has(appmapId), sourceDiff);
|
|
149
139
|
};
|
|
@@ -180,7 +170,7 @@ class ChangeReport {
|
|
|
180
170
|
if (appmapId.endsWith('.appmap.json'))
|
|
181
171
|
appmapId = appmapId.slice(0, appmapId.length - '.appmap.json'.length);
|
|
182
172
|
return {
|
|
183
|
-
appmap: appmap(revisionName,
|
|
173
|
+
appmap: appmap(revisionName, (0, normalizeAppMapId_1.default)(appmapId)),
|
|
184
174
|
finding,
|
|
185
175
|
};
|
|
186
176
|
});
|
|
@@ -192,10 +182,10 @@ class ChangeReport {
|
|
|
192
182
|
else {
|
|
193
183
|
findingDiff = new FindingDiff([], []);
|
|
194
184
|
}
|
|
195
|
-
const newAppMaps = changeReportData.newAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Head,
|
|
196
|
-
const removedAppMaps = changeReportData.removedAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Base,
|
|
185
|
+
const newAppMaps = changeReportData.newAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Head, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
186
|
+
const removedAppMaps = changeReportData.removedAppMaps.map((appmapId) => appmap(RevisionName_1.RevisionName.Base, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
197
187
|
const changedAppMaps = Object.keys(changeReportData.sequenceDiagramDiff).reduce((memo, key) => {
|
|
198
|
-
const appmaps = changeReportData.sequenceDiagramDiff[key].map((appmapId) => appmap(RevisionName_1.RevisionName.Head,
|
|
188
|
+
const appmaps = changeReportData.sequenceDiagramDiff[key].map((appmapId) => appmap(RevisionName_1.RevisionName.Head, (0, normalizeAppMapId_1.default)(appmapId)));
|
|
199
189
|
memo[key] = appmaps;
|
|
200
190
|
return memo;
|
|
201
191
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":";;;;;;AAIA,0DAAuD;AACvD,oDAA4B;AAC5B,6DAA0D;AAC1D,uCAAsC;
|
|
1
|
+
{"version":3,"file":"ChangeReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ChangeReport.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,7 +66,14 @@ class MarkdownReport {
|
|
|
66
66
|
details.push(detail);
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
|
-
const heading = [
|
|
69
|
+
const heading = [
|
|
70
|
+
'# AppMap pull request analysis',
|
|
71
|
+
'',
|
|
72
|
+
'| Summary | Status |',
|
|
73
|
+
'| --- | --- |',
|
|
74
|
+
...headings,
|
|
75
|
+
'',
|
|
76
|
+
].join('\n');
|
|
70
77
|
return [heading, ...details].join('\n');
|
|
71
78
|
}
|
|
72
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;AAE7F,gCAAgC;AACnB,QAAA,QAAQ,GAAc;IACjC,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,aAAa;IACrB,uBAAO,CAAC,mBAAmB;IAC3B,uBAAO,CAAC,gBAAgB;IACxB,uBAAO,CAAC,UAAU;IAClB,uBAAO,CAAC,cAAc;CACvB,CAAC;AACW,QAAA,qBAAqB,GAA0B,CAAC,mCAAmB,CAAC,cAAc,CAAC,CAAC;AAEjG,MAAqB,cAAc;IAIjC,YAAmB,SAAc,EAAS,SAAc;QAArC,cAAS,GAAT,SAAS,CAAK;QAAS,cAAS,GAAT,SAAS,CAAK;IAAG,CAAC;IAE5D,KAAK,CAAC,cAAc,CAAC,gBAAkC;QACrD,MAAM,QAAQ,GAAG;YACf,GAAG,gBAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,CAAC,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA,EAAA,CAAC;YACzE,GAAG,6BAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAA,CAAC;SACtF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEhE,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAU,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,KAAK,EAAU,CAAC;QACpC,MAAM,aAAa,GAAkB;YACnC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QACF,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;YAClC,MAAM,OAAO,GAAG,MAAM,uBAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5E,IAAI,OAAO,EAAE;gBACX,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtB;SACF;QAED,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,kEAA0C;AAC1C,iEAA6F;AAE7F,gCAAgC;AACnB,QAAA,QAAQ,GAAc;IACjC,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,WAAW;IACnB,uBAAO,CAAC,aAAa;IACrB,uBAAO,CAAC,mBAAmB;IAC3B,uBAAO,CAAC,gBAAgB;IACxB,uBAAO,CAAC,UAAU;IAClB,uBAAO,CAAC,cAAc;CACvB,CAAC;AACW,QAAA,qBAAqB,GAA0B,CAAC,mCAAmB,CAAC,cAAc,CAAC,CAAC;AAEjG,MAAqB,cAAc;IAIjC,YAAmB,SAAc,EAAS,SAAc;QAArC,cAAS,GAAT,SAAS,CAAK;QAAS,cAAS,GAAT,SAAS,CAAK;IAAG,CAAC;IAE5D,KAAK,CAAC,cAAc,CAAC,gBAAkC;QACrD,MAAM,QAAQ,GAAG;YACf,GAAG,gBAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,CAAC,CAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,CAAA,EAAA,CAAC;YACzE,GAAG,6BAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,WAAC,OAAA,MAAA,IAAI,CAAC,eAAe,0CAAE,QAAQ,CAAC,OAAO,CAAC,CAAA,EAAA,CAAC;SACtF,CAAC;QAEF,MAAM,YAAY,GAAG,MAAM,sBAAY,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAEhE,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAU,CAAC;QACrC,MAAM,OAAO,GAAG,IAAI,KAAK,EAAU,CAAC;QACpC,MAAM,aAAa,GAAkB;YACnC,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC;QACF,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE;YAClC,MAAM,OAAO,GAAG,MAAM,uBAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACvD,MAAM,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,IAAI,EAAE,CAAC;YAC5E,IAAI,OAAO,EAAE;gBACX,MAAM,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;gBACpE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBACvB,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;aACtB;SACF;QAED,MAAM,OAAO,GAAG;YACd,gCAAgC;YAChC,EAAE;YACF,sBAAsB;YACtB,eAAe;YACf,GAAG,QAAQ;YACX,EAAE;SACH,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACb,OAAO,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;CACF;AAxCD,iCAwCC"}
|
|
@@ -33,6 +33,7 @@ const promises_1 = require("fs/promises");
|
|
|
33
33
|
const fs_1 = require("fs");
|
|
34
34
|
const assert_1 = __importDefault(require("assert"));
|
|
35
35
|
const Preprocessor_1 = __importStar(require("./Preprocessor"));
|
|
36
|
+
const helpers_1 = __importDefault(require("./helpers"));
|
|
36
37
|
exports.TemplateDirectory = [
|
|
37
38
|
'../../../resources/change-report',
|
|
38
39
|
'../../../../resources/change-report', // In development
|
|
@@ -131,29 +132,6 @@ class ReportSection {
|
|
|
131
132
|
let { baseDir } = options;
|
|
132
133
|
if (!baseDir)
|
|
133
134
|
baseDir = process.cwd();
|
|
134
|
-
const inspect = (value) => {
|
|
135
|
-
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
136
|
-
};
|
|
137
|
-
const length = (...list) => {
|
|
138
|
-
const _fn = list.pop();
|
|
139
|
-
let result = 0;
|
|
140
|
-
for (const item of list) {
|
|
141
|
-
if (Array.isArray(item)) {
|
|
142
|
-
result += item.length;
|
|
143
|
-
}
|
|
144
|
-
else if (item.constructor === Map) {
|
|
145
|
-
result += item.size;
|
|
146
|
-
}
|
|
147
|
-
else if (typeof item === 'object') {
|
|
148
|
-
result += Object.keys(item).length;
|
|
149
|
-
}
|
|
150
|
-
}
|
|
151
|
-
return result;
|
|
152
|
-
};
|
|
153
|
-
const coalesce = (...list) => {
|
|
154
|
-
const _fn = list.pop();
|
|
155
|
-
return list.find((item) => item !== undefined && item !== '');
|
|
156
|
-
};
|
|
157
135
|
const source_url = (location, fileLinenoSeparator = '#L') => {
|
|
158
136
|
if (typeof fileLinenoSeparator === 'object') {
|
|
159
137
|
fileLinenoSeparator = '#L';
|
|
@@ -226,20 +204,11 @@ class ReportSection {
|
|
|
226
204
|
return new handlebars_1.default.SafeString(path);
|
|
227
205
|
}
|
|
228
206
|
};
|
|
229
|
-
|
|
230
|
-
return count === 1 ? singular : plural || singular + 's';
|
|
231
|
-
};
|
|
232
|
-
return {
|
|
233
|
-
appmap_diff_url,
|
|
207
|
+
return Object.assign({ appmap_diff_url,
|
|
234
208
|
appmap_title,
|
|
235
209
|
appmap_url,
|
|
236
|
-
coalesce,
|
|
237
210
|
group_appmaps_by_recorder_name,
|
|
238
|
-
|
|
239
|
-
length,
|
|
240
|
-
pluralize,
|
|
241
|
-
source_url,
|
|
242
|
-
};
|
|
211
|
+
source_url }, helpers_1.default);
|
|
243
212
|
}
|
|
244
213
|
static async build(section, templateDir = exports.TemplateDirectory) {
|
|
245
214
|
(0, assert_1.default)(templateDir);
|
|
@@ -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,+DAAmE;
|
|
1
|
+
{"version":3,"file":"ReportSection.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/ReportSection.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,108 @@
|
|
|
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 handlebars_1 = __importDefault(require("handlebars"));
|
|
7
|
+
const js_yaml_1 = require("js-yaml");
|
|
8
|
+
const inspect = (value) => {
|
|
9
|
+
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
10
|
+
};
|
|
11
|
+
const length = (...list) => {
|
|
12
|
+
const _fn = list.pop();
|
|
13
|
+
let result = 0;
|
|
14
|
+
for (const item of list) {
|
|
15
|
+
if (Array.isArray(item)) {
|
|
16
|
+
result += item.length;
|
|
17
|
+
}
|
|
18
|
+
else if (item.constructor === Map) {
|
|
19
|
+
result += item.size;
|
|
20
|
+
}
|
|
21
|
+
else if (typeof item === 'object') {
|
|
22
|
+
result += Object.keys(item).length;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
return result;
|
|
26
|
+
};
|
|
27
|
+
const coalesce = (...list) => {
|
|
28
|
+
const _fn = list.pop();
|
|
29
|
+
return list.find((item) => item !== undefined && item !== '');
|
|
30
|
+
};
|
|
31
|
+
const extractArrayValue = (args) => (Array.isArray(args[0]) ? args[0] : args);
|
|
32
|
+
const eq = (...args) => {
|
|
33
|
+
args = [...args];
|
|
34
|
+
const _fn = args.pop();
|
|
35
|
+
if (args.length === 0)
|
|
36
|
+
return false;
|
|
37
|
+
const first = args[0];
|
|
38
|
+
return args.every((value) => value === first);
|
|
39
|
+
};
|
|
40
|
+
const pluralize = (count, singular, plural) => {
|
|
41
|
+
if (typeof plural !== 'string')
|
|
42
|
+
plural = undefined;
|
|
43
|
+
if (count === 1)
|
|
44
|
+
return singular;
|
|
45
|
+
else if (plural)
|
|
46
|
+
return plural;
|
|
47
|
+
else
|
|
48
|
+
return [singular, 's'].join('');
|
|
49
|
+
};
|
|
50
|
+
const format_as_yaml = (value) => new handlebars_1.default.SafeString((0, js_yaml_1.dump)(value));
|
|
51
|
+
const sum = (...args) => {
|
|
52
|
+
args = [...args];
|
|
53
|
+
const _fn = args.pop();
|
|
54
|
+
const values = extractArrayValue(args);
|
|
55
|
+
return values.reduce((a, b) => a + (b || 0), 0);
|
|
56
|
+
};
|
|
57
|
+
const subtract = (...args) => {
|
|
58
|
+
args = [...args];
|
|
59
|
+
const _fn = args.pop();
|
|
60
|
+
const initial = args.shift() || 0;
|
|
61
|
+
return args.reduce((a, b) => a - (b || 0), initial);
|
|
62
|
+
};
|
|
63
|
+
const divide = (...args) => {
|
|
64
|
+
args = [...args];
|
|
65
|
+
const _fn = args.pop();
|
|
66
|
+
const values = extractArrayValue(args);
|
|
67
|
+
const initial = values.shift() || 0;
|
|
68
|
+
return values.reduce((a, b) => a / (b || 1), initial);
|
|
69
|
+
};
|
|
70
|
+
const format_as_percentage = (value, precision) => {
|
|
71
|
+
return `${(value * 100).toFixed(precision)}%`;
|
|
72
|
+
};
|
|
73
|
+
// TODO: Customize this per-language, e.g. 'module' for Ruby.
|
|
74
|
+
const lang_package_alias = () => 'package';
|
|
75
|
+
const keys = (obj) => {
|
|
76
|
+
if (Array.isArray(obj))
|
|
77
|
+
return obj;
|
|
78
|
+
if (obj.constructor === Map)
|
|
79
|
+
return Array.from(obj.keys());
|
|
80
|
+
if (typeof obj === 'object')
|
|
81
|
+
return Object.keys(obj);
|
|
82
|
+
return [];
|
|
83
|
+
};
|
|
84
|
+
const values = (obj) => {
|
|
85
|
+
if (Array.isArray(obj))
|
|
86
|
+
return obj;
|
|
87
|
+
if (obj.constructor === Map)
|
|
88
|
+
return Array.from(obj.values());
|
|
89
|
+
if (typeof obj === 'object')
|
|
90
|
+
return Object.values(obj);
|
|
91
|
+
return [];
|
|
92
|
+
};
|
|
93
|
+
exports.default = {
|
|
94
|
+
divide,
|
|
95
|
+
format_as_percentage,
|
|
96
|
+
format_as_yaml,
|
|
97
|
+
keys,
|
|
98
|
+
inspect,
|
|
99
|
+
lang_package_alias,
|
|
100
|
+
length,
|
|
101
|
+
coalesce,
|
|
102
|
+
eq,
|
|
103
|
+
pluralize,
|
|
104
|
+
subtract,
|
|
105
|
+
sum,
|
|
106
|
+
values,
|
|
107
|
+
};
|
|
108
|
+
//# sourceMappingURL=helpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const console_1 = require("console");
|
|
4
|
+
function normalizeAppMapId(id) {
|
|
5
|
+
let normalizedId = id;
|
|
6
|
+
if (normalizedId.startsWith('./'))
|
|
7
|
+
normalizedId = normalizedId.slice('./'.length);
|
|
8
|
+
if (normalizedId.endsWith('.appmap.json')) {
|
|
9
|
+
(0, console_1.warn)(`AppMap id ${id} should not include the file extension`);
|
|
10
|
+
normalizedId = normalizedId.slice(0, '.appmap.json'.length * -1);
|
|
11
|
+
}
|
|
12
|
+
return normalizedId;
|
|
13
|
+
}
|
|
14
|
+
exports.default = normalizeAppMapId;
|
|
15
|
+
//# sourceMappingURL=normalizeAppMapId.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"normalizeAppMapId.js","sourceRoot":"","sources":["../../../src/cmds/compare-report/normalizeAppMapId.ts"],"names":[],"mappings":";;AAAA,qCAA+B;AAE/B,SAAwB,iBAAiB,CAAC,EAAU;IAClD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QACzC,IAAA,cAAI,EAAC,aAAa,EAAE,wCAAwC,CAAC,CAAC;QAC9D,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;KAClE;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,oCAQC"}
|
|
@@ -118,7 +118,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
118
118
|
const operation = pathItem[method];
|
|
119
119
|
if (!operation)
|
|
120
120
|
continue;
|
|
121
|
-
const route = `${method.toUpperCase()} ${pattern}`;
|
|
122
121
|
const directoryIsh = pattern.split('/').slice(0, resourceTokens).join('/');
|
|
123
122
|
if (!routeCountByResource[directoryIsh])
|
|
124
123
|
routeCountByResource[directoryIsh] = 1;
|
|
@@ -138,18 +137,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
138
137
|
}
|
|
139
138
|
}
|
|
140
139
|
}
|
|
141
|
-
const findingsFiles = await (0, utils_1.findFiles)(appmapDir, 'appmap-findings.json');
|
|
142
|
-
const findingCountByImpactDomain = {};
|
|
143
|
-
for (const findingsFile of findingsFiles) {
|
|
144
|
-
const scanResults = JSON.parse(await (0, promises_1.readFile)(findingsFile, 'utf-8'));
|
|
145
|
-
for (const finding of scanResults.findings) {
|
|
146
|
-
const impactDomain = finding.impactDomain || 'Unknown';
|
|
147
|
-
if (!findingCountByImpactDomain[impactDomain])
|
|
148
|
-
findingCountByImpactDomain[impactDomain] = 1;
|
|
149
|
-
else
|
|
150
|
-
findingCountByImpactDomain[impactDomain] = findingCountByImpactDomain[impactDomain] + 1;
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
140
|
return {
|
|
154
141
|
appmapCountByRecorderName,
|
|
155
142
|
appmapCountByHTTPServerRequestCount,
|
|
@@ -163,7 +150,6 @@ async function buildRepositoryReport(appmapDir, appmaps, resourceTokens) {
|
|
|
163
150
|
...new Set(uniquePackageDependencies.dependencies.map((d) => [d.caller, d.callee]).flat()),
|
|
164
151
|
].sort(),
|
|
165
152
|
packageDependencies: uniquePackageDependencies.dependencies,
|
|
166
|
-
findingCountByImpactDomain,
|
|
167
153
|
};
|
|
168
154
|
}
|
|
169
155
|
exports.command = 'inventory [output-file]';
|
|
@@ -192,7 +178,7 @@ const builder = (args) => {
|
|
|
192
178
|
exports.builder = builder;
|
|
193
179
|
const handler = async (argv) => {
|
|
194
180
|
(0, utils_1.verbose)(argv.verbose);
|
|
195
|
-
const { outputFile, directory, resourceTokens } = argv;
|
|
181
|
+
const { outputFile, directory, resourceTokens, findingLimit } = argv;
|
|
196
182
|
(0, assert_1.default)(resourceTokens);
|
|
197
183
|
(0, assert_1.default)(typeof resourceTokens === 'number');
|
|
198
184
|
(0, assert_1.default)(resourceTokens > 0);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../src/cmds/inventory/inventory.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,+BAA+C;AAC/C,0CAAkD;AAClD,2BAAgC;AAChC,qCAA+B;AAE/B,iDAA0C;AAE1C,6EAA0E;AAC1E,uCAAiD;
|
|
1
|
+
{"version":3,"file":"inventory.js","sourceRoot":"","sources":["../../../src/cmds/inventory/inventory.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,12 +3,13 @@ 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.ReportTemplate = exports.WelcomeReport =
|
|
6
|
+
exports.ReportTemplate = exports.WelcomeReport = void 0;
|
|
7
7
|
const handlebars_1 = __importDefault(require("handlebars"));
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const promises_1 = require("fs/promises");
|
|
10
10
|
const assert_1 = __importDefault(require("assert"));
|
|
11
11
|
const fs_1 = require("fs");
|
|
12
|
+
const helpers_1 = __importDefault(require("../compare-report/helpers"));
|
|
12
13
|
const TemplateDirectory = [
|
|
13
14
|
'../../../resources/inventory-report',
|
|
14
15
|
'../../../../resources/inventory-report', // In development
|
|
@@ -18,37 +19,25 @@ const TemplateDirectory = [
|
|
|
18
19
|
(0, assert_1.default)(TemplateDirectory, "Report template directory 'inventory-report' not found");
|
|
19
20
|
var TemplateName;
|
|
20
21
|
(function (TemplateName) {
|
|
21
|
-
TemplateName["Default"] = "default";
|
|
22
22
|
TemplateName["Welcome"] = "welcome";
|
|
23
23
|
})(TemplateName || (TemplateName = {}));
|
|
24
|
-
async function generateReport(templateName, report) {
|
|
24
|
+
async function generateReport(templateName, report, appmapConfig) {
|
|
25
25
|
let reportTemplate;
|
|
26
26
|
switch (templateName) {
|
|
27
|
-
case TemplateName.Default:
|
|
28
|
-
reportTemplate = new DefaultReport();
|
|
29
|
-
break;
|
|
30
27
|
case TemplateName.Welcome:
|
|
31
28
|
reportTemplate = new WelcomeReport();
|
|
32
29
|
break;
|
|
33
30
|
}
|
|
34
|
-
return reportTemplate.generateReport(report);
|
|
31
|
+
return reportTemplate.generateReport(report, appmapConfig);
|
|
35
32
|
}
|
|
36
33
|
exports.default = generateReport;
|
|
37
|
-
class DefaultReport {
|
|
38
|
-
async generateReport(reportData) {
|
|
39
|
-
(0, assert_1.default)(TemplateDirectory);
|
|
40
|
-
const templateFile = (0, path_1.join)(TemplateDirectory, 'default', 'inventory.hbs');
|
|
41
|
-
const template = await ReportTemplate.build(templateFile);
|
|
42
|
-
return template.generateMarkdown(reportData);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
exports.DefaultReport = DefaultReport;
|
|
46
34
|
class WelcomeReport {
|
|
47
|
-
async generateReport(reportData) {
|
|
35
|
+
async generateReport(reportData, appmapConfig) {
|
|
48
36
|
(0, assert_1.default)(TemplateDirectory);
|
|
49
37
|
const templateFile = (0, path_1.join)(TemplateDirectory, 'welcome', 'welcome.hbs');
|
|
50
38
|
const template = await ReportTemplate.build(templateFile);
|
|
51
|
-
|
|
39
|
+
const data = Object.assign(Object.assign({}, reportData), { appmapConfig });
|
|
40
|
+
return template.generateMarkdown(data);
|
|
52
41
|
}
|
|
53
42
|
}
|
|
54
43
|
exports.WelcomeReport = WelcomeReport;
|
|
@@ -56,36 +45,13 @@ class ReportTemplate {
|
|
|
56
45
|
constructor(template) {
|
|
57
46
|
this.template = template;
|
|
58
47
|
}
|
|
59
|
-
generateMarkdown(
|
|
60
|
-
return this.template(
|
|
48
|
+
generateMarkdown(data) {
|
|
49
|
+
return this.template(data, {
|
|
61
50
|
helpers: ReportTemplate.helpers(),
|
|
62
51
|
allowProtoPropertiesByDefault: true,
|
|
63
52
|
});
|
|
64
53
|
}
|
|
65
54
|
static helpers() {
|
|
66
|
-
const inspect = (value) => {
|
|
67
|
-
return new handlebars_1.default.SafeString(JSON.stringify(value, null, 2));
|
|
68
|
-
};
|
|
69
|
-
const length = (...list) => {
|
|
70
|
-
const _fn = list.pop();
|
|
71
|
-
let result = 0;
|
|
72
|
-
for (const item of list) {
|
|
73
|
-
if (Array.isArray(item)) {
|
|
74
|
-
result += item.length;
|
|
75
|
-
}
|
|
76
|
-
else if (item.constructor === Map) {
|
|
77
|
-
result += item.size;
|
|
78
|
-
}
|
|
79
|
-
else if (typeof item === 'object') {
|
|
80
|
-
result += Object.keys(item).length;
|
|
81
|
-
}
|
|
82
|
-
}
|
|
83
|
-
return result;
|
|
84
|
-
};
|
|
85
|
-
const coalesce = (...list) => {
|
|
86
|
-
const _fn = list.pop();
|
|
87
|
-
return list.find((item) => item !== undefined && item !== '');
|
|
88
|
-
};
|
|
89
55
|
const select_values_by_key_range = (data, keyMin, keyMax) => {
|
|
90
56
|
if (typeof keyMax === 'object')
|
|
91
57
|
keyMax = undefined;
|
|
@@ -95,25 +61,19 @@ class ReportTemplate {
|
|
|
95
61
|
.map((k) => data[k]);
|
|
96
62
|
return result;
|
|
97
63
|
};
|
|
98
|
-
const extractArrayValue = (args) => (Array.isArray(args[0]) ? args[0] : args);
|
|
99
64
|
const sum_values_by_key_range = (data, keyMin, keyMax) => {
|
|
100
65
|
const values = select_values_by_key_range(data, keyMin, keyMax);
|
|
101
66
|
return values.reduce((a, b) => a + (b || 0), 0);
|
|
102
67
|
};
|
|
103
|
-
const
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
68
|
+
const packages_matching_configuration = (packages, configuredPackages) => {
|
|
69
|
+
const normalizePackage = (pkg) => pkg.replace(/\//g, '.').toLowerCase();
|
|
70
|
+
return packages.filter((pkg) => {
|
|
71
|
+
return configuredPackages.find((configuredPackage) => normalizePackage(pkg).startsWith(normalizePackage(configuredPackage.path)));
|
|
72
|
+
});
|
|
108
73
|
};
|
|
109
|
-
return {
|
|
110
|
-
coalesce,
|
|
111
|
-
inspect,
|
|
112
|
-
length,
|
|
74
|
+
return Object.assign({ packages_matching_configuration,
|
|
113
75
|
select_values_by_key_range,
|
|
114
|
-
|
|
115
|
-
sum_values_by_key_range,
|
|
116
|
-
};
|
|
76
|
+
sum_values_by_key_range }, helpers_1.default);
|
|
117
77
|
}
|
|
118
78
|
static async build(templateFile) {
|
|
119
79
|
const template = handlebars_1.default.compile(await (0, promises_1.readFile)(templateFile, 'utf8'));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/MarkdownReport.ts"],"names":[],"mappings":";;;;;;AAAA,4DAAoC;
|
|
1
|
+
{"version":3,"file":"MarkdownReport.js","sourceRoot":"","sources":["../../../src/cmds/inventory-report/MarkdownReport.ts"],"names":[],"mappings":"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"}
|