@appland/scanner 1.87.1 → 1.88.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@appland/scanner-v1.88.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.88.0...@appland/scanner-v1.88.1) (2025-05-22)
+
+
+### Bug Fixes
+
+* Update pkg dependency to use patched version ([173c58a](https://github.com/getappmap/appmap-js/commit/173c58a027ef1ab9b3fa81bfc9986af3dfc662a2))
+
+# [@appland/scanner-v1.88.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.87.1...@appland/scanner-v1.88.0) (2024-08-16)
+
+
+### Features
+
+* Remove unused @appland/client commands ([a54f352](https://github.com/getappmap/appmap-js/commit/a54f3521dd6eea9336dc4265123bd726869491e8))
+
 # [@appland/scanner-v1.87.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.87.0...@appland/scanner-v1.87.1) (2024-07-25)
 
 

package/LICENSE.txt

@@ -12,7 +12,7 @@ Software: @appland/scanner
 
 License: MIT License
 
-Copyright 2024, AppLand Inc
+Copyright 2025, AppLand Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,

package/built/cli/scan/breakpoint.d.ts

@@ -1,4 +1,3 @@
-import { AppMap } from '@appland/client';
 import { Event } from '@appland/models';
 import Check from '../../check';
 import { MatchResult } from '../../types';
@@ -6,7 +5,6 @@ export declare type ExecutionContext = {
     counter: number;
     depth: number;
     eventName: string;
-    appMap?: AppMap;
     appMapFileName?: string;
     check?: Check;
     event?: Event;

package/built/cli/scan/command.js

@@ -17,7 +17,6 @@ const util_1 = require("../../rules/lib/util");
 const appmapDirFromConfig_1 = require("../appmapDirFromConfig");
 const validateFile_1 = __importDefault(require("../validateFile"));
 const scanArgs_1 = __importDefault(require("../scanArgs"));
-const resolveAppId_1 = __importDefault(require("../resolveAppId"));
 const singleScan_1 = __importDefault(require("./singleScan"));
 const watchScan_1 = __importDefault(require("./watchScan"));
 const configurationProvider_1 = require("../../configuration/configurationProvider");
@@ -40,11 +39,6 @@ exports.default = {
             describe: 'choose your IDE protocol to open AppMaps directly in your IDE.',
             options: ['vscode', 'x-mine', 'idea', 'pycharm'],
         });
-        args.option('all', {
-            describe: 'report all findings, including duplicates of known findings',
-            default: false,
-            type: 'boolean',
-        });
         args.option('watch', {
             describe: 'scan code changes and report findings on changed files',
             default: false,
@@ -55,7 +49,7 @@ exports.default = {
     handler(options) {
         return __awaiter(this, void 0, void 0, function* () {
             let { appmapDir } = options;
-            const { appmapFile, directory, interactive, config: configFile, verbose: isVerbose, all: reportAllFindings, watch, app: appIdArg, apiKey, ide, reportFile, } = options;
+            const { appmapFile, directory, interactive, config: configFile, verbose: isVerbose, watch, apiKey, ide, reportFile, } = options;
             if (isVerbose) {
                 (0, util_1.verbose)(true);
             }
@@ -66,20 +60,14 @@ exports.default = {
             if (appmapFile && watch) {
                 throw new errors_1.ValidationError('Use --appmap-file or --watch, but not both');
             }
-            if (reportAllFindings && watch) {
-                throw new errors_1.ValidationError(`Don't use --all with --watch, because in watch mode all findings are reported`);
-            }
             if (appmapDir)
                 yield (0, validateFile_1.default)('directory', appmapDir);
             if (!appmapFile && !appmapDir) {
                 appmapDir = (yield (0, appmapDirFromConfig_1.appmapDirFromConfig)()) || '.';
             }
-            let appId = appIdArg;
-            if (!watch && !reportAllFindings)
-                appId = yield (0, resolveAppId_1.default)(appIdArg, appmapDir);
             if (watch) {
                 const watchAppMapDir = appmapDir;
-                return (0, watchScan_1.default)({ appId, appmapDir: watchAppMapDir, configFile });
+                return (0, watchScan_1.default)({ appmapDir: watchAppMapDir, configFile });
             }
             else {
                 const configuration = yield (0, configurationProvider_1.parseConfigFile)(configFile);
@@ -95,8 +83,6 @@ exports.default = {
                         appmapFile,
                         appmapDir,
                         configuration,
-                        reportAllFindings,
-                        appId,
                         ide,
                         reportFile,
                     });

package/built/cli/scan/scanner.d.ts

@@ -1,9 +1,7 @@
-import { FindingStatusListItem } from '@appland/client/dist/src';
 import Configuration from '../../configuration/types/configuration';
 import { ScanResults } from '../../report/scanResults';
 export interface Scanner {
     scan(): Promise<ScanResults>;
     scan(skipErrors: boolean): Promise<ScanResults>;
-    fetchFindingStatus(appId?: string, appMapDir?: string): Promise<FindingStatusListItem[]>;
 }
-export default function scanner(reportAllFindings: boolean, configuration: Configuration, files: string[]): Promise<Scanner>;
+export default function scanner(configuration: Configuration, files: string[]): Promise<Scanner>;

package/built/cli/scan/scanner.js

@@ -12,20 +12,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("@appland/client/dist/src");
 const configurationProvider_1 = require("../../configuration/configurationProvider");
-const resolveAppId_1 = __importDefault(require("../resolveAppId"));
 const scan_1 = __importDefault(require("../scan"));
 const scanResults_1 = require("../../report/scanResults");
-function scanner(reportAllFindings, configuration, files) {
+function scanner(configuration, files) {
     return __awaiter(this, void 0, void 0, function* () {
-        if (reportAllFindings) {
-            return new StandaloneScanner(configuration, files);
-        }
-        else {
-            yield (0, src_1.loadConfiguration)();
-            return new ServerIntegratedScanner(configuration, files);
-        }
+        return new StandaloneScanner(configuration, files);
     });
 }
 exports.default = scanner;
@@ -42,23 +34,10 @@ class ScannerBase {
         });
     }
 }
-class ServerIntegratedScanner extends ScannerBase {
-    fetchFindingStatus(appIdArg, appMapDir) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const appId = yield (0, resolveAppId_1.default)(appIdArg, appMapDir);
-            return yield new src_1.App(appId).listFindingStatus();
-        });
-    }
-}
 class StandaloneScanner extends ScannerBase {
     verifyServerConfiguration() {
         return __awaiter(this, void 0, void 0, function* () {
             return true;
         });
     }
-    fetchFindingStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return [];
-        });
-    }
 }

package/built/cli/scan/singleScan.d.ts

@@ -3,9 +3,7 @@ declare type SingleScanOptions = {
     appmapFile?: string | string[];
     appmapDir?: string;
     configuration: Configuration;
-    reportAllFindings: boolean;
     reportFile: string;
-    appId?: string;
     ide?: string;
 };
 export default function singleScan(options: SingleScanOptions): Promise<void>;

package/built/cli/scan/singleScan.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
 const scanner_1 = __importDefault(require("./scanner"));
 const errors_1 = require("../../errors");
-const findings_1 = require("../../findings");
 const findingsReport_1 = __importDefault(require("../../report/findingsReport"));
 const summaryReport_1 = __importDefault(require("../../report/summaryReport"));
 const formatReport_1 = require("./formatReport");
@@ -23,27 +22,16 @@ const util_1 = require("../../rules/lib/util");
 const validateFile_1 = __importDefault(require("../validateFile"));
 function singleScan(options) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { appmapFile, appmapDir, configuration, reportAllFindings, appId, ide, reportFile } = options;
+        const { appmapFile, appmapDir, configuration, ide, reportFile } = options;
         const skipErrors = appmapDir !== undefined;
         const files = yield (0, util_1.collectAppMapFiles)(appmapFile, appmapDir);
         yield Promise.all(files.map((file) => __awaiter(this, void 0, void 0, function* () { return (0, validateFile_1.default)('file', file); })));
-        const scanner = yield (0, scanner_1.default)(reportAllFindings, configuration, files).catch((error) => {
+        const scanner = yield (0, scanner_1.default)(configuration, files).catch((error) => {
             throw new errors_1.ValidationError(error.message + '\nUse --all to perform an offline scan.');
         });
         const startTime = Date.now();
-        const [rawScanResults, findingStatuses] = yield Promise.all([
-            scanner.scan(skipErrors),
-            scanner.fetchFindingStatus(appId, appmapDir),
-        ]);
-        // Always report the raw data
-        yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults));
-        let scanResults;
-        if (reportAllFindings) {
-            scanResults = rawScanResults;
-        }
-        else {
-            scanResults = rawScanResults.withFindings((0, findings_1.newFindings)(rawScanResults.findings, findingStatuses));
-        }
+        const scanResults = yield scanner.scan(skipErrors);
+        yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(scanResults));
         (0, findingsReport_1.default)(scanResults.findings, scanResults.appMapMetadata, ide);
         console.log();
         (0, summaryReport_1.default)(scanResults, true);

package/built/cli/scan/watchScan.js

@@ -190,7 +190,7 @@ class Watcher {
                     return;
                 }
                 const startTime = Date.now();
-                const scanner = yield (0, scanner_1.default)(true, this.config, [appmapFile]);
+                const scanner = yield (0, scanner_1.default)(this.config, [appmapFile]);
                 const rawScanResults = yield scanner.scan();
                 const elapsed = Date.now() - startTime;
                 this.scanEventEmitter.emit('scan', { scanResults: rawScanResults, elapsed });

package/built/cli.js

@@ -6,9 +6,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -41,9 +38,6 @@ function handleError(err) {
     alias: 'v',
 })
     .command(command_1.default)
-    .command(command_2.default)
-    .command(command_3.default)
-    .command(command_4.default)
     .fail((msg, err, yargs) => {
     if (msg) {
         console.warn(yargs.help());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.87.1",
+  "version": "1.88.1",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "main": "built/index.js",
@@ -51,7 +51,7 @@
     "jest": "^29.5.0",
     "nock": "^13.2.2",
     "openapi-types": "^9.3.0",
-    "pkg": "^5.8.0",
+    "pkg": "5.8.1-patched",
     "prettier": "^2.7.1",
     "semantic-release": "^19.0.2",
     "sinon": "^13.0.1",

package/built/cli/ci/command.d.ts

@@ -1,8 +0,0 @@
-import { Arguments, Argv } from 'yargs';
-declare const _default: {
-    command: string;
-    describe: string;
-    builder(args: Argv): Argv;
-    handler(options: Arguments): Promise<void>;
-};
-export default _default;

package/built/cli/ci/command.js

@@ -1,104 +0,0 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const glob_1 = require("glob");
-const promises_1 = require("fs/promises");
-const util_1 = require("util");
-const configurationProvider_1 = require("../../configuration/configurationProvider");
-const errors_1 = require("../../errors");
-const util_2 = require("../../rules/lib/util");
-const appmapDirFromConfig_1 = require("../appmapDirFromConfig");
-const findings_1 = require("../../findings");
-const findingsReport_1 = __importDefault(require("../../report/findingsReport"));
-const summaryReport_1 = __importDefault(require("../../report/summaryReport"));
-const resolveAppId_1 = __importDefault(require("../resolveAppId"));
-const validateFile_1 = __importDefault(require("../validateFile"));
-const upload_1 = __importDefault(require("../upload"));
-const scanner_1 = __importDefault(require("../scan/scanner"));
-const scanArgs_1 = __importDefault(require("../scanArgs"));
-const updateCommitStatus_1 = __importDefault(require("../updateCommitStatus"));
-const reportUploadURL_1 = __importDefault(require("../reportUploadURL"));
-const fail_1 = __importDefault(require("../fail"));
-const codeVersionArgs_1 = __importDefault(require("../codeVersionArgs"));
-const handleWorkingDirectory_1 = require("../handleWorkingDirectory");
-exports.default = {
-    command: 'ci',
-    describe: 'Scan AppMaps, report findings to AppMap Server, and update SCM status',
-    builder(args) {
-        (0, scanArgs_1.default)(args);
-        (0, codeVersionArgs_1.default)(args);
-        args.option('fail', {
-            describe: 'exit with non-zero status if there are any new findings',
-            default: false,
-            type: 'boolean',
-        });
-        args.option('update-commit-status', {
-            describe: 'update commit status in SCM system',
-            default: false,
-            type: 'boolean',
-        });
-        args.option('upload', {
-            describe: 'upload findings to AppMap server',
-            default: true,
-            type: 'boolean',
-        });
-        args.option('merge-key', {
-            describe: 'build job identifier. This is used to merge findings from parallelized scans',
-        });
-        return args.strict();
-    },
-    handler(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { appmapDir } = options;
-            const { config, verbose: isVerbose, fail: failOption, app: appIdArg, directory, reportFile, upload: doUpload, updateCommitStatus: updateCommitStatusOption, mergeKey, commit, branch, environment, } = options;
-            if (isVerbose) {
-                (0, util_2.verbose)(true);
-            }
-            (0, handleWorkingDirectory_1.handleWorkingDirectory)(directory);
-            if (!appmapDir) {
-                appmapDir = yield (0, appmapDirFromConfig_1.appmapDirFromConfig)();
-            }
-            if (!appmapDir)
-                throw new errors_1.ValidationError('appmapDir must be provided as a command option, or available in appmap.yml');
-            yield (0, validateFile_1.default)('directory', appmapDir);
-            const appId = yield (0, resolveAppId_1.default)(appIdArg, appmapDir);
-            const glob = (0, util_1.promisify)(glob_1.glob);
-            const files = yield glob(`${appmapDir}/**/*.appmap.json`);
-            const configData = yield (0, configurationProvider_1.parseConfigFile)(config);
-            const scanner = yield (0, scanner_1.default)(false, configData, files);
-            const [rawScanResults, findingStatuses] = yield Promise.all([scanner.scan(), scanner.fetchFindingStatus(appIdArg, appmapDir)]);
-            // Always report the raw data
-            yield (0, promises_1.writeFile)(reportFile, JSON.stringify(rawScanResults, null, 2));
-            const scanResults = rawScanResults.withFindings((0, findings_1.newFindings)(rawScanResults.findings, findingStatuses));
-            (0, findingsReport_1.default)(scanResults.findings, scanResults.appMapMetadata);
-            (0, summaryReport_1.default)(scanResults, true);
-            if (doUpload) {
-                const uploadResponse = yield (0, upload_1.default)(rawScanResults, appId, appmapDir, mergeKey, {
-                    branch,
-                    commit,
-                    environment,
-                }, {
-                    maxRetries: 3,
-                });
-                (0, reportUploadURL_1.default)(uploadResponse.summary.numFindings, uploadResponse.url);
-            }
-            if (updateCommitStatusOption) {
-                yield (0, updateCommitStatus_1.default)(scanResults.findings.length, scanResults.summary.numChecks);
-            }
-            if (failOption) {
-                (0, fail_1.default)(scanResults.findings.length);
-            }
-        });
-    },
-};

package/built/cli/ci/options.d.ts

@@ -1,10 +0,0 @@
-import ScanOptions from '../scanOptions';
-export default interface CommandOptions extends ScanOptions {
-    fail?: boolean;
-    upload: boolean;
-    updateCommitStatus: boolean;
-    mergeKey?: string;
-    branch?: string;
-    commit?: string;
-    environment?: string;
-}

package/built/cli/ci/options.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/built/cli/merge/command.d.ts

@@ -1,8 +0,0 @@
-import { Arguments, Argv } from 'yargs';
-declare const _default: {
-    command: string;
-    describe: string;
-    builder(args: Argv): Argv;
-    handler(options: Arguments): Promise<void>;
-};
-export default _default;

package/built/cli/merge/command.js

@@ -1,60 +0,0 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../../rules/lib/util");
-const merge_1 = require("../../integration/appland/scannerJob/merge");
-const resolveAppId_1 = __importDefault(require("../resolveAppId"));
-const updateCommitStatus_1 = __importDefault(require("../updateCommitStatus"));
-const fail_1 = __importDefault(require("../fail"));
-exports.default = {
-    command: 'merge <merge-key>',
-    describe: 'Merge scan results from parallel scans',
-    builder(args) {
-        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('fail', {
-            describe: 'exit with non-zero status if there are any new findings',
-            default: false,
-            type: 'boolean',
-        });
-        args.option('update-commit-status', {
-            describe: 'update commit status in SCM system',
-            default: false,
-            type: 'boolean',
-        });
-        args.positional('merge-key', {
-            describe: 'build job identifier. This is used to merge findings from parallelized scans',
-            type: 'string',
-        });
-        return args.strict();
-    },
-    handler(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { verbose: isVerbose, app: appIdArg, fail: failOption, updateCommitStatus: updateCommitStatusOption, mergeKey, } = options;
-            if (isVerbose) {
-                (0, util_1.verbose)(true);
-            }
-            const appId = yield (0, resolveAppId_1.default)(appIdArg, '.');
-            const mergeResults = yield (0, merge_1.merge)(appId, mergeKey);
-            console.warn(`Merged results to ${mergeResults.url}`);
-            if (updateCommitStatusOption) {
-                yield (0, updateCommitStatus_1.default)(mergeResults.summary.numFindings, mergeResults.summary.numChecks);
-            }
-            if (failOption) {
-                (0, fail_1.default)(mergeResults.summary.numFindings);
-            }
-        });
-    },
-};

package/built/cli/merge/options.d.ts

@@ -1,7 +0,0 @@
-export default interface CommandOptions {
-    verbose?: boolean;
-    mergeKey: string;
-    app?: string;
-    fail?: boolean;
-    updateCommitStatus: boolean;
-}

package/built/cli/merge/options.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/built/cli/resolveAppId.d.ts

@@ -1 +0,0 @@
-export default function (appIdArg: string | undefined, appMapDir: string | undefined): Promise<string>;

package/built/cli/resolveAppId.js

@@ -1,54 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const src_1 = require("@appland/client/dist/src");
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const js_yaml_1 = require("js-yaml");
-const path_1 = require("path");
-const errors_1 = require("../errors");
-function resolveAppId(appIdArg, appMapDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (appIdArg) {
-            return appIdArg;
-        }
-        if (appMapDir) {
-            let searchPath = (0, path_1.resolve)(appMapDir);
-            while (searchPath !== '/' && searchPath !== '.') {
-                const configPath = (0, path_1.join)(searchPath, 'appmap.yml');
-                try {
-                    yield (0, promises_1.access)(configPath, fs_1.constants.R_OK);
-                }
-                catch (_a) {
-                    searchPath = (0, path_1.dirname)(searchPath);
-                    continue;
-                }
-                const configContent = yield (0, promises_1.readFile)(configPath, 'utf-8');
-                const config = (0, js_yaml_1.load)(configContent);
-                if (config.name)
-                    return config.name;
-            }
-        }
-    });
-}
-function default_1(appIdArg, appMapDir) {
-    return __awaiter(this, void 0, void 0, function* () {
-        const appId = yield resolveAppId(appIdArg, appMapDir);
-        if (!appId)
-            throw new errors_1.ValidationError('App was not provided and could not be resolved');
-        const appExists = yield new src_1.App(appId).exists();
-        if (!appExists) {
-            throw new errors_1.ValidationError(`App "${appId}" is not valid or does not exist.\nPlease fix the app name in the appmap.yml file, or override it with the --app option.`);
-        }
-        return appId;
-    });
-}
-exports.default = default_1;

package/built/cli/upload/command.d.ts

@@ -1,8 +0,0 @@
-import { Arguments, Argv } from 'yargs';
-declare const _default: {
-    command: string;
-    describe: string;
-    builder(args: Argv): Argv;
-    handler(options: Arguments): Promise<void>;
-};
-export default _default;

package/built/cli/upload/command.js

@@ -1,72 +0,0 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const promises_1 = require("fs/promises");
-const util_1 = require("../../rules/lib/util");
-const appmapDirFromConfig_1 = require("../appmapDirFromConfig");
-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"));
-const errors_1 = require("../../errors");
-const handleWorkingDirectory_1 = require("../handleWorkingDirectory");
-exports.default = {
-    command: 'upload',
-    describe: 'Upload Findings to the AppMap Server',
-    builder(args) {
-        (0, codeVersionArgs_1.default)(args);
-        args.option('directory', {
-            describe: 'program working directory',
-            type: 'string',
-            alias: 'd',
-        });
-        args.option('appmap-dir', {
-            describe: 'base directory of AppMaps',
-        });
-        args.option('report-file', {
-            describe: 'file containing the findings report',
-            default: 'appmap-findings.json',
-        });
-        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(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let { appmapDir } = options;
-            const { verbose: isVerbose, directory, reportFile, app: appIdArg, mergeKey, branch, commit, environment, } = options;
-            if (isVerbose) {
-                (0, util_1.verbose)(true);
-            }
-            (0, handleWorkingDirectory_1.handleWorkingDirectory)(directory);
-            if (!appmapDir) {
-                appmapDir = yield (0, appmapDirFromConfig_1.appmapDirFromConfig)();
-            }
-            if (!appmapDir)
-                throw new errors_1.ValidationError('appmapDir must be provided as a command option, or available in appmap.yml');
-            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);
-        });
-    },
-};

package/built/cli/upload/options.d.ts

@@ -1,11 +0,0 @@
-export default interface CommandOptions {
-    verbose?: boolean;
-    reportFile: string;
-    directory?: string;
-    appmapDir?: string;
-    app?: string;
-    mergeKey?: string;
-    branch?: string;
-    commit?: string;
-    environment?: string;
-}

package/built/cli/upload/options.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/built/cli/upload/pruneAppMap.d.ts

@@ -1,4 +0,0 @@
-import { AppMapBuilder } from '@appland/models';
-export declare function maxAppMapSize(): number;
-export declare function pruneAppMap(builder: AppMapBuilder, maxSize: number): AppMapBuilder;
-export declare function buildAppMap(appMapJson: Record<string, unknown>): AppMapBuilder;

package/built/cli/upload/pruneAppMap.js

@@ -1,20 +0,0 @@
-"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;

package/built/cli/upload.d.ts

@@ -1,5 +0,0 @@
-import { CreateMapsetOptions } from '@appland/client/dist/src';
-import { ScanResults } from '../report/scanResults';
-import { UploadResponse } from '../integration/appland/scannerJob/create';
-import { RetryOptions } from '../integration/appland/retryOptions';
-export default function create(scanResults: ScanResults, appId: string, appMapDir: string, mergeKey?: string, mapsetOptions?: CreateMapsetOptions, retryOptions?: RetryOptions): Promise<UploadResponse>;

package/built/cli/upload.js

@@ -1,100 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const async_1 = require("async");
-const promises_1 = require("fs/promises");
-const src_1 = require("@appland/client/dist/src");
-const util_1 = require("../rules/lib/util");
-const create_1 = require("../integration/appland/scannerJob/create");
-const vars_1 = require("../integration/vars");
-const path_1 = require("path");
-const pruneAppMap_1 = require("./upload/pruneAppMap");
-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(util_1.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 src_1.AppMap.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);
-        if (!q.idle())
-            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 src_1.Mapset.create(appId, Object.values(appMapUUIDByFileName), mapsetOptions, retryOptions);
-        console.warn('Uploading findings');
-        return (0, create_1.create)(scanResults, mapset.id, appMapUUIDByFileName, { mergeKey }, retryOptions);
-    });
-}
-exports.default = create;

package/built/findings.d.ts

@@ -1,3 +0,0 @@
-import { FindingStatusListItem } from '@appland/client/dist/src';
-import { Finding } from './index';
-export declare function newFindings(findings: Finding[], findingStatuses: FindingStatusListItem[]): Finding[];

package/built/findings.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.newFindings = void 0;
-function newFindings(findings, findingStatuses) {
-    const statusByFindingDigest = findingStatuses.reduce((memo, findingStatus) => {
-        memo.set(findingStatus.identity_hash, findingStatus.status);
-        return memo;
-    }, new Map());
-    return findings.filter((finding) => {
-        const status = statusByFindingDigest.get(finding.hash);
-        return !status || status === 'new';
-    });
-}
-exports.newFindings = newFindings;

package/built/integration/appland/location.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" />
-import { URL } from 'url';
-export default interface Location {
-    url: URL;
-}

package/built/integration/appland/location.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/built/integration/appland/retry.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="node" />
-import { IncomingMessage } from 'http';
-import { RetryOptions } from './retryOptions';
-import { RetryHandler } from '@appland/client/dist/src/retryHandler';
-export default function retry(description: string, retryOptions: RetryOptions, retryFn: () => Promise<IncomingMessage>): RetryHandler;

package/built/integration/appland/retry.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const util_1 = require("../../rules/lib/util");
-const RetryDelay = 500;
-const MaxRetries = 3;
-function retry(description, retryOptions, retryFn) {
-    var _a, _b;
-    const maxRetries = (_a = retryOptions.maxRetries) !== null && _a !== void 0 ? _a : MaxRetries;
-    const retryDelay = (_b = retryOptions.retryDelay) !== null && _b !== void 0 ? _b : RetryDelay;
-    let retryCount = 0;
-    function computeDelay() {
-        return retryDelay * Math.pow(2, retryCount - 1);
-    }
-    return (resolve, reject) => {
-        retryCount += 1;
-        if (retryCount > maxRetries) {
-            reject(new Error(`${description} failed: Max retries exceeded.`));
-        }
-        if ((0, util_1.verbose)()) {
-            console.log(`Retrying ${description} in ${computeDelay()}ms`);
-        }
-        setTimeout(() => retryFn().then(resolve).catch(reject), computeDelay());
-    };
-}
-exports.default = retry;

package/built/integration/appland/retryOptions.d.ts

@@ -1,4 +0,0 @@
-export declare type RetryOptions = {
-    maxRetries?: number;
-    retryDelay?: number;
-};

package/built/integration/appland/retryOptions.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });

package/built/integration/appland/scannerJob/create.d.ts

@@ -1,11 +0,0 @@
-import { ScanResults } from '../../../report/scanResults';
-import Location from '../location';
-import ScannerJob from '../scannerJob';
-import { RetryOptions } from '../retryOptions';
-declare type CreateOptions = {
-    mergeKey?: string;
-};
-export interface UploadResponse extends ScannerJob, Location {
-}
-export declare function create(scanResults: ScanResults, mapsetId: number, appMapUUIDByFileName: Record<string, string>, createOptions?: CreateOptions, retryOptions?: RetryOptions): Promise<UploadResponse>;
-export {};

package/built/integration/appland/scannerJob/create.js

@@ -1,56 +0,0 @@
-"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 __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.create = void 0;
-const url_1 = require("url");
-const src_1 = require("@appland/client/dist/src");
-const util_1 = require("../../../rules/lib/util");
-const retry_1 = __importDefault(require("../retry"));
-function create(scanResults, mapsetId, appMapUUIDByFileName, createOptions = {}, retryOptions = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        if ((0, util_1.verbose)())
-            console.warn('Uploading findings');
-        let uploadURL;
-        let request;
-        const retrier = (0, retry_1.default)(`Create scanner job`, retryOptions, makeRequest);
-        function makeRequest() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const payload = JSON.stringify(Object.assign({ scan_results: scanResults, mapset: mapsetId, appmap_uuid_by_file_name: appMapUUIDByFileName }, { merge_key: createOptions.mergeKey }));
-                request = yield (0, src_1.buildRequest)('api/scanner_jobs');
-                return new Promise((resolve, reject) => {
-                    const req = request.requestFunction(request.url, {
-                        method: 'POST',
-                        headers: Object.assign({ 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload) }, request.headers),
-                    }, resolve);
-                    req.on('error', (0, src_1.retryOnError)(retrier, resolve, reject));
-                    req.write(payload);
-                    req.end();
-                }).then((0, src_1.retryOn503)(retrier));
-            });
-        }
-        return makeRequest()
-            .then(src_1.handleError)
-            .then((response) => {
-            if (response.headers.location) {
-                uploadURL = new url_1.URL(response.headers.location, request.url.href);
-            }
-            return (0, src_1.reportJSON)(response);
-        })
-            .then((uploadResponse) => {
-            uploadResponse.url = uploadURL;
-            return uploadResponse;
-        });
-    });
-}
-exports.create = create;

package/built/integration/appland/scannerJob/merge.d.ts

@@ -1,5 +0,0 @@
-import Location from '../location';
-import ScannerJob from '../scannerJob';
-export interface MergeResponse extends ScannerJob, Location {
-}
-export declare function merge(appId: string, mergeKey: string): Promise<MergeResponse>;

package/built/integration/appland/scannerJob/merge.js

@@ -1,46 +0,0 @@
-"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());
-    });
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.merge = void 0;
-const src_1 = require("@appland/client/dist/src");
-const url_1 = require("url");
-function merge(appId, mergeKey) {
-    return __awaiter(this, void 0, void 0, function* () {
-        console.log(`Merging scan results in app ${appId} with merge key ${mergeKey}`);
-        const payload = JSON.stringify({
-            app: appId,
-            merge_key: mergeKey,
-        });
-        const request = yield (0, src_1.buildRequest)('api/scanner_jobs/merge');
-        let uploadURL;
-        return new Promise((resolve, reject) => {
-            const req = request.requestFunction(request.url, {
-                method: 'POST',
-                headers: Object.assign({ 'Content-Type': 'application/json', 'Content-Length': Buffer.byteLength(payload) }, request.headers),
-            }, resolve);
-            req.on('error', reject);
-            req.write(payload);
-            req.end();
-        })
-            .then(src_1.handleError)
-            .then((response) => {
-            if (response.headers.location) {
-                uploadURL = new url_1.URL(response.headers.location, request.url.href);
-            }
-            return (0, src_1.reportJSON)(response);
-        })
-            .then((uploadResponse) => {
-            uploadResponse.url = uploadURL;
-            return uploadResponse;
-        });
-    });
-}
-exports.merge = merge;

package/built/integration/appland/scannerJob.d.ts

@@ -1,11 +0,0 @@
-import { Configuration } from '@appland/client';
-import { ScanSummary } from '../../report/scanSummary';
-export default interface ScannerJob {
-    id: number;
-    created_at: string;
-    updated_at: string;
-    mapset_id: number;
-    merge_key?: string;
-    summary: ScanSummary;
-    configuration: Configuration;
-}

package/built/integration/appland/scannerJob.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });