@appland/appmap 3.13.2 → 3.14.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 +31 -0
- package/built/appmap.html +1 -1
- package/built/main.js.map +1 -1
- package/built/package.json +1 -1
- package/built/src/cmds/agentInstaller/agentProcedure.js +8 -1
- package/built/src/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/install-agent.js +77 -53
- package/built/src/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/src/cmds/agentInstaller/installers.js +4 -1
- package/built/src/cmds/agentInstaller/installers.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js +2 -3
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js +94 -0
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -0
- package/built/src/cmds/agentInstaller/mavenInstaller.js +1 -1
- package/built/src/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/projectConfiguration.js +1 -1
- package/built/src/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/src/service/config/validator.js +7 -1
- package/built/src/service/config/validator.js.map +1 -1
- package/built/src/telemetry.js +15 -11
- package/built/src/telemetry.js.map +1 -1
- package/package.json +3 -3
package/built/package.json
CHANGED
|
@@ -12,16 +12,23 @@ const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
|
12
12
|
const commandRunner_1 = require("./commandRunner");
|
|
13
13
|
const validator_1 = require("../../service/config/validator");
|
|
14
14
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
15
|
+
const telemetry_1 = __importDefault(require("../../telemetry"));
|
|
15
16
|
class AgentProcedure {
|
|
16
17
|
constructor(installer, path) {
|
|
17
18
|
this.installer = installer;
|
|
18
19
|
this.path = path;
|
|
19
20
|
}
|
|
20
21
|
async getEnvironmentForDisplay() {
|
|
21
|
-
let env = {
|
|
22
|
+
// TS is ok with this written as let env:[name: string]: string = {...}, but
|
|
23
|
+
// babel doesn't like it. Splitting it up this way keeps them both happy:
|
|
24
|
+
let env;
|
|
25
|
+
env = {
|
|
22
26
|
'Project type': this.installer.name,
|
|
23
27
|
'Project directory': path_1.resolve(this.path),
|
|
24
28
|
};
|
|
29
|
+
if (!telemetry_1.default.enabled) {
|
|
30
|
+
env = Object.assign({ '!!! Telemetry disabled !!!': 'true' }, env);
|
|
31
|
+
}
|
|
25
32
|
let gitRemote;
|
|
26
33
|
try {
|
|
27
34
|
const stdout = commandRunner_1.runSync(new commandStruct_1.default('git', ['remote', '-v'], this.installer.path));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,+BAAqC;AACrC,sDAA2B;AAC3B,kDAA0B;AAC1B,sCAA4C;AAE5C,yEAAoC;AACpC,mDAA+C;AAC/C,8DAAgE;AAChE,oEAA4C;
|
|
1
|
+
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,6 +50,7 @@ class InstallerError {
|
|
|
50
50
|
},
|
|
51
51
|
});
|
|
52
52
|
userInteraction_1.default.error(`${chalk_1.default.yellow('!')} Installation has been aborted.`);
|
|
53
|
+
return true;
|
|
53
54
|
}
|
|
54
55
|
else if (this.error instanceof errors_1.InvalidPathError) {
|
|
55
56
|
telemetry_1.default.sendEvent({
|
|
@@ -62,6 +63,7 @@ class InstallerError {
|
|
|
62
63
|
},
|
|
63
64
|
});
|
|
64
65
|
userInteraction_1.default.error(`${chalk_1.default.red('!')} ${this.error.message}`);
|
|
66
|
+
return true;
|
|
65
67
|
}
|
|
66
68
|
else {
|
|
67
69
|
let exception;
|
|
@@ -101,8 +103,79 @@ class InstallerError {
|
|
|
101
103
|
},
|
|
102
104
|
});
|
|
103
105
|
}
|
|
106
|
+
return false;
|
|
104
107
|
}
|
|
105
108
|
}
|
|
109
|
+
const _handler = async (args) => {
|
|
110
|
+
const { projectType, directory, verbose: isVerbose } = args;
|
|
111
|
+
const errors = [];
|
|
112
|
+
const installers = installers_1.INSTALLERS.map((constructor) => new constructor(directory));
|
|
113
|
+
utils_1.verbose(isVerbose);
|
|
114
|
+
try {
|
|
115
|
+
const projects = await projectConfiguration_1.getProjects(installers, directory, true, projectType);
|
|
116
|
+
for (let i = 0; i < projects.length; i++) {
|
|
117
|
+
const startTime = Date.now();
|
|
118
|
+
const endTime = () => (Date.now() - startTime) / 1000;
|
|
119
|
+
const project = projects[i];
|
|
120
|
+
const installProcedure = new agentInstallerProcedure_1.default(project.selectedInstaller, project.path);
|
|
121
|
+
console.log(`Installing AppMap agent for ${chalk_1.default.blue(project.name)}...`);
|
|
122
|
+
try {
|
|
123
|
+
await installProcedure.run();
|
|
124
|
+
telemetry_1.default.sendEvent({
|
|
125
|
+
name: 'install-agent:success',
|
|
126
|
+
properties: {
|
|
127
|
+
installer: project.selectedInstaller.name,
|
|
128
|
+
path: project.path,
|
|
129
|
+
},
|
|
130
|
+
metrics: {
|
|
131
|
+
duration: endTime(),
|
|
132
|
+
},
|
|
133
|
+
});
|
|
134
|
+
}
|
|
135
|
+
catch (e) {
|
|
136
|
+
let installerError = new InstallerError(e, endTime(), project);
|
|
137
|
+
const handled = await installerError.handle();
|
|
138
|
+
if (handled) {
|
|
139
|
+
return { exitCode: 1, err: e };
|
|
140
|
+
}
|
|
141
|
+
errors.push(installerError);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
if (errors.length) {
|
|
145
|
+
const message = projects.length === 1
|
|
146
|
+
? 'Installation failed. View error details?'
|
|
147
|
+
: `${errors.length} out of ${projects.length} installations failed. View error details?`;
|
|
148
|
+
const { showError } = await userInteraction_1.default.prompt({
|
|
149
|
+
name: 'showError',
|
|
150
|
+
type: 'confirm',
|
|
151
|
+
message,
|
|
152
|
+
prefix: chalk_1.default.red('!'),
|
|
153
|
+
}, { supressSpinner: true });
|
|
154
|
+
if (showError) {
|
|
155
|
+
errors.forEach((error) => {
|
|
156
|
+
var _a;
|
|
157
|
+
userInteraction_1.default.error(projects.length > 1
|
|
158
|
+
? utils_1.prefixLines(error.message, `[${chalk_1.default.red((_a = error.project) === null || _a === void 0 ? void 0 : _a.name)}] `)
|
|
159
|
+
: error.message);
|
|
160
|
+
});
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
catch (err) {
|
|
165
|
+
const installerError = new InstallerError(err, 0, undefined);
|
|
166
|
+
const handled = await installerError.handle();
|
|
167
|
+
if (handled) {
|
|
168
|
+
return { exitCode: 1, err: err };
|
|
169
|
+
}
|
|
170
|
+
errors.push(installerError);
|
|
171
|
+
}
|
|
172
|
+
if (errors.length) {
|
|
173
|
+
const reason = new Error(errors.map((e) => e.message).join('\n'));
|
|
174
|
+
console.log(reason.message);
|
|
175
|
+
return { exitCode: 1, err: reason };
|
|
176
|
+
}
|
|
177
|
+
return { exitCode: 0, err: null };
|
|
178
|
+
};
|
|
106
179
|
exports.default = {
|
|
107
180
|
command: 'install [directory]',
|
|
108
181
|
aliases: ['i', 'install-agent'],
|
|
@@ -131,59 +204,10 @@ exports.default = {
|
|
|
131
204
|
telemetry_1.default.sendEvent({
|
|
132
205
|
name: 'install-agent:start',
|
|
133
206
|
});
|
|
134
|
-
const {
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
try {
|
|
139
|
-
const projects = await projectConfiguration_1.getProjects(installers, directory, true, projectType);
|
|
140
|
-
for (let i = 0; i < projects.length; i++) {
|
|
141
|
-
const startTime = Date.now();
|
|
142
|
-
const endTime = () => (Date.now() - startTime) / 1000;
|
|
143
|
-
const project = projects[i];
|
|
144
|
-
const installProcedure = new agentInstallerProcedure_1.default(project.selectedInstaller, project.path);
|
|
145
|
-
console.log(`Installing AppMap agent for ${chalk_1.default.blue(project.name)}...`);
|
|
146
|
-
try {
|
|
147
|
-
await installProcedure.run();
|
|
148
|
-
}
|
|
149
|
-
catch (e) {
|
|
150
|
-
let installerError = new InstallerError(e, endTime(), project);
|
|
151
|
-
await installerError.handle();
|
|
152
|
-
errors.push(installerError);
|
|
153
|
-
}
|
|
154
|
-
}
|
|
155
|
-
if (errors.length) {
|
|
156
|
-
const message = projects.length === 1
|
|
157
|
-
? 'Installation failed. View error details?'
|
|
158
|
-
: `${errors.length} out of ${projects.length} installations failed. View error details?`;
|
|
159
|
-
const { showError } = await userInteraction_1.default.prompt({
|
|
160
|
-
name: 'showError',
|
|
161
|
-
type: 'confirm',
|
|
162
|
-
message,
|
|
163
|
-
prefix: chalk_1.default.red('!'),
|
|
164
|
-
}, { supressSpinner: true });
|
|
165
|
-
if (showError) {
|
|
166
|
-
errors.forEach((error) => {
|
|
167
|
-
var _a;
|
|
168
|
-
userInteraction_1.default.error(projects.length > 1
|
|
169
|
-
? utils_1.prefixLines(error.message, `[${chalk_1.default.red((_a = error.project) === null || _a === void 0 ? void 0 : _a.name)}] `)
|
|
170
|
-
: error.message);
|
|
171
|
-
});
|
|
172
|
-
}
|
|
173
|
-
}
|
|
174
|
-
}
|
|
175
|
-
catch (err) {
|
|
176
|
-
const installerError = new InstallerError(err, 0, undefined);
|
|
177
|
-
await installerError.handle();
|
|
178
|
-
errors.push(installerError);
|
|
179
|
-
}
|
|
180
|
-
// Make sure there's nothing left in the queue before we exit.
|
|
181
|
-
await telemetry_1.default.flush();
|
|
182
|
-
if (errors.length) {
|
|
183
|
-
const reason = new Error(errors.map((e) => e.message).join('\n'));
|
|
184
|
-
console.log(reason.message);
|
|
185
|
-
yargs_1.default.exit(1, reason);
|
|
186
|
-
}
|
|
207
|
+
const { exitCode, err } = await _handler(args);
|
|
208
|
+
telemetry_1.default.flush(() => {
|
|
209
|
+
yargs_1.default.exit(exitCode, err);
|
|
210
|
+
});
|
|
187
211
|
},
|
|
188
212
|
};
|
|
189
213
|
//# sourceMappingURL=install-agent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2BAAoC;AACpC,sCAKmB;AACnB,uCAAmD;AACnD,wFAAgE;AAChE,kDAA0B;AAC1B,yEAAoC;AACpC,gEAAwC;AACxC,6CAA0C;AAC1C,mDAAuD;AACvD,iEAA2E;AAE3E,mDAA6C;
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,14 +6,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.INSTALLERS = void 0;
|
|
7
7
|
const gradleInstaller_1 = __importDefault(require("./gradleInstaller"));
|
|
8
8
|
const mavenInstaller_1 = __importDefault(require("./mavenInstaller"));
|
|
9
|
+
const javaScriptAgentInstaller_1 = require("./javaScriptAgentInstaller");
|
|
9
10
|
const pythonAgentInstaller_1 = require("./pythonAgentInstaller");
|
|
10
11
|
const rubyAgentInstaller_1 = require("./rubyAgentInstaller");
|
|
11
12
|
exports.INSTALLERS = [
|
|
12
13
|
rubyAgentInstaller_1.BundleInstaller,
|
|
13
|
-
mavenInstaller_1.default,
|
|
14
14
|
gradleInstaller_1.default,
|
|
15
|
+
mavenInstaller_1.default,
|
|
16
|
+
javaScriptAgentInstaller_1.NpmInstaller,
|
|
15
17
|
pythonAgentInstaller_1.PipInstaller,
|
|
16
18
|
pythonAgentInstaller_1.PoetryInstaller,
|
|
19
|
+
javaScriptAgentInstaller_1.YarnInstaller
|
|
17
20
|
];
|
|
18
21
|
/**
|
|
19
22
|
* Retrieve the installers available for a given path
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"installers.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/installers.ts"],"names":[],"mappings":";;;;;;AACA,wEAAgD;AAChD,sEAA8C;AAC9C,iEAAuE;AACvE,6DAAuD;AAG1C,QAAA,UAAU,GAAyC;IAC9D,oCAAe;IACf,wBAAc;IACd,
|
|
1
|
+
{"version":3,"file":"installers.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/installers.ts"],"names":[],"mappings":";;;;;;AACA,wEAAgD;AAChD,sEAA8C;AAC9C,yEAAyE;AACzE,iEAAuE;AACvE,6DAAuD;AAG1C,QAAA,UAAU,GAAyC;IAC9D,oCAAe;IACf,yBAAe;IACf,wBAAc;IACd,uCAAY;IACZ,mCAAY;IACZ,sCAAe;IACf,wCAAa;CACd,CAAC;AAEF;;;;GAIG;AACY,KAAK,UAAU,sBAAsB,CAClD,IAAY;IAEZ,MAAM,aAAa,GAAG,kBAAU,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IAE7E,gGAAgG;IAChG,iCAAiC;IACjC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC,CACpE,CAAC;IAEF,mEAAmE;IACnE,OAAO,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAbD,yCAaC"}
|
|
@@ -16,15 +16,14 @@ function addJetBrainsEnv() {
|
|
|
16
16
|
return;
|
|
17
17
|
}
|
|
18
18
|
const javaHome = path_1.default.join(jbHome, 'jbr');
|
|
19
|
-
const
|
|
20
|
-
const mvnBin = path_1.default.join(jbHome, 'plugins/maven/maven3/bin');
|
|
19
|
+
const mvnBin = path_1.default.join(jbHome, 'plugins/maven/lib/maven3/bin');
|
|
21
20
|
// Make sure we don't override the user's settings: append to path, use the
|
|
22
21
|
// existing JAVA_HOME if it's set.
|
|
23
22
|
if (!process.env['JAVA_HOME']) {
|
|
24
23
|
process.env['JAVA_HOME'] = javaHome;
|
|
25
24
|
}
|
|
26
25
|
;
|
|
27
|
-
process.env['PATH'] = [process.env['PATH'], path_1.default.join(javaHome, 'bin'),
|
|
26
|
+
process.env['PATH'] = [process.env['PATH'], path_1.default.join(javaHome, 'bin'), mvnBin].join(path_1.default.delimiter);
|
|
28
27
|
}
|
|
29
28
|
exports.addJetBrainsEnv = addJetBrainsEnv;
|
|
30
29
|
addJetBrainsEnv();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javaBuildToolInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaBuildToolInstaller.ts"],"names":[],"mappings":";;;;;;AAEA,gDAAwB;AACxB,kDAA0B;AAC1B,oEAA4C;AAC5C,mDAAsC;AACtC,+CAA0C;AAC1C,yDAAsD;AAEtD,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAG,mCAAgB,EAAE,CAAC;IAClC,IAAI,CAAC,MAAM,EAAE;QACX,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"javaBuildToolInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaBuildToolInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,94 @@
|
|
|
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
|
+
exports.YarnInstaller = exports.NpmInstaller = void 0;
|
|
7
|
+
const utils_1 = require("../../utils");
|
|
8
|
+
const commandUtil_1 = require("./commandUtil");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const commandRunner_1 = require("./commandRunner");
|
|
11
|
+
const chalk_1 = __importDefault(require("chalk"));
|
|
12
|
+
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
13
|
+
const AGENT_PACKAGE = '@appland/appmap-agent-js@latest';
|
|
14
|
+
class JavaScriptInstaller {
|
|
15
|
+
constructor(path) {
|
|
16
|
+
this.path = path;
|
|
17
|
+
}
|
|
18
|
+
get documentation() {
|
|
19
|
+
return 'https://appland.com/docs/reference/appmap-agent-js';
|
|
20
|
+
}
|
|
21
|
+
async environment() {
|
|
22
|
+
const version = await commandUtil_1.getOutput('node', ['--version'], this.path);
|
|
23
|
+
return {
|
|
24
|
+
'Node version': version.ok
|
|
25
|
+
? version.output.split(/\s/)[1]
|
|
26
|
+
: chalk_1.default.red(version.output),
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
async initCommand() {
|
|
30
|
+
return new commandStruct_1.default('npx', ['appmap-agent-js', 'init', this.path], this.path);
|
|
31
|
+
}
|
|
32
|
+
async validateAgentCommand() {
|
|
33
|
+
return new commandStruct_1.default('npx', ['appmap-agent-js', 'status', this.path], this.path);
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
class NpmInstaller extends JavaScriptInstaller {
|
|
37
|
+
constructor(path) {
|
|
38
|
+
super(path);
|
|
39
|
+
this.path = path;
|
|
40
|
+
}
|
|
41
|
+
get name() {
|
|
42
|
+
return 'npm';
|
|
43
|
+
}
|
|
44
|
+
get buildFile() {
|
|
45
|
+
return 'package-lock.json';
|
|
46
|
+
}
|
|
47
|
+
get buildFilePath() {
|
|
48
|
+
return path_1.join(this.path, this.buildFile);
|
|
49
|
+
}
|
|
50
|
+
async postInstallMessage() {
|
|
51
|
+
return [
|
|
52
|
+
`Run your tests with ${chalk_1.default.blue('APPMAP=true')} in the environment.`,
|
|
53
|
+
`By default, AppMap files will be output to ${chalk_1.default.blue('tmp/appmap')}.`,
|
|
54
|
+
].join('\n');
|
|
55
|
+
}
|
|
56
|
+
async available() {
|
|
57
|
+
return await utils_1.exists(this.buildFilePath);
|
|
58
|
+
}
|
|
59
|
+
async installAgent() {
|
|
60
|
+
const cmd = new commandStruct_1.default('npm', ['install', '--saveDev', AGENT_PACKAGE], this.path);
|
|
61
|
+
await commandRunner_1.run(cmd);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
exports.NpmInstaller = NpmInstaller;
|
|
65
|
+
class YarnInstaller extends JavaScriptInstaller {
|
|
66
|
+
constructor(path) {
|
|
67
|
+
super(path);
|
|
68
|
+
this.path = path;
|
|
69
|
+
}
|
|
70
|
+
get name() {
|
|
71
|
+
return 'yarn';
|
|
72
|
+
}
|
|
73
|
+
get buildFile() {
|
|
74
|
+
return 'yarn.lock';
|
|
75
|
+
}
|
|
76
|
+
get buildFilePath() {
|
|
77
|
+
return path_1.join(this.path, this.buildFile);
|
|
78
|
+
}
|
|
79
|
+
async postInstallMessage() {
|
|
80
|
+
return [
|
|
81
|
+
`Run your tests with ${chalk_1.default.blue('APPMAP=true')} in the environment.`,
|
|
82
|
+
`By default, AppMap files will be output to ${chalk_1.default.blue('tmp/appmap')}.`,
|
|
83
|
+
].join('\n');
|
|
84
|
+
}
|
|
85
|
+
async available() {
|
|
86
|
+
return await utils_1.exists(this.buildFilePath);
|
|
87
|
+
}
|
|
88
|
+
async installAgent() {
|
|
89
|
+
const cmd = new commandStruct_1.default('yarn', ['add', '--dev', AGENT_PACKAGE], this.path);
|
|
90
|
+
await commandRunner_1.run(cmd);
|
|
91
|
+
}
|
|
92
|
+
}
|
|
93
|
+
exports.YarnInstaller = YarnInstaller;
|
|
94
|
+
//# sourceMappingURL=javaScriptAgentInstaller.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -46,7 +46,7 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
46
46
|
else if (utils_1.verbose()) {
|
|
47
47
|
console.warn(`${chalk_1.default.yellow(`mvnw${ext} wrapper`)} not found, falling back to ${chalk_1.default.yellow(`mvn${ext}`)}`);
|
|
48
48
|
}
|
|
49
|
-
return
|
|
49
|
+
return `mvn${ext}`;
|
|
50
50
|
}
|
|
51
51
|
async verifyCommand() {
|
|
52
52
|
return new commandStruct_1.default(this.runCommand(), ['-Dplugin=com.appland:appmap-maven-plugin', 'help:describe'], this.path);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":";;;;;AAAA,2BAA8B;AAC9B,4CAAoB;AACpB,+BAA6D;AAC7D,iCAA8B;AAC9B,0EAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAE5C,uCAA8C;AAC9C,sFAA8D;AAC9D,oEAA4C;AAE5C,MAAqB,cACnB,SAAQ,gCAAsB;IAG9B,YAAqB,IAAY;QAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;QADO,SAAI,GAAJ,IAAI,CAAQ;IAEjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,kBAAkB;QACtB,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;QAE9B,OAAO;YACL,sEAAsE,eAAK,CAAC,IAAI,CAC9E,GAAG,GAAG,OAAO,CACd,EAAE;YACH,8CAA8C,eAAK,CAAC,IAAI,CACtD,eAAe,CAChB,EAAE;SACJ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,cAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,UAAU;QACR,MAAM,GAAG,GAAG,YAAE,CAAC,QAAQ,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,eAAU,CAAC,WAAI,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,GAAG,EAAE,CAAC,CAAC,CAAC;QAEhE,IAAI,aAAa,EAAE;YACjB,OAAO,IAAI,UAAG,OAAO,GAAG,EAAE,CAAC;SAC5B;aAAM,IAAI,eAAO,EAAE,EAAE;YACpB,OAAO,CAAC,IAAI,CACV,GAAG,eAAK,CAAC,MAAM,CACb,OAAO,GAAG,UAAU,CACrB,+BAA+B,eAAK,CAAC,MAAM,CAAC,MAAM,GAAG,EAAE,CAAC,EAAE,CAC5D,CAAC;SACH;QAED,OAAO,
|
|
1
|
+
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -165,7 +165,7 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
165
165
|
].join('\n'), dir);
|
|
166
166
|
}
|
|
167
167
|
}
|
|
168
|
-
resolveSelectedInstallers(projectConfigurations, userSpecifiedInstaller);
|
|
168
|
+
await resolveSelectedInstallers(projectConfigurations, userSpecifiedInstaller);
|
|
169
169
|
return projectConfigurations;
|
|
170
170
|
}
|
|
171
171
|
exports.getProjects = getProjects;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,13 @@ class ConfigValidationError extends Error {
|
|
|
15
15
|
exports.ConfigValidationError = ConfigValidationError;
|
|
16
16
|
function validateConfig(schema, config) {
|
|
17
17
|
const ajv = new ajv_1.default();
|
|
18
|
-
|
|
18
|
+
// If schema is an array, it's actually a collection of schemas, and the
|
|
19
|
+
// 'config' schema will be found within it (i.e. will have '"$id"' set to
|
|
20
|
+
// "config"). Otherwise, it's just a single schema, so just add it as a schema
|
|
21
|
+
// named "config".
|
|
22
|
+
const schemaKey = Array.isArray(schema) ? undefined : "config";
|
|
23
|
+
ajv.addSchema(schema, schemaKey);
|
|
24
|
+
const validate = ajv.getSchema('config');
|
|
19
25
|
const valid = validate(config);
|
|
20
26
|
let result = { valid };
|
|
21
27
|
if (!valid) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,mFAA2E;AAU3E,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAqB,MAAwB;QAC3C,KAAK,CAAC,MAAM,CAAC,MAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QADjB,WAAM,GAAN,MAAM,CAAkB;IAE7C,CAAC;CACF;AAJD,sDAIC;AAED,SAAgB,cAAc,CAAC,MAAc,EAAE,MAAc;IAC3D,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;IACtB,MAAM,
|
|
1
|
+
{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,mFAA2E;AAU3E,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAqB,MAAwB;QAC3C,KAAK,CAAC,MAAM,CAAC,MAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QADjB,WAAM,GAAN,MAAM,CAAkB;IAE7C,CAAC;CACF;AAJD,sDAIC;AAED,SAAgB,cAAc,CAAC,MAAc,EAAE,MAAc;IAC3D,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;IACtB,wEAAwE;IACxE,yEAAyE;IACzE,8EAA8E;IAC9E,kBAAkB;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA,CAAC,CAAC,SAAS,CAAA,CAAC,CAAC,QAAQ,CAAC;IAC7D,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAY,CAAC;IAC1C,IAAI,MAAM,GAAqB,EAAC,KAAK,EAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,mCACD,MAAM,KACT,MAAM,EAAE;gBACN,EAAE,EAAE,2BAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;gBACpE,GAAG,EAAE,2BAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC;aACvE,GACF,CAAA;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AArBD,wCAqBC"}
|
package/built/src/telemetry.js
CHANGED
|
@@ -182,18 +182,22 @@ class Telemetry {
|
|
|
182
182
|
}
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
185
|
+
static flush(exitCB) {
|
|
186
|
+
if (this.enabled) {
|
|
187
|
+
// Telemetry.client.flush is broken:
|
|
188
|
+
// https://github.com/microsoft/ApplicationInsights-node.js/issues/871 .
|
|
189
|
+
// As a result, we can fail to send telemetry data when exiting.
|
|
190
|
+
//
|
|
191
|
+
// If we got passed a callback, flush the data and wait for a second
|
|
192
|
+
// before calling it.
|
|
193
|
+
if (exitCB) {
|
|
194
|
+
Telemetry.client.flush();
|
|
195
|
+
setTimeout(exitCB, 1000);
|
|
195
196
|
}
|
|
196
|
-
}
|
|
197
|
+
}
|
|
198
|
+
else {
|
|
199
|
+
exitCB();
|
|
200
|
+
}
|
|
197
201
|
}
|
|
198
202
|
}
|
|
199
203
|
exports.default = Telemetry;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/telemetry.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.14.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/src/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -66,9 +66,9 @@
|
|
|
66
66
|
"vuex"
|
|
67
67
|
],
|
|
68
68
|
"dependencies": {
|
|
69
|
-
"@appland/components": "1.
|
|
69
|
+
"@appland/components": "1.15.0",
|
|
70
70
|
"@appland/diagrams": "1.5.0",
|
|
71
|
-
"@appland/models": "1.
|
|
71
|
+
"@appland/models": "1.7.1",
|
|
72
72
|
"@sidvind/better-ajv-errors": "^0.9.1",
|
|
73
73
|
"@types/moo": "^0.5.5",
|
|
74
74
|
"ajv": "^8.6.3",
|