@appland/scanner 1.71.0 → 1.71.2

package/README.md

@@ -66,7 +66,7 @@ documentation for each rule to see it's pattern filters and other configurable p
 To enable de-duplication of findings, a hash is calculated for each finding. The hash is the
 `sha256` digest of a canonical content string for the finding. The canonical content string combines
 stable data from the finding, such as the rule id, normalized event, etc. See
-[appmap-js/packages/models/src/event/hash.js](https://github.com/applandinc/appmap-js/blob/959a8c93c9be37d40a8f4a0e7d44ee211730641e/packages/models/src/event/hash.js)
+[appmap-js/packages/models/src/event/hash.js](https://github.com/getappmap/appmap-js/blob/959a8c93c9be37d40a8f4a0e7d44ee211730641e/packages/models/src/event/hash.js)
 for details.
 
 ## Findings output file
@@ -102,7 +102,7 @@ _Example_
     "clients": [
       {
         "name": "appmap",
-        "url": "https://github.com/applandinc/appmap-ruby",
+        "url": "https://github.com/getappmap/appmap-ruby",
         "version": "0.70.2"
       }
     ],
@@ -118,12 +118,12 @@ _Example_
     ],
     "git": [
       {
-        "repository": "git@github.com:applandinc/appmap-server.git",
+        "repository": "git@github.com:getappmap/appmap-server.git",
         "branch": "master",
         "commit": "3b028018ec1f84e2c351d01d1dac45aeeae887b6"
       },
       {
-        "repository": "git@github.com:applandinc/appmap-server.git",
+        "repository": "git@github.com:getappmap/appmap-server.git",
         "branch": "master",
         "commit": "3b028018ec1f84e2c351d01d1dac45aeeae887b6",
         "status": [
@@ -200,11 +200,11 @@ _Example_
   "tmp/appmap/rspec/API_APIKeysController_create_a_new_api_key.appmap.json": {
     "client": {
       "name": "appmap",
-      "url": "https://github.com/applandinc/appmap-ruby",
+      "url": "https://github.com/getappmap/appmap-ruby",
       "version": "0.70.1"
     },
     "git": {
-      "repository": "git@github.com:applandinc/appmap-server.git",
+      "repository": "git@github.com:getappmap/appmap-server.git",
       "branch": "master",
       "commit": "3b028018ec1f84e2c351d01d1dac45aeeae887b6"
     },

package/built/cli/scan/watchScan.js

@@ -40,14 +40,14 @@ const promises_1 = require("fs/promises");
 const chokidar = __importStar(require("chokidar"));
 const formatReport_1 = require("./formatReport");
 const scanner_1 = __importDefault(require("./scanner"));
-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"));
+const async_1 = require("async");
 class Watcher {
     constructor(options) {
         this.options = options;
+        this.queue = (0, async_1.queue)(this.scan.bind(this), 2);
     }
     watch() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -71,10 +71,9 @@ class Watcher {
                 interval: 1000,
                 persistent: false,
             });
-            for (const ch of [this.appmapWatcher, this.appmapPoller]) {
-                ch.on('add', (filePath) => this.scan(filePath));
-                ch.on('change', (filePath) => this.scan(filePath));
-            }
+            const enqueue = this.enqueue.bind(this);
+            for (const ch of [this.appmapWatcher, this.appmapPoller])
+                ch.on('add', enqueue).on('change', enqueue);
         });
     }
     close() {
@@ -87,15 +86,23 @@ class Watcher {
             }));
         });
     }
-    scan(fileName) {
+    enqueue(mtimePath) {
+        if ([...this.queue].includes(mtimePath))
+            return;
+        this.queue.push(mtimePath);
+    }
+    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`);
-            const pathTokens = fileName.split('/');
-            const appmapDir = pathTokens.slice(0, pathTokens.length - 1).join('/');
-            const appmapFile = [appmapDir, 'appmap.json'].join('.');
-            const reportFile = [appmapDir, 'appmap-findings.json'].join('/');
-            if (!(yield (0, util_1.promisify)(fs_1.exists)(appmapFile)))
+            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)));
+            if (!appmapStats)
                 return;
+            if (reportStats &&
+                reportStats.mtimeMs > appmapStats.mtimeMs &&
+                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();
             // Always report the raw data

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/built/rules/too-many-joins/rule.js

@@ -13,7 +13,7 @@ function rule(options) {
         (0, assert_1.default)(table.variant === 'table');
         return !excludeTables.find((filter) => filter(table.name));
     }
-    // TODO: clean up (https://github.com/applandinc/scanner/issues/43)
+    // TODO: clean up (https://github.com/getappmap/scanner/issues/43)
     function matcher(command, appMapIndex, eventFilter) {
         const joinCount = {};
         for (const sqlEvent of (0, database_1.sqlStrings)(command, appMapIndex, eventFilter)) {

package/doc/architecture.md

@@ -1,6 +1,6 @@
 ## Scanner architecture
 
-See [@appland/models source code](https://github.com/applandinc/appmap-js/tree/main/packages/models)
+See [@appland/models source code](https://github.com/getappmap/appmap-js/tree/main/packages/models)
 for the JS API to AppMap data.
 
 ## Assertions

package/package.json

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