@appland/appmap 3.91.1 → 3.92.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 +14 -0
- package/built/cli.js +1 -1
- package/built/cli.js.map +1 -1
- package/built/cmds/archive/generateOpenAPI.js +1 -1
- package/built/cmds/archive/generateOpenAPI.js.map +1 -1
- package/built/cmds/compare/ArchiveAnalyzer.js +1 -1
- package/built/cmds/compare/ArchiveAnalyzer.js.map +1 -1
- package/built/cmds/openapi/DataStore.js +105 -0
- package/built/cmds/openapi/DataStore.js.map +1 -0
- package/built/cmds/openapi/DefinitionGenerator.js +51 -0
- package/built/cmds/openapi/DefinitionGenerator.js.map +1 -0
- package/built/cmds/{openapi.js → openapi/openapi.js} +44 -55
- package/built/cmds/openapi/openapi.js.map +1 -0
- package/built/cmds/sequenceDiagramDiff.js +22 -0
- package/built/cmds/sequenceDiagramDiff.js.map +1 -1
- package/built/html/appmap.js +91 -91
- package/built/html/appmap.js.map +4 -4
- package/built/html/sequenceDiagram.js +91 -91
- package/built/html/sequenceDiagram.js.map +4 -4
- package/built/utils.js +6 -5
- package/built/utils.js.map +1 -1
- package/package.json +1 -1
- package/built/cmds/openapi.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@appland/appmap-v3.92.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.92.0...@appland/appmap-v3.92.1) (2023-09-07)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Stage requests into files ([e42e7c2](https://github.com/getappmap/appmap-js/commit/e42e7c2753c23c44e6fe813caca460548a3983e7))
|
|
7
|
+
|
|
8
|
+
# [@appland/appmap-v3.92.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.91.1...@appland/appmap-v3.92.0) (2023-09-07)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* Sequence diagram validation ([e88ab44](https://github.com/getappmap/appmap-js/commit/e88ab44791a994f4102903e8141e538db481d23a))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.91.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.91.0...@appland/appmap-v3.91.1) (2023-09-06)
|
|
2
16
|
|
|
3
17
|
|
package/built/cli.js
CHANGED
|
@@ -23,7 +23,7 @@ const FingerprintWatchCommand = require('./fingerprint/fingerprintWatchCommand')
|
|
|
23
23
|
const Depends = require('./depends');
|
|
24
24
|
const install_agent_1 = __importDefault(require("./cmds/agentInstaller/install-agent"));
|
|
25
25
|
const status_1 = __importDefault(require("./cmds/agentInstaller/status"));
|
|
26
|
-
const openapi_1 = __importDefault(require("./cmds/openapi"));
|
|
26
|
+
const openapi_1 = __importDefault(require("./cmds/openapi/openapi"));
|
|
27
27
|
const prune_1 = __importDefault(require("./cmds/prune/prune"));
|
|
28
28
|
const record_1 = __importDefault(require("./cmds/record/record"));
|
|
29
29
|
const handleWorkingDirectory_1 = require("./lib/handleWorkingDirectory");
|
package/built/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AACA,yCAAyC;AACzC,qCAAqC;AACrC,yCAAyC;AACzC,0CAA0C;AAC1C,+BAA+B;AAC/B,yCAAyC;;;;;AAEzC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACtD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,4CAAqD;AAErD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACvC,MAAM,2BAA2B,GAAG,OAAO,CAAC,2CAA2C,CAAC,CAAC,OAAO,CAAC;AACjG,MAAM,uBAAuB,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC,OAAO,CAAC;AACzF,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACrC,wFAAiE;AACjE,0EAAyD;AACzD,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const path_1 = require("path");
|
|
7
|
-
const openapi_1 = __importDefault(require("../openapi"));
|
|
7
|
+
const openapi_1 = __importDefault(require("../openapi/openapi"));
|
|
8
8
|
async function generateOpenAPI(appMapDir, maxAppMapSizeInBytes) {
|
|
9
9
|
const startTime = new Date().getTime();
|
|
10
10
|
console.log('Generating OpenAPI...');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateOpenAPI.js","sourceRoot":"","sources":["../../../src/cmds/archive/generateOpenAPI.ts"],"names":[],"mappings":";;;;;AAAA,+BAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"generateOpenAPI.js","sourceRoot":"","sources":["../../../src/cmds/archive/generateOpenAPI.ts"],"names":[],"mappings":";;;;;AAAA,+BAA4B;AAC5B,iEAAyC;AAE1B,KAAK,UAAU,eAAe,CAAC,SAAiB,EAAE,oBAA4B;IAC3F,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAC;IACvC,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAErC,MAAM,cAAc,GAAG;QACrB,SAAS,EAAE,SAAS;QACpB,OAAO,EAAE,oBAAoB;QAC7B,UAAU,EAAE,IAAA,WAAI,EAAC,SAAS,EAAE,aAAa,CAAC;KAC3C,CAAC;IACF,MAAM,iBAAO,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAEtC,MAAM,OAAO,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC;IACjD,OAAO,CAAC,GAAG,CAAC,wBAAwB,OAAO,IAAI,CAAC,CAAC;AACnD,CAAC;AAbD,kCAaC"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const executeCommand_1 = require("../../lib/executeCommand");
|
|
7
|
-
const openapi_1 = __importDefault(require("../openapi"));
|
|
7
|
+
const openapi_1 = __importDefault(require("../openapi/openapi"));
|
|
8
8
|
const fileSizeFilter_1 = require("../../lib/fileSizeFilter");
|
|
9
9
|
const path_1 = require("path");
|
|
10
10
|
const os_1 = require("os");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArchiveAnalyzer.js","sourceRoot":"","sources":["../../../src/cmds/compare/ArchiveAnalyzer.ts"],"names":[],"mappings":";;;;;AAAA,6DAA0D;AAC1D,
|
|
1
|
+
{"version":3,"file":"ArchiveAnalyzer.js","sourceRoot":"","sources":["../../../src/cmds/compare/ArchiveAnalyzer.ts"],"names":[],"mappings":";;;;;AAAA,6DAA0D;AAC1D,iEAA2D;AAC3D,6DAAoE;AACpE,+BAA4B;AAC5B,2BAA4B;AAC5B,qCAA8B;AAC9B,0CAA4C;AAE7B,KAAK,UAAU,cAAc,CAC1C,QAAgB,EAChB,GAAW,EACX,aAAiC;IAEjC,MAAM,QAAQ,GAAG,IAAI,eAAe,CAAC,QAAQ,EAAE,GAAG,EAAE,aAAa,CAAC,CAAC;IACnE,OAAO,QAAQ,CAAC,OAAO,EAAE,CAAC;AAC5B,CAAC;AAPD,iCAOC;AAED,MAAM,eAAe;IACnB,YACkB,QAAgB,EAChB,GAAW,EACX,aAAsB;QAFtB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,QAAG,GAAH,GAAG,CAAQ;QACX,kBAAa,GAAb,aAAa,CAAS;IACrC,CAAC;IAEJ,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QAEtB,oEAAoE;QACpE,MAAM,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,EAAE,KAAK,IAAI,EAAE;YACjD,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACrB,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,QAAQ;QACpB,MAAM,IAAA,+BAAc,EAAC,gBAAgB,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxD,CAAC;IAEO,KAAK,CAAC,OAAO;QACnB,MAAM,iBAAU,CAAC,OAAO,CAAC;YACvB,SAAS,EAAE,GAAG;YACd,UAAU,EAAE,aAAa;YACzB,OAAO,EAAE,yCAAwB;SAClC,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,eAAe;QAC3B,IAAI,OAAO,GAAG,uDAAuD,CAAC;QACtE,IAAI,iBAAqC,CAAC;QAC1C,IAAI,IAAI,CAAC,aAAa,EAAE;YACtB,iBAAiB,GAAG,IAAA,WAAI,EAAC,IAAA,WAAM,GAAE,EAAE,kBAAkB,aAAG,MAAM,CAAC,CAAC;YAChE,MAAM,IAAA,oBAAS,EAAC,iBAAiB,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAChE,OAAO,IAAI,OAAO,iBAAiB,EAAE,CAAC;SACvC;QACD,IAAI;YACF,MAAM,IAAA,+BAAc,EAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SACjD;gBAAS;YACR,IAAI,iBAAiB;gBAAE,MAAM,IAAA,aAAE,EAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;SACrE;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB,CAAI,GAAW,EAAE,EAAoB;QACnE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;QAC1B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,IAAI;YACF,MAAM,EAAE,EAAE,CAAC;SACZ;gBAAS;YACR,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;CACF"}
|
|
@@ -0,0 +1,105 @@
|
|
|
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 openapi_1 = require("@appland/openapi");
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
8
|
+
const console_1 = require("console");
|
|
9
|
+
const fs_1 = require("fs");
|
|
10
|
+
const promises_1 = require("fs/promises");
|
|
11
|
+
const os_1 = require("os");
|
|
12
|
+
const path_1 = require("path");
|
|
13
|
+
const util_1 = require("util");
|
|
14
|
+
const utils_1 = require("../../utils");
|
|
15
|
+
class RequestDataFile {
|
|
16
|
+
constructor(fd, fileName) {
|
|
17
|
+
this.fd = fd;
|
|
18
|
+
this.fileName = fileName;
|
|
19
|
+
this.bytesWritten = 0;
|
|
20
|
+
const prefix = '[\n';
|
|
21
|
+
this.bytesWritten = prefix.length;
|
|
22
|
+
(0, fs_1.writeSync)(fd, prefix);
|
|
23
|
+
}
|
|
24
|
+
async writeRequest(request) {
|
|
25
|
+
const json = JSON.stringify({
|
|
26
|
+
status: request.status,
|
|
27
|
+
parameters: request.parameters,
|
|
28
|
+
returnValue: request.returnValue,
|
|
29
|
+
requestHeaders: request.requestHeaders,
|
|
30
|
+
responseHeaders: request.responseHeaders,
|
|
31
|
+
requestContentType: request.requestContentType,
|
|
32
|
+
responseContentType: request.responseContentType,
|
|
33
|
+
requestMethod: request.requestMethod,
|
|
34
|
+
requestPath: request.requestPath,
|
|
35
|
+
});
|
|
36
|
+
const indent = ' ';
|
|
37
|
+
const lineEnding = ',\n';
|
|
38
|
+
const line = [indent, json, lineEnding].join('');
|
|
39
|
+
const { bytesWritten } = await (0, util_1.promisify)(fs_1.write)(this.fd, line);
|
|
40
|
+
this.bytesWritten += bytesWritten;
|
|
41
|
+
}
|
|
42
|
+
async close() {
|
|
43
|
+
const fileEnding = `\n]\n`;
|
|
44
|
+
(0, fs_1.writeSync)(this.fd, fileEnding, this.bytesWritten - 2);
|
|
45
|
+
(0, fs_1.closeSync)(this.fd);
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
class DataStore {
|
|
49
|
+
constructor() {
|
|
50
|
+
this.requestFiles = new Map();
|
|
51
|
+
}
|
|
52
|
+
async initialize() {
|
|
53
|
+
if (this.workDir)
|
|
54
|
+
throw new Error('OpenAPI DataStore already initialized');
|
|
55
|
+
this.workDir = await (0, promises_1.mkdtemp)((0, path_1.join)((0, os_1.tmpdir)(), 'appmap-openapi-'));
|
|
56
|
+
}
|
|
57
|
+
get requestFileNames() {
|
|
58
|
+
return [...this.requestFiles.values()].map((requestFile) => requestFile.fileName);
|
|
59
|
+
}
|
|
60
|
+
async storeAppMap(appMapFile) {
|
|
61
|
+
if (!this.workDir)
|
|
62
|
+
throw new Error('OpenAPI DataStore not initialized');
|
|
63
|
+
const data = await (0, promises_1.readFile)(appMapFile, 'utf-8');
|
|
64
|
+
const requests = new Array();
|
|
65
|
+
(0, openapi_1.parseHTTPServerRequests)(JSON.parse(data), (e) => requests.push(e));
|
|
66
|
+
// This function is not async, so that the request files are opened atomically.
|
|
67
|
+
const openRequestFile = (requestId) => {
|
|
68
|
+
let requestFile = this.requestFiles.get(requestId);
|
|
69
|
+
if (!requestFile) {
|
|
70
|
+
const workFile = Buffer.from(requestId).toString('base64');
|
|
71
|
+
(0, assert_1.default)(this.workDir);
|
|
72
|
+
const requestFileName = (0, path_1.join)(this.workDir, workFile);
|
|
73
|
+
if ((0, utils_1.verbose)())
|
|
74
|
+
(0, console_1.log)(`Opening ${requestFileName} for ${requestId}`);
|
|
75
|
+
const fd = (0, fs_1.openSync)(requestFileName, 'w');
|
|
76
|
+
requestFile = new RequestDataFile(fd, requestFileName);
|
|
77
|
+
(0, assert_1.default)(!this.requestFiles.has(requestId));
|
|
78
|
+
this.requestFiles.set(requestId, requestFile);
|
|
79
|
+
}
|
|
80
|
+
return requestFile;
|
|
81
|
+
};
|
|
82
|
+
for (const e of requests) {
|
|
83
|
+
const request = (0, openapi_1.rpcRequestForEvent)(e);
|
|
84
|
+
if (request) {
|
|
85
|
+
const requestId = request.requestPath;
|
|
86
|
+
const requestFile = openRequestFile(requestId);
|
|
87
|
+
await requestFile.writeRequest(request);
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
async closeAll() {
|
|
92
|
+
for (const [_, requestFile] of this.requestFiles) {
|
|
93
|
+
await requestFile.close();
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
async cleanup() {
|
|
97
|
+
const { workDir } = this;
|
|
98
|
+
if (!workDir)
|
|
99
|
+
return;
|
|
100
|
+
this.workDir = undefined;
|
|
101
|
+
await (0, promises_1.rm)(workDir, { recursive: true });
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
exports.default = DataStore;
|
|
105
|
+
//# sourceMappingURL=DataStore.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DataStore.js","sourceRoot":"","sources":["../../../src/cmds/openapi/DataStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,51 @@
|
|
|
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 openapi_1 = require("@appland/openapi");
|
|
7
|
+
const promises_1 = require("fs/promises");
|
|
8
|
+
const assert_1 = __importDefault(require("assert"));
|
|
9
|
+
const rpcRequest_1 = require("@appland/openapi/dist/rpcRequest");
|
|
10
|
+
class DefinitionGenerator {
|
|
11
|
+
constructor(dataStore) {
|
|
12
|
+
this.dataStore = dataStore;
|
|
13
|
+
}
|
|
14
|
+
async generate() {
|
|
15
|
+
const securitySchemes = new openapi_1.SecuritySchemes();
|
|
16
|
+
const paths = {};
|
|
17
|
+
for (const requestFileName of this.dataStore.requestFileNames) {
|
|
18
|
+
let requestData;
|
|
19
|
+
try {
|
|
20
|
+
requestData = JSON.parse(await (0, promises_1.readFile)(requestFileName, 'utf-8'));
|
|
21
|
+
}
|
|
22
|
+
catch (e) {
|
|
23
|
+
console.warn(`Warning: unable to parse AppMap ${requestFileName}: ${e}`);
|
|
24
|
+
continue;
|
|
25
|
+
}
|
|
26
|
+
(0, assert_1.default)(requestData);
|
|
27
|
+
const model = new openapi_1.Model();
|
|
28
|
+
for (const request of requestData) {
|
|
29
|
+
model.addRpcRequest(request);
|
|
30
|
+
if (request.requestHeaders) {
|
|
31
|
+
const authorizationHeader = (0, rpcRequest_1.headerValue)(request.requestHeaders, 'Authorization');
|
|
32
|
+
if (authorizationHeader)
|
|
33
|
+
securitySchemes.addAuthorizationHeader(authorizationHeader);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
const openapi = model.openapi();
|
|
37
|
+
for (const [path, pathItem] of Object.entries(openapi)) {
|
|
38
|
+
if (pathItem)
|
|
39
|
+
paths[path] = pathItem;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
return {
|
|
43
|
+
paths: Object.keys(paths)
|
|
44
|
+
.sort()
|
|
45
|
+
.reduce((memo, path) => ((memo[path] = paths[path]), memo), {}),
|
|
46
|
+
securitySchemes: securitySchemes.openapi(),
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
exports.default = DefinitionGenerator;
|
|
51
|
+
//# sourceMappingURL=DefinitionGenerator.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"DefinitionGenerator.js","sourceRoot":"","sources":["../../../src/cmds/openapi/DefinitionGenerator.ts"],"names":[],"mappings":";;;;;AAAA,8CAA0D;AAG1D,0CAAuC;AACvC,oDAA4B;AAC5B,iEAA+D;AAE/D,MAAqB,mBAAmB;IACtC,YAAmB,SAAoB;QAApB,cAAS,GAAT,SAAS,CAAW;IAAG,CAAC;IAE3C,KAAK,CAAC,QAAQ;QAIZ,MAAM,eAAe,GAAG,IAAI,yBAAe,EAAE,CAAC;QAC9C,MAAM,KAAK,GAA6C,EAAE,CAAC;QAE3D,KAAK,MAAM,eAAe,IAAI,IAAI,CAAC,SAAS,CAAC,gBAAgB,EAAE;YAC7D,IAAI,WAAkB,CAAC;YACvB,IAAI;gBACF,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;aACpE;YAAC,OAAO,CAAC,EAAE;gBACV,OAAO,CAAC,IAAI,CAAC,mCAAmC,eAAe,KAAK,CAAC,EAAE,CAAC,CAAC;gBACzE,SAAS;aACV;YACD,IAAA,gBAAM,EAAC,WAAW,CAAC,CAAC;YACpB,MAAM,KAAK,GAAG,IAAI,eAAK,EAAE,CAAC;YAC1B,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;gBACjC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;gBAC7B,IAAI,OAAO,CAAC,cAAc,EAAE;oBAC1B,MAAM,mBAAmB,GAAG,IAAA,wBAAW,EAAC,OAAO,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;oBACjF,IAAI,mBAAmB;wBAAE,eAAe,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,CAAC;iBACtF;aACF;YAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC;YAChC,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;gBACtD,IAAI,QAAQ;oBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;aACtC;SACF;QACD,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBACtB,IAAI,EAAE;iBACN,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;YACjE,eAAe,EAAE,eAAe,CAAC,OAAO,EAAE;SAC3C,CAAC;IACJ,CAAC;CACF;AAxCD,sCAwCC"}
|
|
@@ -22,92 +22,81 @@ var __importStar = (this && this.__importStar) || function (mod) {
|
|
|
22
22
|
__setModuleDefault(result, mod);
|
|
23
23
|
return result;
|
|
24
24
|
};
|
|
25
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
26
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
27
|
+
};
|
|
25
28
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
29
|
const path_1 = require("path");
|
|
27
30
|
const fs_1 = require("fs");
|
|
31
|
+
const fs_2 = require("fs");
|
|
28
32
|
const promises_1 = require("fs/promises");
|
|
29
|
-
const async_1 = require("async");
|
|
30
|
-
const glob_1 = require("glob");
|
|
31
33
|
const js_yaml_1 = __importStar(require("js-yaml"));
|
|
32
34
|
const openapi_1 = require("@appland/openapi");
|
|
33
|
-
const
|
|
34
|
-
const
|
|
35
|
-
const
|
|
36
|
-
const
|
|
37
|
-
const
|
|
35
|
+
const locateAppMapDir_1 = require("../../lib/locateAppMapDir");
|
|
36
|
+
const handleWorkingDirectory_1 = require("../../lib/handleWorkingDirectory");
|
|
37
|
+
const locateAppMapConfigFile_1 = require("../../lib/locateAppMapConfigFile");
|
|
38
|
+
const fileSizeFilter_1 = require("../../lib/fileSizeFilter");
|
|
39
|
+
const utils_1 = require("../../utils");
|
|
40
|
+
const DataStore_1 = __importDefault(require("./DataStore"));
|
|
41
|
+
const DefinitionGenerator_1 = __importDefault(require("./DefinitionGenerator"));
|
|
38
42
|
class OpenAPICommand {
|
|
39
43
|
constructor(appmapDir) {
|
|
40
44
|
this.appmapDir = appmapDir;
|
|
41
|
-
this.model = new openapi_1.Model();
|
|
42
|
-
this.securitySchemes = new openapi_1.SecuritySchemes();
|
|
43
45
|
this.errors = [];
|
|
44
46
|
this.filter = async (file) => ({ enable: true });
|
|
45
47
|
}
|
|
46
48
|
async execute() {
|
|
47
|
-
const q = (0, async_1.queue)(this.collectAppMap.bind(this), 2);
|
|
48
|
-
q.pause();
|
|
49
49
|
// Make sure the directory exists -- if it doesn't, the glob below just returns nothing.
|
|
50
50
|
if (!(0, fs_1.existsSync)(this.appmapDir)) {
|
|
51
51
|
throw new Error(`AppMap directory ${this.appmapDir} does not exist`);
|
|
52
52
|
}
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const dataStore = new DataStore_1.default();
|
|
54
|
+
await dataStore.initialize();
|
|
55
|
+
const collectAppMap = async (file) => {
|
|
56
|
+
try {
|
|
57
|
+
await dataStore.storeAppMap(file);
|
|
58
|
+
}
|
|
59
|
+
catch (e) {
|
|
60
|
+
let errorString;
|
|
61
|
+
try {
|
|
62
|
+
errorString = e.toString();
|
|
63
|
+
}
|
|
64
|
+
catch (x) {
|
|
65
|
+
errorString = (e || '').toString();
|
|
66
|
+
}
|
|
67
|
+
this.errors.push(errorString);
|
|
68
|
+
}
|
|
69
|
+
};
|
|
70
|
+
const appMapFiles = await (0, utils_1.findFiles)(this.appmapDir, '.appmap.json');
|
|
71
|
+
for (const file of appMapFiles) {
|
|
56
72
|
const filterResult = await this.filter(file);
|
|
57
73
|
if (!filterResult.enable) {
|
|
58
74
|
if (filterResult.message)
|
|
59
75
|
console.warn(filterResult.message);
|
|
60
76
|
continue;
|
|
61
77
|
}
|
|
62
|
-
|
|
63
|
-
}
|
|
64
|
-
if (q.length() > 0) {
|
|
65
|
-
await new Promise((resolve, reject) => {
|
|
66
|
-
q.drain(resolve);
|
|
67
|
-
q.error(reject);
|
|
68
|
-
q.resume();
|
|
69
|
-
});
|
|
78
|
+
await collectAppMap(file);
|
|
70
79
|
}
|
|
80
|
+
await dataStore.closeAll();
|
|
81
|
+
const definitionGenerator = new DefinitionGenerator_1.default(dataStore);
|
|
82
|
+
const { paths, securitySchemes } = await definitionGenerator.generate();
|
|
83
|
+
// Leave the files in place if an error occurs.
|
|
84
|
+
await dataStore.cleanup();
|
|
71
85
|
return [
|
|
72
86
|
{
|
|
73
|
-
paths
|
|
74
|
-
securitySchemes
|
|
87
|
+
paths,
|
|
88
|
+
securitySchemes,
|
|
75
89
|
},
|
|
76
|
-
|
|
90
|
+
appMapFiles.length,
|
|
77
91
|
];
|
|
78
92
|
}
|
|
79
|
-
async collectAppMap(file) {
|
|
80
|
-
try {
|
|
81
|
-
const data = await fs_1.promises.readFile(file, 'utf-8');
|
|
82
|
-
(0, openapi_1.parseHTTPServerRequests)(JSON.parse(data), (e) => {
|
|
83
|
-
const request = (0, openapi_1.rpcRequestForEvent)(e);
|
|
84
|
-
if (request) {
|
|
85
|
-
this.model.addRpcRequest(request);
|
|
86
|
-
this.securitySchemes.addRpcRequest(request);
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
}
|
|
90
|
-
catch (e) {
|
|
91
|
-
// Re-throwing this error crashes the whole process.
|
|
92
|
-
// So if there is a malformed AppMap, indicate it here but don't blow everything up.
|
|
93
|
-
// Do not write to stdout!
|
|
94
|
-
let errorString;
|
|
95
|
-
try {
|
|
96
|
-
errorString = (0, util_1.inspect)(e);
|
|
97
|
-
}
|
|
98
|
-
catch (x) {
|
|
99
|
-
errorString = (e || '').toString();
|
|
100
|
-
}
|
|
101
|
-
this.errors.push(errorString);
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
93
|
}
|
|
105
94
|
async function loadTemplate(fileName) {
|
|
106
95
|
if (!fileName) {
|
|
107
96
|
// eslint-disable-next-line no-param-reassign
|
|
108
|
-
fileName = (0, path_1.join)(__dirname, '
|
|
97
|
+
fileName = (0, path_1.join)(__dirname, '../../../resources/openapi-template.yaml');
|
|
109
98
|
}
|
|
110
|
-
return js_yaml_1.default.load((await
|
|
99
|
+
return js_yaml_1.default.load((await fs_2.promises.readFile(fileName)).toString());
|
|
111
100
|
}
|
|
112
101
|
exports.default = {
|
|
113
102
|
command: 'openapi',
|
|
@@ -149,7 +138,7 @@ exports.default = {
|
|
|
149
138
|
(0, openapi_1.verbose)(argv.verbose);
|
|
150
139
|
(0, handleWorkingDirectory_1.handleWorkingDirectory)(argv.directory);
|
|
151
140
|
const appmapDir = await (0, locateAppMapDir_1.locateAppMapDir)(argv.appmapDir);
|
|
152
|
-
const { openapiTitle, openapiVersion, maxSize } = argv;
|
|
141
|
+
const { openapiTitle, openapiVersion, maxSize, maxExamples } = argv;
|
|
153
142
|
const maxAppMapSizeInBytes = Math.round(parseFloat(maxSize) * 1024 * 1024);
|
|
154
143
|
function tryConfigure(path, fn) {
|
|
155
144
|
try {
|
|
@@ -162,7 +151,7 @@ exports.default = {
|
|
|
162
151
|
const appmapConfigFile = await (0, locateAppMapConfigFile_1.locateAppMapConfigFile)(appmapDir);
|
|
163
152
|
const cmd = new OpenAPICommand(appmapDir);
|
|
164
153
|
cmd.filter = (0, fileSizeFilter_1.fileSizeFilter)(maxAppMapSizeInBytes);
|
|
165
|
-
const [openapi
|
|
154
|
+
const [openapi] = await cmd.execute();
|
|
166
155
|
for (const error of cmd.errors) {
|
|
167
156
|
console.warn(error);
|
|
168
157
|
}
|
|
@@ -211,7 +200,7 @@ exports.default = {
|
|
|
211
200
|
${js_yaml_1.default.dump(template)}
|
|
212
201
|
`;
|
|
213
202
|
if (argv.outputFile) {
|
|
214
|
-
await
|
|
203
|
+
await fs_2.promises.writeFile(argv.outputFile, fileContents);
|
|
215
204
|
}
|
|
216
205
|
else {
|
|
217
206
|
console.log(fileContents);
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../../src/cmds/openapi/openapi.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+BAA4B;AAE5B,2BAAiD;AACjD,2BAAqC;AACrC,0CAAuC;AACvC,mDAAqC;AAErC,8CAA2C;AAG3C,+DAA4D;AAC5D,6EAA0E;AAC1E,6EAA0E;AAC1E,6DAAoF;AACpF,uCAAwC;AACxC,4DAAoC;AACpC,gFAAwD;AAIxD,MAAM,cAAc;IAIlB,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAHvC,WAAM,GAAa,EAAE,CAAC;QACtB,WAAM,GAAmB,KAAK,EAAE,IAAY,EAAE,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE1B,CAAC;IAElD,KAAK,CAAC,OAAO;QASX,wFAAwF;QACxF,IAAI,CAAC,IAAA,eAAU,EAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,oBAAoB,IAAI,CAAC,SAAS,iBAAiB,CAAC,CAAC;SACtE;QAED,MAAM,SAAS,GAAG,IAAI,mBAAS,EAAE,CAAC;QAClC,MAAM,SAAS,CAAC,UAAU,EAAE,CAAC;QAE7B,MAAM,aAAa,GAAG,KAAK,EAAE,IAAY,EAAE,EAAE;YAC3C,IAAI;gBACF,MAAM,SAAS,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACnC;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI,WAAmB,CAAC;gBACxB,IAAI;oBACF,WAAW,GAAI,CAAS,CAAC,QAAQ,EAAE,CAAC;iBACrC;gBAAC,OAAO,CAAC,EAAE;oBACV,WAAW,GAAG,CAAE,CAAS,IAAI,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;iBAC7C;gBACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/B;QACH,CAAC,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;QACpE,KAAK,MAAM,IAAI,IAAI,WAAW,EAAE;YAC9B,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;gBACxB,IAAI,YAAY,CAAC,OAAO;oBAAE,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAC7D,SAAS;aACV;YACD,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;SAC3B;QACD,MAAM,SAAS,CAAC,QAAQ,EAAE,CAAC;QAE3B,MAAM,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,SAAS,CAAC,CAAC;QAC/D,MAAM,EAAE,KAAK,EAAE,eAAe,EAAE,GAAG,MAAM,mBAAmB,CAAC,QAAQ,EAAE,CAAC;QAExE,+CAA+C;QAC/C,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;QAE1B,OAAO;YACL;gBACE,KAAK;gBACL,eAAe;aAChB;YACD,WAAW,CAAC,MAAM;SACnB,CAAC;IACJ,CAAC;CACF;AAED,KAAK,UAAU,YAAY,CAAC,QAAgB;IAC1C,IAAI,CAAC,QAAQ,EAAE;QACb,6CAA6C;QAC7C,QAAQ,GAAG,IAAA,WAAI,EAAC,SAAS,EAAE,0CAA0C,CAAC,CAAC;KACxE;IACD,OAAO,iBAAI,CAAC,IAAI,CAAC,CAAC,MAAM,aAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,kBAAe;IACb,OAAO,EAAE,SAAS;IAClB,cAAc;IACd,OAAO,EAAE,CAAC,SAAS,CAAC;IACpB,QAAQ,EAAE,8CAA8C;IACxD,OAAO,CAAC,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,QAAQ,EAAE,2BAA2B;YACrC,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,8CAA8C;SACzD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;YACtB,QAAQ,EAAE,uEAAuE;YACjF,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,yCAAwB;SAClC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,KAAK,EAAE,CAAC,GAAG,CAAC;YACZ,QAAQ,EAAE,kBAAkB;YAC5B,WAAW,EAAE,IAAI;SAClB,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,kBAAkB,EAAE;YAC9B,QAAQ,EACN,sFAAsF;SACzF,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,eAAe,EAAE;YAC3B,QAAQ,EAAE,0CAA0C;SACrD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,iBAAiB,EAAE;YAC7B,QAAQ,EAAE,4CAA4C;SACvD,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAqB;;QACjC,IAAA,iBAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxD,MAAM,EAAE,YAAY,EAAE,cAAc,EAAE,OAAO,EAAE,WAAW,EAAE,GAAG,IAAI,CAAC;QACpE,MAAM,oBAAoB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;QAE3E,SAAS,YAAY,CAAC,IAAY,EAAE,EAAc;YAChD,IAAI;gBACF,EAAE,EAAE,CAAC;aACN;YAAC,WAAM;gBACN,OAAO,CAAC,IAAI,CAAC,8CAA8C,IAAI,EAAE,CAAC,CAAC;aACpE;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,+CAAsB,EAAC,SAAS,CAAC,CAAC;QAEjE,MAAM,GAAG,GAAG,IAAI,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1C,GAAG,CAAC,MAAM,GAAG,IAAA,+BAAc,EAAC,oBAAoB,CAAC,CAAC;QAClD,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;QAEtC,KAAK,MAAM,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE;YAC9B,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACrB;QAED,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1D,QAAQ,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;QAE/B,IAAI,YAAY,EAAE;YAChB,YAAY,CAAC,YAAY,EAAE,GAAG,EAAE;gBAC9B,QAAQ,CAAC,IAAI,CAAC,KAAK,GAAG,YAAY,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,cAAc,EAAE;YAClB,YAAY,CAAC,cAAc,EAAE,GAAG,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC,OAAO,GAAG,cAAc,CAAC;YACzC,CAAC,CAAC,CAAC;SACJ;QAED,iDAAiD;QACjD,QAAQ,CAAC,UAAU,GAAI,OAAe,CAAC,UAAU,CAAC;QAClD,QAAQ,CAAC,UAAU,KAAnB,QAAQ,CAAC,UAAU,GAAK,EAAE,EAAC;QAE3B,IAAI,YAA6C,CAAC;QAClD,IAAI,gBAAgB,EAAE;YACpB,YAAY,GAAG,CAAC,IAAA,cAAI,EAAC,MAAM,IAAA,mBAAQ,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAQ,CAAC;SAC/E;QAED,MAAM,SAAS,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,SAAS,CAAC;QACnD,MAAM,OAAO,GAAG,MAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,OAAO,0CAAE,OAAO,CAAC;QAC/C,IAAI,OAAO;YAAE,QAAQ,CAAC,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;QACnD,IAAI,SAAS;YAAE,oBAAoB,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAC/D,IAAI,QAAQ,CAAC,KAAK;YAAE,cAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEnD,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;EAevB,iBAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;CACpB,CAAC;QACE,IAAI,IAAI,CAAC,UAAU,EAAE;YACnB,MAAM,aAAG,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;SACpD;aAAM;YACL,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;SAC3B;IACH,CAAC;CACF,CAAC;AAEF,SAAS,cAAc,CAAC,MAA2B;IACjD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAClC,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACxB,IAAI,GAAG,KAAK,YAAY,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACrD,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;iBAC7B,IAAI,EAAE;iBACN,MAAM,CAAC,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACpB,MAAM,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBACrB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,WAAW,KAAK,KAAK;oBAAE,cAAc,CAAC,CAAC,CAAC,CAAC;gBACtF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,EAAE,CAAC,CAAC;SACV;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,EAAE;YACtD,cAAc,CAAC,KAAK,CAAC,CAAC;SACvB;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,oBAAoB,CAAC,KAA0B,EAAE,SAA8B;IACtF,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO;QAEhC,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,SAAS;YAAE,OAAO;QAEpC,IAAI,GAAG,KAAK,QAAQ,EAAE;YACpB,KAAK,CAAC,MAAM,qBAAQ,SAAS,CAAC,MAAM,CAAE,CAAC;SACxC;aAAM,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YACpC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC;SACzC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,SAAS,CAAI,EAA0B;IACpD,IAAI;QACF,OAAO,MAAM,EAAE,CAAC;KACjB;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,OAAO;KACR;AACH,CAAC"}
|
|
@@ -12,6 +12,7 @@ const utils_1 = require("../utils");
|
|
|
12
12
|
const path_1 = require("path");
|
|
13
13
|
const DiffDiagrams_1 = require("../sequenceDiagramDiff/DiffDiagrams");
|
|
14
14
|
const readDiagramFile_1 = require("./sequenceDiagram/readDiagramFile");
|
|
15
|
+
const promises_2 = require("fs/promises");
|
|
15
16
|
exports.command = 'sequence-diagram-diff base-diagram head-diagram';
|
|
16
17
|
exports.describe = 'Diff sequence diagrams that are represented as JSON';
|
|
17
18
|
const builder = (args) => {
|
|
@@ -42,6 +43,11 @@ const builder = (args) => {
|
|
|
42
43
|
args.option('exclude', {
|
|
43
44
|
describe: 'code objects to exclude from the diagram',
|
|
44
45
|
});
|
|
46
|
+
args.option('validate', {
|
|
47
|
+
describe: 'enable diagram validation',
|
|
48
|
+
type: 'boolean',
|
|
49
|
+
default: true,
|
|
50
|
+
});
|
|
45
51
|
return args.strict();
|
|
46
52
|
};
|
|
47
53
|
exports.builder = builder;
|
|
@@ -72,6 +78,22 @@ const handler = async (argv) => {
|
|
|
72
78
|
throw new Error(`${fileName} does not exist`);
|
|
73
79
|
});
|
|
74
80
|
const compareFiles = async () => {
|
|
81
|
+
if (argv.validate) {
|
|
82
|
+
const baseValidation = await (0, sequence_diagram_1.validateDiagram)(JSON.parse(await (0, promises_2.readFile)(baseDiagramFile, 'utf-8')));
|
|
83
|
+
const headValidation = await (0, sequence_diagram_1.validateDiagram)(JSON.parse(await (0, promises_2.readFile)(headDiagramFile, 'utf-8')));
|
|
84
|
+
if (baseValidation !== sequence_diagram_1.ValidationResult.Valid || headValidation !== sequence_diagram_1.ValidationResult.Valid) {
|
|
85
|
+
console.error(`Base File: ${baseDiagramFile} is ${baseValidation === sequence_diagram_1.ValidationResult.AppMap ? 'an AppMap' : 'an invalid file'}`);
|
|
86
|
+
console.error(`Head File: ${headDiagramFile} is ${headValidation === sequence_diagram_1.ValidationResult.AppMap ? 'an AppMap' : 'an invalid file'}`);
|
|
87
|
+
if (baseValidation === sequence_diagram_1.ValidationResult.AppMap &&
|
|
88
|
+
headValidation === sequence_diagram_1.ValidationResult.AppMap) {
|
|
89
|
+
console.error('You have passed AppMap files. To compare diagrams, run the following commands:');
|
|
90
|
+
console.error(`appmap sequence-diagram -f json ${baseDiagramFile}`);
|
|
91
|
+
console.error(`appmap sequence-diagram -f json ${headDiagramFile}`);
|
|
92
|
+
console.error(`appmap sequence-diagram-diff ${(0, path_1.basename)(baseDiagramFile, '.appmap.json')}.sequence.json ${(0, path_1.basename)(headDiagramFile, '.appmap.json')}.sequence.json`);
|
|
93
|
+
}
|
|
94
|
+
return;
|
|
95
|
+
}
|
|
96
|
+
}
|
|
75
97
|
const baseDiagram = await (0, readDiagramFile_1.readDiagramFile)(baseDiagramFile);
|
|
76
98
|
const headDiagram = await (0, readDiagramFile_1.readDiagramFile)(headDiagramFile);
|
|
77
99
|
const diffDiagram = diffDiagrams.diff(baseDiagram, headDiagram);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sequenceDiagramDiff.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagramDiff.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAC9B,2BAA0C;AAC1C,0CAA+C;AAC/C,+BAA4B;AAC5B,+BAAiC;AAEjC,0EAAuE;AACvE,
|
|
1
|
+
{"version":3,"file":"sequenceDiagramDiff.js","sourceRoot":"","sources":["../../src/cmds/sequenceDiagramDiff.ts"],"names":[],"mappings":";;;AAAA,iCAA8B;AAC9B,2BAA0C;AAC1C,0CAA+C;AAC/C,+BAA4B;AAC5B,+BAAiC;AAEjC,0EAAuE;AACvE,gEAOmC;AACnC,oCAAmC;AACnC,+BAAsC;AACtC,sEAAmE;AACnE,uEAAoE;AACpE,0CAAuC;AAE1B,QAAA,OAAO,GAAG,iDAAiD,CAAC;AAC5D,QAAA,QAAQ,GAAG,qDAAqD,CAAC;AAEvE,MAAM,OAAO,GAAG,CAAC,IAAgB,EAAE,EAAE;IAC1C,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE;QAC9B,QAAQ,EAAE,2CAA2C;KACtD,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE;QAC9B,QAAQ,EAAE,2CAA2C;KACtD,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,kDAAkD;QAC5D,OAAO,EAAE,GAAG;KACb,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE;QACpB,QAAQ,EAAE,eAAe;QACzB,KAAK,EAAE,GAAG;QACV,OAAO,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC;QACrC,OAAO,EAAE,UAAU;KACpB,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,QAAQ,EAAE,mEAAmE;KAC9E,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;QACrB,QAAQ,EAAE,0CAA0C;KACrD,CAAC,CAAC;IAEH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,SAAS;QACf,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,CAAC;AAtCW,QAAA,OAAO,WAsClB;AAEF,KAAK,UAAU,SAAS,CACtB,OAAgB,EAChB,MAAkB,EAClB,cAAsB,EACtB,WAAmB;IAEnB,MAAM,QAAQ,GAAG,IAAA,yBAAa,EAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAE7D,MAAM,UAAU,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;IAE9C,OAAO,CAAC,GAAG,CAAC,mBAAmB,UAAU,EAAE,CAAC,CAAC;IAE7C,OAAO,OAAO,CAAC;AACjB,CAAC;AAEM,MAAM,OAAO,GAAG,KAAK,EAAE,IAAS,EAAE,EAAE;IACzC,IAAA,eAAO,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAEtB,IAAI,CAAC,6BAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;QACrC,OAAO,CAAC,GAAG,CAAC,mBAAmB,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;QACrB,OAAO;KACR;IAED,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,IAAA,gBAAK,EAAC,IAAI,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAEjD,MAAM,EAAE,WAAW,EAAE,eAAe,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC;IAE5E,MAAM,YAAY,GAAG,IAAI,2BAAY,EAAE,CAAC;IAExC,IAAI,IAAI,CAAC,OAAO;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE,CACrF,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAC3B,CAAC;IACJ,IAAI,IAAI,CAAC,OAAO;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE,CACrF,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,CAC3B,CAAC;IAEJ,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACtD,IAAI,CAAC,IAAA,eAAU,EAAC,QAAQ,CAAC;YAAE,MAAM,IAAI,KAAK,CAAC,GAAG,QAAQ,iBAAiB,CAAC,CAAC;IAC3E,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,KAAK,IAAmB,EAAE;QAC7C,IAAI,IAAI,CAAC,QAAQ,EAAE;YACjB,MAAM,cAAc,GAAG,MAAM,IAAA,kCAAe,EAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,OAAO,CAAC,CAAQ,CAC5D,CAAC;YACF,MAAM,cAAc,GAAG,MAAM,IAAA,kCAAe,EAC1C,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,eAAe,EAAE,OAAO,CAAC,CAAQ,CAC5D,CAAC;YAEF,IAAI,cAAc,KAAK,mCAAgB,CAAC,KAAK,IAAI,cAAc,KAAK,mCAAgB,CAAC,KAAK,EAAE;gBAC1F,OAAO,CAAC,KAAK,CACX,cAAc,eAAe,OAC3B,cAAc,KAAK,mCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,iBAC7D,EAAE,CACH,CAAC;gBACF,OAAO,CAAC,KAAK,CACX,cAAc,eAAe,OAC3B,cAAc,KAAK,mCAAgB,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,iBAC7D,EAAE,CACH,CAAC;gBAEF,IACE,cAAc,KAAK,mCAAgB,CAAC,MAAM;oBAC1C,cAAc,KAAK,mCAAgB,CAAC,MAAM,EAC1C;oBACA,OAAO,CAAC,KAAK,CACX,gFAAgF,CACjF,CAAC;oBACF,OAAO,CAAC,KAAK,CAAC,mCAAmC,eAAe,EAAE,CAAC,CAAC;oBACpE,OAAO,CAAC,KAAK,CAAC,mCAAmC,eAAe,EAAE,CAAC,CAAC;oBACpE,OAAO,CAAC,KAAK,CACX,gCAAgC,IAAA,eAAQ,EACtC,eAAe,EACf,cAAc,CACf,kBAAkB,IAAA,eAAQ,EAAC,eAAe,EAAE,cAAc,CAAC,gBAAgB,CAC7E,CAAC;iBACH;gBAED,OAAO;aACR;SACF;QAED,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAe,EAAC,eAAe,CAAC,CAAC;QAC3D,MAAM,WAAW,GAAG,MAAM,IAAA,iCAAe,EAAC,eAAe,CAAC,CAAC;QAE3D,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;QAChE,IAAI,CAAC,WAAW,EAAE;YAChB,OAAO,CAAC,GAAG,CAAC,GAAG,eAAe,QAAQ,eAAe,gBAAgB,CAAC,CAAC;YACvE,OAAO;SACR;QAED,SAAS,CACP,WAAW,EACX,IAAI,CAAC,MAAM,EACX,IAAA,WAAI,EAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,EAC5B,QAAQ,eAAe,SAAS,eAAe,EAAE,CAClD,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,kBAAkB,GAAG,KAAK,IAAmB,EAAE;QACnD,MAAM,WAAW,GAAoD,IAAI,GAAG,EAAE,CAAC;QAC/E,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE;YAC/B,QAAQ,EAAE,IAAI,GAAG,EAAmB;SACrC,CAAC,CAAC;QACH,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE;YAC/B,QAAQ,EAAE,IAAI,GAAG,EAAmB;SACrC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CACf,CAAC,GAAG,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;YAC5C,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,OAAO,CAAE,CAAC;YACvC,MAAM,IAAA,gBAAS,EAAC,WAAI,CAAC,CAAC,GAAG,OAAO,qBAAqB,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC5E,MAAM,MAAM,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,SAAiB,EAAE,EAAE;oBAC/C,MAAM,OAAO,GAAG,MAAM,IAAA,iCAAe,EAAC,SAAS,CAAC,CAAC;oBACjD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;oBACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBAC3C,CAAC,EAAE,CAAC,CAAC,CAAC;gBACN,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACrD,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;oBAAE,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YAC3C,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CACH,CAAC;QAEF,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;QACvC,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;YACtE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,KAAK,MAAM,QAAQ,IAAI,WAAW,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,QAAQ,CAAC,IAAI,EAAE;YACtE,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAE7B,KAAK,MAAM,QAAQ,IAAI,YAAY,EAAE;YACnC,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7E,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC7B,OAAO,CAAC,GAAG,CAAC,WAAW,QAAQ,mBAAmB,eAAe,EAAE,CAAC,CAAC;gBACrE,SAAS;aACV;YAED,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,eAAe,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC7E,IAAI,WAAW,KAAK,SAAS,EAAE;gBAC7B,OAAO,CAAC,GAAG,CAAC,WAAW,QAAQ,mBAAmB,eAAe,EAAE,CAAC,CAAC;gBACrE,SAAS;aACV;YAED,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;YAChE,IAAI,CAAC,WAAW,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,GAAG,QAAQ,eAAe,CAAC,CAAC;gBACxC,SAAS;aACV;YAED,SAAS,CAAC,WAAW,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,QAAQ,QAAQ,EAAE,CAAC,CAAC;SACvF;IACH,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACjG,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACzB,MAAM,YAAY,EAAE,CAAC;KACtB;SAAM,IAAI,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;QAClC,MAAM,kBAAkB,EAAE,CAAC;KAC5B;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;KACpE;AACH,CAAC,CAAC;AArJW,QAAA,OAAO,WAqJlB"}
|