@appland/scanner 1.41.1 → 1.42.0

package/built/appMapIndex.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var models_1 = require("@appland/models");
+var lru_cache_1 = __importDefault(require("lru-cache"));
+var sqlWarning_1 = __importDefault(require("./sqlWarning"));
+var NormalizedSQLBySQLString = new lru_cache_1.default({ max: 10000 });
+var ASTBySQLString = new lru_cache_1.default({ max: 1000 });
+var AppMapIndex = /** @class */ (function () {
+    function AppMapIndex(appMap) {
+        this.appMap = appMap;
+    }
+    AppMapIndex.prototype.sqlAST = function (event) {
+        if (!event.sql)
+            throw new Error(event.fqid + " is not a SQL query");
+        var sql = this.sqlNormalized(event);
+        var ast = ASTBySQLString.get(sql);
+        if (!ast) {
+            ast = (0, models_1.parseSQL)(sql, sqlWarning_1.default);
+            ast ? ASTBySQLString.set(sql, ast) : ASTBySQLString.set(sql, []);
+        }
+        return ast;
+    };
+    AppMapIndex.prototype.sqlNormalized = function (event) {
+        if (!event.sql)
+            throw new Error(event.fqid + " is not a SQL query");
+        var cacheKey = [event.sql.database_type, event.sql.sql].join(':');
+        var sql = NormalizedSQLBySQLString.get(cacheKey);
+        if (!sql) {
+            sql = (0, models_1.normalizeSQL)(event.sql.sql, event.sql.database_type);
+            NormalizedSQLBySQLString.set(cacheKey, sql);
+        }
+        return sql;
+    };
+    return AppMapIndex;
+}());
+exports.default = AppMapIndex;
+//# sourceMappingURL=appMapIndex.js.map

package/built/appMapIndex.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"appMapIndex.js","sourceRoot":"","sources":["../src/appMapIndex.ts"],"names":[],"mappings":";;;;;AAAA,0CAAwE;AAExE,wDAAiC;AACjC,4DAAsC;AAEtC,IAAM,wBAAwB,GAAG,IAAI,mBAAQ,CAAiB,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;AAC9E,IAAM,cAAc,GAAG,IAAI,mBAAQ,CAAmB,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;AAErE;IACE,qBAAmB,MAAc;QAAd,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAErC,4BAAM,GAAN,UAAO,KAAY;QACjB,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAI,KAAK,CAAC,IAAI,wBAAqB,CAAC,CAAC;QAEpE,IAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACtC,IAAI,GAAG,GAAG,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAClC,IAAI,CAAC,GAAG,EAAE;YACR,GAAG,GAAG,IAAA,iBAAQ,EAAC,GAAG,EAAE,oBAAU,CAAC,CAAC;YAChC,GAAG,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,EAAE,EAAS,CAAC,CAAC;SACzE;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,mCAAa,GAAb,UAAc,KAAY;QACxB,IAAI,CAAC,KAAK,CAAC,GAAG;YAAE,MAAM,IAAI,KAAK,CAAI,KAAK,CAAC,IAAI,wBAAqB,CAAC,CAAC;QAEpE,IAAM,QAAQ,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACpE,IAAI,GAAG,GAAG,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QACjD,IAAI,CAAC,GAAG,EAAE;YACR,GAAG,GAAG,IAAA,qBAAY,EAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;YAC3D,wBAAwB,CAAC,GAAG,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;SAC7C;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IACH,kBAAC;AAAD,CAAC,AA1BD,IA0BC"}

package/built/check.js

@@ -15,14 +15,14 @@ var Check = /** @class */ (function () {
         this.includeEvent = [];
         this.excludeEvent = [];
     }
-    Check.prototype.filterScope = function (event, appMap) {
-        if (this.includeScope.length > 0 && !this.includeScope.every(function (fn) { return fn(event, appMap); })) {
+    Check.prototype.filterScope = function (event, appMapIndex) {
+        if (this.includeScope.length > 0 && !this.includeScope.every(function (fn) { return fn(event, appMapIndex); })) {
             if ((0, util_1.verbose)()) {
                 console.warn("\t'includeScope' clause is not satisifed.");
             }
             return false;
         }
-        if (this.excludeScope.some(function (fn) { return fn(event, appMap); })) {
+        if (this.excludeScope.some(function (fn) { return fn(event, appMapIndex); })) {
             if ((0, util_1.verbose)()) {
                 console.warn("\t'excludeScope' clause is not satisifed.");
             }

package/built/check.js.map

@@ -1 +1 @@
-{"version":3,"file":"check.js","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":";;AACA,yCAA2C;AAG3C;IASE,eAAmB,IAAU,EAAE,OAA6B;QAAzC,SAAI,GAAJ,IAAI,CAAM;QAC3B,SAAS,WAAW;YAClB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,WAAW,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,2BAAW,GAAX,UAAY,KAAY,EAAE,MAAe;QACvC,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAjB,CAAiB,CAAC,EAAE;YACvF,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAjB,CAAiB,CAAC,EAAE;YACrD,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAQ,GAAR;QACE,IAAM,MAAM,GAAG,CAAC,MAAI,IAAI,CAAC,IAAI,CAAC,EAAE,MAAG,CAAC,CAAC;QACrC,4DAA4D;QAC5D,IAAM,IAAI,GAAQ,IAAI,CAAC;QACvB,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;YAC3E,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,MAAI,GAAG,SAAI,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAG,CAAC,CAAC;aACnD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACH,YAAC;AAAD,CAAC,AAlDD,IAkDC"}
+{"version":3,"file":"check.js","sourceRoot":"","sources":["../src/check.ts"],"names":[],"mappings":";;AACA,yCAA2C;AAG3C;IASE,eAAmB,IAAU,EAAE,OAA6B;QAAzC,SAAI,GAAJ,IAAI,CAAM;QAC3B,SAAS,WAAW;YAClB,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,IAAI,WAAW,EAAE,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,IAAI,MAAM,CAAC;QAClC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,2BAAW,GAAX,UAAY,KAAY,EAAE,WAAwB;QAChD,IAAI,IAAI,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAtB,CAAsB,CAAC,EAAE;YAC5F,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAtB,CAAsB,CAAC,EAAE;YAC1D,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,wBAAQ,GAAR;QACE,IAAM,MAAM,GAAG,CAAC,MAAI,IAAI,CAAC,IAAI,CAAC,EAAE,MAAG,CAAC,CAAC;QACrC,4DAA4D;QAC5D,IAAM,IAAI,GAAQ,IAAI,CAAC;QACvB,CAAC,cAAc,EAAE,cAAc,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,UAAC,GAAG;YAC3E,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,MAAM,CAAC,IAAI,CAAC,MAAI,GAAG,SAAI,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAG,CAAC,CAAC;aACnD;QACH,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACH,YAAC;AAAD,CAAC,AAlDD,IAkDC"}

package/built/checkInstance.js

@@ -41,21 +41,21 @@ var CheckInstance = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    CheckInstance.prototype.filterEvent = function (event, appMap) {
-        if (this.ruleLogic.where && !this.ruleLogic.where(event, appMap)) {
+    CheckInstance.prototype.filterEvent = function (event, appMapIndex) {
+        if (this.ruleLogic.where && !this.ruleLogic.where(event, appMapIndex)) {
             if ((0, util_1.verbose)()) {
                 console.warn("\t'where' clause is not satisifed.");
             }
             return false;
         }
         if (this.check.includeEvent.length > 0 &&
-            !this.check.includeEvent.every(function (fn) { return fn(event, appMap); })) {
+            !this.check.includeEvent.every(function (fn) { return fn(event, appMapIndex); })) {
             if ((0, util_1.verbose)()) {
                 console.warn("\t'includeEvent' clause is not satisifed.");
             }
             return false;
         }
-        if (this.check.excludeEvent.some(function (fn) { return fn(event, appMap); })) {
+        if (this.check.excludeEvent.some(function (fn) { return fn(event, appMapIndex); })) {
             if ((0, util_1.verbose)()) {
                 console.warn("\t'excludeEvent' clause is not satisifed.");
             }

package/built/checkInstance.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkInstance.js","sourceRoot":"","sources":["../src/checkInstance.ts"],"names":[],"mappings":";;AAEA,yCAA2C;AAG3C;IAIE,uBAAY,KAAY;QACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,sBAAI,kCAAO;aAAX;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,CAAC;;;OAAA;IAED,sBAAI,iCAAM;aAAV;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,CAAC;;;OAAA;IAED,sBAAI,gCAAK;aAAT;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/B,CAAC;;;OAAA;IAED,sBAAI,gCAAK;aAAT;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,CAAC;;;OAAA;IAED,sBAAI,yCAAc;aAAlB;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;QACxC,CAAC;;;OAAA;IAED,mCAAW,GAAX,UAAY,KAAY,EAAE,MAAe;QACvC,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE;YAChE,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;aACpD;YACD,OAAO,KAAK,CAAC;SACd;QAED,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAClC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAjB,CAAiB,CAAC,EACzD;YACA,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAjB,CAAiB,CAAC,EAAE;YAC3D,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACH,oBAAC;AAAD,CAAC,AAtDD,IAsDC"}
+{"version":3,"file":"checkInstance.js","sourceRoot":"","sources":["../src/checkInstance.ts"],"names":[],"mappings":";;AAEA,yCAA2C;AAG3C;IAIE,uBAAY,KAAY;QACtB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC;IACzD,CAAC;IAED,sBAAI,kCAAO;aAAX;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,CAAC;;;OAAA;IAED,sBAAI,iCAAM;aAAV;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAC5B,CAAC;;;OAAA;IAED,sBAAI,gCAAK;aAAT;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC;QAC/B,CAAC;;;OAAA;IAED,sBAAI,gCAAK;aAAT;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QAC1B,CAAC;;;OAAA;IAED,sBAAI,yCAAc;aAAlB;YACE,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC;QACxC,CAAC;;;OAAA;IAED,mCAAW,GAAX,UAAY,KAAY,EAAE,WAAwB;QAChD,IAAI,IAAI,CAAC,SAAS,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE;YACrE,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,oCAAoC,CAAC,CAAC;aACpD;YACD,OAAO,KAAK,CAAC;SACd;QAED,IACE,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC;YAClC,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAtB,CAAsB,CAAC,EAC9D;YACA,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,IAAI,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,UAAC,EAAE,IAAK,OAAA,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAtB,CAAsB,CAAC,EAAE;YAChE,IAAI,IAAA,cAAO,GAAE,EAAE;gBACb,OAAO,CAAC,IAAI,CAAC,2CAA2C,CAAC,CAAC;aAC3D;YACD,OAAO,KAAK,CAAC;SACd;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IACH,oBAAC;AAAD,CAAC,AAtDD,IAsDC"}

package/built/cli/scan/command.js

@@ -121,7 +121,7 @@ exports.default = {
     },
     handler: function (options) {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, appmapDir, appmapFile, config, isVerbose, reportAllFindings, appIdArg, apiKey, ide, reportFile, files, glob, configData, scanner, _b, rawScanResults, findingStatuses, scanResults, err_1;
+            var _a, appmapDir, appmapFile, config, isVerbose, reportAllFindings, appIdArg, apiKey, ide, reportFile, files, glob, configData, scanner, startTime, _b, rawScanResults, findingStatuses, scanResults, elapsed, numChecks, err_1;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -162,6 +162,7 @@ exports.default = {
                     case 7:
                         configData = _c.sent();
                         scanner = (0, scanner_1.default)(reportAllFindings, configData, files);
+                        startTime = Date.now();
                         return [4 /*yield*/, Promise.all([scanner.scan(), scanner.fetchFindingStatus(appIdArg, appmapDir)])];
                     case 8:
                         _b = __read.apply(void 0, [_c.sent(), 2]), rawScanResults = _b[0], findingStatuses = _b[1];
@@ -181,6 +182,9 @@ exports.default = {
                         console.log();
                         (0, summaryReport_1.default)(scanResults, true);
                         console.log('\n');
+                        elapsed = Date.now() - startTime;
+                        numChecks = scanResults.checks.length * scanResults.summary.numAppMaps;
+                        console.log("Performed " + numChecks + " checks in " + elapsed + "ms (" + Math.floor(numChecks / (elapsed / 1000.0)) + " checks/sec)");
                         return [3 /*break*/, 11];
                     case 10:
                         err_1 = _c.sent();

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

@@ -1 +1 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4C;AAC5C,wCAAwC;AACxC,6BAAiC;AAKjC,mFAA4E;AAC5E,uCAA2D;AAE3D,6CAA+C;AAC/C,2CAA6C;AAC7C,+EAAyD;AACzD,6EAAuD;AAEvD,wCAAuC;AACvC,iEAA2C;AAG3C,sDAAoD;AACpD,yDAAmC;AAInC,kBAAe;IACb,OAAO,EAAE,MAAM;IACf,QAAQ,EAAE,yCAAyC;IACnD,OAAO,EAAP,UAAQ,IAAU;QAChB,IAAA,kBAAQ,EAAC,IAAI,CAAC,CAAC;QAEf,IAAI,CAAC,MAAM,CAAC,aAAa,EAAE;YACzB,QAAQ,EAAE,qBAAqB;YAC/B,KAAK,EAAE,GAAG;SACX,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EAAE,gEAAgE;YAC1E,OAAO,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,CAAC;SACjD,CAAC,CAAC;QACH,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE;YACjB,QAAQ,EAAE,6DAA6D;YACvE,OAAO,EAAE,KAAK;YACd,IAAI,EAAE,SAAS;SAChB,CAAC,CAAC;QAEH,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;IACvB,CAAC;IACK,OAAO,EAAb,UAAc,OAAkB;;;;;;wBACxB,KAUF,OAAoC,EATtC,SAAS,eAAA,EACT,UAAU,gBAAA,EACV,MAAM,YAAA,EACG,SAAS,aAAA,EACb,iBAAiB,SAAA,EACjB,QAAQ,SAAA,EACb,MAAM,YAAA,EACN,GAAG,SAAA,EACH,UAAU,gBAAA,CAC6B;wBAEzC,IAAI,SAAS,EAAE;4BACb,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC;yBACf;wBAED,IAAI,MAAM,EAAE;4BACV,OAAO,CAAC,GAAG,CAAC,eAAe,GAAG,MAAM,CAAC;yBACtC;;;;wBAGC,IAAI,UAAU,IAAI,SAAS,EAAE;4BAC3B,MAAM,IAAI,wBAAe,CAAC,iDAAiD,CAAC,CAAC;yBAC9E;wBACD,IAAI,CAAC,UAAU,IAAI,CAAC,SAAS,EAAE;4BAC7B,MAAM,IAAI,wBAAe,CAAC,kDAAkD,CAAC,CAAC;yBAC/E;wBAEG,KAAK,GAAa,EAAE,CAAC;6BACrB,SAAS,EAAT,wBAAS;wBACX,qBAAM,IAAA,sBAAY,EAAC,WAAW,EAAE,SAAU,CAAC,EAAA;;wBAA3C,SAA2C,CAAC;wBACtC,IAAI,GAAG,IAAA,gBAAS,EAAC,WAAY,CAAC,CAAC;wBAC7B,qBAAM,IAAI,CAAI,SAAS,sBAAmB,CAAC,EAAA;;wBAAnD,KAAK,GAAG,SAA2C,CAAC;;;6BAElD,UAAU,EAAV,wBAAU;wBACZ,qBAAM,IAAA,sBAAY,EAAC,MAAM,EAAE,UAAU,CAAC,EAAA;;wBAAtC,SAAsC,CAAC;wBACvC,KAAK,GAAG,CAAC,UAAU,CAAC,CAAC;;4BAGJ,qBAAM,IAAA,uCAAe,EAAC,MAAM,CAAC,EAAA;;wBAA1C,UAAU,GAAG,SAA6B;wBAE1C,OAAO,GAAG,IAAA,iBAAY,EAAC,iBAAiB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;wBAEzB,qBAAM,OAAO,CAAC,GAAG,CAGzD,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,EAAA;;wBAH9D,KAAA,sBAAoC,SAG0B,KAAA,EAH7D,cAAc,QAAA,EAAE,eAAe,QAAA;wBAKtC,6BAA6B;wBAC7B,qBAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC,EAAA;;wBADzD,6BAA6B;wBAC7B,SAAyD,CAAC;wBAEtD,WAAW,SAAA,CAAC;wBAChB,IAAI,iBAAiB,EAAE;4BACrB,WAAW,GAAG,cAAc,CAAC;yBAC9B;6BAAM;4BACL,WAAW,GAAG,cAAc,CAAC,YAAY,CACvC,IAAA,sBAAW,EAAC,cAAc,CAAC,QAAQ,EAAE,eAAe,CAAC,CACtD,CAAC;yBACH;wBAED,IAAA,wBAAc,EAAC,WAAW,CAAC,QAAQ,EAAE,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;wBACtE,OAAO,CAAC,GAAG,EAAE,CAAC;wBACd,IAAA,uBAAa,EAAC,WAAW,EAAE,IAAI,CAAC,CAAC;wBACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;;;;wBAElB,IAAI,KAAG,YAAY,wBAAe,EAAE;4BAClC,OAAO,CAAC,IAAI,CAAC,KAAG,CAAC,OAAO,CAAC,CAAC;4BAC1B,sBAAO,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,eAAe,CAAC,EAAC;yBAC/C;wBACD,IAAI,KAAG,YAAY,mBAAU,EAAE;4BAC7B,sBAAO,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,UAAU,CAAC,EAAC;yBAC1C;wBACD,IAAI,CAAC,cAAO,IAAI,KAAG,YAAY,KAAK,EAAE;4BACpC,OAAO,CAAC,KAAK,CAAC,KAAG,CAAC,OAAO,CAAC,CAAC;4BAC3B,sBAAO,OAAO,CAAC,IAAI,CAAC,mBAAQ,CAAC,YAAY,CAAC,EAAC;yBAC5C;wBAED,MAAM,KAAG,CAAC;;;;;KAEb;CACF,CAAC;AAEF,SAAS,cAAc,CAAC,EAOP;QANC,IAAI,iBAAA,EACD,OAAO,oBAAA,EACJ,UAAU,uBAAA,EACjB,GAAG,gBAAA,EACG,SAAS,sBAAA,EACT,SAAS,sBAAA;IAE9B,IAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,GAAG,EAAE,IAAI,GAAG,CAAC;QACb,MAAM,EAAE,OAAO,GAAG,CAAC;QACnB,GAAG,EAAE,GAAG,GAAG,CAAC;QACZ,QAAQ,EAAE,SAAS,GAAG,CAAC;QACvB,QAAQ,EAAE,SAAS,GAAG,CAAC;KACxB,CAAC;SACC,MAAM,CAAC,UAAC,EAAK;YAAL,KAAA,aAAK,EAAF,CAAC,QAAA;QAAM,OAAA,CAAC;IAAD,CAAC,CAAC;SACpB,GAAG,CAAC,UAAC,EAAG;YAAH,KAAA,aAAG,EAAF,CAAC,QAAA;QAAM,OAAA,CAAC;IAAD,CAAC,CAAC,CAAC;IAEnB,OAAO,UAAU,QAAkB;QACjC,OAAO,MAAM,CAAC,WAAW,CACvB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,UAAC,EAAM;gBAAN,KAAA,aAAM,EAAL,CAAC,QAAA,EAAE,CAAC,QAAA;YACpC,IAAI,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAAE,OAAO,KAAK,CAAC;YACvC,IAAI,CAAC,KAAK,YAAY;gBAAE,OAAQ,CAAC,CAAC,IAAI,EAAE,CAAa,CAAC,MAAM,KAAK,UAAU,CAAC;YAC5E,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,IAAI,CAAO,OAAoB,EAAE,GAAgB;;IACxD,IAAM,MAAM,GAAG,IAAI,GAAG,EAAQ,CAAC;;QAE/B,KAAoB,IAAA,YAAA,SAAA,OAAO,CAAA,gCAAA,qDAAE;YAAxB,IAAM,KAAK,oBAAA;YACd,IAAM,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC;YACrB,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAAE,SAAS;YAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;SACtB;;;;;;;;;IAED,OAAO,MAAM,CAAC,MAAM,EAAE,CAAC;AACzB,CAAC;AAED,0DAA0D;AAC1D,SAAS,YAAY,CAAC,cAA2B;IACzC,IAAA,kBAA6C,cAAc,CAAE,EAA3D,OAAO,aAAA,EAAE,cAAc,oBAAA,EAAE,QAAQ,cAA0B,CAAC;IAEpE,gDAAgD;IAChD,IAAM,MAAM,GAAG,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IACtD,IAAM,QAAQ,GAAG,MAAM,CAAC,WAAW,CACjC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,UAAC,EAAc;YAAd,KAAA,aAAc,EAAb,EAAE,QAAA,EAAE,QAAQ,QAAA;QAAM,OAAA,CAAC,EAAE,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAAtB,CAAsB,CAAC,CAC/E,CAAC;IAEF,yCAAyC;IACzC,IAAM,cAAc,4BAAO,IAAI,CAAC,QAAQ,EAAE,UAAC,EAAQ;YAAN,IAAI,UAAA;QAAO,OAAA,IAAI;IAAJ,CAAI,CAAC,SAAC,CAAC;IAE/D,OAAO,IAAI,CAAC,SAAS,uBAEd,cAAc,KACjB,OAAO,wBAAO,OAAO,KAAE,WAAW,EAAE,cAAc,CAAC,MAAM,KACzD,cAAc,EAAE,QAAQ,EACxB,QAAQ,EAAE,cAAc,KAE1B,IAAI,EACJ,CAAC,CACF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":"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"}

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/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/report/summaryReport.js

@@ -53,7 +53,7 @@ function default_1(summary, colorize) {
     var matchedStr = summary.summary.numFindings + " finding" + (summary.summary.numFindings === 1 ? '' : 's');
     var colouredMatchedStr = colorize ? chalk_1.default.stderr.magenta(matchedStr) : matchedStr;
     console.log();
-    console.log(summary.summary.numChecks + " checks (" + [colouredMatchedStr].join(', ') + ")");
+    console.log(colouredMatchedStr);
     summarizeFindings(summary.findings)
         .sort(function (a, b) { return a.ruleTitle.localeCompare(b.ruleTitle); })
         .forEach(function (finding) {

package/built/report/summaryReport.js.map

@@ -1 +1 @@
-{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAK1B,SAAS,iBAAiB,CAAC,QAAmB;IAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,cAAc,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACnB,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,mBAAyB,OAAoB,EAAE,QAAiB;IAC9D,IAAM,UAAU,GAAM,OAAO,CAAC,OAAO,CAAC,WAAW,iBAC/C,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC5C,CAAC;IACH,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEpF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAI,OAAO,CAAC,OAAO,CAAC,SAAS,iBAAY,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC,CAAC;IAExF,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,EAAtC,CAAsC,CAAC;SACtD,OAAO,CAAC,UAAC,OAAO;QACf,IAAM,QAAQ,GAAG,SAAO,OAAO,CAAC,SAAS,UAAK,OAAO,CAAC,MAAM,YAAO,OAAO,CAAC,YAAY,aAAU,CAAC;QAClG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAM,cAAc,GAAG,yBAAI,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAE,IAAI,EAAE,CAAC;QAC7D,cAAc,CAAC,OAAO,CAAC,UAAC,OAAO;YAC7B,IAAM,UAAU,GAAG,SAAO,OAAS,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AApBD,4BAoBC"}
+{"version":3,"file":"summaryReport.js","sourceRoot":"","sources":["../../src/report/summaryReport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAK1B,SAAS,iBAAiB,CAAC,QAAmB;IAC5C,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAC,IAAI,EAAE,OAAO;QAC3C,IAAI,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,cAAc,EAAE;YAClB,cAAc,CAAC,YAAY,IAAI,CAAC,CAAC;YACjC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;SAC9C;aAAM;YACL,cAAc,GAAG;gBACf,MAAM,EAAE,OAAO,CAAC,MAAM;gBACtB,SAAS,EAAE,OAAO,CAAC,SAAS;gBAC5B,YAAY,EAAE,CAAC;gBACf,QAAQ,EAAE,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;aACnB,CAAC;YACpB,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,cAAc,CAAC;SACvC;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAoC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,mBAAyB,OAAoB,EAAE,QAAiB;IAC9D,IAAM,UAAU,GAAM,OAAO,CAAC,OAAO,CAAC,WAAW,iBAC/C,OAAO,CAAC,OAAO,CAAC,WAAW,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAC5C,CAAC;IACH,IAAM,kBAAkB,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;IAEpF,OAAO,CAAC,GAAG,EAAE,CAAC;IACd,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAEhC,iBAAiB,CAAC,OAAO,CAAC,QAAQ,CAAC;SAChC,IAAI,CAAC,UAAC,CAAC,EAAE,CAAC,IAAK,OAAA,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC,EAAtC,CAAsC,CAAC;SACtD,OAAO,CAAC,UAAC,OAAO;QACf,IAAM,QAAQ,GAAG,SAAO,OAAO,CAAC,SAAS,UAAK,OAAO,CAAC,MAAM,YAAO,OAAO,CAAC,YAAY,aAAU,CAAC;QAClG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAClE,IAAM,cAAc,GAAG,yBAAI,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAE,IAAI,EAAE,CAAC;QAC7D,cAAc,CAAC,OAAO,CAAC,UAAC,OAAO;YAC7B,IAAM,UAAU,GAAG,SAAO,OAAS,CAAC;YACpC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACxE,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC;AApBD,4BAoBC"}