@appland/scanner 1.56.0 → 1.59.0

package/built/cli/upload.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 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) {
@@ -19,173 +8,105 @@ 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 {
+Object.defineProperty(exports, "__esModule", { value: true });
+const async_1 = require("async");
+const promises_1 = require("fs/promises");
+const util_1 = require("../rules/lib/util");
+const create_1 = require("../integration/appland/appMap/create");
+const create_2 = require("../integration/appland/mapset/create");
+const create_3 = require("../integration/appland/scannerJob/create");
+const vars_1 = require("../integration/vars");
+const promises_2 = require("fs/promises");
+const path_1 = require("path");
+const pruneAppMap_1 = require("./upload/pruneAppMap");
+function fileExists(file) {
+    return __awaiter(this, void 0, void 0, function* () {
         try {
-            if (r && !r.done && (m = i["return"])) m.call(i);
+            yield (0, promises_2.stat)(file);
+            return true;
         }
-        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];
+        catch (e) {
+            return false;
         }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var async_1 = require("async");
-var promises_1 = require("fs/promises");
-var util_1 = require("../rules/lib/util");
-var create_1 = require("../integration/appland/appMap/create");
-var create_2 = require("../integration/appland/mapset/create");
-var create_3 = require("../integration/appland/scannerJob/create");
-var vars_1 = require("../integration/vars");
-var promises_2 = require("fs/promises");
-var path_1 = require("path");
-function fileExists(file) {
-    return __awaiter(this, void 0, void 0, function () {
-        var e_1;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    _a.trys.push([0, 2, , 3]);
-                    return [4 /*yield*/, (0, promises_2.stat)(file)];
-                case 1:
-                    _a.sent();
-                    return [2 /*return*/, true];
-                case 2:
-                    e_1 = _a.sent();
-                    return [2 /*return*/, false];
-                case 3: return [2 /*return*/];
-            }
-        });
     });
 }
-function create(scanResults, appId, appMapDir, mergeKey, mapsetOptions, retryOptions) {
-    if (mapsetOptions === void 0) { mapsetOptions = {}; }
-    if (retryOptions === void 0) { retryOptions = {}; }
-    return __awaiter(this, void 0, void 0, function () {
-        var findings, relevantFilePaths, appMapUUIDByFileName, branchCount, commitCount, createAppMapOptions, q, mostFrequent, mapset;
-        var _this = this;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0:
-                    if ((0, util_1.verbose)())
-                        console.log("Uploading AppMaps and findings to application '".concat(appId, "'"));
-                    findings = scanResults.findings;
-                    relevantFilePaths = __spreadArray([], __read(new Set(findings.filter(function (f) { return f.appMapFile; }).map(function (f) { return f.appMapFile; }))), false);
-                    appMapUUIDByFileName = {};
-                    branchCount = {};
-                    commitCount = {};
-                    createAppMapOptions = {
-                        app: appId,
-                    };
-                    q = (0, async_1.queue)(function (filePath, callback) { return __awaiter(_this, void 0, void 0, function () {
-                        var filePaths, filePathsExist, fullPath;
-                        return __generator(this, function (_a) {
-                            switch (_a.label) {
-                                case 0:
-                                    if ((0, util_1.verbose)())
-                                        console.log("Uploading AppMap ".concat(filePath));
-                                    filePaths = [filePath, (0, path_1.join)(appMapDir, filePath)];
-                                    return [4 /*yield*/, Promise.all(filePaths.map(fileExists))];
-                                case 1:
-                                    filePathsExist = _a.sent();
-                                    fullPath = filePaths.find(function (_, fileIndex) { return filePathsExist[fileIndex]; });
-                                    if (!fullPath)
-                                        throw new Error("File ".concat(filePath, " not found"));
-                                    (0, promises_1.readFile)(fullPath)
-                                        .then(function (buffer) {
-                                        var _a, _b;
-                                        var appMapStruct = JSON.parse(buffer.toString());
-                                        var metadata = appMapStruct.metadata;
-                                        var branch = (_a = appMapStruct.metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
-                                        var commit = (_b = appMapStruct.metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
-                                        if (branch) {
-                                            branchCount[branch] || (branchCount[branch] = 1);
-                                            branchCount[branch] += 1;
-                                        }
-                                        if (commit) {
-                                            commitCount[commit] || (commitCount[commit] = 1);
-                                            commitCount[commit] += 1;
-                                        }
-                                        return (0, create_1.create)(buffer, Object.assign(retryOptions, __assign(__assign({}, createAppMapOptions), { metadata: metadata })));
-                                    })
-                                        .then(function (appMap) {
-                                        if (appMap) {
-                                            appMapUUIDByFileName[filePath] = appMap.uuid;
-                                        }
-                                    })
-                                        .then(function () { return callback(null); })
-                                        .catch(callback);
-                                    return [2 /*return*/];
-                            }
-                        });
-                    }); }, 3);
-                    q.error(function (err, filePath) {
-                        console.error("An error occurred uploading ".concat(filePath, ": ").concat(err));
-                    });
-                    if ((0, util_1.verbose)())
-                        console.log("Uploading ".concat(relevantFilePaths.length, " AppMaps"));
-                    q.push(relevantFilePaths);
-                    return [4 /*yield*/, q.drain()];
-                case 1:
-                    _a.sent();
-                    mostFrequent = function (counts) {
-                        if (Object.keys(counts).length === 0)
-                            return;
-                        var maxCount = Object.values(counts).reduce(function (max, count) { return Math.max(max, count); }, 0);
-                        return Object.entries(counts).find(function (e) { return e[1] === maxCount; })[0];
-                    };
-                    mapsetOptions.branch || (mapsetOptions.branch = (0, vars_1.branch)() || mostFrequent(branchCount));
-                    mapsetOptions.commit || (mapsetOptions.commit = (0, vars_1.sha)() || mostFrequent(commitCount));
-                    return [4 /*yield*/, (0, create_2.create)(appId, Object.values(appMapUUIDByFileName), mapsetOptions, retryOptions)];
-                case 2:
-                    mapset = _a.sent();
-                    console.warn('Uploading findings');
-                    return [2 /*return*/, (0, create_3.create)(scanResults, mapset.id, appMapUUIDByFileName, { mergeKey: mergeKey }, retryOptions)];
-            }
+function create(scanResults, appId, appMapDir, mergeKey, mapsetOptions = {}, retryOptions = {}) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if ((0, util_1.verbose)())
+            console.log(`Uploading AppMaps and findings to application '${appId}'`);
+        const { findings } = scanResults;
+        const relevantFilePaths = [
+            ...new Set(findings.filter((f) => f.appMapFile).map((f) => f.appMapFile)),
+        ];
+        const appMapUUIDByFileName = {};
+        const branchCount = {};
+        const commitCount = {};
+        const createAppMapOptions = {
+            app: appId,
+        };
+        const q = (0, async_1.queue)((filePath, callback) => __awaiter(this, void 0, void 0, function* () {
+            if ((0, util_1.verbose)())
+                console.log(`Uploading AppMap ${filePath}`);
+            const filePaths = [filePath, (0, path_1.join)(appMapDir, filePath)];
+            const filePathsExist = yield Promise.all(filePaths.map(fileExists));
+            const fullPath = filePaths.find((_, fileIndex) => filePathsExist[fileIndex]);
+            if (!fullPath)
+                throw new Error(`File ${filePath} not found`);
+            (0, promises_1.readFile)(fullPath)
+                .then((buffer) => {
+                const maxSize = (0, pruneAppMap_1.maxAppMapSize)();
+                const appMapJson = JSON.parse(buffer.toString());
+                const builder = (0, pruneAppMap_1.buildAppMap)(appMapJson);
+                let metadata = appMapJson.metadata;
+                if (buffer.byteLength > maxSize) {
+                    console.warn(`${fullPath} is larger than ${maxSize / 1024}K, pruning it`);
+                    (0, pruneAppMap_1.pruneAppMap)(builder, maxSize);
+                }
+                const prunedAppMap = builder.normalize().build();
+                metadata = prunedAppMap.metadata;
+                buffer = Buffer.from(JSON.stringify(prunedAppMap));
+                return { metadata, buffer };
+            })
+                .then(({ metadata, buffer }) => {
+                var _a, _b;
+                const branch = (_a = metadata.git) === null || _a === void 0 ? void 0 : _a.branch;
+                const commit = (_b = metadata.git) === null || _b === void 0 ? void 0 : _b.commit;
+                if (branch) {
+                    branchCount[branch] || (branchCount[branch] = 1);
+                    branchCount[branch] += 1;
+                }
+                if (commit) {
+                    commitCount[commit] || (commitCount[commit] = 1);
+                    commitCount[commit] += 1;
+                }
+                return (0, create_1.create)(buffer, Object.assign(retryOptions, Object.assign(Object.assign({}, createAppMapOptions), { metadata })));
+            })
+                .then((appMap) => {
+                if (appMap) {
+                    appMapUUIDByFileName[filePath] = appMap.uuid;
+                }
+            })
+                .then(() => callback(null))
+                .catch(callback);
+        }), 3);
+        q.error((err, filePath) => {
+            console.error(`An error occurred uploading ${filePath}: ${err}`);
         });
+        if ((0, util_1.verbose)())
+            console.log(`Uploading ${relevantFilePaths.length} AppMaps`);
+        q.push(relevantFilePaths);
+        yield q.drain();
+        const mostFrequent = (counts) => {
+            if (Object.keys(counts).length === 0)
+                return;
+            const maxCount = Object.values(counts).reduce((max, count) => Math.max(max, count), 0);
+            return Object.entries(counts).find((e) => e[1] === maxCount)[0];
+        };
+        mapsetOptions.branch || (mapsetOptions.branch = (0, vars_1.branch)() || mostFrequent(branchCount));
+        mapsetOptions.commit || (mapsetOptions.commit = (0, vars_1.sha)() || mostFrequent(commitCount));
+        const mapset = yield (0, create_2.create)(appId, Object.values(appMapUUIDByFileName), mapsetOptions, retryOptions);
+        console.warn('Uploading findings');
+        return (0, create_3.create)(scanResults, mapset.id, appMapUUIDByFileName, { mergeKey }, retryOptions);
     });
 }
 exports.default = create;
-//# sourceMappingURL=upload.js.map

package/built/cli/validateFile.js

@@ -8,63 +8,24 @@ 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 chalk_1 = __importDefault(require("chalk"));
-var fs_1 = require("fs");
-var promises_1 = require("fs/promises");
-var errors_1 = require("../errors");
+const chalk_1 = __importDefault(require("chalk"));
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const errors_1 = require("../errors");
 function default_1(kind, path) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    if (path === '.')
-                        return [2 /*return*/];
-                    _b.label = 1;
-                case 1:
-                    _b.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, (0, promises_1.access)(path, fs_1.constants.R_OK)];
-                case 2:
-                    _b.sent();
-                    return [3 /*break*/, 4];
-                case 3:
-                    _a = _b.sent();
-                    throw new errors_1.ValidationError("AppMap ".concat(kind, " ").concat(chalk_1.default.red(path), " does not exist, or is not readable."));
-                case 4: return [2 /*return*/];
-            }
-        });
+    return __awaiter(this, void 0, void 0, function* () {
+        if (path === '.')
+            return;
+        try {
+            yield (0, promises_1.access)(path, fs_1.constants.R_OK);
+        }
+        catch (_a) {
+            throw new errors_1.ValidationError(`AppMap ${kind} ${chalk_1.default.red(path)} does not exist, or is not readable.`);
+        }
     });
 }
 exports.default = default_1;
-//# sourceMappingURL=validateFile.js.map

package/built/cli.js

@@ -4,14 +4,34 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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"));
-var util_1 = require("./rules/lib/util");
-var errors_1 = require("./errors");
-var exitCode_1 = require("./cli/exitCode");
+const yargs_1 = __importDefault(require("yargs"));
+const command_1 = __importDefault(require("./cli/scan/command"));
+const command_2 = __importDefault(require("./cli/upload/command"));
+const command_3 = __importDefault(require("./cli/ci/command"));
+const command_4 = __importDefault(require("./cli/merge/command"));
+const util_1 = require("./rules/lib/util");
+const errors_1 = require("./errors");
+const exitCode_1 = require("./cli/exitCode");
+const telemetry_1 = __importDefault(require("./telemetry"));
+function errorInfo(err) {
+    if (err instanceof errors_1.ValidationError)
+        return { label: 'validation-error', code: exitCode_1.ExitCode.ValidationError };
+    else if (err instanceof errors_1.AbortError)
+        return { label: 'abort', code: exitCode_1.ExitCode.AbortError };
+    else
+        return { label: 'error', code: exitCode_1.ExitCode.RuntimeError };
+}
+function handleError(err) {
+    const { label, code } = errorInfo(err);
+    process.exitCode = code;
+    const telemetry = {
+        name: [process.argv[2], label].join(':'),
+        properties: { error: err.message },
+    };
+    if (label === 'error')
+        telemetry.properties.errorStack = err.stack;
+    telemetry_1.default.sendEvent(telemetry);
+}
 (0, yargs_1.default)(process.argv.slice(2))
     .option('verbose', {
     describe: 'Show verbose output',
@@ -21,7 +41,7 @@ var exitCode_1 = require("./cli/exitCode");
     .command(command_2.default)
     .command(command_3.default)
     .command(command_4.default)
-    .fail(function (msg, err, yargs) {
+    .fail((msg, err, yargs) => {
     if (msg) {
         console.warn(yargs.help());
         console.warn(msg);
@@ -33,19 +53,12 @@ var exitCode_1 = require("./cli/exitCode");
         else {
             console.error(err.message);
         }
-        if (err instanceof errors_1.ValidationError) {
-            process.exit(exitCode_1.ExitCode.ValidationError);
-        }
-        if (err instanceof errors_1.AbortError) {
-            process.exit(exitCode_1.ExitCode.AbortError);
-        }
-        if (err instanceof Error) {
-            process.exit(exitCode_1.ExitCode.RuntimeError);
-        }
     }
-    process.exit(1);
+    process.exitCode = exitCode_1.ExitCode.ValidationError;
 })
+    .exitProcess(false)
     .strict()
     .demandCommand()
-    .help().argv;
-//# sourceMappingURL=cli.js.map
+    .help()
+    .parseAsync()
+    .catch(handleError);