@appland/scanner 1.74.5 → 1.75.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@appland/scanner-v1.75.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.6...@appland/scanner-v1.75.0) (2023-01-18)
+
+
+### Features
+
+* Report env var names ([6264cb6](https://github.com/getappmap/appmap-js/commit/6264cb6c73927a90fc350bfb1531d3a8dd97df69))
+
+# [@appland/scanner-v1.74.6](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.5...@appland/scanner-v1.74.6) (2023-01-09)
+
+
+### Bug Fixes
+
+* Scan-watching directories on other than the current drive ([8cd131a](https://github.com/getappmap/appmap-js/commit/8cd131ae99ba649a710fff1ae41ef16aa3b2d4b0))
+
 # [@appland/scanner-v1.74.5](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.74.4...@appland/scanner-v1.74.5) (2023-01-09)
 
 

package/built/cli/scan/watchScan.js

@@ -48,6 +48,7 @@ const configurationProvider_1 = require("../../configuration/configurationProvid
 const telemetry_1 = __importDefault(require("../../telemetry"));
 const events_1 = __importDefault(require("events"));
 const watchScanTelemetry_1 = require("./watchScanTelemetry");
+const isAncestorPath_1 = __importDefault(require("../../lib/isAncestorPath"));
 function isDir(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
@@ -68,9 +69,6 @@ function existingParent(targetPath) {
         return targetPath;
     });
 }
-function isAncestorPath(ancestor, descendant) {
-    return !path_1.default.relative(ancestor, descendant).startsWith('..');
-}
 class Watcher {
     constructor(options) {
         this.options = options;
@@ -98,11 +96,11 @@ class Watcher {
             // If the appmap directory is a descendant of cwd, watch cwd (presumably project directory).
             // This ensures the watch will survive even if the appmap dir is removed and recreated.
             // Otherwise, make sure to use an existing directory. Chokidar struggles with missing directories.
-            const watchDir = isAncestorPath(cwd, appmapDir) ? cwd : yield existingParent(appmapDir);
+            const watchDir = (0, isAncestorPath_1.default)(cwd, appmapDir) ? cwd : yield existingParent(appmapDir);
             // Custom ignore function needed to cut down the watch tree to just what we need.
             const ignored = (targetPath) => {
                 // Ignore anything that isn't an ancestor or descendant of the appmap dir.
-                if (!(isAncestorPath(targetPath, appmapDir) || isAncestorPath(appmapDir, targetPath)))
+                if (!((0, isAncestorPath_1.default)(targetPath, appmapDir) || (0, isAncestorPath_1.default)(appmapDir, targetPath)))
                     return true;
                 // Also make sure to not try to recurse down node_modules or .git
                 const basename = path_1.default.basename(targetPath);

package/built/lib/isAncestorPath.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path_1 = __importDefault(require("path"));
+function isAncestorPath(ancestor, descendant) {
+    const relative = path_1.default.relative(ancestor, descendant);
+    return !relative.startsWith('..') && !path_1.default.isAbsolute(relative);
+}
+exports.default = isAncestorPath;

package/built/report/scanResults.js

@@ -101,6 +101,7 @@ function sendScanResultsTelemetry(telemetry) {
             numAppMaps: telemetry.numAppMaps,
             numFindings: telemetry.numFindings,
         },
-    });
+    }),
+        { includeEnvironmentVariables: true };
 }
 exports.sendScanResultsTelemetry = sendScanResultsTelemetry;

package/built/telemetry.js

@@ -159,11 +159,14 @@ class Telemetry {
         }
         return this._client;
     }
-    static sendEvent(data) {
+    static sendEvent(data, options = { includeEnvironment: false }) {
         try {
             const transformedProperties = transformProps(Object.assign({ version: version, args: process.argv.slice(1).join(' ') }, data.properties));
             const transformedMetrics = transformProps(data.metrics || {});
             const properties = Object.assign({ 'common.source': name, 'common.os': os.platform(), 'common.platformversion': os.release(), 'common.arch': os.arch(), 'appmap.cli.machineId': Telemetry.machineId, 'appmap.cli.sessionId': Telemetry.session.id }, transformedProperties);
+            if (options.includeEnvironment) {
+                properties['common.environmentVariables'] = Object.keys(process.env).sort().join(',');
+            }
             const event = {
                 name: `${name}/${data.name}`,
                 measurements: transformedMetrics,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.74.5",
+  "version": "1.75.0",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "files": [