@appland/scanner 1.61.0 → 1.62.2

package/CHANGELOG.md

@@ -1,3 +1,25 @@
+# [@appland/scanner-v1.62.2](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.62.1...@appland/scanner-v1.62.2) (2022-07-25)
+
+
+### Bug Fixes
+
+* Return proper result for job-not-cancelled ([f7ee5da](https://github.com/applandinc/appmap-js/commit/f7ee5da073849881c3c553f08fc2dd82bb8c7965))
+
+# [@appland/scanner-v1.62.1](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.62.0...@appland/scanner-v1.62.1) (2022-07-13)
+
+
+### Bug Fixes
+
+* More reliable detection of appmap changes by scanner watch ([b0cc14d](https://github.com/applandinc/appmap-js/commit/b0cc14d61b7e27248975c35022a8cd4da070337b))
+
+# [@appland/scanner-v1.62.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.61.0...@appland/scanner-v1.62.0) (2022-07-12)
+
+
+### Features
+
+* Support working directory -d arg ([2bd280f](https://github.com/applandinc/appmap-js/commit/2bd280fa2e6bb2d13c6bc1c578b1b78c3a62492a))
+* upload command uses appmap_dir from config ([801b75b](https://github.com/applandinc/appmap-js/commit/801b75bf008b6188d4aacd143a1992149aafebd3))
+
 # [@appland/scanner-v1.61.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.60.0...@appland/scanner-v1.61.0) (2022-07-11)
 
 

package/built/cli/appmapDirFromConfig.js

@@ -0,0 +1,29 @@
+"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.appmapDirFromConfig = void 0;
+const fs_1 = require("fs");
+const promises_1 = require("fs/promises");
+const js_yaml_1 = require("js-yaml");
+const util_1 = require("util");
+function appmapDirFromConfig() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const appMapConfigExists = yield (0, util_1.promisify)(fs_1.exists)('appmap.yml');
+        if (appMapConfigExists) {
+            const appMapConfigData = (0, js_yaml_1.load)((yield (0, promises_1.readFile)('appmap.yml')).toString());
+            if (appMapConfigData && typeof appMapConfigData === 'object') {
+                const configData = appMapConfigData;
+                return configData['appmap_dir'];
+            }
+        }
+    });
+}
+exports.appmapDirFromConfig = appmapDirFromConfig;

package/built/cli/ci/command.js

@@ -18,6 +18,7 @@ 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"));
@@ -30,6 +31,7 @@ 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',
@@ -59,17 +61,16 @@ exports.default = {
     handler(options) {
         return __awaiter(this, void 0, void 0, function* () {
             let { appmapDir } = options;
-            const { config, verbose: isVerbose, fail: failOption, app: appIdArg, reportFile, upload: doUpload, updateCommitStatus: updateCommitStatusOption, mergeKey, commit, branch, environment, } = 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, util_2.appmapDirFromConfig)();
-            }
-            if (!appmapDir) {
-                appmapDir = yield (0, util_2.appmapDirFromConfig)();
-                throw new errors_1.ValidationError('--appmap-dir is required');
+                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);

package/built/cli/handleWorkingDirectory.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleWorkingDirectory = void 0;
+function handleWorkingDirectory(directory) {
+    if (directory)
+        process.chdir(directory);
+}
+exports.handleWorkingDirectory = handleWorkingDirectory;

package/built/cli/scan/command.js

@@ -14,12 +14,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("../../errors");
 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");
+const handleWorkingDirectory_1 = require("../handleWorkingDirectory");
 exports.default = {
     command: 'scan',
     describe: 'Scan AppMaps for code behavior findings',
@@ -48,10 +50,11 @@ exports.default = {
     handler(options) {
         return __awaiter(this, void 0, void 0, function* () {
             let { appmapDir } = options;
-            const { appmapFile, config, verbose: isVerbose, all: reportAllFindings, watch, app: appIdArg, apiKey, ide, reportFile, } = options;
+            const { appmapFile, config, directory, verbose: isVerbose, all: reportAllFindings, watch, app: appIdArg, apiKey, ide, reportFile, } = options;
             if (isVerbose) {
                 (0, util_1.verbose)(true);
             }
+            (0, handleWorkingDirectory_1.handleWorkingDirectory)(directory);
             if (apiKey) {
                 process.env.APPLAND_API_KEY = apiKey;
             }
@@ -65,7 +68,7 @@ exports.default = {
                 throw new errors_1.ValidationError(`Don't use --app with --watch, because in watch mode all findings are reported`);
             }
             if (!appmapFile && !appmapDir) {
-                appmapDir = (yield (0, util_1.appmapDirFromConfig)()) || '.';
+                appmapDir = (yield (0, appmapDirFromConfig_1.appmapDirFromConfig)()) || '.';
             }
             if (appmapDir)
                 yield (0, validateFile_1.default)('directory', appmapDir);

package/built/cli/scanArgs.js

@@ -1,9 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 function default_1(args) {
+    args.option('directory', {
+        describe: 'program working directory',
+        type: 'string',
+        alias: 'd',
+    });
     args.option('appmap-dir', {
         describe: 'directory to recursively inspect for AppMaps',
-        alias: 'd',
     });
     args.option('config', {
         describe: 'path to assertions config file (TypeScript or YAML, check docs for configuration format)',

package/built/cli/upload/command.js

@@ -14,19 +14,26 @@ var __importDefault = (this && this.__importDefault) || function (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',
-            alias: 'd',
         });
         args.option('report-file', {
             describe: 'file containing the findings report',
@@ -42,10 +49,17 @@ exports.default = {
     },
     handler(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { verbose: isVerbose, reportFile, appmapDir, app: appIdArg, mergeKey, branch, commit, environment, } = options;
+            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());

package/built/rules/jobNotCancelled.js

@@ -18,11 +18,14 @@ function build() {
         const missing = creationEvents.length - cancellationEvents.length;
         if (missing === 0)
             return;
-        return creationEvents.map((jobCreationEvent) => ({
-            event: jobCreationEvent,
-            message: `Job created by ${jobCreationEvent.codeObject.prettyName} was not cancelled when the enclosing transaction rolled back`,
-            participatingEvents: { beginTransaction: event },
-        }));
+        const result = {
+            event: event,
+            message: `${missing} jobs are scheduled but not cancelled in a rolled back transaction`,
+            // if there's a mismatch and there are cancellations we can't tell
+            // for sure which creations they match, so return everything
+            relatedEvents: [...creationEvents, ...cancellationEvents],
+        };
+        return [result];
     }
     return {
         matcher,

package/built/rules/lib/util.js

@@ -1,33 +1,7 @@
 "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.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.pluralize = exports.dasherize = exports.camelize = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = exports.appmapDirFromConfig = void 0;
-const fs_1 = require("fs");
-const promises_1 = require("fs/promises");
-const js_yaml_1 = require("js-yaml");
+exports.verbose = exports.toRegExpArray = exports.responseContentType = exports.toRegExp = exports.providesAuthentication = exports.pluralize = exports.dasherize = exports.camelize = exports.parseValue = exports.isRoot = exports.ideLink = exports.isTruthy = exports.isFalsey = exports.emptyValue = exports.capitalize = exports.appMapDir = void 0;
 const path_1 = require("path");
-const util_1 = require("util");
-function appmapDirFromConfig() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const appMapConfigExists = yield (0, util_1.promisify)(fs_1.exists)('appmap.yml');
-        if (appMapConfigExists) {
-            const appMapConfigData = (0, js_yaml_1.load)((yield (0, promises_1.readFile)('appmap.yml')).toString());
-            if (appMapConfigData && typeof appMapConfigData === 'object') {
-                const configData = appMapConfigData;
-                return configData['appmap_dir'];
-            }
-        }
-    });
-}
-exports.appmapDirFromConfig = appmapDirFromConfig;
 let isVerbose = false;
 function verbose(v = null) {
     if (v === true || v === false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.61.0",
+  "version": "1.62.2",
   "description": "",
   "bin": "built/cli.js",
   "files": [
@@ -65,11 +65,11 @@
     "applicationinsights": "^2.1.4",
     "async": "^3.2.3",
     "chalk": "^4.1.2",
-    "chokidar": "^3.5.3",
+    "chokidar": "applandinc/chokidar#fix/new-file-new-directory-race-on-linux",
     "cli-progress": "^3.11.0",
     "conf": "^10.0.2",
     "form-data": "^4.0.0",
-    "glob": "^7.2.0",
+    "glob": "7.2.3",
     "js-yaml": "^4.1.0",
     "lru-cache": "^6.0.0",
     "minimatch": "^3.0.4",