@appland/appmap 3.75.1 → 3.76.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 +8 -0
- package/built/cmds/prune/pruneAppMap.js +7 -6
- package/built/cmds/prune/pruneAppMap.js.map +1 -1
- package/built/cmds/sequenceDiagram.js +13 -3
- package/built/cmds/sequenceDiagram.js.map +1 -1
- package/built/html/appmap.js +2 -2
- package/built/html/appmap.js.map +3 -3
- package/built/html/sequenceDiagram.js +2 -2
- package/built/html/sequenceDiagram.js.map +3 -3
- package/built/lib/deserializeFilter.js +16 -0
- package/built/lib/deserializeFilter.js.map +1 -0
- package/built/lib/filterAppMap.js +12 -0
- package/built/lib/filterAppMap.js.map +1 -0
- package/built/lib/serveAndOpen.js +3 -3
- package/built/lib/serveAndOpen.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,11 @@
|
|
|
1
|
+
# [@appland/appmap-v3.76.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.75.1...@appland/appmap-v3.76.0) (2023-04-25)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Apply filter string to sequence diagram ([551c781](https://github.com/getappmap/appmap-js/commit/551c781889f3fccdd89c54100cd80b22459ca872))
|
|
7
|
+
* Change the format of the web viewer HTML files ([7d9b05c](https://github.com/getappmap/appmap-js/commit/7d9b05c29c800c79aed16c01884e132705492743))
|
|
8
|
+
|
|
1
9
|
# [@appland/appmap-v3.75.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.75.0...@appland/appmap-v3.75.1) (2023-04-18)
|
|
2
10
|
|
|
3
11
|
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.pruneWithFilter = exports.pruneAppMap = void 0;
|
|
4
7
|
const models_1 = require("@appland/models");
|
|
8
|
+
const deserializeFilter_1 = __importDefault(require("../../lib/deserializeFilter"));
|
|
5
9
|
function combinePruneFilters(oldFilter, currentFilter) {
|
|
6
10
|
const newFilter = currentFilter;
|
|
7
11
|
if (oldFilter.hideUnlabeled)
|
|
@@ -45,12 +49,9 @@ const pruneWithFilter = (appMap, serializedFilter) => {
|
|
|
45
49
|
// TODO: update type for AppMap
|
|
46
50
|
const fullMap = (0, models_1.buildAppMap)().source(appMap).normalize().build();
|
|
47
51
|
const filterBefore = fullMap.data.pruneFilter || {};
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
const appmapFilter =
|
|
51
|
-
appmapFilter.declutter.limitRootEvents.on = false;
|
|
52
|
-
appmapFilter.declutter.hideMediaRequests.on = false;
|
|
53
|
-
appmapFilter.apply(filter);
|
|
52
|
+
// Note: Preserving the default of these two options to false, even though I am not sure why
|
|
53
|
+
// that is done in the original implementation.
|
|
54
|
+
const { filter, appmapFilter } = (0, deserializeFilter_1.default)(serializedFilter, false, false);
|
|
54
55
|
// TODO: update type for AppMap
|
|
55
56
|
const prunedMap = appmapFilter.filter(fullMap, []);
|
|
56
57
|
const pruneFilter = combinePruneFilters(filterBefore, filter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pruneAppMap.js","sourceRoot":"","sources":["../../../src/cmds/prune/pruneAppMap.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pruneAppMap.js","sourceRoot":"","sources":["../../../src/cmds/prune/pruneAppMap.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const sequence_diagram_1 = require("@appland/sequence-diagram");
|
|
|
13
13
|
const serveAndOpen_1 = require("../lib/serveAndOpen");
|
|
14
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
15
|
const browserRenderer_1 = __importDefault(require("./sequenceDiagram/browserRenderer"));
|
|
16
|
+
const filterAppMap_1 = __importDefault(require("../lib/filterAppMap"));
|
|
16
17
|
exports.command = 'sequence-diagram <appmap...>';
|
|
17
18
|
exports.describe = 'Generate a sequence diagram for an AppMap';
|
|
18
19
|
const builder = (args) => {
|
|
@@ -44,8 +45,13 @@ const builder = (args) => {
|
|
|
44
45
|
choices: ['png', 'plantuml', 'json'],
|
|
45
46
|
default: 'png',
|
|
46
47
|
});
|
|
48
|
+
args.option('filter', {
|
|
49
|
+
describe: 'Filter to use to prune the map',
|
|
50
|
+
type: 'string',
|
|
51
|
+
});
|
|
47
52
|
args.option('exclude', {
|
|
48
53
|
describe: 'code objects to exclude from the diagram',
|
|
54
|
+
deprecated: true,
|
|
49
55
|
});
|
|
50
56
|
return args.strict();
|
|
51
57
|
};
|
|
@@ -63,13 +69,16 @@ const handler = async (argv) => {
|
|
|
63
69
|
process.exitCode = 1;
|
|
64
70
|
return;
|
|
65
71
|
}
|
|
72
|
+
const { filter } = argv;
|
|
66
73
|
let browserRender;
|
|
67
74
|
if (argv.format === 'png') {
|
|
68
75
|
browserRender = new browserRenderer_1.default(argv.showBrowser);
|
|
69
76
|
}
|
|
70
77
|
const generateDiagram = async (appmapFileName) => {
|
|
71
78
|
const appmapData = JSON.parse(await (0, promises_1.readFile)(appmapFileName, 'utf-8'));
|
|
72
|
-
|
|
79
|
+
let appmap = (0, models_1.buildAppMap)().source(appmapData).build();
|
|
80
|
+
if (filter)
|
|
81
|
+
appmap = (0, filterAppMap_1.default)(appmap, filter);
|
|
73
82
|
const specOptions = {
|
|
74
83
|
loops: argv.loops,
|
|
75
84
|
};
|
|
@@ -94,11 +103,12 @@ const handler = async (argv) => {
|
|
|
94
103
|
await (0, promises_1.writeFile)(resultPath, template.diagram);
|
|
95
104
|
return resultPath;
|
|
96
105
|
};
|
|
106
|
+
let outputPath;
|
|
97
107
|
if (argv.format === 'png') {
|
|
98
108
|
// PNG rendering is performed by loading the sequence
|
|
99
109
|
// diagram in a browser and taking a screenshot.
|
|
100
110
|
const diagramPath = await printDiagram(sequence_diagram_1.FormatType.JSON);
|
|
101
|
-
|
|
111
|
+
outputPath = await new Promise((resolve) => (0, serveAndOpen_1.serveAndOpenSequenceDiagram)(diagramPath, false, async (url) => {
|
|
102
112
|
if ((0, utils_1.verbose)())
|
|
103
113
|
console.warn(`Rendering PNG`);
|
|
104
114
|
(0, assert_1.default)(browserRender, 'Browser not initialized');
|
|
@@ -111,7 +121,7 @@ const handler = async (argv) => {
|
|
|
111
121
|
else {
|
|
112
122
|
// Other forms of output are produced directly by the
|
|
113
123
|
// sequence diagram library.
|
|
114
|
-
|
|
124
|
+
outputPath = await printDiagram(argv.format);
|
|
115
125
|
console.log(`Printed diagram ${outputPath}`);
|
|
116
126
|
}
|
|
117
127
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequenceDiagram.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagram.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAyD;AACzD,+BAA+C;AAE/C,0EAAuE;AACvE,oCAAmC;AACnC,
|
|
1
|
+
{"version":3,"file":"sequenceDiagram.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagram.ts"],"names":[],"mappings":"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"}
|