@appland/appmap 3.45.0 → 3.46.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/built/appmap.html +1 -1
- package/built/cmds/agentInstaller/agentProcedure.js +20 -13
- package/built/cmds/agentInstaller/agentProcedure.js.map +1 -1
- package/built/cmds/record/action/guessTestCommands.js +2 -2
- package/built/cmds/record/action/guessTestCommands.js.map +1 -1
- package/built/main.js.map +1 -1
- package/package.json +3 -3
|
@@ -73,19 +73,26 @@ class AgentProcedure {
|
|
|
73
73
|
}
|
|
74
74
|
userInteraction_1.default.status = 'Validating the AppMap agent...';
|
|
75
75
|
let { stdout } = await this.validateAgent(validateCmd);
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
.
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
76
|
+
try {
|
|
77
|
+
const validationResult = JSON.parse(stdout);
|
|
78
|
+
const errors = Array.isArray(validationResult) ? validationResult : validationResult.errors;
|
|
79
|
+
// if there were no errors then there's no "errors" key
|
|
80
|
+
if (errors && errors.length > 0) {
|
|
81
|
+
throw new errors_1.ValidationError(errors
|
|
82
|
+
.map((e) => {
|
|
83
|
+
let msg = e.message;
|
|
84
|
+
if (e.detailed_message) {
|
|
85
|
+
msg += `, ${e.detailed_message}`;
|
|
86
|
+
}
|
|
87
|
+
return msg;
|
|
88
|
+
})
|
|
89
|
+
.join('\n'));
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
catch (e) {
|
|
93
|
+
userInteraction_1.default.error('Output from validateAgent was: ' + stdout);
|
|
94
|
+
userInteraction_1.default.error('Failed to validate the installation.');
|
|
95
|
+
throw e;
|
|
89
96
|
}
|
|
90
97
|
const schema = JSON.parse(stdout)['schema'];
|
|
91
98
|
// If appmap-agent-validate returned a schema, and we're using an
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"agentProcedure.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/agentProcedure.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,14 +27,14 @@ const TestCommands = [
|
|
|
27
27
|
{
|
|
28
28
|
paths: ['package.json', 'node_modules/mocha'],
|
|
29
29
|
command: {
|
|
30
|
-
command: 'npx appmap-agent-js --recorder=mocha -- npx mocha',
|
|
30
|
+
command: 'npx @appland/appmap-agent-js --recorder=mocha -- npx mocha',
|
|
31
31
|
env: {},
|
|
32
32
|
},
|
|
33
33
|
},
|
|
34
34
|
{
|
|
35
35
|
paths: ['package.json', 'node_modules'],
|
|
36
36
|
command: {
|
|
37
|
-
command: 'npx appmap-agent-js --recorder=process -- npm run test',
|
|
37
|
+
command: 'npx @appland/appmap-agent-js --recorder=process -- npm run test',
|
|
38
38
|
env: {},
|
|
39
39
|
},
|
|
40
40
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"guessTestCommands.js","sourceRoot":"","sources":["../../../../src/cmds/record/action/guessTestCommands.ts"],"names":[],"mappings":";;AACA,0CAAiD;AAGjD,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;AAO3D,MAAM,YAAY,GAAuB;IACvC;QACE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,mBAAmB;SAC7B;KACF;IACD;QACE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,wBAAwB;SAClC;KACF;IACD;QACE,KAAK,EAAE,CAAC,SAAS,CAAC;QAClB,OAAO,EAAE;YACP,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,EAAE;SACR;KACF;IACD;QACE,KAAK,EAAE,CAAC,cAAc,EAAE,oBAAoB,CAAC;QAC7C,OAAO,EAAE;YACP,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"guessTestCommands.js","sourceRoot":"","sources":["../../../../src/cmds/record/action/guessTestCommands.ts"],"names":[],"mappings":";;AACA,0CAAiD;AAGjD,MAAM,OAAO,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC;AAO3D,MAAM,YAAY,GAAuB;IACvC;QACE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,mBAAmB;SAC7B;KACF;IACD;QACE,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;QAC1B,OAAO,EAAE;YACP,GAAG,EAAE,OAAO;YACZ,OAAO,EAAE,wBAAwB;SAClC;KACF;IACD;QACE,KAAK,EAAE,CAAC,SAAS,CAAC;QAClB,OAAO,EAAE;YACP,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,EAAE;SACR;KACF;IACD;QACE,KAAK,EAAE,CAAC,cAAc,EAAE,oBAAoB,CAAC;QAC7C,OAAO,EAAE;YACP,OAAO,EAAE,4DAA4D;YACrE,GAAG,EAAE,EAAE;SACR;KACF;IACD;QACE,KAAK,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC;QACvC,OAAO,EAAE;YACP,OAAO,EAAE,iEAAiE;YAC1E,GAAG,EAAE,EAAE;SACR;KACF;CACF,CAAC;AAEa,KAAK,UAAU,iBAAiB;IAC7C,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,GAAG,CAClC,YAAY,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAC3D,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAA,cAAM,EAAC,IAAI,CAAC,CAAC,CAAC,CACrD,CACF,CAAC;IACF,OAAO,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CACxE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CACzB,CAAC;AACJ,CAAC;AATD,oCASC"}
|