@appland/appmap 3.92.0 → 3.93.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,17 @@
1
+ # [@appland/appmap-v3.93.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.92.1...@appland/appmap-v3.93.0) (2023-09-07)
2
+
3
+
4
+ ### Features
5
+
6
+ * **ChangeReporter.ts:** add import statements for DiffOutcome and DiffResult ([1e9ce9d](https://github.com/getappmap/appmap-js/commit/1e9ce9defab93fc4e86a66d8ea52322d9514d543))
7
+
8
+ # [@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)
9
+
10
+
11
+ ### Bug Fixes
12
+
13
+ * Stage requests into files ([e42e7c2](https://github.com/getappmap/appmap-js/commit/e42e7c2753c23c44e6fe813caca460548a3983e7))
14
+
1
15
  # [@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)
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":"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"}
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,yDAAiC;AAElB,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"}
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,yDAAmD;AACnD,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"}
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"}
@@ -384,6 +384,30 @@ class ReportFieldCalculator {
384
384
  resolved: resolvedFindings,
385
385
  };
386
386
  }
387
+ async formatEndpoint(input) {
388
+ if (input.startsWith('paths.')) {
389
+ const parts = input.split('.');
390
+ // Check if the input only has the 'paths.' and endpoint
391
+ if (parts.length === 2) {
392
+ return parts[1];
393
+ }
394
+ const statusCode = parts[parts.length - 1];
395
+ const method = parts[parts.length - 3].toUpperCase();
396
+ const path = parts[1];
397
+ return `${statusCode} ${method} ${path}`;
398
+ }
399
+ return input;
400
+ }
401
+ async processDifferences(diffArray) {
402
+ for (const diffResult of diffArray) {
403
+ for (const details of diffResult.destinationSpecEntityDetails) {
404
+ details.location = await this.formatEndpoint(details.location);
405
+ }
406
+ for (const details of diffResult.sourceSpecEntityDetails) {
407
+ details.location = await this.formatEndpoint(details.location);
408
+ }
409
+ }
410
+ }
387
411
  async apiDiff(reportRemoved) {
388
412
  const readOpenAPI = async (revision) => {
389
413
  const openapiPath = this.reporter.paths.openapiPath(revision);
@@ -414,6 +438,17 @@ class ReportFieldCalculator {
414
438
  format: 'openapi3',
415
439
  },
416
440
  });
441
+ if (result.breakingDifferencesFound) {
442
+ const diffOutcomeFailure = result; // Type narrowing
443
+ await this.processDifferences(diffOutcomeFailure.breakingDifferences);
444
+ await this.processDifferences(diffOutcomeFailure.nonBreakingDifferences);
445
+ await this.processDifferences(diffOutcomeFailure.unclassifiedDifferences);
446
+ }
447
+ else {
448
+ const diffOutcomeSuccess = result; // Type narrowing
449
+ await this.processDifferences(diffOutcomeSuccess.nonBreakingDifferences);
450
+ await this.processDifferences(diffOutcomeSuccess.unclassifiedDifferences);
451
+ }
417
452
  if (!reportRemoved && result.breakingDifferencesFound) {
418
453
  const diffOutcomeFailure = result;
419
454
  diffOutcomeFailure.breakingDifferencesFound = false;
@@ -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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"}
@@ -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 util_1 = require("util");
34
- const locateAppMapDir_1 = require("../lib/locateAppMapDir");
35
- const handleWorkingDirectory_1 = require("../lib/handleWorkingDirectory");
36
- const locateAppMapConfigFile_1 = require("../lib/locateAppMapConfigFile");
37
- const fileSizeFilter_1 = require("../lib/fileSizeFilter");
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 files = glob_1.glob.sync((0, path_1.join)(this.appmapDir, '**', '*.appmap.json'));
54
- for (let index = 0; index < files.length; index++) {
55
- const file = files[index];
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
- q.push(file);
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: this.model.openapi(),
74
- securitySchemes: this.securitySchemes.openapi(),
87
+ paths,
88
+ securitySchemes,
75
89
  },
76
- files.length,
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, '../../resources/openapi-template.yaml');
97
+ fileName = (0, path_1.join)(__dirname, '../../../resources/openapi-template.yaml');
109
98
  }
110
- return js_yaml_1.default.load((await fs_1.promises.readFile(fileName)).toString());
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, numAppMaps] = await cmd.execute();
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 fs_1.promises.writeFile(argv.outputFile, fileContents);
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":"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"}