@appland/appmap 3.18.2 → 3.18.3
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 +8 -0
- package/built/appmap.html +1 -1
- package/built/main.js.LICENSE.txt +4 -4
- package/built/main.js.map +1 -1
- package/built/package.json +2 -2
- package/built/src/cmds/agentInstaller/agentInstaller.js +1 -1
- package/built/src/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/agentInstallerProcedure.js +1 -1
- package/built/src/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/agentProcedure.js +6 -6
- package/built/src/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/src/cmds/agentInstaller/commandRunner.js +4 -4
- package/built/src/cmds/agentInstaller/commandRunner.js.map +1 -1
- package/built/src/cmds/agentInstaller/commandUtil.js +1 -1
- package/built/src/cmds/agentInstaller/commandUtil.js.map +1 -1
- package/built/src/cmds/agentInstaller/gradleInstaller.js +6 -6
- package/built/src/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/install-agent.js +4 -4
- package/built/src/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js +3 -3
- package/built/src/cmds/agentInstaller/javaBuildToolInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js +7 -7
- package/built/src/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/mavenInstaller.js +5 -5
- package/built/src/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/projectConfiguration.js +7 -7
- package/built/src/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js +8 -8
- package/built/src/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js +5 -5
- package/built/src/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/src/cmds/agentInstaller/sourceUtil.js +1 -1
- package/built/src/cmds/agentInstaller/sourceUtil.js.map +1 -1
- package/built/src/cmds/agentInstaller/status.js +2 -2
- package/built/src/cmds/agentInstaller/status.js.map +1 -1
- package/built/src/cmds/errors.js +1 -1
- package/built/src/cmds/errors.js.map +1 -1
- package/built/src/cmds/open/open.js +4 -4
- package/built/src/cmds/open/open.js.map +1 -1
- package/built/src/cmds/open/openers.js +3 -3
- package/built/src/cmds/open/openers.js.map +1 -1
- package/built/src/cmds/open/serveAndOpenAppMap.js +13 -13
- package/built/src/cmds/open/serveAndOpenAppMap.js.map +1 -1
- package/built/src/cmds/open/showAppMap.js +1 -1
- package/built/src/cmds/open/showAppMap.js.map +1 -1
- package/built/src/cmds/prune/prune.js +2 -2
- package/built/src/cmds/prune/prune.js.map +1 -1
- package/built/src/cmds/prune/pruneAppMap.js +1 -1
- package/built/src/cmds/prune/pruneAppMap.js.map +1 -1
- package/built/src/cmds/record/configureConnection.js +3 -3
- package/built/src/cmds/record/configureConnection.js.map +1 -1
- package/built/src/cmds/record/configureRemainingRequestOptions.js +1 -1
- package/built/src/cmds/record/configureRemainingRequestOptions.js.map +1 -1
- package/built/src/cmds/record/confirmProcessCharacteristics.js +3 -3
- package/built/src/cmds/record/confirmProcessCharacteristics.js.map +1 -1
- package/built/src/cmds/record/intro.js +1 -1
- package/built/src/cmds/record/intro.js.map +1 -1
- package/built/src/cmds/record/record.js +7 -7
- package/built/src/cmds/record/record.js.map +1 -1
- package/built/src/cmds/record/testConnection.js +1 -1
- package/built/src/cmds/record/testConnection.js.map +1 -1
- package/built/src/cmds/runCommand.js +1 -1
- package/built/src/cmds/runCommand.js.map +1 -1
- package/built/src/cmds/userInteraction.js +3 -3
- package/built/src/cmds/userInteraction.js.map +1 -1
- package/built/src/fingerprint/canonicalize/sqlTables.js +1 -1
- package/built/src/fingerprint/canonicalize/sqlTables.js.map +1 -1
- package/built/src/fingerprint/canonicalize/trace.js +1 -1
- package/built/src/fingerprint/canonicalize/trace.js.map +1 -1
- package/built/src/functionStats.js +1 -0
- package/built/src/functionStats.js.map +1 -1
- package/built/src/openapi/command.js +2 -2
- package/built/src/openapi/command.js.map +1 -1
- package/built/src/service/config/validator.js +5 -3
- package/built/src/service/config/validator.js.map +1 -1
- package/built/src/telemetry.js +5 -5
- package/built/src/telemetry.js.map +1 -1
- package/package.json +2 -2
package/built/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.18.
|
|
3
|
+
"version": "3.18.3",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/src/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
"dependencies": {
|
|
69
69
|
"@appland/components": "workspace:*",
|
|
70
70
|
"@appland/diagrams": "workspace:*",
|
|
71
|
-
"@appland/models": "workspace:^1.
|
|
71
|
+
"@appland/models": "workspace:^1.14.1",
|
|
72
72
|
"@sidvind/better-ajv-errors": "^0.9.1",
|
|
73
73
|
"@types/moo": "^0.5.5",
|
|
74
74
|
"JSONStream": "^1.3.5",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAG/B,MAA8B,cAAc;IAM1C,YAAqB,IAAY,EAAE,IAAY;QAA1B,SAAI,GAAJ,IAAI,CAAQ;QAC/B,IAAI,CAAC,IAAI,GAAG,cAAO,
|
|
1
|
+
{"version":3,"file":"agentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstaller.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAG/B,MAA8B,cAAc;IAM1C,YAAqB,IAAY,EAAE,IAAY;QAA1B,SAAI,GAAJ,IAAI,CAAQ;QAC/B,IAAI,CAAC,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CAQF;AAhBD,iCAgBC"}
|
|
@@ -56,7 +56,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
56
56
|
const appMapYml = this.configPath;
|
|
57
57
|
if (!useExistingAppMapYml) {
|
|
58
58
|
const initCommand = await this.installer.initCommand();
|
|
59
|
-
const { stdout } = await commandRunner_1.run(initCommand);
|
|
59
|
+
const { stdout } = await (0, commandRunner_1.run)(initCommand);
|
|
60
60
|
const json = JSON.parse(stdout);
|
|
61
61
|
fs_1.default.writeFileSync(appMapYml, json.configuration.contents);
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AAEpB,kDAA0B;AAG1B,sCAAwD;AACxD,mDAAsC;AACtC,yEAAoC;AACpC,sEAA8C;AAE9C,MAAqB,uBAAwB,SAAQ,wBAAc;IACjE,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;YAClC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,OAAO,EAAE;gBACP,6DAA6D;gBAC7D,MAAM,IAAI,CAAC,wBAAwB,EAAE;gBACrC,EAAE;gBACF,oBAAoB;aACrB;iBACE,IAAI,EAAE;iBACN,IAAI,CAAC,IAAI,CAAC;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE;YACZ,yBAAE,CAAC,MAAM,GAAG,wBAAwB,CAAC;YACrC,yBAAE,CAAC,KAAK,CACN;gBACE,wEAAwE;gBACxE,OAAO,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;aACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACF,MAAM,IAAI,mBAAU,CAAC,mDAAmD,CAAC,CAAC;SAC3E;QAED,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,YAAY,GAAG,cAAc,CAAC;YACpC,MAAM,SAAS,GAAG,WAAW,CAAC;YAC9B,MAAM,KAAK,GAAG,OAAO,CAAC;YAEtB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;gBAC7C,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EACL,uFAAuF;gBACzF,OAAO,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAI,kBAAkB,KAAK,KAAK,EAAE;gBAChC,eAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;aAC5B;YAED,IAAI,kBAAkB,KAAK,YAAY,EAAE;gBACvC,oBAAoB,GAAG,IAAI,CAAC;aAC7B;SACF;QAED,yBAAE,CAAC,MAAM,GAAG,gCAAgC,CAAC;QAE7C,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAEpC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YACvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,mBAAG,
|
|
1
|
+
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AAEpB,kDAA0B;AAG1B,sCAAwD;AACxD,mDAAsC;AACtC,yEAAoC;AACpC,sEAA8C;AAE9C,MAAqB,uBAAwB,SAAQ,wBAAc;IACjE,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;YAClC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,OAAO,EAAE;gBACP,6DAA6D;gBAC7D,MAAM,IAAI,CAAC,wBAAwB,EAAE;gBACrC,EAAE;gBACF,oBAAoB;aACrB;iBACE,IAAI,EAAE;iBACN,IAAI,CAAC,IAAI,CAAC;SACd,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,EAAE;YACZ,yBAAE,CAAC,MAAM,GAAG,wBAAwB,CAAC;YACrC,yBAAE,CAAC,KAAK,CACN;gBACE,wEAAwE;gBACxE,OAAO,eAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,wBAAwB;aACpD,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YACF,MAAM,IAAI,mBAAU,CAAC,mDAAmD,CAAC,CAAC;SAC3E;QAED,IAAI,oBAAoB,GAAG,KAAK,CAAC;QACjC,IAAI,IAAI,CAAC,YAAY,EAAE;YACrB,MAAM,YAAY,GAAG,cAAc,CAAC;YACpC,MAAM,SAAS,GAAG,WAAW,CAAC;YAC9B,MAAM,KAAK,GAAG,OAAO,CAAC;YAEtB,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;gBAC7C,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE,oBAAoB;gBAC1B,OAAO,EACL,uFAAuF;gBACzF,OAAO,EAAE,CAAC,YAAY,EAAE,SAAS,EAAE,KAAK,CAAC;aAC1C,CAAC,CAAC;YAEH,IAAI,kBAAkB,KAAK,KAAK,EAAE;gBAChC,eAAK,CAAC,IAAI,CAAC,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;aAC5B;YAED,IAAI,kBAAkB,KAAK,YAAY,EAAE;gBACvC,oBAAoB,GAAG,IAAI,CAAC;aAC7B;SACF;QAED,yBAAE,CAAC,MAAM,GAAG,gCAAgC,CAAC;QAE7C,MAAM,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;QAEpC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,oBAAoB,EAAE;YACzB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YACvD,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAG,EAAC,WAAW,CAAC,CAAC;YAC1C,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEhC,YAAE,CAAC,aAAa,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;SAC1D;QAED,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;QAEjD,MAAM,cAAc,GAAG;YACrB,eAAK,CAAC,KAAK,CAAC,+CAA+C,CAAC;SAC7D,CAAC;QAEF,IAAI,IAAI,CAAC,SAAS,CAAC,aAAa,EAAE;YAChC,cAAc,CAAC,IAAI,CACjB,kDAAkD,EAClD,eAAK,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CACzC,CAAC;SACH;QAED,yBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxC,CAAC;CACF;AA/ED,0CA+EC"}
|
|
@@ -24,14 +24,14 @@ class AgentProcedure {
|
|
|
24
24
|
let env;
|
|
25
25
|
env = {
|
|
26
26
|
'Project type': this.installer.name,
|
|
27
|
-
'Project directory': path_1.resolve(this.path),
|
|
27
|
+
'Project directory': (0, path_1.resolve)(this.path),
|
|
28
28
|
};
|
|
29
29
|
if (!telemetry_1.default.enabled) {
|
|
30
30
|
env = Object.assign({ '!!! Telemetry disabled !!!': 'true' }, env);
|
|
31
31
|
}
|
|
32
32
|
let gitRemote;
|
|
33
33
|
try {
|
|
34
|
-
const stdout = commandRunner_1.runSync(new commandStruct_1.default('git', ['remote', '-v'], this.installer.path));
|
|
34
|
+
const stdout = (0, commandRunner_1.runSync)(new commandStruct_1.default('git', ['remote', '-v'], this.installer.path));
|
|
35
35
|
if (stdout.length > 0) {
|
|
36
36
|
gitRemote = stdout.split('\n')[0];
|
|
37
37
|
}
|
|
@@ -54,12 +54,12 @@ class AgentProcedure {
|
|
|
54
54
|
async verifyProject() {
|
|
55
55
|
const verifyCommand = await this.installer.verifyCommand();
|
|
56
56
|
if (verifyCommand) {
|
|
57
|
-
await commandRunner_1.run(verifyCommand);
|
|
57
|
+
await (0, commandRunner_1.run)(verifyCommand);
|
|
58
58
|
}
|
|
59
59
|
}
|
|
60
60
|
async validateAgent(cmd) {
|
|
61
61
|
try {
|
|
62
|
-
return commandRunner_1.run(cmd);
|
|
62
|
+
return (0, commandRunner_1.run)(cmd);
|
|
63
63
|
}
|
|
64
64
|
catch (e) {
|
|
65
65
|
userInteraction_1.default.error('Failed to validate the installation.');
|
|
@@ -94,7 +94,7 @@ class AgentProcedure {
|
|
|
94
94
|
if (schema && checkSyntax) {
|
|
95
95
|
userInteraction_1.default.status = `Checking the syntax of AppMap agent configuration...`;
|
|
96
96
|
const config = this.loadConfig();
|
|
97
|
-
const result = validator_1.validateConfig(schema, config);
|
|
97
|
+
const result = (0, validator_1.validateConfig)(schema, config);
|
|
98
98
|
if (!result.valid) {
|
|
99
99
|
const errors = result.errors;
|
|
100
100
|
const lines = errors.cli.split('\n').slice(2, 4);
|
|
@@ -113,7 +113,7 @@ class AgentProcedure {
|
|
|
113
113
|
return fs_1.default.existsSync(this.configPath);
|
|
114
114
|
}
|
|
115
115
|
get configPath() {
|
|
116
|
-
return path_1.resolve(path_1.join(this.path, 'appmap.yml'));
|
|
116
|
+
return (0, path_1.resolve)((0, path_1.join)(this.path, 'appmap.yml'));
|
|
117
117
|
}
|
|
118
118
|
}
|
|
119
119
|
exports.default = AgentProcedure;
|
|
@@ -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;AAC5C,gEAAwC;AAExC,MAA8B,cAAc;IAC1C,YAAqB,SAAyB,EAAW,IAAY;QAAhD,cAAS,GAAT,SAAS,CAAgB;QAAW,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAEzE,KAAK,CAAC,wBAAwB;QAC5B,4EAA4E;QAC5E,yEAAyE;QACzE,IAAI,GAAG,CAAC;QACR,GAAG,GAAG;YACJ,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI;YACnC,mBAAmB,EAAE,cAAO,
|
|
1
|
+
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,13 +58,13 @@ class CommandOutput {
|
|
|
58
58
|
async function run(command) {
|
|
59
59
|
return new Promise((resolve, reject) => {
|
|
60
60
|
var _a, _b, _c, _d;
|
|
61
|
-
const cp = child_process_1.spawn(command.program, command.args, {
|
|
61
|
+
const cp = (0, child_process_1.spawn)(command.program, command.args, {
|
|
62
62
|
shell: true,
|
|
63
63
|
env: command.environment,
|
|
64
64
|
cwd: command.path,
|
|
65
65
|
});
|
|
66
66
|
let output = new CommandOutput();
|
|
67
|
-
if (utils_1.verbose()) {
|
|
67
|
+
if ((0, utils_1.verbose)()) {
|
|
68
68
|
console.log([
|
|
69
69
|
`Running command: \`${chalk_1.default.yellow(command.toString())}\``,
|
|
70
70
|
`cwd: ${chalk_1.default.yellow(path_1.default.resolve(command.path))}`,
|
|
@@ -87,7 +87,7 @@ async function run(command) {
|
|
|
87
87
|
reject(err);
|
|
88
88
|
});
|
|
89
89
|
cp.on('exit', (code, signal) => {
|
|
90
|
-
if (utils_1.verbose()) {
|
|
90
|
+
if ((0, utils_1.verbose)()) {
|
|
91
91
|
console.log(`'${command.program}' exited with code ${code}`);
|
|
92
92
|
}
|
|
93
93
|
ProcessLog.recordExit(command.program, code, signal);
|
|
@@ -103,7 +103,7 @@ async function run(command) {
|
|
|
103
103
|
}
|
|
104
104
|
exports.run = run;
|
|
105
105
|
function runSync(command) {
|
|
106
|
-
const ret = child_process_1.execSync(command.toString(), {
|
|
106
|
+
const ret = (0, child_process_1.execSync)(command.toString(), {
|
|
107
107
|
env: command.environment,
|
|
108
108
|
cwd: command.path,
|
|
109
109
|
stdio: 'pipe'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":";;;;;;AAAA,iDAA6E;AAC7E,gDAAwB;AACxB,kDAA0B;AAE1B,uCAAsC;AACtC,sCAA8C;AAE9C,MAAa,UAAU;IAGd,MAAM,CAAC,GAAG,CAAC,OAAe,EAAE,YAA0B;;QAC3D,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,0BAA0B,OAAO,QAAQ,CAAC,CAAC;QAC5E,MAAA,YAAY,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,MAAA,YAAY,CAAC,MAAM,0CAAE,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;YAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC;IACL,CAAC;IAEM,MAAM,CAAC,UAAU,CACtB,OAAe,EACf,IAAmB,EACnB,MAA6B;QAE7B,IAAI,CAAC,MAAM,CAAC,MAAM,CAChB,QAAQ,OAAO,sBAAsB,IAAI,YAAY,MAAM,MAAM,CAClE,CAAC;IACJ,CAAC;IAED,wDAAwD;IACjD,MAAM,CAAC,aAAa;QACzB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5BH,gCA6BC;AA5Be,iBAAM,GAAW,EAAE,CAAC;AAmCpC,MAAM,aAAa;IAAnB;QACU,WAAM,GAAyB,EAAE,CAAC;IAuB5C,CAAC;IArBC,MAAM,CAAC,MAA2B,EAAE,IAAY;QAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM;aACf,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;aAC5C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;aAC1B,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM;aACf,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;aAC5C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;aAC1B,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACzD,CAAC;CACF;AAEM,KAAK,UAAU,GAAG,CAAC,OAAsB;IAC9C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;;QACrC,MAAM,EAAE,GAAG,qBAAK,
|
|
1
|
+
{"version":3,"file":"commandRunner.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
|
17
17
|
*/
|
|
18
18
|
async function getOutput(program, args, cwd) {
|
|
19
19
|
try {
|
|
20
|
-
const { stdout, stderr } = await commandRunner_1.run(new commandStruct_1.default(program, args, cwd));
|
|
20
|
+
const { stdout, stderr } = await (0, commandRunner_1.run)(new commandStruct_1.default(program, args, cwd));
|
|
21
21
|
return {
|
|
22
22
|
output: stdout ? stdout : stderr,
|
|
23
23
|
ok: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"commandUtil.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandUtil.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAsC;AACtC,oEAA+D;AAE/D;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,OAAe,EACf,IAAc,EACd,GAAW;IAEX,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,mBAAG,
|
|
1
|
+
{"version":3,"file":"commandUtil.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/commandUtil.ts"],"names":[],"mappings":";;;;;;AAAA,mDAAsC;AACtC,oEAA+D;AAE/D;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,OAAe,EACf,IAAc,EACd,GAAW;IAEX,IAAI;QACF,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,mBAAG,EAAC,IAAI,uBAAa,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC;QAC5E,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;YAChC,EAAE,EAAE,IAAI;SACT,CAAC;KACH;IAAC,OAAO,IAAI,EAAE;QACb,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;QAE/B,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,OAAO,CAAC,MAAM,GAAG,GAAG,OAAO,gBAAgB,CAAC;SAC7C;aAAM;YACL,OAAO,CAAC,MAAM,GAAG,GAAG,OAAO,qBAAqB,IAAI,EAAE,CAAC;SACxD;QAED,OAAO,OAAO,CAAC;KAChB;AACH,CAAC;AAtBD,8BAsBC"}
|
|
@@ -22,21 +22,21 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
22
22
|
return 'build.gradle';
|
|
23
23
|
}
|
|
24
24
|
get buildFilePath() {
|
|
25
|
-
return path_1.join(this.path, this.buildFile);
|
|
25
|
+
return (0, path_1.join)(this.path, this.buildFile);
|
|
26
26
|
}
|
|
27
27
|
async printJarPathCommand() {
|
|
28
28
|
return new commandStruct_1.default(await this.runCommand(), ['appmap-print-jar-path'], this.path);
|
|
29
29
|
}
|
|
30
30
|
async available() {
|
|
31
|
-
return await utils_1.exists(this.buildFilePath);
|
|
31
|
+
return await (0, utils_1.exists)(this.buildFilePath);
|
|
32
32
|
}
|
|
33
33
|
async runCommand() {
|
|
34
34
|
const ext = os_1.default.platform() === 'win32' ? '.bat' : '';
|
|
35
|
-
const wrapperExists = await utils_1.exists(path_1.join(this.path, `gradlew${ext}`));
|
|
35
|
+
const wrapperExists = await (0, utils_1.exists)((0, path_1.join)(this.path, `gradlew${ext}`));
|
|
36
36
|
if (wrapperExists) {
|
|
37
37
|
return `.${path_1.sep}gradlew${ext}`;
|
|
38
38
|
}
|
|
39
|
-
else if (utils_1.verbose()) {
|
|
39
|
+
else if ((0, utils_1.verbose)()) {
|
|
40
40
|
console.warn(`${chalk_1.default.yellow(`gradlew${ext} wrapper`)} not located, falling back to ${chalk_1.default.yellow(`gradle${ext}`)}`);
|
|
41
41
|
}
|
|
42
42
|
return 'gradle';
|
|
@@ -113,7 +113,7 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
113
113
|
else {
|
|
114
114
|
lines.push(pluginSpec);
|
|
115
115
|
}
|
|
116
|
-
const column = sourceUtil_1.getColumn(buildFileSource, parseResult.plugins.lbrace);
|
|
116
|
+
const column = (0, sourceUtil_1.getColumn)(buildFileSource, parseResult.plugins.lbrace);
|
|
117
117
|
const updatedSrc = [
|
|
118
118
|
buildFileSource.substring(0, parseResult.plugins.lbrace + 1),
|
|
119
119
|
lines.map((l) => whitespace.padLine(l)).join(os_1.default.EOL),
|
|
@@ -169,7 +169,7 @@ ${whitespace.padLine(mavenCentral)}
|
|
|
169
169
|
const parser = new gradleParser_1.GradleParser();
|
|
170
170
|
const parseResult = parser.parse(buildFileSource);
|
|
171
171
|
parser.checkSyntax(parseResult);
|
|
172
|
-
const whitespace = sourceUtil_1.getWhitespace(buildFileSource);
|
|
172
|
+
const whitespace = (0, sourceUtil_1.getWhitespace)(buildFileSource);
|
|
173
173
|
let { updatedSrc, offset } = await this.insertPluginSpec(buildFileSource, parseResult, whitespace);
|
|
174
174
|
({ updatedSrc, offset } = await this.insertRepository(buildFileSource, updatedSrc, offset, parseResult, whitespace));
|
|
175
175
|
updatedSrc += buildFileSource.substring(offset);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,+BAAiC;AACjC,kDAA0B;AAC1B,oEAA4C;AAE5C,uCAA8C;AAC9C,yEAAoC;AACpC,6CAAoE;AACpE,sCAAuC;AACvC,sFAA8D;AAC9D,iDAAiE;AACjE,oEAA4C;AAE5C,MAAqB,eACnB,SAAQ,gCAAsB;IAE9B,YAAY,IAAY;QACtB,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,WAAI,
|
|
1
|
+
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ class InstallerError {
|
|
|
58
58
|
properties: {
|
|
59
59
|
error: this.error.message,
|
|
60
60
|
directory: ((_e = this.project) === null || _e === void 0 ? void 0 : _e.path)
|
|
61
|
-
? await telemetryUtil_1.getDirectoryProperty(this.project.path)
|
|
61
|
+
? await (0, telemetryUtil_1.getDirectoryProperty)(this.project.path)
|
|
62
62
|
: undefined,
|
|
63
63
|
},
|
|
64
64
|
});
|
|
@@ -110,9 +110,9 @@ const _handler = async (args) => {
|
|
|
110
110
|
const { projectType, directory, verbose: isVerbose } = args;
|
|
111
111
|
const errors = [];
|
|
112
112
|
const installers = installers_1.INSTALLERS.map((constructor) => new constructor(directory));
|
|
113
|
-
utils_1.verbose(isVerbose);
|
|
113
|
+
(0, utils_1.verbose)(isVerbose);
|
|
114
114
|
try {
|
|
115
|
-
const projects = await projectConfiguration_1.getProjects(installers, directory, true, projectType);
|
|
115
|
+
const projects = await (0, projectConfiguration_1.getProjects)(installers, directory, true, projectType);
|
|
116
116
|
for (let i = 0; i < projects.length; i++) {
|
|
117
117
|
const startTime = Date.now();
|
|
118
118
|
const endTime = () => (Date.now() - startTime) / 1000;
|
|
@@ -155,7 +155,7 @@ const _handler = async (args) => {
|
|
|
155
155
|
errors.forEach((error) => {
|
|
156
156
|
var _a;
|
|
157
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)}] `)
|
|
158
|
+
? (0, utils_1.prefixLines)(error.message, `[${chalk_1.default.red((_a = error.project) === null || _a === void 0 ? void 0 : _a.name)}] `)
|
|
159
159
|
: error.message);
|
|
160
160
|
});
|
|
161
161
|
}
|
|
@@ -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;AAO7C,MAAM,cAAc;IAIlB,YACE,KAAc,EACL,QAAgB,EAChB,OAA8B;QAD9B,aAAQ,GAAR,QAAQ,CAAQ;QAChB,YAAO,GAAP,OAAO,CAAuB;QAEvC,IAAI,CAAC,KAAK,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QACvE,IAAI,CAAC,GAAG,GAAG,0BAAU,CAAC,aAAa,EAAE,CAAC;IACxC,CAAC;IAED,IAAI,OAAO;QACT,IACE,IAAI,CAAC,KAAK,YAAY,wBAAe;YACrC,IAAI,CAAC,KAAK,YAAY,0BAAiB,EACvC;YACA,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;SAC3B;aAAM,IAAI,IAAI,CAAC,KAAK,YAAY,KAAK,EAAE;YACtC,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SAC/C;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAED,KAAK,CAAC,MAAM;;QACV,yBAAE,CAAC,KAAK,EAAE,CAAC;QAEX,MAAM,mBAAmB,GAAG,MAAA,IAAI,CAAC,OAAO,0CAAE,mBAAmB,CAC1D,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EACjB,IAAI,CAAC,IAAI,CAAC,CAAC;QAEd,IAAI,IAAI,CAAC,KAAK,YAAY,mBAAU,EAAE;YACpC,mBAAS,CAAC,SAAS,CAAC;gBAClB,IAAI,EAAE,qBAAqB;gBAC3B,UAAU,EAAE;oBACV,SAAS,EAAE,MAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,iBAAiB,0CAAE,IAAI;oBAChD,oBAAoB,EAAE,mBAAmB;oBACzC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oBAC1B,IAAI,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI;iBACzB;gBACD,OAAO,EAAE;oBACP,QAAQ,EAAE,IAAI,CAAC,QAAQ;iBACxB;aACF,CAAC,CAAC;YAEH,yBAAE,CAAC,KAAK,CAAC,GAAG,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;YAChE,OAAO,IAAI,CAAC;SACb;aAAM,IAAI,IAAI,CAAC,KAAK,YAAY,yBAAgB,EAAE;YACjD,mBAAS,CAAC,SAAS,CAAC;gBAClB,IAAI,EAAE,4BAA4B;gBAClC,UAAU,EAAE;oBACV,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO;oBACzB,SAAS,EAAE,CAAA,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI;wBAC3B,CAAC,CAAC,MAAM,oCAAoB,
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ const commandUtil_1 = require("./commandUtil");
|
|
|
12
12
|
const jetBrainsSupport_1 = require("./jetBrainsSupport");
|
|
13
13
|
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
14
14
|
function addJetBrainsEnv() {
|
|
15
|
-
const jbHome = jetBrainsSupport_1.findIntelliJHome();
|
|
15
|
+
const jbHome = (0, jetBrainsSupport_1.findIntelliJHome)();
|
|
16
16
|
if (!jbHome) {
|
|
17
17
|
return;
|
|
18
18
|
}
|
|
@@ -44,7 +44,7 @@ class JavaBuildToolInstaller extends agentInstaller_1.default {
|
|
|
44
44
|
async agentJar() {
|
|
45
45
|
if (!this._agentJar) {
|
|
46
46
|
const cmd = await this.printJarPathCommand();
|
|
47
|
-
const { stdout } = await commandRunner_1.run(cmd);
|
|
47
|
+
const { stdout } = await (0, commandRunner_1.run)(cmd);
|
|
48
48
|
this._agentJar = stdout
|
|
49
49
|
.split('\n')
|
|
50
50
|
.filter((l) => l.match(/^com\.appland:appmap-agent\.jar.path/))[0]
|
|
@@ -55,7 +55,7 @@ class JavaBuildToolInstaller extends agentInstaller_1.default {
|
|
|
55
55
|
async environment() {
|
|
56
56
|
// JDK version is returned as a string similar to:
|
|
57
57
|
// javac 1.8.0_212-internal (build 1.8.0_212-internal+11)
|
|
58
|
-
const version = await commandUtil_1.getOutput('javac', ['-version'], this.path);
|
|
58
|
+
const version = await (0, commandUtil_1.getOutput)('javac', ['-version'], this.path);
|
|
59
59
|
return {
|
|
60
60
|
JAVA_HOME: process.env['JAVA_HOME'] || chalk_1.default.yellow('Unspecified'),
|
|
61
61
|
'JDK Version': version.ok
|
|
@@ -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;AACtD,sEAA8C;AAE9C,SAAgB,eAAe;IAC7B,MAAM,MAAM,GAAG,mCAAgB,
|
|
1
|
+
{"version":3,"file":"javaBuildToolInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaBuildToolInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,7 +20,7 @@ class JavaScriptInstaller extends agentInstaller_1.default {
|
|
|
20
20
|
return 'https://appland.com/docs/reference/appmap-agent-js';
|
|
21
21
|
}
|
|
22
22
|
async environment() {
|
|
23
|
-
const version = await commandUtil_1.getOutput('node', ['--version'], this.path);
|
|
23
|
+
const version = await (0, commandUtil_1.getOutput)('node', ['--version'], this.path);
|
|
24
24
|
return {
|
|
25
25
|
'Node version': version.ok
|
|
26
26
|
? version.output.split(/\s/)[1]
|
|
@@ -42,14 +42,14 @@ class NpmInstaller extends JavaScriptInstaller {
|
|
|
42
42
|
return 'package-lock.json';
|
|
43
43
|
}
|
|
44
44
|
get buildFilePath() {
|
|
45
|
-
return path_1.join(this.path, this.buildFile);
|
|
45
|
+
return (0, path_1.join)(this.path, this.buildFile);
|
|
46
46
|
}
|
|
47
47
|
async available() {
|
|
48
|
-
return await utils_1.exists(this.buildFilePath);
|
|
48
|
+
return await (0, utils_1.exists)(this.buildFilePath);
|
|
49
49
|
}
|
|
50
50
|
async installAgent() {
|
|
51
51
|
const cmd = new commandStruct_1.default('npm', ['install', '--saveDev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
52
|
-
await commandRunner_1.run(cmd);
|
|
52
|
+
await (0, commandRunner_1.run)(cmd);
|
|
53
53
|
}
|
|
54
54
|
async verifyCommand() {
|
|
55
55
|
return undefined;
|
|
@@ -64,14 +64,14 @@ class YarnInstaller extends JavaScriptInstaller {
|
|
|
64
64
|
return 'yarn.lock';
|
|
65
65
|
}
|
|
66
66
|
get buildFilePath() {
|
|
67
|
-
return path_1.join(this.path, this.buildFile);
|
|
67
|
+
return (0, path_1.join)(this.path, this.buildFile);
|
|
68
68
|
}
|
|
69
69
|
async available() {
|
|
70
|
-
return await utils_1.exists(this.buildFilePath);
|
|
70
|
+
return await (0, utils_1.exists)(this.buildFilePath);
|
|
71
71
|
}
|
|
72
72
|
async installAgent() {
|
|
73
73
|
const cmd = new commandStruct_1.default('yarn', ['add', '--dev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
74
|
-
await commandRunner_1.run(cmd);
|
|
74
|
+
await (0, commandRunner_1.run)(cmd);
|
|
75
75
|
}
|
|
76
76
|
async verifyCommand() {
|
|
77
77
|
return undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAqC;AACrC,+CAA0C;AAC1C,+BAA4B;AAC5B,mDAAsC;AACtC,sEAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAE5C,MAAM,aAAa,GAAG,iCAAiC,CAAC;AAExD,MAAe,mBAAoB,SAAQ,wBAAc;IACvD,YAAY,IAAY,EAAE,IAAY;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,oDAAoD,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,OAAO,GAAG,MAAM,uBAAS,
|
|
1
|
+
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,uCAAqC;AACrC,+CAA0C;AAC1C,+BAA4B;AAC5B,mDAAsC;AACtC,sEAA8C;AAC9C,kDAA0B;AAC1B,oEAA4C;AAE5C,MAAM,aAAa,GAAG,iCAAiC,CAAC;AAExD,MAAe,mBAAoB,SAAQ,wBAAc;IACvD,YAAY,IAAY,EAAE,IAAY;QACpC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,oDAAoD,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,OAAO,GAAG,MAAM,IAAA,uBAAS,EAAC,MAAM,EAAE,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAElE,OAAO;YACL,cAAc,EAAE,OAAO,CAAC,EAAE;gBACxB,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC;SAC9B,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,WAAW;QACf,OAAO,IAAI,uBAAa,CACtB,KAAK,EACL,CAAC,iBAAiB,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,EACtC,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,OAAO,IAAI,uBAAa,CACtB,KAAK,EACL,CAAC,iBAAiB,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,EACxC,IAAI,CAAC,IAAI,CACV,CAAC;IACJ,CAAC;CACF;AAED,MAAa,YACX,SAAQ,mBAAmB;IAE3B,YAAY,IAAY;QACtB,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACrB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,mBAAmB,CAAC;IAC7B,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,GAAG,GAAG,IAAI,uBAAa,CAC3B,KAAK,EACL,CAAC,SAAS,EAAE,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAa,CAAC,EAC3E,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAhCD,oCAgCC;AAED,MAAa,aACX,SAAQ,mBAAmB;IAE3B,YAAY,IAAY;QACtB,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IACtB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,WAAW,CAAC;IACrB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,GAAG,GAAG,IAAI,uBAAa,CAC3B,MAAM,EACN,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,aAAa,CAAC,EACnE,IAAI,CAAC,IAAI,CACV,CAAC;QAEF,MAAM,IAAA,mBAAG,EAAC,GAAG,CAAC,CAAC;IACjB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAhCD,sCAgCC"}
|
|
@@ -21,18 +21,18 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
21
21
|
return 'pom.xml';
|
|
22
22
|
}
|
|
23
23
|
get buildFilePath() {
|
|
24
|
-
return path_1.join(this.path, this.buildFile);
|
|
24
|
+
return (0, path_1.join)(this.path, this.buildFile);
|
|
25
25
|
}
|
|
26
26
|
async available() {
|
|
27
|
-
return await utils_1.exists(this.buildFilePath);
|
|
27
|
+
return await (0, utils_1.exists)(this.buildFilePath);
|
|
28
28
|
}
|
|
29
29
|
runCommand() {
|
|
30
30
|
const ext = os_1.default.platform() === 'win32' ? '.cmd' : '';
|
|
31
|
-
const wrapperExists = fs_1.existsSync(path_1.join(this.path, `mvnw${ext}`));
|
|
31
|
+
const wrapperExists = (0, fs_1.existsSync)((0, path_1.join)(this.path, `mvnw${ext}`));
|
|
32
32
|
if (wrapperExists) {
|
|
33
33
|
return `.${path_1.sep}mvnw${ext}`;
|
|
34
34
|
}
|
|
35
|
-
else if (utils_1.verbose()) {
|
|
35
|
+
else if ((0, utils_1.verbose)()) {
|
|
36
36
|
console.warn(`${chalk_1.default.yellow(`mvnw${ext} wrapper`)} not found, falling back to ${chalk_1.default.yellow(`mvn${ext}`)}`);
|
|
37
37
|
}
|
|
38
38
|
return `mvn${ext}`;
|
|
@@ -112,7 +112,7 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
112
112
|
}
|
|
113
113
|
pluginsSection.appendChild(doc.createTextNode(os_1.default.EOL));
|
|
114
114
|
}
|
|
115
|
-
const serialized = w3c_xmlserializer_1.default(doc.getRootNode());
|
|
115
|
+
const serialized = (0, w3c_xmlserializer_1.default)(doc.getRootNode());
|
|
116
116
|
encodedFile.write(serialized);
|
|
117
117
|
}
|
|
118
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,7 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
53
53
|
const result = await userInteraction_1.default.prompt({
|
|
54
54
|
type: 'list',
|
|
55
55
|
name: key,
|
|
56
|
-
message: `Multiple project types were found in ${chalk_1.default.blue(path_1.resolve(project.path))}. Select one to continue.`,
|
|
56
|
+
message: `Multiple project types were found in ${chalk_1.default.blue((0, path_1.resolve)(project.path))}. Select one to continue.`,
|
|
57
57
|
choices: project.availableInstallers.map((i) => i.name),
|
|
58
58
|
});
|
|
59
59
|
const installerName = result[key];
|
|
@@ -81,7 +81,7 @@ async function getSubprojects(dir, rootHasInstaller) {
|
|
|
81
81
|
if (!ent.isDirectory()) {
|
|
82
82
|
return null;
|
|
83
83
|
}
|
|
84
|
-
const subProjectPath = path_1.join(dir, ent.name);
|
|
84
|
+
const subProjectPath = (0, path_1.join)(dir, ent.name);
|
|
85
85
|
try {
|
|
86
86
|
await fs_1.promises.access(subProjectPath, fs_1.constants.R_OK);
|
|
87
87
|
}
|
|
@@ -89,7 +89,7 @@ async function getSubprojects(dir, rootHasInstaller) {
|
|
|
89
89
|
// This directory is not readable. Ignore it.
|
|
90
90
|
return null;
|
|
91
91
|
}
|
|
92
|
-
const installers = await installers_1.default(subProjectPath);
|
|
92
|
+
const installers = await (0, installers_1.default)(subProjectPath);
|
|
93
93
|
if (!installers.length) {
|
|
94
94
|
return null;
|
|
95
95
|
}
|
|
@@ -127,7 +127,7 @@ async function getSubprojects(dir, rootHasInstaller) {
|
|
|
127
127
|
}
|
|
128
128
|
async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller) {
|
|
129
129
|
let projectConfigurations = [];
|
|
130
|
-
const availableInstallers = await installers_1.default(dir);
|
|
130
|
+
const availableInstallers = await (0, installers_1.default)(dir);
|
|
131
131
|
const rootHasInstaller = !!availableInstallers.length;
|
|
132
132
|
if (allowMulti) {
|
|
133
133
|
const subprojects = await getSubprojects(dir, rootHasInstaller);
|
|
@@ -143,8 +143,8 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
143
143
|
if (availableInstallers.length) {
|
|
144
144
|
projectConfigurations = [
|
|
145
145
|
{
|
|
146
|
-
name: path_1.basename(dir),
|
|
147
|
-
path: path_1.resolve(dir),
|
|
146
|
+
name: (0, path_1.basename)(dir),
|
|
147
|
+
path: (0, path_1.resolve)(dir),
|
|
148
148
|
availableInstallers,
|
|
149
149
|
},
|
|
150
150
|
];
|
|
@@ -152,7 +152,7 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
152
152
|
else {
|
|
153
153
|
const longestInstallerName = Math.max(...installers.map((i) => i.name.length));
|
|
154
154
|
throw new errors_1.InvalidPathError([
|
|
155
|
-
`No supported project was found in ${chalk_1.default.red(path_1.resolve(dir))}.`,
|
|
155
|
+
`No supported project was found in ${chalk_1.default.red((0, path_1.resolve)(dir))}.`,
|
|
156
156
|
'',
|
|
157
157
|
'The installation requirements for each project type are listed below:',
|
|
158
158
|
installers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,2BAA8D;AAC9D,+BAA+C;AAC/C,sCAAyD;AACzD,yEAAoC;AAEpC,8DAAkD;AAUlD,KAAK,UAAU,yBAAyB,CACtC,QAAgC,EAChC,sBAA+B;IAE/B,wEAAwE;IACxE,IAAI,sBAAsB,EAAE;QAC1B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;YAC9B,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;YACxC,IAAI,iBAA6C,CAAC;YAElD,iBAAiB,GAAG,mBAAmB,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,KAAK,sBAAsB,CAAC,WAAW,EAAE,CACrE,CAAC;YAEF,IAAI,CAAC,iBAAiB,EAAE;gBACtB,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;oBACvC;wBACE,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,cAAc;wBACpB,MAAM,EAAE,eAAK,CAAC,MAAM,CAAC,GAAG,CAAC;wBACzB,OAAO,EAAE,GAAG,eAAK,CAAC,GAAG,CACnB,sBAAsB,CACvB,+DAA+D,eAAK,CAAC,IAAI,CACxE,IAAI,CACL,uBAAuB,mBAAmB;6BACxC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,eAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;6BAC9B,IAAI,CAAC,IAAI,CAAC,aAAa;qBAC3B;iBACF,CAAC,CAAC;gBAEH,IAAI,CAAC,YAAY,EAAE;oBACjB,MAAM,IAAI,mBAAU,CAClB;wBACE,mCAAmC,sBAAsB,iBAAiB;wBAC1E,yBAAyB,mBAAmB;6BACzC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;6BAClB,IAAI,CAAC,IAAI,CAAC,EAAE;qBAChB,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;iBACH;aACF;YAED,OAAO,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;SAC/C;KACF;IAED,+FAA+F;IAC/F,uBAAuB;IACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,EAAE,CAAC,EAAE;QACxC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE;YAC9B,IAAI,OAAO,CAAC,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE;gBAC5C,OAAO,CAAC,iBAAiB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;aAC5D;iBAAM;gBACL,MAAM,GAAG,GAAG,YAAY,CAAC,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;oBAC7B,IAAI,EAAE,MAAM;oBACZ,IAAI,EAAE,GAAG;oBACT,OAAO,EAAE,wCAAwC,eAAK,CAAC,IAAI,CACzD,cAAO,
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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"}
|