@appland/appmap 3.71.0 → 3.73.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/cmds/agentInstaller/agentInstaller.js +2 -2
- package/built/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/agentInstallerProcedure.js +26 -37
- package/built/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentProcedure.js +19 -24
- package/built/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/agentStatusProcedure.js +4 -5
- package/built/cmds/agentInstaller/agentStatusProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/gradleInstaller.js +10 -23
- package/built/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/install-agent.js +35 -21
- package/built/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/cmds/agentInstaller/installerUI.js +174 -0
- package/built/cmds/agentInstaller/installerUI.js.map +1 -0
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +4 -4
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/mavenInstaller.js +2 -2
- package/built/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/projectConfiguration.js +12 -36
- package/built/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/cmds/agentInstaller/pythonAgentInstaller.js +11 -20
- package/built/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/rubyAgentInstaller.js +2 -2
- package/built/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/status.js +4 -2
- package/built/cmds/agentInstaller/status.js.map +1 -1
- package/built/cmds/stats/stats.js +20 -13
- package/built/cmds/stats/stats.js.map +1 -1
- package/package.json +2 -2
|
@@ -15,7 +15,6 @@ const semver_1 = __importDefault(require("semver"));
|
|
|
15
15
|
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
16
16
|
const utils_1 = require("../../utils");
|
|
17
17
|
const errors_1 = require("../errors");
|
|
18
|
-
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
19
18
|
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
20
19
|
const commandRunner_1 = require("./commandRunner");
|
|
21
20
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
@@ -63,7 +62,7 @@ class PoetryInstaller extends PythonInstaller {
|
|
|
63
62
|
async initCommand() {
|
|
64
63
|
return new commandStruct_1.default('poetry', ['run', 'appmap-agent-init'], this.path);
|
|
65
64
|
}
|
|
66
|
-
async checkConfigCommand() {
|
|
65
|
+
async checkConfigCommand(_ui) {
|
|
67
66
|
return new commandStruct_1.default('poetry', ['install', '--dry-run'], this.path);
|
|
68
67
|
}
|
|
69
68
|
async installAgent() {
|
|
@@ -99,10 +98,10 @@ class PipenvInstaller extends PythonInstaller {
|
|
|
99
98
|
async initCommand() {
|
|
100
99
|
return new commandStruct_1.default('pipenv', ['run', 'appmap-agent-init'], this.path);
|
|
101
100
|
}
|
|
102
|
-
async checkConfigCommand() {
|
|
101
|
+
async checkConfigCommand(_ui) {
|
|
103
102
|
return new commandStruct_1.default('pipenv', ['install', '--dev'], this.path);
|
|
104
103
|
}
|
|
105
|
-
async installAgent() {
|
|
104
|
+
async installAgent(_ui) {
|
|
106
105
|
const cmd = new commandStruct_1.default('pipenv', ['install', '--dev', '--pre', 'appmap'], this.path);
|
|
107
106
|
await (0, commandRunner_1.run)(cmd);
|
|
108
107
|
}
|
|
@@ -139,36 +138,28 @@ class PipInstaller extends PythonInstaller {
|
|
|
139
138
|
nodir: true,
|
|
140
139
|
});
|
|
141
140
|
}
|
|
142
|
-
async chooseBuildFile(choices) {
|
|
141
|
+
async chooseBuildFile(ui, choices) {
|
|
143
142
|
const defaultChoice = choices.filter((f) => (0, minimatch_1.default)(f, '*dev*', { matchBase: true }));
|
|
144
|
-
const
|
|
145
|
-
{
|
|
146
|
-
type: 'list',
|
|
147
|
-
name: 'buildFile',
|
|
148
|
-
message: 'Please choose the requirements file used for development:',
|
|
149
|
-
choices,
|
|
150
|
-
default: defaultChoice[0],
|
|
151
|
-
},
|
|
152
|
-
]);
|
|
143
|
+
const buildFile = await ui.pythonBuildFile(defaultChoice[0], choices);
|
|
153
144
|
return (0, path_1.basename)(buildFile);
|
|
154
145
|
}
|
|
155
|
-
async resolveBuildFile() {
|
|
146
|
+
async resolveBuildFile(ui) {
|
|
156
147
|
const choices = this.findBuildFiles();
|
|
157
148
|
if (choices.length === 1) {
|
|
158
149
|
return choices[0];
|
|
159
150
|
}
|
|
160
151
|
else {
|
|
161
|
-
|
|
152
|
+
ui.message(`
|
|
162
153
|
|
|
163
154
|
This project contains multiple Pip requirements files. AppMap should only be
|
|
164
155
|
installed during development and testing, not when deploying in a production
|
|
165
156
|
environment.
|
|
166
157
|
`);
|
|
167
|
-
return this.chooseBuildFile(choices);
|
|
158
|
+
return this.chooseBuildFile(ui, choices);
|
|
168
159
|
}
|
|
169
160
|
}
|
|
170
|
-
async checkConfigCommand() {
|
|
171
|
-
this._buildFile = await this.resolveBuildFile();
|
|
161
|
+
async checkConfigCommand(ui) {
|
|
162
|
+
this._buildFile = await this.resolveBuildFile(ui);
|
|
172
163
|
let commandArgs = ['-m', 'pip', 'install', '-r', this.buildFile];
|
|
173
164
|
let supportsDryRun;
|
|
174
165
|
try {
|
|
@@ -187,7 +178,7 @@ environment.
|
|
|
187
178
|
}
|
|
188
179
|
return new commandStruct_1.default('python3', commandArgs, this.path);
|
|
189
180
|
}
|
|
190
|
-
async installAgent() {
|
|
181
|
+
async installAgent(_ui) {
|
|
191
182
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
192
183
|
let requirements = encodedFile.toString();
|
|
193
184
|
const pkgExists = requirements.search(REGEX_PKG_DEPENDENCY) !== -1;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA2C;AAC3C,yCAAyC;AACzC,kDAA0B;AAC1B,+BAA4B;AAC5B,0DAAkC;AAClC,4CAAoB;AACpB,+BAAsC;AACtC,oDAA4B;
|
|
1
|
+
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,7 +41,7 @@ class BundleInstaller extends agentInstaller_1.default {
|
|
|
41
41
|
async available() {
|
|
42
42
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
43
43
|
}
|
|
44
|
-
async checkConfigCommand() {
|
|
44
|
+
async checkConfigCommand(_ui) {
|
|
45
45
|
return new commandStruct_1.default('bundle', ['check', '--dry-run'], this.path);
|
|
46
46
|
}
|
|
47
47
|
async checkBundlerConfig() {
|
|
@@ -51,7 +51,7 @@ class BundleInstaller extends agentInstaller_1.default {
|
|
|
51
51
|
throw new errors_1.BundlerConfigError('Bundler is currently configured to install without the test and development groups\n');
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
-
async installAgent() {
|
|
54
|
+
async installAgent(_ui) {
|
|
55
55
|
await this.checkBundlerConfig();
|
|
56
56
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
57
57
|
let gemfile = encodedFile.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":";AAAA,2CAA2C;AAC3C,yCAAyC;;;;;;AAEzC,4CAAoB;AACpB,+BAA4B;AAC5B,kDAA0B;AAC1B,uCAAqC;AACrC,sEAA8C;AAC9C,mDAAsC;AACtC,+CAA0C;AAC1C,oEAA4C;AAC5C,oEAA4C;AAC5C,sCAA+C;
|
|
1
|
+
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,7 @@ const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
|
10
10
|
const installers_1 = require("./installers");
|
|
11
11
|
const agentStatusProcedure_1 = __importDefault(require("./agentStatusProcedure"));
|
|
12
12
|
const projectConfiguration_1 = require("./projectConfiguration");
|
|
13
|
+
const installerUI_1 = __importDefault(require("./installerUI"));
|
|
13
14
|
exports.default = {
|
|
14
15
|
command: 'status [directory]',
|
|
15
16
|
aliases: ['s'],
|
|
@@ -38,10 +39,11 @@ exports.default = {
|
|
|
38
39
|
const { projectType, directory, verbose: isVerbose } = args;
|
|
39
40
|
const installers = installers_1.INSTALLERS.map((constructor) => new constructor(directory));
|
|
40
41
|
(0, utils_1.verbose)(isVerbose);
|
|
42
|
+
const ui = new installerUI_1.default(false, { overwriteAppMapConfig: false });
|
|
41
43
|
try {
|
|
42
|
-
const [project] = await (0, projectConfiguration_1.getProjects)(installers, directory, false, projectType);
|
|
44
|
+
const [project] = await (0, projectConfiguration_1.getProjects)(ui, installers, directory, false, projectType);
|
|
43
45
|
const statusProcedure = new agentStatusProcedure_1.default(project.selectedInstaller, directory);
|
|
44
|
-
await statusProcedure.run();
|
|
46
|
+
await statusProcedure.run(ui);
|
|
45
47
|
}
|
|
46
48
|
catch (e) {
|
|
47
49
|
const err = e;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/status.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,uCAAsC;AACtC,kDAA0B;AAC1B,yEAAoC;AAEpC,6CAA0C;AAC1C,kFAA0D;AAC1D,iEAAqD;
|
|
1
|
+
{"version":3,"file":"status.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/status.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,uCAAsC;AACtC,kDAA0B;AAC1B,yEAAoC;AAEpC,6CAA0C;AAC1C,kFAA0D;AAC1D,iEAAqD;AACrD,gEAAwC;AAQxC,kBAAe;IACb,OAAO,EAAE,oBAAoB;IAC7B,OAAO,EAAE,CAAC,GAAG,CAAC;IACd,QAAQ,EAAE,uEAAuE;IACjF,OAAO,CAAC,IAAgB;QACtB,kGAAkG;QAClG,oGAAoG;QACpG,UAAU;QACV,MAAM,cAAc,GAAG,uBAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAC7F,IAAI,CACL,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,cAAc,EAAE;YAC1B,QAAQ,EAAE;gBACR,6FAA6F;gBAC7F,4BAA4B,cAAc,EAAE;aAC7C,CAAC,IAAI,CAAC,IAAI,CAAC;YACZ,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,SAAS;YAClB,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE;YAC3B,QAAQ,EAAE,oBAAoB;YAC9B,OAAO,EAAE,GAAG;SACb,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAA2B;QACvC,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC;QAC5D,MAAM,UAAU,GAAG,uBAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,SAAS,CAAC,CAAC,CAAC;QAE/E,IAAA,eAAO,EAAC,SAAS,CAAC,CAAC;QAEnB,MAAM,EAAE,GAAG,IAAI,qBAAW,CAAC,KAAK,EAAE,EAAE,qBAAqB,EAAE,KAAK,EAAE,CAAC,CAAC;QACpE,IAAI;YACF,MAAM,CAAC,OAAO,CAAC,GAAG,MAAM,IAAA,kCAAW,EAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;YAEnF,MAAM,eAAe,GAAG,IAAI,8BAAoB,CAC9C,OAAO,CAAC,iBAAmC,EAC3C,SAAS,CACV,CAAC;YAEF,MAAM,eAAe,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;SAC/B;QAAC,OAAO,CAAC,EAAE;YACV,MAAM,GAAG,GAAG,CAAU,CAAC;YACvB,yBAAE,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YACtB,eAAK,CAAC,IAAI,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;SACpB;IACH,CAAC;CACF,CAAC"}
|
|
@@ -25,17 +25,18 @@ async function locateAppMapFile(userInput, appmapDir) {
|
|
|
25
25
|
else if (userInput.endsWith('.appmap')) {
|
|
26
26
|
extension = '.json';
|
|
27
27
|
}
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
return
|
|
37
|
-
|
|
38
|
-
|
|
28
|
+
const mapFile = userInput + extension;
|
|
29
|
+
const appmapDirIsCwd = () => path_1.default.resolve(appmapDir) === process.cwd();
|
|
30
|
+
// if --appmap-file is a valid exact path, then return it
|
|
31
|
+
if (path_1.default.isAbsolute(mapFile) && (0, fs_1.existsSync)(mapFile))
|
|
32
|
+
return mapFile;
|
|
33
|
+
// resolve --appmap-dir and --appmap-file and check for an exact match
|
|
34
|
+
const searchPath = appmapDirIsCwd() ? mapFile : path_1.default.join(appmapDir, mapFile);
|
|
35
|
+
if ((0, fs_1.existsSync)(path_1.default.resolve(searchPath)))
|
|
36
|
+
return searchPath;
|
|
37
|
+
// recursively search in the --appmap-dir
|
|
38
|
+
const globArray = appmapDirIsCwd() ? ['**', mapFile] : [appmapDir, '**', mapFile];
|
|
39
|
+
const matches = glob_1.default.sync(path_1.default.join(...globArray));
|
|
39
40
|
if (matches.length === 0) {
|
|
40
41
|
console.error(chalk_1.default.red('No matching AppMap found'));
|
|
41
42
|
return;
|
|
@@ -83,13 +84,19 @@ exports.builder = builder;
|
|
|
83
84
|
async function handler(argv, handlerCaller = 'from_stats') {
|
|
84
85
|
(0, utils_1.verbose)(argv.verbose);
|
|
85
86
|
(0, handleWorkingDirectory_1.handleWorkingDirectory)(argv.directory);
|
|
86
|
-
|
|
87
|
+
let appmapDir;
|
|
88
|
+
try {
|
|
89
|
+
appmapDir = await (0, locateAppMapDir_1.locateAppMapDir)(argv.appmapDir);
|
|
90
|
+
}
|
|
91
|
+
catch (e) {
|
|
92
|
+
appmapDir = process.cwd();
|
|
93
|
+
}
|
|
87
94
|
const { format, limit, appmapFile } = argv;
|
|
88
95
|
if (appmapFile) {
|
|
89
96
|
const fileToAnalyze = await locateAppMapFile(appmapFile, appmapDir);
|
|
90
97
|
if (!fileToAnalyze)
|
|
91
98
|
return;
|
|
92
|
-
console.warn(`Analyzing AppMap: ${fileToAnalyze}`);
|
|
99
|
+
console.warn(chalk_1.default.yellow(`Analyzing AppMap: ${fileToAnalyze}\n`));
|
|
93
100
|
return await (0, statsForMap_1.statsForMap)(format, limit, fileToAnalyze);
|
|
94
101
|
}
|
|
95
102
|
return await (0, statsForDirectory_1.statsForDirectory)(appmapDir, format, limit, handlerCaller);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/cmds/stats/stats.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"stats.js","sourceRoot":"","sources":["../../../src/cmds/stats/stats.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.73.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@appland/client": "^1",
|
|
75
75
|
"@appland/components": "^2",
|
|
76
76
|
"@appland/diagrams": "^1",
|
|
77
|
-
"@appland/models": "^2.
|
|
77
|
+
"@appland/models": "^2.4.0",
|
|
78
78
|
"@appland/openapi": "^1.4.3",
|
|
79
79
|
"@appland/sequence-diagram": "^1",
|
|
80
80
|
"@sidvind/better-ajv-errors": "^0.9.1",
|