@appland/scanner 1.40.2 → 1.43.0

package/built/cli/scan.js

@@ -68,6 +68,7 @@ var promises_1 = require("fs/promises");
 var models_1 = require("@appland/models");
 var ruleChecker_1 = __importDefault(require("../ruleChecker"));
 var progressReporter_1 = __importDefault(require("./progressReporter"));
+var appMapIndex_1 = __importDefault(require("../appMapIndex"));
 function batch(items, size, process) {
     return __awaiter(this, void 0, void 0, function () {
         var left;
@@ -98,7 +99,7 @@ function scan(files, checks) {
                     appMapMetadata = {};
                     findings = [];
                     return [4 /*yield*/, batch(files, 2, function (file) { return __awaiter(_this, void 0, void 0, function () {
-                            var appMapData, appMap;
+                            var appMapData, appMap, appMapIndex;
                             var _this = this;
                             return __generator(this, function (_a) {
                                 switch (_a.label) {
@@ -113,6 +114,7 @@ function scan(files, checks) {
                                     case 1:
                                         appMapData = _a.sent();
                                         appMap = (0, models_1.buildAppMap)(appMapData).normalize().build();
+                                        appMapIndex = new appMapIndex_1.default(appMap);
                                         appMapMetadata[file] = appMap.metadata;
                                         return [4 /*yield*/, Promise.all(checks.map(function (check) { return __awaiter(_this, void 0, void 0, function () {
                                                 var matchCount, newMatches;
@@ -120,7 +122,7 @@ function scan(files, checks) {
                                                     switch (_a.label) {
                                                         case 0:
                                                             matchCount = findings.length;
-                                                            return [4 /*yield*/, checker.check(file, appMap, check, findings)];
+                                                            return [4 /*yield*/, checker.check(file, appMapIndex, check, findings)];
                                                         case 1:
                                                             _a.sent();
                                                             newMatches = findings.slice(matchCount, findings.length);

package/built/cli/scan.js.map

@@ -1 +1 @@
-{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAuC;AACvC,0CAAwD;AAGxD,+DAAyC;AAGzC,wEAAkD;AAOlD,SAAe,KAAK,CAClB,KAAmB,EACnB,IAAY,EACZ,OAAmD;;;;;;oBAE7C,IAAI,4BAAO,KAAK,SAAC,CAAC;;;yBACjB,IAAI,CAAC,MAAM;oBAAE,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAA;;oBAApD,SAAoD,CAAC;;;;;;CAC1E;AAED,SAA8B,IAAI,CAAC,KAAe,EAAE,MAAe;;;;;;;oBAC3D,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAC;oBAC5B,cAAc,GAA6B,EAAE,CAAC;oBAC9C,QAAQ,GAAc,EAAE,CAAC;oBAE/B,qBAAM,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,UAAO,IAAY;;;;;;wCACvC,2DAA2D;wCAC3D,+FAA+F;wCAC/F,6BAA6B;wCAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;4CAC5C,sBAAO,IAAI,EAAC;yCACb;wCACkB,qBAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;wCAAzC,UAAU,GAAG,SAA4B;wCACzC,MAAM,GAAG,IAAA,oBAAW,EAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC;wCAC3D,cAAc,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;wCAEvC,qBAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,UAAO,KAAK;;;;;4DACf,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;4DACnC,qBAAM,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAA;;4DAAlD,SAAkD,CAAC;4DAC7C,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;4DAC/D,UAAU,CAAC,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;4DACzD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,0BAAgB,EAAC,UAAU,CAAC,CAAC,CAAC;;;;iDACpD,CAAC,CACH,EAAA;;wCARD,SAQC,CAAC;;;;6BACH,CAAC,EAAA;;oBApBF,SAoBE,CAAC;oBAEH,sBAAO,EAAE,cAAc,gBAAA,EAAE,QAAQ,UAAA,EAAE,EAAC;;;;CACrC;AA5BD,uBA4BC"}
+{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAuC;AACvC,0CAAwD;AAGxD,+DAAyC;AAGzC,wEAAkD;AAClD,+DAAyC;AAOzC,SAAe,KAAK,CAClB,KAAmB,EACnB,IAAY,EACZ,OAAmD;;;;;;oBAE7C,IAAI,4BAAO,KAAK,SAAC,CAAC;;;yBACjB,IAAI,CAAC,MAAM;oBAAE,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,EAAA;;oBAApD,SAAoD,CAAC;;;;;;CAC1E;AAED,SAA8B,IAAI,CAAC,KAAe,EAAE,MAAe;;;;;;;oBAC3D,OAAO,GAAG,IAAI,qBAAW,EAAE,CAAC;oBAC5B,cAAc,GAA6B,EAAE,CAAC;oBAC9C,QAAQ,GAAc,EAAE,CAAC;oBAE/B,qBAAM,KAAK,CAAC,KAAK,EAAE,CAAC,EAAE,UAAO,IAAY;;;;;;wCACvC,2DAA2D;wCAC3D,+FAA+F;wCAC/F,6BAA6B;wCAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;4CAC5C,sBAAO,IAAI,EAAC;yCACb;wCACkB,qBAAM,IAAA,mBAAQ,EAAC,IAAI,EAAE,MAAM,CAAC,EAAA;;wCAAzC,UAAU,GAAG,SAA4B;wCACzC,MAAM,GAAG,IAAA,oBAAW,EAAC,UAAU,CAAC,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,CAAC;wCACrD,WAAW,GAAG,IAAI,qBAAW,CAAC,MAAM,CAAC,CAAC;wCAC5C,cAAc,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,QAAQ,CAAC;wCAEvC,qBAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,GAAG,CAAC,UAAO,KAAK;;;;;4DACf,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC;4DACnC,qBAAM,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAA;;4DAAvD,SAAuD,CAAC;4DAClD,UAAU,GAAG,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;4DAC/D,UAAU,CAAC,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,CAAC,KAAK,CAAC,UAAU,GAAG,IAAI,CAAC,EAAzB,CAAyB,CAAC,CAAC;4DACzD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAA,0BAAgB,EAAC,UAAU,CAAC,CAAC,CAAC;;;;iDACpD,CAAC,CACH,EAAA;;wCARD,SAQC,CAAC;;;;6BACH,CAAC,EAAA;;oBArBF,SAqBE,CAAC;oBAEH,sBAAO,EAAE,cAAc,gBAAA,EAAE,QAAQ,UAAA,EAAE,EAAC;;;;CACrC;AA7BD,uBA6BC"}

package/built/cli/updateCommitStatus.js

@@ -0,0 +1,65 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var commitStatus_1 = __importDefault(require("../integration/github/commitStatus"));
+function updateCommitStatus(numFindings, numChecks) {
+    return __awaiter(this, void 0, void 0, function () {
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    if (!(numFindings > 0)) return [3 /*break*/, 2];
+                    return [4 /*yield*/, (0, commitStatus_1.default)('failure', numChecks + " checks, " + numFindings + " findings. See CI job log for details.")];
+                case 1:
+                    _a.sent();
+                    console.log("Commit status updated to: failure (" + numFindings + " findings)");
+                    return [3 /*break*/, 4];
+                case 2: return [4 /*yield*/, (0, commitStatus_1.default)('success', numChecks + " checks passed")];
+                case 3:
+                    _a.sent();
+                    console.log("Commit status updated to: success.");
+                    _a.label = 4;
+                case 4: return [2 /*return*/];
+            }
+        });
+    });
+}
+exports.default = updateCommitStatus;
+//# sourceMappingURL=updateCommitStatus.js.map

package/built/cli/updateCommitStatus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateCommitStatus.js","sourceRoot":"","sources":["../../src/cli/updateCommitStatus.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,oFAAkE;AAElE,SAA8B,kBAAkB,CAC9C,WAAmB,EACnB,SAAiB;;;;;yBAEb,CAAA,WAAW,GAAG,CAAC,CAAA,EAAf,wBAAe;oBACjB,qBAAM,IAAA,sBAAgB,EACpB,SAAS,EACN,SAAS,iBAAY,WAAW,2CAAwC,CAC5E,EAAA;;oBAHD,SAGC,CAAC;oBACF,OAAO,CAAC,GAAG,CAAC,wCAAsC,WAAW,eAAY,CAAC,CAAC;;wBAE3E,qBAAM,IAAA,sBAAgB,EAAC,SAAS,EAAK,SAAS,mBAAgB,CAAC,EAAA;;oBAA/D,SAA+D,CAAC;oBAChE,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAC;;;;;;CAErD;AAdD,qCAcC"}

package/built/cli/upload/command.js

@@ -40,10 +40,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var promises_1 = require("fs/promises");
-var upload_1 = __importDefault(require("../../integration/appland/upload"));
+var create_1 = require("../../integration/appland/scannerJob/create");
 var util_1 = require("../../rules/lib/util");
 var validateFile_1 = __importDefault(require("../validateFile"));
 var resolveAppId_1 = __importDefault(require("../resolveAppId"));
+var reportUploadURL_1 = __importDefault(require("../reportUploadURL"));
 exports.default = {
     command: 'upload',
     describe: 'Upload Findings to the AppMap Server',
@@ -59,15 +60,18 @@ exports.default = {
         args.option('app', {
             describe: 'name of the app to publish the findings for. By default, this is determined by looking in appmap.yml',
         });
+        args.option('merge-key', {
+            describe: 'build job identifier. This is used to merge findings from parallelized scans',
+        });
         return args.strict();
     },
     handler: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, isVerbose, reportFile, appmapDir, appIdArg, appId, scanResults, _b, _c;
+            var _a, isVerbose, reportFile, appmapDir, appIdArg, mergeKey, appId, scanResults, _b, _c, uploadResponse;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
-                        _a = options, isVerbose = _a.verbose, reportFile = _a.reportFile, appmapDir = _a.appmapDir, appIdArg = _a.app;
+                        _a = options, isVerbose = _a.verbose, reportFile = _a.reportFile, appmapDir = _a.appmapDir, appIdArg = _a.app, mergeKey = _a.mergeKey;
                         if (isVerbose) {
                             (0, util_1.verbose)(true);
                         }
@@ -83,9 +87,10 @@ exports.default = {
                         return [4 /*yield*/, (0, promises_1.readFile)(reportFile)];
                     case 4:
                         scanResults = _c.apply(_b, [(_d.sent()).toString()]);
-                        return [4 /*yield*/, (0, upload_1.default)(scanResults, appId)];
+                        return [4 /*yield*/, (0, create_1.create)(scanResults, appId, mergeKey)];
                     case 5:
-                        _d.sent();
+                        uploadResponse = _d.sent();
+                        (0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
                         return [2 /*return*/];
                 }
             });

package/built/cli/upload/command.js.map

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/upload/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAAuC;AAEvC,4EAAsD;AAEtD,6CAA+C;AAE/C,iEAA2C;AAG3C,iEAA2C;AAE3C,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,sCAAsC;IAChD,OAAO,EAAP,UAAQ,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,uBAAuB;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EACN,sGAAsG;SACzG,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACK,OAAO,EAAb,UAAc,OAAkB;;;;;;wBACxB,KAKF,OAAoC,EAJ7B,SAAS,aAAA,EAClB,UAAU,gBAAA,EACV,SAAS,eAAA,EACJ,QAAQ,SAAA,CAC0B;wBAEzC,IAAI,SAAS,EAAE;4BACb,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;yBACf;6BAEG,SAAS,EAAT,wBAAS;wBAAE,qBAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,SAAU,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;;4BAC7C,qBAAM,IAAA,sBAAY,EAAC,QAAQ,EAAE,SAAS,CAAC,EAAA;;wBAA/C,KAAK,GAAG,SAAuC;wBAEjC,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,KAAK,CAAA;wBAAE,qBAAM,IAAA,mBAAQ,EAAC,UAAU,CAAC,EAAA;;wBAApD,WAAW,GAAG,cAAW,CAAC,SAA0B,CAAC,CAAC,QAAQ,EAAE,EAAgB;wBACtF,qBAAM,IAAA,gBAAM,EAAC,WAAW,EAAE,KAAK,CAAC,EAAA;;wBAAhC,SAAgC,CAAC;;;;;KAClC;CACF,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/upload/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wCAAuC;AAEvC,sEAAyF;AAEzF,6CAA+C;AAE/C,iEAA2C;AAG3C,iEAA2C;AAC3C,uEAAiD;AAEjD,kBAAe;IACb,OAAO,EAAE,QAAQ;IACjB,QAAQ,EAAE,sCAAsC;IAChD,OAAO,EAAP,UAAQ,IAAU;QAChB,IAAI,CAAC,MAAM,CAAC,YAAY,EAAE;YACxB,QAAQ,EAAE,2BAA2B;YACrC,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,QAAQ,EAAE,qCAAqC;YAC/C,OAAO,EAAE,uBAAuB;SACjC,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EACN,sGAAsG;SACzG,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE;YACvB,QAAQ,EAAE,8EAA8E;SACzF,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACK,OAAO,EAAb,UAAc,OAAkB;;;;;;wBACxB,KAMF,OAAoC,EAL7B,SAAS,aAAA,EAClB,UAAU,gBAAA,EACV,SAAS,eAAA,EACJ,QAAQ,SAAA,EACb,QAAQ,cAAA,CAC+B;wBAEzC,IAAI,SAAS,EAAE;4BACb,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;yBACf;6BAEG,SAAS,EAAT,wBAAS;wBAAE,qBAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,SAAU,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;;4BAC7C,qBAAM,IAAA,sBAAY,EAAC,QAAQ,EAAE,SAAS,CAAC,EAAA;;wBAA/C,KAAK,GAAG,SAAuC;wBAEjC,KAAA,CAAA,KAAA,IAAI,CAAA,CAAC,KAAK,CAAA;wBAAE,qBAAM,IAAA,mBAAQ,EAAC,UAAU,CAAC,EAAA;;wBAApD,WAAW,GAAG,cAAW,CAAC,SAA0B,CAAC,CAAC,QAAQ,EAAE,EAAgB;wBAC/D,qBAAM,IAAA,eAAgB,EAAC,WAAW,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAA;;wBAArE,cAAc,GAAG,SAAoD;wBAE3E,IAAA,yBAAe,EAAC,cAAc,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,CAAC,CAAC;;;;;KACzE;CACF,CAAC"}

package/built/cli.js

@@ -8,6 +8,7 @@ var yargs_1 = __importDefault(require("yargs"));
 var command_1 = __importDefault(require("./cli/scan/command"));
 var command_2 = __importDefault(require("./cli/upload/command"));
 var command_3 = __importDefault(require("./cli/ci/command"));
+var command_4 = __importDefault(require("./cli/merge/command"));
 (0, yargs_1.default)(process.argv.slice(2))
     .option('verbose', {
     describe: 'Show verbose output',
@@ -16,6 +17,7 @@ var command_3 = __importDefault(require("./cli/ci/command"));
     .command(command_1.default)
     .command(command_2.default)
     .command(command_3.default)
+    .command(command_4.default)
     .fail(function (msg, err, yargs) {
     if (msg) {
         console.log(yargs.help());

package/built/cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAEA,gDAA0B;AAC1B,+DAA6C;AAC7C,iEAAiD;AACjD,6DAAyC;AAEzC,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,MAAM,CAAC,SAAS,EAAE;IACjB,QAAQ,EAAE,qBAAqB;IAC/B,KAAK,EAAE,GAAG;CACX,CAAC;KACD,OAAO,CAAC,iBAAW,CAAC;KACpB,OAAO,CAAC,iBAAa,CAAC;KACtB,OAAO,CAAC,iBAAS,CAAC;KAClB,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,EAAE,KAAK;IACpB,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,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACpB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,MAAM,EAAE;KACR,aAAa,EAAE;KACf,IAAI,EAAE,CAAC,IAAI,CAAC"}
+{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;;;;AAEA,gDAA0B;AAC1B,+DAA6C;AAC7C,iEAAiD;AACjD,6DAAyC;AACzC,gEAA+C;AAE/C,IAAA,eAAK,EAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACzB,MAAM,CAAC,SAAS,EAAE;IACjB,QAAQ,EAAE,qBAAqB;IAC/B,KAAK,EAAE,GAAG;CACX,CAAC;KACD,OAAO,CAAC,iBAAW,CAAC;KACpB,OAAO,CAAC,iBAAa,CAAC;KACtB,OAAO,CAAC,iBAAS,CAAC;KAClB,OAAO,CAAC,iBAAY,CAAC;KACrB,IAAI,CAAC,UAAC,GAAG,EAAE,GAAG,EAAE,KAAK;IACpB,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,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KACpB;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC,CAAC;KACD,MAAM,EAAE;KACR,aAAa,EAAE;KACf,IAAI,EAAE,CAAC,IAAI,CAAC"}

package/built/database/index.js

@@ -1,6 +1,4 @@
 "use strict";
-// License: https://github.com/newrelic/newrelic-ruby-agent/blob/main/LICENSE
-// Apache License 2.0
 var __generator = (this && this.__generator) || function (thisArg, body) {
     var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
     return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
@@ -28,6 +26,31 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __values = (this && this.__values) || function(o) {
     var s = typeof Symbol === "function" && Symbol.iterator, m = s && o[s], i = 0;
     if (m) return m.call(o);
@@ -40,155 +63,114 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.countJoins = exports.sqlStrings = exports.isSelect = exports.sqlNormalized = exports.obfuscate = void 0;
-// TODO: Copied and TypeScript-ified from @appland/models
-var visit_1 = require("./visit");
+exports.countJoins = exports.sqlStrings = exports.isSelect = exports.getSqlLabelFromString = exports.getHttpLabel = exports.capitalizeString = void 0;
 var models_1 = require("@appland/models");
-var COMPONENTS_REGEXP_MAP = {
-    single_quotes: /'(?:[^']|'')*?(?:\\'.*|'(?!'))/g,
-    double_quotes: /"(?:[^"]|"")*?(?:\\".*|"(?!"))/g,
-    dollar_quotes: /(\$(?!\d)[^$]*?\$).*?(?:\1|$)/g,
-    uuids: /\{?(?:[0-9a-fA-F]-*){32}\}?/g,
-    numeric_literals: /-?\b(?:[0-9]+\.)?[0-9]+([eE][+-]?[0-9]+)?\b/g,
-    boolean_literals: /\b(?:true|false|null)\b/gi,
-    hexadecimal_literals: /0x[0-9a-fA-F]+/g,
-    comments: /(?:#|--).*?(?=\r|\n|$)/gi,
-    multi_line_comments: /\/\*(?:[^/]|\/[^*])*?(?:\*\/|\/\*.*)/g,
-    oracle_quoted_strings: /q'\[.*?(?:\]'|$)|q'\{.*?(?:\}'|$)|q'<.*?(?:>'|$)|q'\(.*?(?:\)'|$)/g,
-};
-// We use these to check whether the query contains any quote characters
-// after obfuscation. If so, that's a good indication that the original
-// query was malformed, and so our obfuscation can't reliably find
-// literals. In such a case, we'll replace the entire query with a
-// placeholder.
-var CLEANUP_REGEXP = {
-    mysql: /'|"|\/\*|\*\//,
-    mysql2: /'|"|\/\*|\*\//,
-    postgres: /'|\/\*|\*\/|\$(?!\?)/,
-    sqlite: /'|\/\*|\*\//,
-    cassandra: /'|\/\*|\*\//,
-    oracle: /'|\/\*|\*\//,
-    oracle_enhanced: /'|\/\*|\*\//,
-};
-/**
- * @type {{string: string[]}}
- */
-var DIALECT_COMPONENTS = {
-    fallback: Object.keys(COMPONENTS_REGEXP_MAP),
-    mysql: [
-        'single_quotes',
-        'double_quotes',
-        'numeric_literals',
-        'boolean_literals',
-        'hexadecimal_literals',
-        'comments',
-        'multi_line_comments',
-    ],
-    postgres: [
-        'single_quotes',
-        'dollar_quotes',
-        'uuids',
-        'numeric_literals',
-        'boolean_literals',
-        'comments',
-        'multi_line_comments',
-    ],
-    sqlite: [
-        'single_quotes',
-        'numeric_literals',
-        'boolean_literals',
-        'hexadecimal_literals',
-        'comments',
-        'multi_line_comments',
-    ],
-    oracle: [
-        'single_quotes',
-        'oracle_quoted_strings',
-        'numeric_literals',
-        'comments',
-        'multi_line_comments',
-    ],
-    cassandra: [
-        'single_quotes',
-        'uuids',
-        'numeric_literals',
-        'boolean_literals',
-        'hexadecimal_literals',
-        'comments',
-        'multi_line_comments',
-    ],
-};
-var PLACEHOLDER = '?';
-/**
- * @param {string} dialect
- * @returns {RegExp[]}
- */
-function generateRegexp(dialect) {
-    var components = DIALECT_COMPONENTS[dialect];
-    // No Regexp.union in JS
-    return components.map(function (component) { return COMPONENTS_REGEXP_MAP[component]; });
-}
-var MYSQL_COMPONENTS_REGEXP = generateRegexp('mysql');
-var POSTGRES_COMPONENTS_REGEXP = generateRegexp('postgres');
-var SQLITE_COMPONENTS_REGEXP = generateRegexp('sqlite');
-var ORACLE_COMPONENTS_REGEXP = generateRegexp('oracle');
-var CASSANDRA_COMPONENTS_REGEXP = generateRegexp('cassandra');
-var FALLBACK_REGEXP = generateRegexp('fallback');
-function detectUnmatchedPairs(obfuscated, adapter) {
-    if (CLEANUP_REGEXP[adapter]) {
-        return CLEANUP_REGEXP[adapter].test(obfuscated);
+var visit_1 = require("./visit");
+var url_1 = require("url");
+function capitalizeString(str) {
+    if (typeof str !== 'string') {
+        return '';
     }
-    return CLEANUP_REGEXP.mysql.test(obfuscated);
+    return str.slice(0, 1).toUpperCase() + str.slice(1).toLowerCase();
 }
-var FAILED_TO_OBFUSCATE_MESSAGE = 'Failed to obfuscate SQL query - quote characters remained after obfuscation';
-/**
- * Replaces literal query parameters with parameter symbols (e.g. '?');
- *
- * @param {string} sql
- * @param {string} adapter
- * @returns {string}
- */
-function obfuscate(sql, adapter) {
-    /** @type {RegExp[]} */ var regexp;
-    switch (adapter) {
-        case 'mysql':
-        case 'mysql2':
-            regexp = MYSQL_COMPONENTS_REGEXP;
-            break;
-        case 'postgres':
-            regexp = POSTGRES_COMPONENTS_REGEXP;
-            break;
-        case 'sqlite':
-            regexp = SQLITE_COMPONENTS_REGEXP;
-            break;
-        case 'oracle':
-        case 'oracle_enhanced':
-            regexp = ORACLE_COMPONENTS_REGEXP;
-            break;
-        case 'cassandra':
-            regexp = CASSANDRA_COMPONENTS_REGEXP;
-            break;
-        default:
-            regexp = FALLBACK_REGEXP;
+exports.capitalizeString = capitalizeString;
+function getHttpLabel(event) {
+    if (!event.httpServerRequest) {
+        return;
     }
-    var obfuscated = sql;
-    // eslint-disable-next-line no-return-assign
-    regexp.forEach(function (re) { return (obfuscated = obfuscated.replace(re, PLACEHOLDER)); });
-    if (detectUnmatchedPairs(obfuscated, adapter)) {
-        obfuscated = FAILED_TO_OBFUSCATE_MESSAGE;
+    var requestMethod = event.httpServerRequest.request_method;
+    var pathInfo = event.httpServerRequest.path_info;
+    var label;
+    try {
+        // the url is fake, we only care about the path info anyway
+        var url = new url_1.URL(pathInfo, 'http://hostname');
+        label = requestMethod + " " + url.pathname;
+    }
+    catch (ex) {
+        label = 'HTTP Request';
     }
-    return obfuscated;
+    return label;
 }
-exports.obfuscate = obfuscate;
-function sqlNormalized(query) {
-    return obfuscate(query.sql, query.database_type);
+exports.getHttpLabel = getHttpLabel;
+var sqlLabels = new Set([
+    'insert',
+    'update',
+    'select',
+    'delete',
+    'alter',
+    'create',
+    'drop',
+    'rename',
+    'truncate',
+    'replace',
+    'savepoint',
+    'release',
+    'rollback',
+    'lock',
+    'unlock',
+    'set',
+    'start',
+    'call',
+    'delete',
+    'do',
+    'perform',
+    'handler',
+    'load',
+    'purge',
+    'reset',
+    'prepare',
+    'execute',
+    'deallocate',
+    'xa',
+]);
+function getSqlLabelFromString(sqlString) {
+    var sqlChars = __spreadArray([], __read(sqlString.trimLeft()), false);
+    if (sqlChars.length > 0 && sqlChars[0] === '(') {
+        // if the query is wrapped in parenthesis, drop the opening parenthesis
+        // it doesn't matter if we leave a hanging closing parenthesis.
+        // e.g. (SELECT 1);
+        sqlChars.shift();
+    }
+    // drop sub-queries and parenthesized expressions
+    var depth = 0;
+    var topLevelSql = sqlChars
+        .reduce(function (arr, c) {
+        if (c === '(') {
+            depth += 1;
+        }
+        if (depth === 0) {
+            arr.push(c);
+        }
+        if (c === ')') {
+            depth -= 1;
+        }
+        return arr;
+    }, [])
+        .join('');
+    var queryType;
+    if (topLevelSql.search(/\s/) === -1) {
+        // There's only a single token
+        // e.g. BEGIN, COMMIT, CHECKPOINT
+        queryType = topLevelSql;
+    }
+    else {
+        // convert non-word sequences to spaces and split by space
+        // find the first known token
+        queryType =
+            topLevelSql
+                .replace(/[^\w]+/g, ' ')
+                .toLowerCase()
+                .split(' ')
+                .find(function (t) { return sqlLabels.has(t); }) || 'unknown';
+    }
+    return ['SQL', capitalizeString(queryType) || null].join(' ');
 }
-exports.sqlNormalized = sqlNormalized;
+exports.getSqlLabelFromString = getSqlLabelFromString;
 function isSelect(sql) {
-    return (0, models_1.getSqlLabelFromString)(sql) === 'SQL Select';
+    return getSqlLabelFromString(sql) === 'SQL Select';
 }
 exports.isSelect = isSelect;
-function sqlStrings(event, filter) {
+function sqlStrings(event, appMapIndex, filter) {
     var _a, _b, e, sql, e_1_1;
     var e_1, _c;
     if (filter === void 0) { filter = function () { return true; }; }
@@ -201,19 +183,19 @@ function sqlStrings(event, filter) {
             case 1:
                 if (!!_b.done) return [3 /*break*/, 4];
                 e = _b.value;
-                if (!e.event.sqlQuery) {
+                if (!e.event.sql) {
                     return [3 /*break*/, 3];
                 }
-                if (!filter(e.event)) {
+                if (!filter(e.event, appMapIndex)) {
                     return [3 /*break*/, 3];
                 }
                 if (!isSelect(e.event.sqlQuery)) {
                     return [3 /*break*/, 3];
                 }
-                if (!filter(event)) {
+                if (!filter(event, appMapIndex)) {
                     return [3 /*break*/, 3];
                 }
-                sql = sqlNormalized(e.event.sql);
+                sql = appMapIndex.sqlNormalized(e.event);
                 return [4 /*yield*/, { event: e.event, sql: sql }];
             case 2:
                 _d.sent();
@@ -237,23 +219,16 @@ function sqlStrings(event, filter) {
     });
 }
 exports.sqlStrings = sqlStrings;
-function countJoins(normalizedSql) {
-    try {
-        var ast = (0, models_1.buildQueryAST)(normalizedSql);
-        var joins_1 = 0;
-        if (ast) {
-            (0, visit_1.visit)(ast, {
-                'map.join': function (node) {
-                    joins_1 += node.map.length;
-                },
-            });
-        }
-        return joins_1;
-    }
-    catch (_) {
-        console.warn("Unable to analyze query \"" + normalizedSql + "\"");
+function countJoins(ast) {
+    if (!ast)
         return 0;
-    }
+    var joins = 0;
+    (0, visit_1.visit)(ast, {
+        'map.join': function (node) {
+            joins += node.map.length;
+        },
+    });
+    return joins;
 }
 exports.countJoins = countJoins;
 //# sourceMappingURL=index.js.map

package/built/database/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/database/index.ts"],"names":[],"mappings":"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"}

package/built/eventUtil.js

@@ -0,0 +1,61 @@
+"use strict";
+var __read = (this && this.__read) || function (o, n) {
+    var m = typeof Symbol === "function" && o[Symbol.iterator];
+    if (!m) return o;
+    var i = m.call(o), r, ar = [], e;
+    try {
+        while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
+    }
+    catch (error) { e = { error: error }; }
+    finally {
+        try {
+            if (r && !r.done && (m = i["return"])) m.call(i);
+        }
+        finally { if (e) throw e.error; }
+    }
+    return ar;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cloneEvent = exports.cloneCodeObject = void 0;
+var models_1 = require("@appland/models");
+function cloneCodeObject(sourceObject) {
+    var codeObjects = __spreadArray([
+        sourceObject
+    ], __read(sourceObject.ancestors()), false);
+    var currentSourceObject = codeObjects.pop();
+    var lastClonedObject;
+    while (currentSourceObject) {
+        lastClonedObject = new models_1.CodeObject(currentSourceObject.data, lastClonedObject);
+        currentSourceObject = codeObjects.pop();
+    }
+    return lastClonedObject;
+}
+exports.cloneCodeObject = cloneCodeObject;
+// FIXME: These methods should live in @appland/models. Perhaps via Event#clone.
+function cloneEvent(sourceEvent) {
+    // We need to clone both the sourceEvent and the 'linkedEvent'. The linkedEvent will be a return
+    // if `sourceEvent` is a call and vice versa. Some accessors on the Event will use the linkedEvent
+    // as a convienence, so we may run into errors if we don't restore this relationship. For example,
+    // accessing `elapsedTime` on a call event will retrieve the value from the associated return
+    // event.
+    var linkedEvent = new models_1.Event(sourceEvent.linkedEvent);
+    var event = new models_1.Event(sourceEvent);
+    event.linkedEvent = linkedEvent;
+    // The codeObject is used as well so it'll need a clone.
+    var codeObject = cloneCodeObject(sourceEvent.codeObject);
+    if (codeObject) {
+        event.codeObject = codeObject;
+    }
+    return event;
+}
+exports.cloneEvent = cloneEvent;
+//# sourceMappingURL=eventUtil.js.map

package/built/eventUtil.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"eventUtil.js","sourceRoot":"","sources":["../src/eventUtil.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAoD;AAWpD,SAAgB,eAAe,CAAC,YAAwB;IACtD,IAAM,WAAW;QACf,YAAY;cACR,YAAY,CAAC,SAA2C,EAAE,SAC/D,CAAC;IACF,IAAI,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;IAC5C,IAAI,gBAAgB,CAAC;IAErB,OAAO,mBAAmB,EAAE;QAC1B,gBAAgB,GAAG,IAAK,mBAAoC,CACzD,mBAAoD,CAAC,IAAI,EAC1D,gBAAgB,CACjB,CAAC;QACF,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;KACzC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAjBD,0CAiBC;AAED,gFAAgF;AAEhF,SAAgB,UAAU,CAAC,WAAkB;IAC3C,gGAAgG;IAChG,kGAAkG;IAClG,kGAAkG;IAClG,6FAA6F;IAC7F,SAAS;IACT,IAAM,WAAW,GAAG,IAAK,cAA0B,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;IAC7E,IAAM,KAAK,GAAG,IAAK,cAA0B,CAAC,WAAW,CAAC,CAAC;IAC3D,KAAK,CAAC,WAAW,GAAG,WAAW,CAAC;IAEhC,wDAAwD;IACxD,IAAM,UAAU,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IAC3D,IAAI,UAAU,EAAE;QACd,KAAK,CAAC,UAAU,GAAG,UAAU,CAAC;KAC/B;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAjBD,gCAiBC"}

package/built/integration/appland/{fetchStatus.js → app/listFindingStatus.js}

@@ -48,4 +48,4 @@ function default_1(appId) {
     });
 }
 exports.default = default_1;
-//# sourceMappingURL=fetchStatus.js.map
+//# sourceMappingURL=listFindingStatus.js.map