@appland/appmap 3.91.0 → 3.92.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 +14 -0
- package/built/appMapCatalog.js +1 -1
- package/built/appMapCatalog.js.map +1 -1
- package/built/cli.js +1 -1
- package/built/cli.js.map +1 -1
- package/built/cmds/sequenceDiagramDiff.js +22 -0
- package/built/cmds/sequenceDiagramDiff.js.map +1 -1
- package/built/fingerprint/fingerprintDirectoryCommand.js +2 -2
- package/built/fingerprint/fingerprintDirectoryCommand.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/inventoryCommand.js +1 -1
- package/built/inventoryCommand.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@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
|
+
|
|
3
|
+
|
|
4
|
+
### Features
|
|
5
|
+
|
|
6
|
+
* Sequence diagram validation ([e88ab44](https://github.com/getappmap/appmap-js/commit/e88ab44791a994f4102903e8141e538db481d23a))
|
|
7
|
+
|
|
8
|
+
# [@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)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Bug Fixes
|
|
12
|
+
|
|
13
|
+
* Resolve some cases where locating AppMap files fails ([0f8fc8d](https://github.com/getappmap/appmap-js/commit/0f8fc8def801f73be46f3b87275cd799ca546cfd))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.91.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.90.0...@appland/appmap-v3.91.0) (2023-09-05)
|
|
2
16
|
|
|
3
17
|
|
package/built/appMapCatalog.js
CHANGED
|
@@ -9,7 +9,7 @@ const { baseName, findFiles } = require('./utils');
|
|
|
9
9
|
*/
|
|
10
10
|
async function appMapCatalog(directory) {
|
|
11
11
|
const appMapsByName = {};
|
|
12
|
-
const appMapFiles = await findFiles(directory, '
|
|
12
|
+
const appMapFiles = await findFiles(directory, '.appmap.json');
|
|
13
13
|
await Promise.all(
|
|
14
14
|
// eslint-disable-next-line prefer-arrow-callback
|
|
15
15
|
appMapFiles.map(async (file) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appMapCatalog.js","sourceRoot":"","sources":["../src/appMapCatalog.js"],"names":[],"mappings":";AAAA,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACnC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnD;;;;;GAKG;AACH,KAAK,UAAU,aAAa,CAAC,SAAS;IACpC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"appMapCatalog.js","sourceRoot":"","sources":["../src/appMapCatalog.js"],"names":[],"mappings":";AAAA,MAAM,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC;AACnC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEnD;;;;;GAKG;AACH,KAAK,UAAU,aAAa,CAAC,SAAS;IACpC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;IAE/D,MAAM,OAAO,CAAC,GAAG;IACf,iDAAiD;IACjD,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QAC7B,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;QACnE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,KAAK,GAAG;YACZ,QAAQ,EAAE,IAAI;YACd,QAAQ;SACT,CAAC;QACF,IAAI,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAChC,OAAO,CAAC,IAAI,CAAC,eAAe,QAAQ,CAAC,IAAI,8BAA8B,CAAC,CAAC;SAC1E;aAAM;YACL,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;SACtC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,MAAM,CAAC,OAAO,GAAG,aAAa,CAAC"}
|
package/built/cli.js
CHANGED
|
@@ -18,7 +18,7 @@ const readline = require('readline');
|
|
|
18
18
|
const { join } = require('path');
|
|
19
19
|
const models_1 = require("@appland/models");
|
|
20
20
|
const { verbose } = require('./utils');
|
|
21
|
-
const FingerprintDirectoryCommand = require('./fingerprint/fingerprintDirectoryCommand');
|
|
21
|
+
const FingerprintDirectoryCommand = require('./fingerprint/fingerprintDirectoryCommand').default;
|
|
22
22
|
const FingerprintWatchCommand = require('./fingerprint/fingerprintWatchCommand').default;
|
|
23
23
|
const Depends = require('./depends');
|
|
24
24
|
const install_agent_1 = __importDefault(require("./cmds/agentInstaller/install-agent"));
|
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;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -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":"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"}
|
|
@@ -33,8 +33,8 @@ class FingerprintDirectoryCommand {
|
|
|
33
33
|
return count;
|
|
34
34
|
}
|
|
35
35
|
async files(fn) {
|
|
36
|
-
return (0, utils_1.findFiles)(this.directory, '
|
|
36
|
+
return (0, utils_1.findFiles)(this.directory, '.appmap.json', fn);
|
|
37
37
|
}
|
|
38
38
|
}
|
|
39
|
-
|
|
39
|
+
exports.default = FingerprintDirectoryCommand;
|
|
40
40
|
//# sourceMappingURL=fingerprintDirectoryCommand.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fingerprintDirectoryCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintDirectoryCommand.ts"],"names":[],"mappings":";;;;;AACA,oCAA8C;AAC9C,0EAAkD;AAClD,iEAAyC;AAEzC,MAAM,2BAA2B;IAK/B,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAJtC,YAAO,GAAW,CAAC,CAAC;QACpB,WAAM,GAAW,CAAC,CAAC;IAGsB,CAAC;IAElD,KAAK,CAAC,OAAO;QACX,IAAI,IAAA,eAAO,GAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAC7D;QAED,MAAM,OAAO,GAAG,IAAI,0BAAgB,EAAE,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;YACtD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;YACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YACxB,KAAK,IAAI,CAAC,CAAC;YACX,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAA,mBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE;QACZ,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"fingerprintDirectoryCommand.js","sourceRoot":"","sources":["../../src/fingerprint/fingerprintDirectoryCommand.ts"],"names":[],"mappings":";;;;;AACA,oCAA8C;AAC9C,0EAAkD;AAClD,iEAAyC;AAEzC,MAAM,2BAA2B;IAK/B,YAA6B,SAAiB;QAAjB,cAAS,GAAT,SAAS,CAAQ;QAJtC,YAAO,GAAW,CAAC,CAAC;QACpB,WAAM,GAAW,CAAC,CAAC;IAGsB,CAAC;IAElD,KAAK,CAAC,OAAO;QACX,IAAI,IAAA,eAAO,GAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,6BAA6B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;SAC7D;QAED,MAAM,OAAO,GAAG,IAAI,0BAAgB,EAAE,CAAC;QACvC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,EAAE;YACtD,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YAClB,IAAI,CAAC,MAAM,IAAI,SAAS,CAAC;YACzB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAC3B,CAAC,CAAC,CAAC;QAEH,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,MAAM,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE;YACxB,KAAK,IAAI,CAAC,CAAC;YACX,OAAO,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,GAAG,CAAC;YAAE,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;QAEvC,IAAA,mBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEpE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,EAAE;QACZ,OAAO,IAAA,iBAAS,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC;IACvD,CAAC;CACF;AAED,kBAAe,2BAA2B,CAAC"}
|