@appland/appmap 3.36.0 → 3.37.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 +14 -0
- package/built/cmds/agentInstaller/agentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/agentInstallerProcedure.js +1 -0
- package/built/cmds/agentInstaller/agentInstallerProcedure.js.map +1 -1
- package/built/cmds/agentInstaller/gradleInstaller.js +9 -3
- package/built/cmds/agentInstaller/gradleInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/install-agent.js +21 -5
- package/built/cmds/agentInstaller/install-agent.js.map +1 -1
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +24 -1
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/mavenInstaller.js +2 -0
- package/built/cmds/agentInstaller/mavenInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/pythonAgentInstaller.js +19 -0
- package/built/cmds/agentInstaller/pythonAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/rubyAgentInstaller.js +10 -0
- package/built/cmds/agentInstaller/rubyAgentInstaller.js.map +1 -1
- package/built/cmds/errors.js +4 -1
- package/built/cmds/errors.js.map +1 -1
- package/built/cmds/record/state/agentNotAvailable.js +2 -2
- package/built/cmds/record/state/agentNotAvailable.js.map +1 -1
- package/built/lib/ticket/openTicket.js +5 -2
- package/built/lib/ticket/openTicket.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,17 @@
|
|
|
1
|
+
# [@appland/appmap-v3.37.1](https://github.com/applandinc/appmap-js/compare/@appland/appmap-v3.37.0...@appland/appmap-v3.37.1) (2022-09-16)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Use better language when opening a ticket ([1f072a7](https://github.com/applandinc/appmap-js/commit/1f072a70d081f98fc94aa8f4e8baf82f830fef05))
|
|
7
|
+
|
|
8
|
+
# [@appland/appmap-v3.37.0](https://github.com/applandinc/appmap-js/compare/@appland/appmap-v3.36.0...@appland/appmap-v3.37.0) (2022-09-14)
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
### Features
|
|
12
|
+
|
|
13
|
+
* check project dependencies before adding appmap ([ee200e9](https://github.com/applandinc/appmap-js/commit/ee200e9e86e57781d0152fffc511cae6e734f4fa))
|
|
14
|
+
|
|
1
15
|
# [@appland/appmap-v3.36.0](https://github.com/applandinc/appmap-js/compare/@appland/appmap-v3.35.0...@appland/appmap-v3.36.0) (2022-09-14)
|
|
2
16
|
|
|
3
17
|
|
|
@@ -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,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;
|
|
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;CASF;AAjBD,iCAiBC"}
|
|
@@ -51,6 +51,7 @@ class AgentInstallerProcedure extends agentProcedure_1.default {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
userInteraction_1.default.status = 'Installing the AppMap agent...';
|
|
54
|
+
await this.installer.checkCurrentConfig();
|
|
54
55
|
await this.installer.installAgent();
|
|
55
56
|
await this.verifyProject();
|
|
56
57
|
const appMapYml = this.configPath;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;
|
|
1
|
+
{"version":3,"file":"agentInstallerProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentInstallerProcedure.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,4CAAoB;AACpB,kDAA0B;AAE1B,sCAAuC;AACvC,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,kBAAkB,EAAE,CAAC;QAC1C,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;YAC5D,EAAE;YACF,eAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC;YACvC,EAAE;YACF,iEAAiE;YACjE,4DAA4D;SAC7D,CAAC;QAEF,yBAAE,CAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACxC,CAAC;CACF;AA9ED,0CA8EC"}
|
|
@@ -38,7 +38,9 @@ class GradleInstaller extends javaBuildToolInstaller_1.default {
|
|
|
38
38
|
*/
|
|
39
39
|
get identifyGradleFile() {
|
|
40
40
|
const buildGradleKtsExists = fs_1.default.existsSync((0, path_1.join)(this.path, this.buildGradleKtsFileName));
|
|
41
|
-
return buildGradleKtsExists
|
|
41
|
+
return buildGradleKtsExists
|
|
42
|
+
? this.buildGradleKtsFileName
|
|
43
|
+
: this.buildGradleFileName;
|
|
42
44
|
}
|
|
43
45
|
async printJarPathCommand() {
|
|
44
46
|
return new commandStruct_1.default(await this.runCommand(), ['appmap-print-jar-path'], this.path);
|
|
@@ -133,7 +135,7 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
133
135
|
const updatedSrc = [
|
|
134
136
|
buildFileSource.substring(0, parseResult.plugins.lbrace + 1),
|
|
135
137
|
lines.map((l) => whitespace.padLine(l)).join(os_1.default.EOL),
|
|
136
|
-
'}'
|
|
138
|
+
'}',
|
|
137
139
|
].join(os_1.default.EOL);
|
|
138
140
|
const offset = parseResult.plugins.rbrace + 1;
|
|
139
141
|
return { updatedSrc, offset };
|
|
@@ -141,7 +143,9 @@ ${whitespace.padLine(pluginSpec)}
|
|
|
141
143
|
selectPluginSpec() {
|
|
142
144
|
const pluginSpecKotlinSyntax = `id("com.appland.appmap") version "1.1.0"`;
|
|
143
145
|
const pluginSpecGroovySyntax = `id 'com.appland.appmap' version '1.1.0'`;
|
|
144
|
-
return this.identifyGradleFile.endsWith('.gradle.kts')
|
|
146
|
+
return this.identifyGradleFile.endsWith('.gradle.kts')
|
|
147
|
+
? pluginSpecKotlinSyntax
|
|
148
|
+
: pluginSpecGroovySyntax;
|
|
145
149
|
}
|
|
146
150
|
/**
|
|
147
151
|
* Ensure the build file contains a buildscript block with mavenCentral in its
|
|
@@ -184,6 +188,8 @@ ${whitespace.padLine(mavenCentral)}
|
|
|
184
188
|
offset = parseResult.repositories.rbrace - 1;
|
|
185
189
|
return { updatedSrc, offset };
|
|
186
190
|
}
|
|
191
|
+
// TODO: validate the user's project before adding AppMap
|
|
192
|
+
async checkCurrentConfig() { }
|
|
187
193
|
async installAgent() {
|
|
188
194
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
189
195
|
const buildFileSource = encodedFile.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,4CAAoB;AACpB,+BAAiC;AACjC,kDAA0B;AAC1B,oEAA4C;AAC5C,uCAA8C;AAC9C,yEAAoC;AACpC,6CAAoE;AACpE,sCAAuC;AACvC,sFAA8D;AAC9D,iDAAiE;AACjE,oEAA4C;AAE5C,MAAqB,
|
|
1
|
+
{"version":3,"file":"gradleInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/gradleInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,7 +34,7 @@ class InstallerError {
|
|
|
34
34
|
return String(this.error);
|
|
35
35
|
}
|
|
36
36
|
async handle() {
|
|
37
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
37
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
|
|
38
38
|
userInteraction_1.default.error();
|
|
39
39
|
const installersAvailable = (_a = this.project) === null || _a === void 0 ? void 0 : _a.availableInstallers.map((i) => i.name).join(', ');
|
|
40
40
|
if (this.error instanceof errors_1.AbortError) {
|
|
@@ -66,6 +66,22 @@ class InstallerError {
|
|
|
66
66
|
userInteraction_1.default.error(`${chalk_1.default.red('!')} ${this.error.message}`);
|
|
67
67
|
return true;
|
|
68
68
|
}
|
|
69
|
+
else if (this.error instanceof errors_1.UserConfigError) {
|
|
70
|
+
userInteraction_1.default.error(`${chalk_1.default.red('!')} Error in project configuration:\n\n${(_f = this.error) === null || _f === void 0 ? void 0 : _f.message}`);
|
|
71
|
+
telemetry_1.default.sendEvent({
|
|
72
|
+
name: 'install-agent:user-config-error',
|
|
73
|
+
properties: {
|
|
74
|
+
installer: (_h = (_g = this.project) === null || _g === void 0 ? void 0 : _g.selectedInstaller) === null || _h === void 0 ? void 0 : _h.name,
|
|
75
|
+
installers_available: installersAvailable,
|
|
76
|
+
error: (_j = this.error) === null || _j === void 0 ? void 0 : _j.message,
|
|
77
|
+
log: this.log,
|
|
78
|
+
directory: ((_k = this.project) === null || _k === void 0 ? void 0 : _k.path)
|
|
79
|
+
? await (0, telemetryUtil_1.getDirectoryProperty)(this.project.path)
|
|
80
|
+
: undefined,
|
|
81
|
+
},
|
|
82
|
+
});
|
|
83
|
+
return true;
|
|
84
|
+
}
|
|
69
85
|
else {
|
|
70
86
|
let exception;
|
|
71
87
|
if (this.error instanceof Error) {
|
|
@@ -75,7 +91,7 @@ class InstallerError {
|
|
|
75
91
|
exception = String(this.error);
|
|
76
92
|
}
|
|
77
93
|
let directoryContents;
|
|
78
|
-
if ((
|
|
94
|
+
if ((_l = this.project) === null || _l === void 0 ? void 0 : _l.path) {
|
|
79
95
|
try {
|
|
80
96
|
directoryContents = (await fs_1.promises.readdir(this.project.path)).join('\n');
|
|
81
97
|
}
|
|
@@ -91,13 +107,13 @@ class InstallerError {
|
|
|
91
107
|
telemetry_1.default.sendEvent({
|
|
92
108
|
name: 'install-agent:failure',
|
|
93
109
|
properties: {
|
|
94
|
-
installer: (
|
|
110
|
+
installer: (_o = (_m = this.project) === null || _m === void 0 ? void 0 : _m.selectedInstaller) === null || _o === void 0 ? void 0 : _o.name,
|
|
95
111
|
installers_available: installersAvailable,
|
|
96
|
-
exception_type: (
|
|
112
|
+
exception_type: (_q = (_p = this.error) === null || _p === void 0 ? void 0 : _p.constructor) === null || _q === void 0 ? void 0 : _q.name,
|
|
97
113
|
log: this.log,
|
|
98
114
|
exception,
|
|
99
115
|
directory: directoryContents,
|
|
100
|
-
path: (
|
|
116
|
+
path: (_r = this.project) === null || _r === void 0 ? void 0 : _r.path,
|
|
101
117
|
},
|
|
102
118
|
metrics: {
|
|
103
119
|
duration: this.duration,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":";;;;;AAAA,kDAA0B;AAC1B,2BAAoC;AACpC,
|
|
1
|
+
{"version":3,"file":"install-agent.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/install-agent.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,7 @@ const commandRunner_1 = require("./commandRunner");
|
|
|
11
11
|
const agentInstaller_1 = __importDefault(require("./agentInstaller"));
|
|
12
12
|
const chalk_1 = __importDefault(require("chalk"));
|
|
13
13
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
14
|
+
const errors_1 = require("../errors");
|
|
14
15
|
const AGENT_PACKAGE = '@appland/appmap-agent-js@latest';
|
|
15
16
|
class JavaScriptInstaller extends agentInstaller_1.default {
|
|
16
17
|
constructor(name, path) {
|
|
@@ -47,8 +48,21 @@ class NpmInstaller extends JavaScriptInstaller {
|
|
|
47
48
|
async available() {
|
|
48
49
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
49
50
|
}
|
|
51
|
+
async checkCurrentConfig() {
|
|
52
|
+
const cmd = new commandStruct_1.default('npm', ['install', '--dry-run'], this.path);
|
|
53
|
+
try {
|
|
54
|
+
await (0, commandRunner_1.run)(cmd);
|
|
55
|
+
}
|
|
56
|
+
catch (err) {
|
|
57
|
+
throw new errors_1.UserConfigError(err);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
50
60
|
async installAgent() {
|
|
51
|
-
const cmd = new commandStruct_1.default('npm', [
|
|
61
|
+
const cmd = new commandStruct_1.default('npm', [
|
|
62
|
+
'install',
|
|
63
|
+
'--saveDev',
|
|
64
|
+
process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE,
|
|
65
|
+
], this.path);
|
|
52
66
|
await (0, commandRunner_1.run)(cmd);
|
|
53
67
|
}
|
|
54
68
|
async verifyCommand() {
|
|
@@ -69,6 +83,15 @@ class YarnInstaller extends JavaScriptInstaller {
|
|
|
69
83
|
async available() {
|
|
70
84
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
71
85
|
}
|
|
86
|
+
async checkCurrentConfig() {
|
|
87
|
+
const cmd = new commandStruct_1.default('yarn', ['install', '--immutable'], this.path);
|
|
88
|
+
try {
|
|
89
|
+
await (0, commandRunner_1.run)(cmd);
|
|
90
|
+
}
|
|
91
|
+
catch (err) {
|
|
92
|
+
throw new errors_1.UserConfigError(err);
|
|
93
|
+
}
|
|
94
|
+
}
|
|
72
95
|
async installAgent() {
|
|
73
96
|
const cmd = new commandStruct_1.default('yarn', ['add', '--dev', process.env.APPMAP_AGENT_PACKAGE || AGENT_PACKAGE], this.path);
|
|
74
97
|
await (0, commandRunner_1.run)(cmd);
|
|
@@ -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,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,
|
|
1
|
+
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,8 @@ class MavenInstaller extends javaBuildToolInstaller_1.default {
|
|
|
43
43
|
async printJarPathCommand() {
|
|
44
44
|
return new commandStruct_1.default(this.runCommand(), ['appmap:print-jar-path'], this.path);
|
|
45
45
|
}
|
|
46
|
+
// TODO: validate the user's project before adding AppMap
|
|
47
|
+
async checkCurrentConfig() { }
|
|
46
48
|
async installAgent() {
|
|
47
49
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
48
50
|
const buildFileSource = encodedFile.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mavenInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/mavenInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const chalk_1 = __importDefault(require("chalk"));
|
|
|
15
15
|
const commandRunner_1 = require("./commandRunner");
|
|
16
16
|
const commandUtil_1 = require("./commandUtil");
|
|
17
17
|
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
18
|
+
const errors_1 = require("../errors");
|
|
18
19
|
const REGEX_PKG_DEPENDENCY = /^\s*appmap\s*[=>~]+=.*$/m;
|
|
19
20
|
// include .dev0 so pip will allow prereleases
|
|
20
21
|
const PKG_DEPENDENCY = 'appmap>=1.1.0.dev0';
|
|
@@ -56,6 +57,15 @@ class PoetryInstaller extends PythonInstaller {
|
|
|
56
57
|
async initCommand() {
|
|
57
58
|
return new commandStruct_1.default('poetry', ['run', 'appmap-agent-init'], this.path);
|
|
58
59
|
}
|
|
60
|
+
async checkCurrentConfig() {
|
|
61
|
+
const cmd = new commandStruct_1.default('poetry', ['install', '--dry-run'], this.path);
|
|
62
|
+
try {
|
|
63
|
+
await (0, commandRunner_1.run)(cmd);
|
|
64
|
+
}
|
|
65
|
+
catch (err) {
|
|
66
|
+
throw new errors_1.UserConfigError(err);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
59
69
|
async installAgent() {
|
|
60
70
|
const cmd = new commandStruct_1.default('poetry', ['add', '--dev', '--allow-prereleases', 'appmap'], this.path);
|
|
61
71
|
await (0, commandRunner_1.run)(cmd);
|
|
@@ -84,6 +94,15 @@ class PipInstaller extends PythonInstaller {
|
|
|
84
94
|
async available() {
|
|
85
95
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
86
96
|
}
|
|
97
|
+
async checkCurrentConfig() {
|
|
98
|
+
const cmd = new commandStruct_1.default('pip', ['install', '-r', this.buildFile, '--dry-run'], this.path);
|
|
99
|
+
try {
|
|
100
|
+
await (0, commandRunner_1.run)(cmd);
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
throw new errors_1.UserConfigError(err);
|
|
104
|
+
}
|
|
105
|
+
}
|
|
87
106
|
async installAgent() {
|
|
88
107
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
89
108
|
let requirements = encodedFile.toString();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":";;;;;;AAAA,2CAA2C;AAC3C,yCAAyC;AACzC,4CAAoB;AACpB,+BAA4B;AAC5B,sEAA8C;AAC9C,oEAA4C;AAC5C,uCAAqC;AACrC,kDAA0B;AAC1B,mDAAsC;AACtC,+CAA0C;AAC1C,oEAA4C;AAE5C,MAAM,oBAAoB,GAAG,0BAA0B,CAAC;AACxD,8CAA8C;AAC9C,MAAM,cAAc,GAAG,oBAAoB,CAAC;AAE5C,MAAe,eAAgB,SAAQ,wBAAc;IACnD,YAAY,
|
|
1
|
+
{"version":3,"file":"pythonAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/pythonAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,6 +15,7 @@ const commandRunner_1 = require("./commandRunner");
|
|
|
15
15
|
const commandUtil_1 = require("./commandUtil");
|
|
16
16
|
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
17
17
|
const encodedFile_1 = __importDefault(require("../../encodedFile"));
|
|
18
|
+
const errors_1 = require("../errors");
|
|
18
19
|
const REGEX_GEM_DECLARATION = /^(?:gem|group|require)\s/m;
|
|
19
20
|
const REGEX_GEM_DEPENDENCY = /^\s*gem\s+['|"]appmap['|"].*$/m;
|
|
20
21
|
const GEM_DEPENDENCY = "gem 'appmap', :groups => [:development, :test]";
|
|
@@ -34,6 +35,15 @@ class BundleInstaller extends agentInstaller_1.default {
|
|
|
34
35
|
async available() {
|
|
35
36
|
return await (0, utils_1.exists)(this.buildFilePath);
|
|
36
37
|
}
|
|
38
|
+
async checkCurrentConfig() {
|
|
39
|
+
const cmd = new commandStruct_1.default('bundle', ['check', '--dry-run'], this.path);
|
|
40
|
+
try {
|
|
41
|
+
await (0, commandRunner_1.run)(cmd);
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
throw new errors_1.UserConfigError(err);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
37
47
|
async installAgent() {
|
|
38
48
|
const encodedFile = new encodedFile_1.default(this.buildFilePath);
|
|
39
49
|
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;AAE5C,MAAM,qBAAqB,GAAG,2BAA2B,CAAC;AAE1D,MAAM,oBAAoB,GAAG,gCAAgC,CAAC;AAC9D,MAAM,cAAc,GAAG,gDAAgD,CAAC;AAExE,MAAa,eAAgB,SAAQ,wBAAc;IACjD,YAAY,IAAY;QACtB,KAAK,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACzB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,gDAAgD,CAAC;IAC1D,CAAC;IAED,KAAK,CAAC,SAAS;QACb,OAAO,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,YAAY;QAChB,MAAM,WAAW,GAAgB,IAAI,qBAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACrE,IAAI,OAAO,GAAG,WAAW,CAAC,QAAQ,EAAE,CAAC;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QAEpD,IAAI,KAAK,KAAK,CAAC,CAAC,EAAE;YAChB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,CAAC;YAE9D,IAAI,SAAS,EAAE;gBACb,gDAAgD;gBAChD,OAAO,GAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"rubyAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/rubyAgentInstaller.ts"],"names":[],"mappings":"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"}
|
package/built/cmds/errors.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.ChildProcessError = exports.HttpError = exports.ValidationError = exports.AbortError = exports.InvalidPathError = void 0;
|
|
6
|
+
exports.ChildProcessError = exports.HttpError = exports.UserConfigError = exports.ValidationError = exports.AbortError = exports.InvalidPathError = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
class InvalidPathError extends Error {
|
|
@@ -20,6 +20,9 @@ exports.AbortError = AbortError;
|
|
|
20
20
|
class ValidationError extends Error {
|
|
21
21
|
}
|
|
22
22
|
exports.ValidationError = ValidationError;
|
|
23
|
+
class UserConfigError extends Error {
|
|
24
|
+
}
|
|
25
|
+
exports.UserConfigError = UserConfigError;
|
|
23
26
|
class HttpError extends Error {
|
|
24
27
|
constructor(message, response) {
|
|
25
28
|
super(message);
|
package/built/cmds/errors.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/cmds/errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oCAAuC;AAEvC,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAqB,OAAe,EAAW,IAAa;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QADI,YAAO,GAAP,OAAO,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAS;IAE5D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAS7C,MAAa,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAe,EAAW,QAA4B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADqB,aAAQ,GAAR,QAAQ,CAAoB;IAElE,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YACW,OAAe,EACf,MAAc,EACd,IAAoB;QAE7B,KAAK,CACH;YACE,gDAAgD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;YACtE,IAAI,IAAI,gCAAgC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YAC3D,MAAM,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;QAZO,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAgB;IAW/B,CAAC;CACF;AAhBD,8CAgBC"}
|
|
1
|
+
{"version":3,"file":"errors.js","sourceRoot":"","sources":["../../src/cmds/errors.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,oCAAuC;AAEvC,MAAa,gBAAiB,SAAQ,KAAK;IACzC,YAAqB,OAAe,EAAW,IAAa;QAC1D,KAAK,CAAC,OAAO,CAAC,CAAC;QADI,YAAO,GAAP,OAAO,CAAQ;QAAW,SAAI,GAAJ,IAAI,CAAS;IAE5D,CAAC;CACF;AAJD,4CAIC;AAED,MAAa,UAAW,SAAQ,KAAK;CAAG;AAAxC,gCAAwC;AACxC,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAC7C,MAAa,eAAgB,SAAQ,KAAK;CAAG;AAA7C,0CAA6C;AAS7C,MAAa,SAAU,SAAQ,KAAK;IAClC,YAAY,OAAe,EAAW,QAA4B;QAChE,KAAK,CAAC,OAAO,CAAC,CAAC;QADqB,aAAQ,GAAR,QAAQ,CAAoB;IAElE,CAAC;CACF;AAJD,8BAIC;AAED,MAAa,iBAAkB,SAAQ,KAAK;IAC1C,YACW,OAAe,EACf,MAAc,EACd,IAAoB;QAE7B,KAAK,CACH;YACE,gDAAgD,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI;YACtE,IAAI,IAAI,gCAAgC,eAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI;YAC3D,MAAM,IAAI,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,EAAE,EAAE,eAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvD;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,EAAE,CAAC,CACZ,CAAC;QAZO,YAAO,GAAP,OAAO,CAAQ;QACf,WAAM,GAAN,MAAM,CAAQ;QACd,SAAI,GAAJ,IAAI,CAAgB;IAW/B,CAAC;CACF;AAhBD,8CAgBC"}
|
|
@@ -23,7 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
23
23
|
};
|
|
24
24
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
25
25
|
exports.NextStepChoices = void 0;
|
|
26
|
-
const openTicket_1 =
|
|
26
|
+
const openTicket_1 = __importStar(require("../../../lib/ticket/openTicket"));
|
|
27
27
|
const userInteraction_1 = __importDefault(require("../../userInteraction"));
|
|
28
28
|
const configureRemainingRequestOptions_1 = __importDefault(require("../action/configureRemainingRequestOptions"));
|
|
29
29
|
const detectProcessCharacteristics_1 = __importDefault(require("../action/detectProcessCharacteristics"));
|
|
@@ -77,7 +77,7 @@ For case (3), you should contact AppMap support for help with troubleshooting.
|
|
|
77
77
|
break;
|
|
78
78
|
case exports.NextStepChoices.SUPPORT.value:
|
|
79
79
|
const details = ((_a = recordContext.remoteError) === null || _a === void 0 ? void 0 : _a.toString()) || '';
|
|
80
|
-
await (0, openTicket_1.default)(details);
|
|
80
|
+
await (0, openTicket_1.default)(details, openTicket_1.DEFAULT_HELP_MSG, false);
|
|
81
81
|
return abort_1.default; // We're done
|
|
82
82
|
break;
|
|
83
83
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentNotAvailable.js","sourceRoot":"","sources":["../../../../src/cmds/record/state/agentNotAvailable.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"agentNotAvailable.js","sourceRoot":"","sources":["../../../../src/cmds/record/state/agentNotAvailable.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6EAA8E;AAC9E,4EAAuC;AACvC,kHAA0F;AAC1F,0GAAkF;AAClF,2HAE0D;AAG1D,oDAA4B;AAC5B,sFAA8D;AAC9D,oEAAsC;AAEzB,QAAA,eAAe,GAAG;IAC7B,SAAS,EAAE,EAAE,IAAI,EAAE,iCAAiC,EAAE,KAAK,EAAE,WAAW,EAAE;IAC1E,QAAQ,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,KAAK,EAAE,UAAU,EAAE;IAC7D,OAAO,EAAE,EAAE,IAAI,EAAE,iBAAiB,EAAE,KAAK,EAAE,SAAS,EAAE;CACvD,CAAC;AAEF,kFAAkF;AAClF,qCAAqC;AACrC,yFAAyF;AACzF,wCAAwC;AACxC,yFAAyF;AAC1E,KAAK,UAAU,iBAAiB,CAC7C,aAA4B;;IAE5B,IAAI,CAAC,CAAC,MAAM,IAAA,sCAA4B,EAAC,aAAa,CAAC,CAAC,EAAE;QACxD,IACE,CAAC,MAAM,IAAA,gDAAsC,EAAC,aAAa,CAAC,CAAC;YAC7D,4DAAmB,CAAC,WAAW;YAE/B,OAAO,gCAAsB,CAAC;KACjC;IAED,yBAAE,CAAC,QAAQ,CACT;;;;;;;;;;;;CAYH,CACE,CAAC;IAEF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;QACjC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,6BAA6B;QACtC,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,uBAAe,CAAC;KACxC,CAAC,CAAC;IAEH,QAAQ,MAAM,EAAE;QACd,KAAK,uBAAe,CAAC,SAAS,CAAC,KAAK;YAClC,MAAM,IAAA,0CAAgC,EAAC,aAAa,CAAC,CAAC;YACtD,aAAa,CAAC,WAAW,EAAE,CAAC;YAC5B,MAAM;QACR,KAAK,uBAAe,CAAC,QAAQ,CAAC,KAAK;YACjC,MAAM,yBAAE,CAAC,QAAQ,CAAC,gDAAgD,CAAC,CAAC;YACpE,MAAM;QACR,KAAK,uBAAe,CAAC,OAAO,CAAC,KAAK;YAChC,MAAM,OAAO,GAAG,CAAA,MAAA,aAAa,CAAC,WAAW,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAE5D,MAAM,IAAA,oBAAU,EAAC,OAAO,EAAE,6BAAgB,EAAE,KAAK,CAAC,CAAC;YAEnD,OAAO,eAAK,CAAC,CAAC,aAAa;YAC3B,MAAM;KACT;IAED,OAAO,uBAAO,CAAC;AACjB,CAAC;AApDD,oCAoDC"}
|
|
@@ -3,18 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.DEFAULT_HELP_MSG = void 0;
|
|
6
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
7
8
|
const userInteraction_1 = __importDefault(require("../../cmds/userInteraction"));
|
|
8
9
|
const telemetry_1 = __importDefault(require("../../telemetry"));
|
|
9
10
|
const zendesk_1 = __importDefault(require("./zendesk"));
|
|
10
|
-
|
|
11
|
+
exports.DEFAULT_HELP_MSG = ' ';
|
|
12
|
+
async function openTicket(errors, helpMsg = exports.DEFAULT_HELP_MSG, prompt = true) {
|
|
11
13
|
var _a;
|
|
12
14
|
errors = !Array.isArray(errors) ? [errors] : errors;
|
|
13
15
|
userInteraction_1.default.progress(`
|
|
14
16
|
Help is available from the AppMap support team!${helpMsg}
|
|
15
17
|
`);
|
|
16
18
|
if (await userInteraction_1.default.confirm(`Details of the error will be provided to the support team.
|
|
17
|
-
|
|
19
|
+
|
|
20
|
+
Would you like to review the details here before submitting the support ticket?`)) {
|
|
18
21
|
userInteraction_1.default.error(errors.join('\n'));
|
|
19
22
|
}
|
|
20
23
|
if (prompt) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openTicket.js","sourceRoot":"","sources":["../../../src/lib/ticket/openTicket.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"openTicket.js","sourceRoot":"","sources":["../../../src/lib/ticket/openTicket.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,iFAA4C;AAC5C,gEAAwC;AACxC,wDAA6C;AAEhC,QAAA,gBAAgB,GAAG,GAAG,CAAC;AAErB,KAAK,UAAU,UAAU,CACtC,MAAyB,EACzB,UAAkB,wBAAgB,EAClC,SAAkB,IAAI;;IAEtB,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAEpD,yBAAE,CAAC,QAAQ,CAAC;iDACmC,OAAO;CACvD,CAAC,CAAC;IAED,IACE,MAAM,yBAAE,CAAC,OAAO,CAAC;;gFAE2D,CAAC,EAC7E;QACA,yBAAE,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAC7B;IAED,IAAI,MAAM,EAAE;QACV,MAAM,OAAO,GAAG,2CAA2C,CAAC;QAC5D,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;YACrC,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,IAAI;YACb,OAAO;SACR,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,EAAE;YACf,yBAAE,CAAC,QAAQ,CACT;gBACE;;;;CAIT;aACQ,CAAC,IAAI,CAAC,IAAI,CAAC,CACb,CAAC;YAEF,mBAAS,CAAC,SAAS,CAAC;gBAClB,IAAI,EAAE,sBAAsB;aAC7B,CAAC,CAAC;YAEH,OAAO;SACR;KACF;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,yBAAE,CAAC,MAAM,CAAC;QAChC;YACE,IAAI,EAAE,OAAO;YACb,OAAO,EAAE;+DACgD;YACzD,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,IAAI,iCAAiC;SAC1E;KACF,CAAC,CAAC;IAEH,IAAI;QACF,MAAM,EAAE,GAAG,MAAM,IAAA,iBAAoB,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACrD,mBAAS,CAAC,SAAS,CAAC;YAClB,IAAI,EAAE,qBAAqB;SAC5B,CAAC,CAAC;QACH,yBAAE,CAAC,OAAO,CACR;;SAEG,EAAE;;mEAEwD,EAC7D,MAAM,CACP,CAAC;KACH;IAAC,OAAO,CAAC,EAAE;QACV,MAAM,EAAE,GAAG,CAAc,CAAC;QAC1B,MAAM,QAAQ,GAAG,EAAE,CAAC,QAAQ,CAAC;QAC7B,IAAI,SAAiB,CAAC;QACtB,IAAI,KAAK,GAAuB,SAAS,CAAC;QAC1C,IAAI,QAAQ,EAAE;YACZ,SAAS,GAAG,eACV,CAAA,MAAA,EAAE,CAAC,QAAQ,0CAAE,MAAM,MAAK,GAAG,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAC/C,EAAE,CAAC;YACH,KAAK,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;SAC7B;aAAM;YACL,SAAS,GAAG,yBAAyB,CAAC;SACvC;QACD,mBAAS,CAAC,SAAS,CAAC;YAClB,IAAI,EAAE,SAAS;YACf,UAAU,EAAE;gBACV,KAAK;aACN;SACF,CAAC,CAAC;QACH,yBAAE,CAAC,KAAK,CACN,GAAG,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC;;EAErB,eAAK,CAAC,GAAG,CAAC,GAAG,CAAC,qDAAqD,CAChE,CAAC;KACH;AACH,CAAC;AA9FD,6BA8FC"}
|