@appland/scanner 1.71.1 → 1.71.2

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@appland/scanner-v1.71.2](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.71.1...@appland/scanner-v1.71.2) (2022-10-04)
+
+
+### Bug Fixes
+
+* Use default configuration timestamp in scan --watch if none provided ([3d246f2](https://github.com/getappmap/appmap-js/commit/3d246f2b350af2dd14a097519ea9af6fe410e543))
+
 # [@appland/scanner-v1.71.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.71.0...@appland/scanner-v1.71.1) (2022-10-04)
 
 

package/built/cli/scan/watchScan.js

@@ -94,7 +94,6 @@ class Watcher {
     scan(mtimePath) {
         return __awaiter(this, void 0, void 0, function* () {
             (0, assert_1.default)(this.config, `config should always be loaded before appmapWatcher triggers a scan`);
-            (0, assert_1.default)(this.configTime);
             const appmapFile = mtimePath.replace(/\/mtime$/, '.appmap.json');
             const reportFile = mtimePath.replace(/mtime$/, 'appmap-findings.json');
             const [appmapStats, reportStats] = yield Promise.all([appmapFile, reportFile].map((f) => (0, promises_1.stat)(f).catch(() => null)));
@@ -102,7 +101,7 @@ class Watcher {
                 return;
             if (reportStats &&
                 reportStats.mtimeMs > appmapStats.mtimeMs &&
-                reportStats.mtimeMs > this.configTime)
+                reportStats.mtimeMs > this.config.timestampMs)
                 return; // report is up to date
             const scanner = yield (0, scanner_1.default)(true, this.config, [appmapFile]);
             const rawScanResults = yield scanner.scan();
@@ -113,7 +112,6 @@ class Watcher {
     reloadConfig() {
         return __awaiter(this, void 0, void 0, function* () {
             this.config = yield (0, configurationProvider_1.parseConfigFile)(this.options.configFile);
-            this.configTime = (yield (0, promises_1.stat)(this.options.configFile)).mtimeMs;
         });
     }
 }

package/built/configuration/configurationProvider.js

@@ -211,10 +211,12 @@ function parseConfigFile(configPath) {
             configPath = (0, path_1.join)(__dirname, '../sampleConfig/default.yml');
         }
         console.log(`Using scanner configuration file ${configPath}`);
+        const timestampMs = (yield fs_1.promises.stat(configPath)).mtimeMs;
         const yamlConfig = yield fs_1.promises.readFile(configPath, 'utf-8');
-        return js_yaml_1.default.load(yamlConfig, {
+        const config = js_yaml_1.default.load(yamlConfig, {
             filename: configPath,
         });
+        return Object.assign(Object.assign({}, config), { timestampMs });
     });
 }
 exports.parseConfigFile = parseConfigFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.71.1",
+  "version": "1.71.2",
   "description": "",
   "bin": "built/cli.js",
   "files": [