@appland/appmap 3.64.3 → 3.65.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 +18 -0
- package/built/cli.js +2 -0
- package/built/cli.js.map +1 -1
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js +17 -0
- package/built/cmds/agentInstaller/javaScriptAgentInstaller.js.map +1 -1
- package/built/cmds/agentInstaller/projectConfiguration.js +126 -28
- package/built/cmds/agentInstaller/projectConfiguration.js.map +1 -1
- package/built/cmds/upload.js +129 -0
- package/built/cmds/upload.js.map +1 -0
- package/built/lib/appNameFromConfig.js +14 -0
- package/built/lib/appNameFromConfig.js.map +1 -0
- package/built/lib/appmapDirFromConfig.js +4 -12
- package/built/lib/appmapDirFromConfig.js.map +1 -1
- package/built/lib/loadAppMapConfig.js +17 -0
- package/built/lib/loadAppMapConfig.js.map +1 -0
- package/package.json +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
# [@appland/appmap-v3.65.1](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.65.0...@appland/appmap-v3.65.1) (2023-02-07)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* add @appland/client dependency ([9bd2b6f](https://github.com/getappmap/appmap-js/commit/9bd2b6f5bec5a99a1f3e1416a6a1c28e7644d805))
|
|
7
|
+
* Detect yarn packages as sub-projects ([17871e3](https://github.com/getappmap/appmap-js/commit/17871e3f3e9f693391b179d209383d77fdc0ba21))
|
|
8
|
+
* Improve detection for yarn 1. ([013004a](https://github.com/getappmap/appmap-js/commit/013004a03b59c876bc8b51f01828183e0338425e))
|
|
9
|
+
|
|
10
|
+
# [@appland/appmap-v3.65.0](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.64.3...@appland/appmap-v3.65.0) (2023-02-06)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### Features
|
|
14
|
+
|
|
15
|
+
* Standardize command options ([e8dd5fa](https://github.com/getappmap/appmap-js/commit/e8dd5fa523e32799f4e3566168c53317ffedc9f8))
|
|
16
|
+
* Upload command ([7f83aa5](https://github.com/getappmap/appmap-js/commit/7f83aa52890c86c604acb1233ca1b8b21dd74b69))
|
|
17
|
+
* Verify that the app exists before upload ([1ddf241](https://github.com/getappmap/appmap-js/commit/1ddf2414020446d692a44751154b60631b2f9356))
|
|
18
|
+
|
|
1
19
|
# [@appland/appmap-v3.64.3](https://github.com/getappmap/appmap-js/compare/@appland/appmap-v3.64.2...@appland/appmap-v3.64.3) (2023-02-03)
|
|
2
20
|
|
|
3
21
|
|
package/built/cli.js
CHANGED
|
@@ -36,6 +36,7 @@ const InspectCommand = require('./cmds/inspect/inspect');
|
|
|
36
36
|
const SequenceDiagramCommand = require('./cmds/sequenceDiagram');
|
|
37
37
|
const SequenceDiagramDiffCommand = require('./cmds/sequenceDiagramDiff');
|
|
38
38
|
const StatsCommand = require('./cmds/stats/stats');
|
|
39
|
+
const upload_1 = __importDefault(require("./cmds/upload"));
|
|
39
40
|
class DiffCommand {
|
|
40
41
|
setBaseDir(dir) {
|
|
41
42
|
this.baseDir = dir;
|
|
@@ -379,6 +380,7 @@ yargs(process.argv.slice(2))
|
|
|
379
380
|
.command(SequenceDiagramCommand)
|
|
380
381
|
.command(SequenceDiagramDiffCommand)
|
|
381
382
|
.command(prune_1.default)
|
|
383
|
+
.command(upload_1.default)
|
|
382
384
|
.strict()
|
|
383
385
|
.demandCommand()
|
|
384
386
|
.help().argv;
|
package/built/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;AACA,yCAAyC;AACzC,qCAAqC;AACrC,yCAAyC;AACzC,0CAA0C;AAC1C,+BAA+B;AAC/B,yCAAyC;;;;;AAEzC,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAC/B,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACtC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAChC,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACtD,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,MAAM,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AACrC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,MAAM,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;AAC9D,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AACnD,MAAM,aAAa,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACjD,MAAM,2BAA2B,GAAG,OAAO,CAAC,2CAA2C,CAAC,CAAC;AACzF,MAAM,uBAAuB,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC,OAAO,CAAC;AACzF,MAAM,OAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;AACrC,wFAAiE;AACjE,0EAAyD;AACzD,6DAA2D;AAC3D,+DAA8C;AAC9C,kEAAiD;AACjD,yEAAsE;AACtE,2DAAwD;AACxD,MAAM,gBAAgB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AACvD,MAAM,WAAW,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAChD,MAAM,cAAc,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACzD,MAAM,sBAAsB,GAAG,OAAO,CAAC,wBAAwB,CAAC,CAAC;AACjE,MAAM,0BAA0B,GAAG,OAAO,CAAC,4BAA4B,CAAC,CAAC;AACzE,MAAM,YAAY,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnD,MAAM,WAAW;IASf,UAAU,CAAC,GAAG;QACZ,IAAI,CAAC,OAAO,GAAG,GAAG,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,aAAa,CAAC,GAAG;QACf,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;OAIG;IACH,cAAc,CAAC,KAAK;QAClB,IAAI,CAAC,WAAW,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,OAAO,CAAC,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,OAAO,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IAClF,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,CAAC,aAAa;QACzB,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE3B,MAAM,MAAM,GAAa,EAAE,CAAC;QAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;aAC7B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;aACxC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACvC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAChB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;YACpC,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,EAAE;gBACjE,OAAO,CAAC,IAAI,CAAC,4CAA4C,IAAI,EAAE,CAAC,CAAC;gBACjE,OAAO;aACR;YAED,MAAM,eAAe,GAAG,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CACrD,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,0BAA0B,KAAK,aAAa,CAC1E,CAAC;YACF,MAAM,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAC3D,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,CAAC,0BAA0B,KAAK,aAAa,CAC1E,CAAC;YACF,IAAI,CAAC,eAAe,IAAI,CAAC,kBAAkB,EAAE;gBAC3C,OAAO,CAAC,IAAI,CAAC,MAAM,aAAa,gCAAgC,IAAI,EAAE,CAAC,CAAC;gBACxE,OAAO;aACR;YAED,IAAI,eAAe,CAAC,MAAM,KAAK,kBAAkB,CAAC,MAAM,EAAE;gBACxD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACnB;QACH,CAAC,CAAC,CAAC;QACL,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,eAAe,CAAC,IAAI;QAClB,OAAO,CAAC,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACzD,CAAC;IAED,gDAAgD;IAChD,KAAK,CAAC,aAAa;QACjB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YACpB,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;SACxD;QACD,6FAA6F;QAC7F,iBAAiB;QACjB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;SACrD;QAED,IAAI,CAAC,cAAc,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,WAAW,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAErD,IAAI,CAAC,kBAAkB,GAAG,IAAI,GAAG,CAC/B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACzE,CAAC;QACF,IAAI,CAAC,eAAe,GAAG,IAAI,GAAG,CAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CACtE,CAAC;IACJ,CAAC;CACF;AAED,MAAM,YAAY;IAKhB,YAAY,SAAS,EAAE,UAAU,EAAE,aAAa;QAC9C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,EAAE;YACpC,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;YAC3D,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAClC,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,kBAAkB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACpD,MAAM,UAAU,GAAG,kBAAkB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAC1D,OAAO,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACxC,CAAC;CACF;AAED,iDAAiD;AACjD,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,OAAO,CACN,MAAM,EACN,4CAA4C,EAC5C,CAAC,IAAI,EAAE,EAAE;IACP,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;QAClB,QAAQ,EAAE,uCAAuC;KAClD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,oEAAoE;QAC9E,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE,2CAA2C;KACtD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,+CAA+C;KAC1D,CAAC,CAAC;AACL,CAAC,EACD,KAAK,WAAW,IAAI;IAClB,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAEvC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAE1B,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;KACjE;IACD,IAAI,CAAC,UAAU,EAAE;QACf,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;KACrE;IAED,MAAM,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;IAE7E,IAAI,IAAI,CAAC,IAAI,EAAE;QACb,IAAI,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAClC;IAED,MAAM,UAAU,GAAG;QACjB,KAAK,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE;QACvC,OAAO,EAAS,EAAE;QAClB,OAAO,EAAO,SAAS;KACxB,CAAC;IAEF,MAAM,wBAAwB,GAAG,IAAI,GAAG,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;SACpB,GAAG,CAAC,UAAU,SAAS;QACtB,OAAO,KAAK;YACV,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC9C,MAAM,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACrF,cAAc,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,wBAAwB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;YACrE,MAAM,YAAY,GAAG;gBACnB,SAAS;gBACT,OAAO,EAAS,EAAE;aACnB,CAAC;YACF,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC7B,IAAI,QAAQ,EAAE;oBACZ,YAAY,CAAC,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CACtC,cAAc,CAAC,GAAG;oBAChB,6CAA6C;oBAC7C,KAAK,WAAW,IAAI;wBAClB,OAAO;4BACL,IAAI;4BACJ,IAAI,EAAE,MAAM,IAAI,YAAY,CAC1B,SAAS,EACT,MAAM,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,EACjD,MAAM,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CACrD,CAAC,IAAI,EAAE;yBACT,CAAC;oBACJ,CAAC,CACF,CACF,CAAC;iBACH;qBAAM;oBACL,YAAY,CAAC,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;wBACnD,IAAI;qBACL,CAAC,CAAC,CAAC;iBACL;aACF;YACD,OAAO,YAAY,CAAC;QACtB,CAAC,CAAC;IACJ,CAAC,CAAC;SACD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,CAAC,CACzB,CAAC;IACF,UAAU,CAAC,OAAO,GAAG,OAAO,CAAC;IAC7B,UAAU,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAExD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;AACrC,CAAC,CACF;KACA,OAAO,CACN,iBAAiB,EACjB,gDAAgD,EAChD,CAAC,IAAI,EAAE,EAAE;IACP,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE;QACvB,QAAQ,EAAE,8CAA8C;KACzD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,8CAA8C;KACzD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;QACtB,QAAQ,EAAE,qDAAqD;QAC/D,OAAO,EAAE,GAAG;KACb,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,QAAQ,EAAE,yCAAyC;KACpD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;QACzB,QAAQ,EAAE,8DAA8D;QACxE,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAExD,IAAI,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;IACrB,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,YAAY,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;QAChD,MAAM,UAAU,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC5C,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,EAAE;YACb,OAAO,CAAC,IAAI,CAAC,wBAAwB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC1D;KACF;IAED,IAAI,OAAO,EAAE,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,sBAAsB,SAAS,EAAE,CAAC,CAAC;KACjD;IAED,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IACvC,IAAI,IAAI,CAAC,OAAO,EAAE;QAChB,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;KAChC;IACD,IAAI,KAAK,EAAE;QACT,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;KACvB;IAED,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;IAC5C,MAAM,MAAM,GAAU,EAAE,CAAC;IACzB,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC;QACvB,MAAM,CAAC,GAAG,KAAK,CAAC,KAAK,EAAE,cAAsB,EAAE,EAAE;YAC/C,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC,CAAC;YACvE,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC9B,IAAI,KAAK,EAAE;gBACT,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;aACxB;iBAAM;gBACL,OAAO,CAAC,IAAI,CAAC,MAAM,KAAK,OAAO,cAAc,EAAE,CAAC,CAAC;aAClD;QACH,CAAC,EAAE,CAAC,CAAC,CAAC;QACN,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5C,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;KACjB;SAAM;QACL,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;KAClD;IACD,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;AAC7D,CAAC,CACF;KACA,OAAO,CACN,OAAO,EACP,4EAA4E,EAC5E,CAAC,IAAI,EAAE,EAAE;IACP,IAAI,CAAC,UAAU,EAAE,CAAC;IAElB,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,8CAA8C;KACzD,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE;QACnB,QAAQ,EAAE,4CAA4C;QACtD,OAAO,EAAE,IAAI;KACd,CAAC,CAAC;IACH,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE;QAC/B,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,EAAE;QACX,QAAQ,EAAE,yDAAyD;QACnE,MAAM,EAAE,IAAI;KACb,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAExD,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,MAAM,GAAG,GAAG,IAAI,uBAAuB,CAAC,SAAS,CAAC,CAAC;QACnD,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE;YACzC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAClC,MAAM,YAAY,GAAG,sBAAsB,CAAC;YAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACnC,WAAW,CAAC,GAAG,EAAE;gBACf,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;gBAC3D,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,CAAC;YAC9C,CAAC,EAAE,IAAI,CAAC,CAAC;YAET,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,EAAC,WAAW,EAAE,EAAE;gBACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;SACJ;KACF;SAAM;QACL,MAAM,GAAG,GAAG,IAAI,2BAA2B,CAAC,SAAS,CAAC,CAAC;QACvD,MAAM,GAAG,CAAC,OAAO,EAAE,CAAC;KACrB;AACH,CAAC,CACF;KACA,OAAO,CACN,WAAW,EACX,mEAAmE,EACnE,CAAC,IAAI,EAAE,EAAE;IACP,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;QACvB,QAAQ,EAAE,2BAA2B;QACrC,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,GAAG;KACX,CAAC,CAAC;IACH,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;QACxB,QAAQ,EAAE,8CAA8C;KACzD,CAAC,CAAC;IACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;AACvB,CAAC,EACD,KAAK,EAAE,IAAI,EAAE,EAAE;IACb,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,IAAA,+CAAsB,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,SAAS,GAAG,MAAM,IAAA,iCAAe,EAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAExD,MAAM,IAAI,2BAA2B,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;IAE3D,MAAM,SAAS,GAAG,MAAM,IAAI,gBAAgB,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC;IAClE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;AACpC,CAAC,CACF;KACA,MAAM,CAAC,SAAS,EAAE;IACjB,KAAK,EAAE,GAAG;IACV,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,0BAA0B;CACxC,CAAC;KACD,IAAI,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;IACxB,IAAI,GAAG,EAAE;QACP,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;QAC1B,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;KAClB;SAAM,IAAI,GAAG,EAAE;QACd,IAAI,GAAG,CAAC,KAAK,EAAE;YACb,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;YAC3B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SAC1B;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACpB;KACF;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,OAAO,CAAC,iBAAc,CAAC;KACvB,OAAO,CAAC,uBAAc,CAAC;KACvB,OAAO,CAAC,WAAW,CAAC;KACpB,OAAO,CAAC,gBAAa,CAAC;KACtB,OAAO,CAAC,gBAAa,CAAC;KACtB,OAAO,CAAC,YAAY,CAAC;KACrB,OAAO,CAAC,cAAc,CAAC;KACvB,OAAO,CAAC,sBAAsB,CAAC;KAC/B,OAAO,CAAC,0BAA0B,CAAC;KACnC,OAAO,CAAC,eAAY,CAAC;KACrB,MAAM,EAAE;KACR,aAAa,EAAE;KACf,IAAI,EAAE,CAAC,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,8 @@ 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");
|
|
15
|
+
const semver_1 = __importDefault(require("semver"));
|
|
14
16
|
const AGENT_PACKAGE = '@appland/appmap-agent-js@latest';
|
|
15
17
|
class JavaScriptInstaller extends agentInstaller_1.default {
|
|
16
18
|
constructor(name, path) {
|
|
@@ -87,6 +89,21 @@ class YarnInstaller extends JavaScriptInstaller {
|
|
|
87
89
|
async verifyCommand() {
|
|
88
90
|
return undefined;
|
|
89
91
|
}
|
|
92
|
+
async isYarnVersionOne() {
|
|
93
|
+
let isVersionOne;
|
|
94
|
+
try {
|
|
95
|
+
const versionOutput = await (0, commandUtil_1.getOutput)('yarn', ['--version'], this.path);
|
|
96
|
+
const version = semver_1.default.coerce(versionOutput.output);
|
|
97
|
+
if (!version) {
|
|
98
|
+
throw new errors_1.UserConfigError('Could not detect yarn version');
|
|
99
|
+
}
|
|
100
|
+
isVersionOne = !semver_1.default.satisfies(version, '>= 2.0.0');
|
|
101
|
+
}
|
|
102
|
+
catch (err) {
|
|
103
|
+
throw new errors_1.UserConfigError(err);
|
|
104
|
+
}
|
|
105
|
+
return isVersionOne;
|
|
106
|
+
}
|
|
90
107
|
}
|
|
91
108
|
exports.YarnInstaller = YarnInstaller;
|
|
92
109
|
YarnInstaller.identifier = 'yarn';
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"javaScriptAgentInstaller.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/javaScriptAgentInstaller.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,13 +3,17 @@ 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.getProjects = void 0;
|
|
6
|
+
exports.getProjects = exports.getYarnSubprojects = void 0;
|
|
7
|
+
const assert_1 = __importDefault(require("assert"));
|
|
7
8
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
9
|
const fs_1 = require("fs");
|
|
9
10
|
const path_1 = require("path");
|
|
10
11
|
const errors_1 = require("../errors");
|
|
11
12
|
const userInteraction_1 = __importDefault(require("../userInteraction"));
|
|
12
13
|
const installers_1 = __importDefault(require("./installers"));
|
|
14
|
+
const javaScriptAgentInstaller_1 = require("./javaScriptAgentInstaller");
|
|
15
|
+
const commandStruct_1 = __importDefault(require("./commandStruct"));
|
|
16
|
+
const commandRunner_1 = require("./commandRunner");
|
|
13
17
|
async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
14
18
|
// Attempt to resolve selectedInstallers from the user's arg line input.
|
|
15
19
|
if (userSpecifiedInstaller) {
|
|
@@ -59,11 +63,96 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
59
63
|
}
|
|
60
64
|
}
|
|
61
65
|
}
|
|
62
|
-
// Sanity check. Verify everything resolved properly. This
|
|
66
|
+
// Sanity check. Verify everything resolved properly. This branch should never occur.
|
|
63
67
|
if (projects.some(({ selectedInstaller }) => !selectedInstaller)) {
|
|
64
68
|
throw new Error('Invalid selection');
|
|
65
69
|
}
|
|
66
70
|
}
|
|
71
|
+
function yarn1Workspaces(info) {
|
|
72
|
+
(0, assert_1.default)(info && typeof info === 'object');
|
|
73
|
+
return Object.entries(info).map(([name, data]) => {
|
|
74
|
+
(0, assert_1.default)(data && typeof data === 'object');
|
|
75
|
+
(0, assert_1.default)('location' in data);
|
|
76
|
+
(0, assert_1.default)(typeof data['location'] === 'string');
|
|
77
|
+
return [name, data['location']];
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
// With yarn 1:
|
|
81
|
+
// - if there's no "workspaces" key in package.json we get the following error:
|
|
82
|
+
// $ yarn workspaces info --json
|
|
83
|
+
// yarn workspaces v1.22.19
|
|
84
|
+
// error Cannot find the root of your workspace - are you sure you're currently in a workspace?
|
|
85
|
+
// info Visit https://yarnpkg.com/en/docs/cli/workspaces for documentation about this command.
|
|
86
|
+
// - if there is a "workspaces" key in package.json the output contains text
|
|
87
|
+
// outside of json. Remove it:
|
|
88
|
+
// $ yarn workspaces info --json
|
|
89
|
+
// yarn workspaces v1.22.19
|
|
90
|
+
// {
|
|
91
|
+
// "workspace-a": {
|
|
92
|
+
// "location": "workspace-a",
|
|
93
|
+
// "workspaceDependencies": [],
|
|
94
|
+
// "mismatchedWorkspaceDependencies": []
|
|
95
|
+
// }
|
|
96
|
+
// }
|
|
97
|
+
// Done in 0.02s.
|
|
98
|
+
async function getYarnSubprojectsVersionOne(dir, installer, subprojects) {
|
|
99
|
+
const cmd = new commandStruct_1.default('yarn', ['workspaces', 'info', '--json'], installer.path);
|
|
100
|
+
const output = await (0, commandRunner_1.run)(cmd);
|
|
101
|
+
// Remove any text before and after JSON
|
|
102
|
+
let lines = output.stdout.split('\n');
|
|
103
|
+
let outputClean = '';
|
|
104
|
+
for (const line of lines) {
|
|
105
|
+
if (line.startsWith('error'))
|
|
106
|
+
return;
|
|
107
|
+
if (!(line.startsWith('yarn workspaces v') || line.startsWith('Done in ')))
|
|
108
|
+
outputClean += line;
|
|
109
|
+
}
|
|
110
|
+
for (const [name, location] of yarn1Workspaces(JSON.parse(outputClean))) {
|
|
111
|
+
const subProjectPath = (0, path_1.join)(dir, location);
|
|
112
|
+
const subProjectName = (0, path_1.basename)(name);
|
|
113
|
+
const projectConfiguration = {
|
|
114
|
+
name: subProjectName,
|
|
115
|
+
path: subProjectPath,
|
|
116
|
+
// must set the new path in the installer
|
|
117
|
+
availableInstallers: [new javaScriptAgentInstaller_1.YarnInstaller(subProjectPath)],
|
|
118
|
+
};
|
|
119
|
+
subprojects.push(projectConfiguration);
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
async function getYarnSubprojectsVersionAboveOne(dir, installer, subprojects) {
|
|
123
|
+
const cmd = new commandStruct_1.default('yarn', ['workspaces', 'list', '--json'], installer.path);
|
|
124
|
+
const output = await (0, commandRunner_1.run)(cmd);
|
|
125
|
+
for (const line of output.stdout.split('\n')) {
|
|
126
|
+
if (line !== '') {
|
|
127
|
+
const yarnWorkspace = JSON.parse(line);
|
|
128
|
+
const subProjectPath = (0, path_1.join)(dir, yarnWorkspace['location']);
|
|
129
|
+
const subProjectName = (0, path_1.basename)(yarnWorkspace['name']);
|
|
130
|
+
const projectConfiguration = {
|
|
131
|
+
name: subProjectName,
|
|
132
|
+
path: subProjectPath,
|
|
133
|
+
// must set the new path in the installer
|
|
134
|
+
availableInstallers: [new javaScriptAgentInstaller_1.YarnInstaller(subProjectPath)],
|
|
135
|
+
};
|
|
136
|
+
subprojects.push(projectConfiguration);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
async function getYarnSubprojects(dir, availableInstallers) {
|
|
141
|
+
let subprojects = [];
|
|
142
|
+
for (const installer of availableInstallers) {
|
|
143
|
+
if (installer.name === 'yarn') {
|
|
144
|
+
const yarnInstaller = installer;
|
|
145
|
+
if (await yarnInstaller.isYarnVersionOne()) {
|
|
146
|
+
await getYarnSubprojectsVersionOne(dir, yarnInstaller, subprojects);
|
|
147
|
+
}
|
|
148
|
+
else {
|
|
149
|
+
await getYarnSubprojectsVersionAboveOne(dir, yarnInstaller, subprojects);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
return subprojects;
|
|
154
|
+
}
|
|
155
|
+
exports.getYarnSubprojects = getYarnSubprojects;
|
|
67
156
|
/**
|
|
68
157
|
* Identifies subprojects and returns an array of ProjectConfigurations if the user chooses to
|
|
69
158
|
* install to them. If the user opts not to install to any subprojects, undefined is returned. This
|
|
@@ -73,30 +162,39 @@ async function resolveSelectedInstallers(projects, userSpecifiedInstaller) {
|
|
|
73
162
|
* @returns ProjectConfiguration[] if the user chooses to install to subprojects, otherwise
|
|
74
163
|
* undefined
|
|
75
164
|
*/
|
|
76
|
-
async function getSubprojects(dir, rootHasInstaller) {
|
|
77
|
-
|
|
78
|
-
const
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
165
|
+
async function getSubprojects(dir, rootHasInstaller, availableInstallers) {
|
|
166
|
+
let subprojects = [];
|
|
167
|
+
const yarnSubprojects = await getYarnSubprojects(dir, availableInstallers);
|
|
168
|
+
if (yarnSubprojects.length > 0) {
|
|
169
|
+
// detect yarn packages as sub-projects
|
|
170
|
+
subprojects = yarnSubprojects;
|
|
171
|
+
}
|
|
172
|
+
else {
|
|
173
|
+
// read directory to detect sub-projects
|
|
174
|
+
const ents = await fs_1.promises.readdir(dir, { withFileTypes: true });
|
|
175
|
+
subprojects = (await Promise.all(ents.map(async (ent) => {
|
|
176
|
+
if (!ent.isDirectory()) {
|
|
177
|
+
return null;
|
|
178
|
+
}
|
|
179
|
+
const subProjectPath = (0, path_1.join)(dir, ent.name);
|
|
180
|
+
try {
|
|
181
|
+
await fs_1.promises.access(subProjectPath, fs_1.constants.R_OK);
|
|
182
|
+
}
|
|
183
|
+
catch (_a) {
|
|
184
|
+
// This directory is not readable. Ignore it.
|
|
185
|
+
return null;
|
|
186
|
+
}
|
|
187
|
+
const installers = await (0, installers_1.default)(subProjectPath);
|
|
188
|
+
if (!installers.length) {
|
|
189
|
+
return null;
|
|
190
|
+
}
|
|
191
|
+
return {
|
|
192
|
+
name: ent.name,
|
|
193
|
+
path: subProjectPath,
|
|
194
|
+
availableInstallers: installers,
|
|
195
|
+
};
|
|
196
|
+
}))).filter(Boolean);
|
|
197
|
+
}
|
|
100
198
|
if (!subprojects.length) {
|
|
101
199
|
// There's nothing that we can do here.
|
|
102
200
|
return undefined;
|
|
@@ -108,7 +206,7 @@ async function getSubprojects(dir, rootHasInstaller) {
|
|
|
108
206
|
message: 'This directory contains sub-projects. Would you like to choose sub-projects for installation?',
|
|
109
207
|
});
|
|
110
208
|
if (!addSubprojects) {
|
|
111
|
-
// The user has opted not to continue by selecting subprojects.
|
|
209
|
+
// The user has opted not to continue by not selecting subprojects.
|
|
112
210
|
return undefined;
|
|
113
211
|
}
|
|
114
212
|
const subProjectConfigurations = [];
|
|
@@ -128,7 +226,7 @@ async function getProjects(installers, dir, allowMulti, userSpecifiedInstaller)
|
|
|
128
226
|
const availableInstallers = await (0, installers_1.default)(dir);
|
|
129
227
|
const rootHasInstaller = !!availableInstallers.length;
|
|
130
228
|
if (allowMulti) {
|
|
131
|
-
const subprojects = await getSubprojects(dir, rootHasInstaller);
|
|
229
|
+
const subprojects = await getSubprojects(dir, rootHasInstaller, availableInstallers);
|
|
132
230
|
if (subprojects === null || subprojects === void 0 ? void 0 : subprojects.length) {
|
|
133
231
|
projectConfigurations.push(...subprojects);
|
|
134
232
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,2BAA8D;
|
|
1
|
+
{"version":3,"file":"projectConfiguration.js","sourceRoot":"","sources":["../../../src/cmds/agentInstaller/projectConfiguration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,129 @@
|
|
|
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.handler = void 0;
|
|
7
|
+
const client_1 = require("@appland/client");
|
|
8
|
+
const utils_1 = require("../utils");
|
|
9
|
+
const promises_1 = require("fs/promises");
|
|
10
|
+
const assert_1 = __importDefault(require("assert"));
|
|
11
|
+
const userInteraction_1 = __importDefault(require("./userInteraction"));
|
|
12
|
+
const errors_1 = require("./errors");
|
|
13
|
+
const handleWorkingDirectory_1 = require("../lib/handleWorkingDirectory");
|
|
14
|
+
const locateAppMapDir_1 = require("../lib/locateAppMapDir");
|
|
15
|
+
const console_1 = require("console");
|
|
16
|
+
const appNameFromConfig_1 = require("../lib/appNameFromConfig");
|
|
17
|
+
const MAX_APPMAP_SIZE = 2 * 1024 * 1024;
|
|
18
|
+
function applyOrCheck(data, key, input) {
|
|
19
|
+
if (!input)
|
|
20
|
+
return;
|
|
21
|
+
const existing = data[key];
|
|
22
|
+
if (existing) {
|
|
23
|
+
if (existing !== input)
|
|
24
|
+
throw new errors_1.ValidationError(`"${key}" mismatch ("${existing}" !== "${input}")`);
|
|
25
|
+
}
|
|
26
|
+
else {
|
|
27
|
+
data[key] = input;
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
function checkMetadata(metadata, input) {
|
|
31
|
+
if (!input)
|
|
32
|
+
return; // no metadata in appmap, ie. matches
|
|
33
|
+
(0, assert_1.default)(typeof input === 'object');
|
|
34
|
+
applyOrCheck(metadata, 'application', input['app']);
|
|
35
|
+
const git = input['git'];
|
|
36
|
+
if (typeof git !== 'object')
|
|
37
|
+
return;
|
|
38
|
+
applyOrCheck(metadata, 'branch', git['branch']);
|
|
39
|
+
applyOrCheck(metadata, 'commit', git['commit']);
|
|
40
|
+
}
|
|
41
|
+
async function collect(appmapDir, force) {
|
|
42
|
+
const metadata = {};
|
|
43
|
+
const paths = [];
|
|
44
|
+
await (0, utils_1.listAppMapFiles)(appmapDir, (path) => {
|
|
45
|
+
paths.push(path);
|
|
46
|
+
});
|
|
47
|
+
for (const path of paths) {
|
|
48
|
+
checkMetadata(metadata, JSON.parse(await (0, promises_1.readFile)(path, 'utf-8')).metadata);
|
|
49
|
+
if (!force)
|
|
50
|
+
checkSize(await (0, promises_1.stat)(path));
|
|
51
|
+
}
|
|
52
|
+
return [paths, metadata];
|
|
53
|
+
}
|
|
54
|
+
async function handler(argv) {
|
|
55
|
+
const { directory, appmapDir: appmapDirOpt, app: appOpt, force } = argv;
|
|
56
|
+
(0, utils_1.verbose)(argv.verbose);
|
|
57
|
+
(0, handleWorkingDirectory_1.handleWorkingDirectory)(directory);
|
|
58
|
+
const appmapDir = await (0, locateAppMapDir_1.locateAppMapDir)(appmapDirOpt);
|
|
59
|
+
let app = appOpt;
|
|
60
|
+
if (!app)
|
|
61
|
+
app = await (0, appNameFromConfig_1.appNameFromConfig)();
|
|
62
|
+
if (!app) {
|
|
63
|
+
throw new errors_1.ValidationError([
|
|
64
|
+
'Application name is required.',
|
|
65
|
+
`You can provide the application name by setting the 'name' field in appmap.yml, or with the --app option.`,
|
|
66
|
+
].join('\n'));
|
|
67
|
+
}
|
|
68
|
+
const exists = await new client_1.App(app).exists();
|
|
69
|
+
if (!exists)
|
|
70
|
+
throw new errors_1.ValidationError(`Application '${app}' does not exist.`);
|
|
71
|
+
userInteraction_1.default.progress(`Examining AppMaps...`);
|
|
72
|
+
const [paths, metadata] = await collect(appmapDir, !!force);
|
|
73
|
+
if (paths.length === 0)
|
|
74
|
+
throw new Error(`No AppMaps found in directory '${appmapDir}'`);
|
|
75
|
+
let total = paths.length;
|
|
76
|
+
const { baseURL } = (0, client_1.loadConfiguration)();
|
|
77
|
+
userInteraction_1.default.progress(`Uploading ${total} AppMaps for ${app} to ${baseURL}...`);
|
|
78
|
+
const uuids = [];
|
|
79
|
+
let processed = 0;
|
|
80
|
+
for (const path of paths) {
|
|
81
|
+
processed += 1;
|
|
82
|
+
userInteraction_1.default.status = `[${processed}/${total}] ${path}`;
|
|
83
|
+
const data = await (0, promises_1.readFile)(path); // TODO: stream this instead of slurping the whole thing?
|
|
84
|
+
let response;
|
|
85
|
+
try {
|
|
86
|
+
response = await client_1.AppMap.create(data, { app });
|
|
87
|
+
}
|
|
88
|
+
catch (e) {
|
|
89
|
+
(0, console_1.warn)(`Error uploading ${path}: ${e}`);
|
|
90
|
+
throw e;
|
|
91
|
+
}
|
|
92
|
+
uuids.push(response.uuid);
|
|
93
|
+
}
|
|
94
|
+
userInteraction_1.default.status = 'Creating mapset...';
|
|
95
|
+
const mapset = await client_1.Mapset.create(app, uuids, metadata);
|
|
96
|
+
const url = [baseURL, 'applications', mapset.app_id, 'mapsets', mapset.id].join('/');
|
|
97
|
+
userInteraction_1.default.success(`Created mapset ${url} with ${total} AppMaps`);
|
|
98
|
+
}
|
|
99
|
+
exports.handler = handler;
|
|
100
|
+
function checkSize({ size }) {
|
|
101
|
+
if (size > MAX_APPMAP_SIZE)
|
|
102
|
+
throw new errors_1.ValidationError([
|
|
103
|
+
`File size is ${size / 1024} KiB which is greater than the size limit of ${MAX_APPMAP_SIZE / 1024} KiB.`,
|
|
104
|
+
'Use --force if you want to upload it anyway.',
|
|
105
|
+
].join('\n'));
|
|
106
|
+
}
|
|
107
|
+
const command = {
|
|
108
|
+
command: 'upload',
|
|
109
|
+
builder: {
|
|
110
|
+
directory: {
|
|
111
|
+
alias: 'd',
|
|
112
|
+
},
|
|
113
|
+
'appmap-dir': {},
|
|
114
|
+
app: {
|
|
115
|
+
alias: 'a',
|
|
116
|
+
description: 'application name override',
|
|
117
|
+
type: 'string',
|
|
118
|
+
},
|
|
119
|
+
force: {
|
|
120
|
+
alias: 'f',
|
|
121
|
+
description: 'force uploading oversized files',
|
|
122
|
+
type: 'boolean',
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
describe: 'Upload AppMaps and create a mapset',
|
|
126
|
+
handler,
|
|
127
|
+
};
|
|
128
|
+
exports.default = command;
|
|
129
|
+
//# sourceMappingURL=upload.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/cmds/upload.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,14 @@
|
|
|
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.appNameFromConfig = void 0;
|
|
7
|
+
const loadAppMapConfig_1 = __importDefault(require("./loadAppMapConfig"));
|
|
8
|
+
async function appNameFromConfig() {
|
|
9
|
+
const appmapConfig = await (0, loadAppMapConfig_1.default)();
|
|
10
|
+
if (appmapConfig)
|
|
11
|
+
return appmapConfig.name;
|
|
12
|
+
}
|
|
13
|
+
exports.appNameFromConfig = appNameFromConfig;
|
|
14
|
+
//# sourceMappingURL=appNameFromConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"appNameFromConfig.js","sourceRoot":"","sources":["../../src/lib/appNameFromConfig.ts"],"names":[],"mappings":";;;;;;AAAA,0EAAkD;AAE3C,KAAK,UAAU,iBAAiB;IACrC,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAgB,GAAE,CAAC;IAC9C,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC,IAAI,CAAC;AAC7C,CAAC;AAHD,8CAGC"}
|
|
@@ -5,19 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.assertAppMapDir = exports.appmapDirFromConfig = void 0;
|
|
7
7
|
const assert_1 = __importDefault(require("assert"));
|
|
8
|
-
const
|
|
9
|
-
const promises_1 = require("fs/promises");
|
|
10
|
-
const js_yaml_1 = require("js-yaml");
|
|
11
|
-
const util_1 = require("util");
|
|
8
|
+
const loadAppMapConfig_1 = __importDefault(require("./loadAppMapConfig"));
|
|
12
9
|
async function appmapDirFromConfig() {
|
|
13
|
-
const
|
|
14
|
-
if (
|
|
15
|
-
|
|
16
|
-
if (appMapConfigData && typeof appMapConfigData === 'object') {
|
|
17
|
-
const configData = appMapConfigData;
|
|
18
|
-
return configData['appmap_dir'];
|
|
19
|
-
}
|
|
20
|
-
}
|
|
10
|
+
const appmapConfig = await (0, loadAppMapConfig_1.default)();
|
|
11
|
+
if (appmapConfig)
|
|
12
|
+
return appmapConfig.appmap_dir;
|
|
21
13
|
}
|
|
22
14
|
exports.appmapDirFromConfig = appmapDirFromConfig;
|
|
23
15
|
function assertAppMapDir(appmapDir) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appmapDirFromConfig.js","sourceRoot":"","sources":["../../src/lib/appmapDirFromConfig.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,
|
|
1
|
+
{"version":3,"file":"appmapDirFromConfig.js","sourceRoot":"","sources":["../../src/lib/appmapDirFromConfig.ts"],"names":[],"mappings":";;;;;;AAAA,oDAA4B;AAC5B,0EAAkD;AAE3C,KAAK,UAAU,mBAAmB;IACvC,MAAM,YAAY,GAAG,MAAM,IAAA,0BAAgB,GAAE,CAAC;IAC9C,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC,UAAU,CAAC;AACnD,CAAC;AAHD,kDAGC;AAED,SAAgB,eAAe,CAAC,SAAiB;IAC/C,IAAA,gBAAM,EAAC,SAAS,EAAE,4EAA4E,CAAC,CAAC;AAClG,CAAC;AAFD,0CAEC"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const fs_1 = require("fs");
|
|
4
|
+
const promises_1 = require("fs/promises");
|
|
5
|
+
const js_yaml_1 = require("js-yaml");
|
|
6
|
+
const util_1 = require("util");
|
|
7
|
+
async function loadAppMapConfig() {
|
|
8
|
+
const appMapConfigExists = await (0, util_1.promisify)(fs_1.exists)('appmap.yml');
|
|
9
|
+
if (appMapConfigExists) {
|
|
10
|
+
const appMapConfigData = (0, js_yaml_1.load)((await (0, promises_1.readFile)('appmap.yml')).toString());
|
|
11
|
+
if (appMapConfigData && typeof appMapConfigData === 'object') {
|
|
12
|
+
return appMapConfigData;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
exports.default = loadAppMapConfig;
|
|
17
|
+
//# sourceMappingURL=loadAppMapConfig.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"loadAppMapConfig.js","sourceRoot":"","sources":["../../src/lib/loadAppMapConfig.ts"],"names":[],"mappings":";;AAAA,2BAA4B;AAC5B,0CAAuC;AACvC,qCAA+B;AAC/B,+BAAiC;AAOlB,KAAK,UAAU,gBAAgB;IAC5C,MAAM,kBAAkB,GAAG,MAAM,IAAA,gBAAS,EAAC,WAAM,CAAC,CAAC,YAAY,CAAC,CAAC;IACjE,IAAI,kBAAkB,EAAE;QACtB,MAAM,gBAAgB,GAAG,IAAA,cAAI,EAAC,CAAC,MAAM,IAAA,mBAAQ,EAAC,YAAY,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACzE,IAAI,gBAAgB,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE;YAC5D,OAAO,gBAAgC,CAAC;SACzC;KACF;AACH,CAAC;AARD,mCAQC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/appmap",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.65.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -68,6 +68,7 @@
|
|
|
68
68
|
"vuex"
|
|
69
69
|
],
|
|
70
70
|
"dependencies": {
|
|
71
|
+
"@appland/client": "^1",
|
|
71
72
|
"@appland/components": "^2",
|
|
72
73
|
"@appland/diagrams": "^1",
|
|
73
74
|
"@appland/models": "^2.0.0",
|