@appland/scanner 1.56.0 → 1.59.0

package/built/cli/scan.js

@@ -8,153 +8,60 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 __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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable @typescript-eslint/no-empty-function */
-var cli_progress_1 = __importDefault(require("cli-progress"));
-var promises_1 = require("fs/promises");
-var models_1 = require("@appland/models");
-var ruleChecker_1 = __importDefault(require("../ruleChecker"));
-var appMapIndex_1 = __importDefault(require("../appMapIndex"));
+const cli_progress_1 = __importDefault(require("cli-progress"));
+const promises_1 = require("fs/promises");
+const models_1 = require("@appland/models");
+const ruleChecker_1 = __importDefault(require("../ruleChecker"));
+const appMapIndex_1 = __importDefault(require("../appMapIndex"));
 function batch(items, size, process) {
-    return __awaiter(this, void 0, void 0, function () {
-        var left;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    left = __spreadArray([], __read(items), false);
-                    _a.label = 1;
-                case 1:
-                    if (!left.length) return [3 /*break*/, 3];
-                    return [4 /*yield*/, Promise.all(left.splice(0, size).map(process))];
-                case 2:
-                    _a.sent();
-                    return [3 /*break*/, 1];
-                case 3: return [2 /*return*/];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        const left = [...items];
+        while (left.length)
+            yield Promise.all(left.splice(0, size).map(process));
     });
 }
 function scan(files, checks) {
-    return __awaiter(this, void 0, void 0, function () {
+    return __awaiter(this, void 0, void 0, function* () {
+        // TODO: Improve this by respecting .gitignore, or similar.
+        // For now, this addresses the main problem of encountering appmap-js and its appmap.json files
+        // in a bundled node_modules.
+        files = files.filter((file) => !file.split('/').includes('node_modules'));
+        const checker = new ruleChecker_1.default();
+        const appMapMetadata = {};
+        const findings = [];
         function newProgress() {
             if (process.stdout.isTTY) {
-                return new cli_progress_1.default.SingleBar({ format: "Scanning [{bar}] {percentage}% | {value}/{total}" }, cli_progress_1.default.Presets.shades_classic);
+                return new cli_progress_1.default.SingleBar({ format: `Scanning [{bar}] {percentage}% | {value}/{total}` }, cli_progress_1.default.Presets.shades_classic);
             }
             return {
-                increment: function () { },
-                start: function () { },
-                stop: function () { },
+                increment: () => { },
+                start: () => { },
+                stop: () => { },
             };
         }
-        var checker, appMapMetadata, findings, progress;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    // TODO: Improve this by respecting .gitignore, or similar.
-                    // For now, this addresses the main problem of encountering appmap-js and its appmap.json files
-                    // in a bundled node_modules.
-                    files = files.filter(function (file) { return !file.split('/').includes('node_modules'); });
-                    checker = new ruleChecker_1.default();
-                    appMapMetadata = {};
-                    findings = [];
-                    progress = newProgress();
-                    progress.start(files.length * checks.length, 0);
-                    return [4 /*yield*/, batch(files, 2, function (file) { return __awaiter(_this, void 0, void 0, function () {
-                            var appMapData, appMap, appMapIndex;
-                            var _this = this;
-                            return __generator(this, function (_a) {
-                                switch (_a.label) {
-                                    case 0: return [4 /*yield*/, (0, promises_1.readFile)(file, 'utf8')];
-                                    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;
-                                                return __generator(this, function (_a) {
-                                                    switch (_a.label) {
-                                                        case 0:
-                                                            matchCount = findings.length;
-                                                            return [4 /*yield*/, checker.check(file, appMapIndex, check, findings)];
-                                                        case 1:
-                                                            _a.sent();
-                                                            progress.increment();
-                                                            newMatches = findings.slice(matchCount, findings.length);
-                                                            newMatches.forEach(function (match) { return (match.appMapFile = file); });
-                                                            return [2 /*return*/];
-                                                    }
-                                                });
-                                            }); }))];
-                                    case 2:
-                                        _a.sent();
-                                        return [2 /*return*/, null];
-                                }
-                            });
-                        }); })];
-                case 1:
-                    _a.sent();
-                    progress.stop();
-                    return [2 /*return*/, { appMapMetadata: appMapMetadata, findings: findings }];
-            }
-        });
+        const progress = newProgress();
+        progress.start(files.length * checks.length, 0);
+        yield batch(files, 2, (file) => __awaiter(this, void 0, void 0, function* () {
+            const appMapData = yield (0, promises_1.readFile)(file, 'utf8');
+            const appMap = (0, models_1.buildAppMap)(appMapData).normalize().build();
+            const appMapIndex = new appMapIndex_1.default(appMap);
+            appMapMetadata[file] = appMap.metadata;
+            yield Promise.all(checks.map((check) => __awaiter(this, void 0, void 0, function* () {
+                const matchCount = findings.length;
+                yield checker.check(file, appMapIndex, check, findings);
+                progress.increment();
+                const newMatches = findings.slice(matchCount, findings.length);
+                newMatches.forEach((match) => (match.appMapFile = file));
+            })));
+            return null;
+        }));
+        progress.stop();
+        return { appMapMetadata, findings };
     });
 }
 exports.default = scan;
-//# sourceMappingURL=scan.js.map

package/built/cli/scanArgs.js

@@ -23,4 +23,3 @@ function default_1(args) {
     });
 }
 exports.default = default_1;
-//# sourceMappingURL=scanArgs.js.map

package/built/cli/scanOptions.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=scanOptions.js.map

package/built/cli/updateCommitStatus.js

@@ -8,58 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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"));
+const 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', "".concat(numChecks, " checks, ").concat(numFindings, " findings. See CI job log for details."))];
-                case 1:
-                    _a.sent();
-                    console.log("Commit status updated to: failure (".concat(numFindings, " findings)"));
-                    return [3 /*break*/, 4];
-                case 2: return [4 /*yield*/, (0, commitStatus_1.default)('success', "".concat(numChecks, " checks passed"))];
-                case 3:
-                    _a.sent();
-                    console.log("Commit status updated to: success.");
-                    _a.label = 4;
-                case 4: return [2 /*return*/];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        if (numFindings > 0) {
+            yield (0, commitStatus_1.default)('failure', `${numChecks} checks, ${numFindings} findings. See CI job log for details.`);
+            console.log(`Commit status updated to: failure (${numFindings} findings)`);
+        }
+        else {
+            yield (0, commitStatus_1.default)('success', `${numChecks} checks passed`);
+            console.log(`Commit status updated to: success.`);
+        }
     });
 }
 exports.default = updateCommitStatus;
-//# sourceMappingURL=updateCommitStatus.js.map

package/built/cli/upload/command.js

@@ -8,48 +8,21 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 promises_1 = require("fs/promises");
-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"));
-var upload_1 = __importDefault(require("../upload"));
-var codeVersionArgs_1 = __importDefault(require("../codeVersionArgs"));
+const promises_1 = require("fs/promises");
+const util_1 = require("../../rules/lib/util");
+const validateFile_1 = __importDefault(require("../validateFile"));
+const resolveAppId_1 = __importDefault(require("../resolveAppId"));
+const reportUploadURL_1 = __importDefault(require("../reportUploadURL"));
+const upload_1 = __importDefault(require("../upload"));
+const codeVersionArgs_1 = __importDefault(require("../codeVersionArgs"));
 exports.default = {
     command: 'upload',
     describe: 'Upload Findings to the AppMap Server',
-    builder: function (args) {
+    builder(args) {
         (0, codeVersionArgs_1.default)(args);
         args.option('appmap-dir', {
             describe: 'base directory of AppMaps',
@@ -67,36 +40,19 @@ exports.default = {
         });
         return args.strict();
     },
-    handler: function (options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var _a, isVerbose, reportFile, appmapDir, appIdArg, mergeKey, branch, commit, environment, 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, mergeKey = _a.mergeKey, branch = _a.branch, commit = _a.commit, environment = _a.environment;
-                        if (isVerbose) {
-                            (0, util_1.verbose)(true);
-                        }
-                        return [4 /*yield*/, (0, validateFile_1.default)('directory', appmapDir)];
-                    case 1:
-                        _d.sent();
-                        return [4 /*yield*/, (0, resolveAppId_1.default)(appIdArg, appmapDir)];
-                    case 2:
-                        appId = _d.sent();
-                        _c = (_b = JSON).parse;
-                        return [4 /*yield*/, (0, promises_1.readFile)(reportFile)];
-                    case 3:
-                        scanResults = _c.apply(_b, [(_d.sent()).toString()]);
-                        return [4 /*yield*/, (0, upload_1.default)(scanResults, appId, appmapDir, mergeKey, { branch: branch, commit: commit, environment: environment }, {
-                                maxRetries: 3,
-                            })];
-                    case 4:
-                        uploadResponse = _d.sent();
-                        (0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
-                        return [2 /*return*/];
-                }
+    handler(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { verbose: isVerbose, reportFile, appmapDir, app: appIdArg, mergeKey, branch, commit, environment, } = options;
+            if (isVerbose) {
+                (0, util_1.verbose)(true);
+            }
+            yield (0, validateFile_1.default)('directory', appmapDir);
+            const appId = yield (0, resolveAppId_1.default)(appIdArg, appmapDir);
+            const scanResults = JSON.parse((yield (0, promises_1.readFile)(reportFile)).toString());
+            const uploadResponse = yield (0, upload_1.default)(scanResults, appId, appmapDir, mergeKey, { branch, commit, environment }, {
+                maxRetries: 3,
             });
+            (0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
         });
     },
 };
-//# sourceMappingURL=command.js.map

package/built/cli/upload/options.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=options.js.map

package/built/cli/upload/pruneAppMap.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildAppMap = exports.pruneAppMap = exports.maxAppMapSize = void 0;
+const models_1 = require("@appland/models");
+const APPMAP_UPLOAD_MAX_SIZE = parseInt(process.env.APPMAP_UPLOAD_MAX_SIZE || '40960') * 1024;
+if (!APPMAP_UPLOAD_MAX_SIZE) {
+    throw Error(`Failed parsing APPMAP_UPLOAD_MAX_SIZE: "${process.env.APPMAP_UPLOAD_MAX_SIZE}"`);
+}
+function maxAppMapSize() {
+    return APPMAP_UPLOAD_MAX_SIZE;
+}
+exports.maxAppMapSize = maxAppMapSize;
+function pruneAppMap(builder, maxSize) {
+    return builder.prune(maxSize);
+}
+exports.pruneAppMap = pruneAppMap;
+function buildAppMap(appMapJson) {
+    return (0, models_1.buildAppMap)().source(appMapJson);
+}
+exports.buildAppMap = buildAppMap;