@appland/scanner 1.58.0 → 1.59.2

package/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [@appland/scanner-v1.59.2](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.59.1...@appland/scanner-v1.59.2) (2022-06-29)
+
+
+### Bug Fixes
+
+* Use absolute paths when creating watchers ([afc81e0](https://github.com/applandinc/appmap-js/commit/afc81e03f1e5004288acda75c89bb61a1857c462))
+
+# [@appland/scanner-v1.59.1](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.59.0...@appland/scanner-v1.59.1) (2022-06-15)
+
+
+### Bug Fixes
+
+* Upgrade @appland/models to v1.16.1 ([7eead86](https://github.com/applandinc/appmap-js/commit/7eead8607f30299150dd08032142a3aba5770f89))
+
+# [@appland/scanner-v1.59.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.58.0...@appland/scanner-v1.59.0) (2022-06-08)
+
+
+### Features
+
+* Always rewrite an AppMap before upload ([61617a9](https://github.com/applandinc/appmap-js/commit/61617a985fc3a4f6ce6dc805f7cc86e3c576264e))
+
 # [@appland/scanner-v1.58.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.57.0...@appland/scanner-v1.58.0) (2022-06-07)
 
 

package/built/cli/scan/watchScan.js

@@ -44,6 +44,7 @@ const fs_1 = require("fs");
 const util_1 = require("util");
 const configurationProvider_1 = require("../../configuration/configurationProvider");
 const assert_1 = __importDefault(require("assert"));
+const path_1 = __importDefault(require("path"));
 class Watcher {
     constructor(options) {
         this.options = options;
@@ -57,10 +58,14 @@ class Watcher {
             this.configWatcher
                 .on('add', this.reloadConfig.bind(this))
                 .on('change', this.reloadConfig.bind(this));
-            this.appmapWatcher = chokidar.watch(`${this.options.appmapDir}/**/mtime`, {
+            // Chokidar struggles with relative paths. Make sure the watch pattern is absolute.
+            const watchPattern = path_1.default.resolve(this.options.appmapDir, '**', 'mtime');
+            this.appmapWatcher = chokidar.watch(watchPattern, {
                 ignoreInitial: true,
             });
-            this.appmapWatcher.on('add', this.scan.bind(this)).on('change', this.scan.bind(this));
+            this.appmapWatcher
+                .on('add', (filePath) => this.scan(filePath))
+                .on('change', (filePath) => this.scan(filePath));
         });
     }
     close() {

package/built/cli/upload/pruneAppMap.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.pruneAppMap = exports.maxAppMapSize = void 0;
+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) {
@@ -10,7 +10,11 @@ function maxAppMapSize() {
     return APPMAP_UPLOAD_MAX_SIZE;
 }
 exports.maxAppMapSize = maxAppMapSize;
-function pruneAppMap(appMapJson, maxSize) {
-    return (0, models_1.buildAppMap)().source(appMapJson).prune(maxSize).normalize().build();
+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.js

@@ -56,13 +56,15 @@ function create(scanResults, appId, appMapDir, mergeKey, mapsetOptions = {}, ret
                 .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`);
-                    const prunedAppMap = (0, pruneAppMap_1.pruneAppMap)(appMapJson, maxSize);
-                    metadata = prunedAppMap.metadata;
-                    buffer = Buffer.from(JSON.stringify(prunedAppMap));
+                    (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 }) => {

package/built/telemetry.js

@@ -125,7 +125,7 @@ const transformProps = (obj) => {
 };
 class Telemetry {
     static get enabled() {
-        return this._enabled;
+        return process.env.APPMAP_TELEMETRY_DISABLED === undefined;
     }
     static get session() {
         var _a;
@@ -211,5 +211,4 @@ class Telemetry {
 }
 exports.default = Telemetry;
 Telemetry.debug = process.env.APPMAP_TELEMETRY_DEBUG !== undefined;
-Telemetry._enabled = process.env.APPMAP_TELEMETRY_DISABLED === undefined;
 Telemetry.machineId = getMachineId();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.58.0",
+  "version": "1.59.2",
   "description": "",
   "bin": "built/cli.js",
   "files": [
@@ -56,8 +56,8 @@
   },
   "dependencies": {
     "@appland/client": "^1.3.0",
-    "@appland/models": "^1.14.5",
-    "@appland/openapi": "1.0.1",
+    "@appland/models": "^1.16.1",
+    "@appland/openapi": "1.0.2",
     "@appland/sql-parser": "^1.5.0",
     "@types/cli-progress": "^3.9.2",
     "ajv": "^8.8.2",