@appland/appmap 3.68.0 → 3.69.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
CHANGED
|
@@ -1,3 +1,22 @@
|
|
|
1
|
+
# [@appland/appmap-v3.69.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.68.1...@appland/appmap-v3.69.0) (2023-03-20)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Specify puppeteer as an optional dependency ([ad49f57](https://github.com/getappmap/appmap-js/commit/ad49f57ca442eef9cbb379a1ac049746f4201ff8))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Reverts
|
|
10
|
+
|
|
11
|
+
* Revert "Revert "Merge pull request #1076 from getappmap/feat/sequence-diagram-png-format"" ([5164b7e](https://github.com/getappmap/appmap-js/commit/5164b7e92966e402ca441d1580a0dd44a953bed3)), closes [#1076](https://github.com/getappmap/appmap-js/issues/1076)
|
|
12
|
+
|
|
13
|
+
# [@appland/appmap-v3.68.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.68.0...@appland/appmap-v3.68.1) (2023-03-16)
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
### Bug Fixes
|
|
17
|
+
|
|
18
|
+
* Revert the addition of puppeteer ([b91f57d](https://github.com/getappmap/appmap-js/commit/b91f57d3710e819c708624ea373064c75870314f))
|
|
19
|
+
|
|
1
20
|
# [@appland/appmap-v3.68.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.67.2...@appland/appmap-v3.68.0) (2023-03-16)
|
|
2
21
|
|
|
3
22
|
|
|
@@ -0,0 +1,42 @@
|
|
|
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 utils_1 = require("../../utils");
|
|
8
|
+
class BrowserRenderer {
|
|
9
|
+
constructor(showBrowser = false) {
|
|
10
|
+
this.showBrowser = showBrowser;
|
|
11
|
+
this.showBrowser = showBrowser;
|
|
12
|
+
this._browser = undefined;
|
|
13
|
+
}
|
|
14
|
+
async screenshot(url, outputPath) {
|
|
15
|
+
await this.initialize();
|
|
16
|
+
(0, assert_1.default)(this._browser);
|
|
17
|
+
const page = await this._browser.newPage();
|
|
18
|
+
if ((0, utils_1.verbose)())
|
|
19
|
+
page.on('console', (msg) => console.log('CONSOLE: ', msg.text()));
|
|
20
|
+
if ((0, utils_1.verbose)())
|
|
21
|
+
console.warn(`Rendering ${url} to ${outputPath}`);
|
|
22
|
+
await page.goto(url);
|
|
23
|
+
await page.waitForSelector('.sequence-diagram');
|
|
24
|
+
await page.screenshot({ path: outputPath, fullPage: true });
|
|
25
|
+
}
|
|
26
|
+
async close() {
|
|
27
|
+
if (this._browser) {
|
|
28
|
+
await this._browser.close();
|
|
29
|
+
this._browser = undefined;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
async initialize() {
|
|
33
|
+
if (this._browser)
|
|
34
|
+
return this._browser;
|
|
35
|
+
const puppeteer = require('puppeteer');
|
|
36
|
+
if ((0, utils_1.verbose)())
|
|
37
|
+
console.warn(`Preparing browser for PNG rendering`);
|
|
38
|
+
this._browser = await puppeteer.launch({ timeout: 120 * 1000, headless: !this.showBrowser });
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
exports.default = BrowserRenderer;
|
|
42
|
+
//# sourceMappingURL=browserRenderer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"browserRenderer.js","sourceRoot":"","sources":["../../../src/cmds/sequenceDiagram/browserRenderer.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAC5B,uCAAsC;AAetC,MAAqB,eAAe;IAGlC,YAAmB,cAAc,KAAK;QAAnB,gBAAW,GAAX,WAAW,CAAQ;QACpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,UAAkB;QAC9C,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,IAAA,gBAAM,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QAC3C,IAAI,IAAA,eAAO,GAAE;YAAE,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAEjF,IAAI,IAAA,eAAO,GAAE;YAAE,OAAO,CAAC,IAAI,CAAC,aAAa,GAAG,OAAO,UAAU,EAAE,CAAC,CAAC;QAEjE,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACrB,MAAM,IAAI,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;QAChD,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,KAAK;QACT,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;YAC5B,IAAI,CAAC,QAAQ,GAAG,SAAS,CAAC;SAC3B;IACH,CAAC;IAEO,KAAK,CAAC,UAAU;QACtB,IAAI,IAAI,CAAC,QAAQ;YAAE,OAAO,IAAI,CAAC,QAAQ,CAAC;QAExC,MAAM,SAAS,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAEvC,IAAI,IAAA,eAAO,GAAE;YAAE,OAAO,CAAC,IAAI,CAAC,qCAAqC,CAAC,CAAC;QACnE,IAAI,CAAC,QAAQ,GAAG,MAAM,SAAS,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,IAAI,EAAE,QAAQ,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC;IAC/F,CAAC;CACF;AArCD,kCAqCC"}
|
|
@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.handler = exports.builder = exports.describe = exports.command = void 0;
|
|
7
7
|
const promises_1 = require("fs/promises");
|
|
8
8
|
const path_1 = require("path");
|
|
9
|
-
const puppeteer_1 = __importDefault(require("puppeteer"));
|
|
10
9
|
const handleWorkingDirectory_1 = require("../lib/handleWorkingDirectory");
|
|
11
10
|
const utils_1 = require("../utils");
|
|
12
11
|
const models_1 = require("@appland/models");
|
|
13
12
|
const sequence_diagram_1 = require("@appland/sequence-diagram");
|
|
14
13
|
const serveAndOpen_1 = require("../lib/serveAndOpen");
|
|
15
14
|
const assert_1 = __importDefault(require("assert"));
|
|
15
|
+
const browserRenderer_1 = __importDefault(require("./sequenceDiagram/browserRenderer"));
|
|
16
16
|
exports.command = 'sequence-diagram <appmap...>';
|
|
17
17
|
exports.describe = 'Generate a sequence diagram for an AppMap';
|
|
18
18
|
const builder = (args) => {
|
|
@@ -63,11 +63,9 @@ const handler = async (argv) => {
|
|
|
63
63
|
process.exitCode = 1;
|
|
64
64
|
return;
|
|
65
65
|
}
|
|
66
|
-
let
|
|
66
|
+
let browserRender;
|
|
67
67
|
if (argv.format === 'png') {
|
|
68
|
-
|
|
69
|
-
console.warn(`Preparing browser for PNG rendering`);
|
|
70
|
-
browser = await puppeteer_1.default.launch({ timeout: 120 * 1000, headless: !argv.showBrowser });
|
|
68
|
+
browserRender = new browserRenderer_1.default(argv.showBrowser);
|
|
71
69
|
}
|
|
72
70
|
const generateDiagram = async (appmapFileName) => {
|
|
73
71
|
const appmapData = JSON.parse(await (0, promises_1.readFile)(appmapFileName, 'utf-8'));
|
|
@@ -103,14 +101,9 @@ const handler = async (argv) => {
|
|
|
103
101
|
const outputPath = await new Promise((resolve) => (0, serveAndOpen_1.serveAndOpenSequenceDiagram)(diagramPath, false, async (url) => {
|
|
104
102
|
if ((0, utils_1.verbose)())
|
|
105
103
|
console.warn(`Rendering PNG`);
|
|
106
|
-
(0, assert_1.default)(
|
|
107
|
-
const page = await browser.newPage();
|
|
108
|
-
if (argv.verbose)
|
|
109
|
-
page.on('console', (msg) => console.log('CONSOLE: ', msg.text()));
|
|
104
|
+
(0, assert_1.default)(browserRender, 'Browser not initialized');
|
|
110
105
|
const outputPath = (0, path_1.join)((0, path_1.dirname)(diagramPath), [(0, path_1.basename)(diagramPath, '.json'), '.png'].join(''));
|
|
111
|
-
await
|
|
112
|
-
await page.waitForSelector('.sequence-diagram');
|
|
113
|
-
await page.screenshot({ path: outputPath, fullPage: true });
|
|
106
|
+
await browserRender.screenshot(url, outputPath);
|
|
114
107
|
resolve(outputPath);
|
|
115
108
|
}));
|
|
116
109
|
console.warn(`Printed diagram ${outputPath}`);
|
|
@@ -126,8 +119,8 @@ const handler = async (argv) => {
|
|
|
126
119
|
const appmapFile = argv.appmap[i];
|
|
127
120
|
await generateDiagram(appmapFile);
|
|
128
121
|
}
|
|
129
|
-
if (
|
|
130
|
-
await
|
|
122
|
+
if (browserRender)
|
|
123
|
+
await browserRender.close();
|
|
131
124
|
};
|
|
132
125
|
exports.handler = handler;
|
|
133
126
|
//# sourceMappingURL=sequenceDiagram.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequenceDiagram.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagram.ts"],"names":[],"mappings":";;;;;;AAAA,0CAAyD;AACzD,+BAA+C;
|
|
1
|
+
{"version":3,"file":"sequenceDiagram.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagram.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.69.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -108,7 +108,6 @@
|
|
|
108
108
|
"port-pid": "^0.0.7",
|
|
109
109
|
"pretty-bytes": "^5.6.0",
|
|
110
110
|
"ps-node": "^0.1.6",
|
|
111
|
-
"puppeteer": "^19.7.5",
|
|
112
111
|
"read-pkg-up": "^7.0.1",
|
|
113
112
|
"semver": "^7.3.5",
|
|
114
113
|
"strip-ansi": "^6.0.0",
|
|
@@ -133,5 +132,8 @@
|
|
|
133
132
|
"built/appmap.html"
|
|
134
133
|
],
|
|
135
134
|
"outputPath": "dist"
|
|
135
|
+
},
|
|
136
|
+
"optionalDependencies": {
|
|
137
|
+
"puppeteer": "^19.7.5"
|
|
136
138
|
}
|
|
137
139
|
}
|