@appland/scanner 1.81.1 → 1.82.1

package/CHANGELOG.md

@@ -1,3 +1,22 @@
+# [@appland/scanner-v1.82.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.82.0...@appland/scanner-v1.82.1) (2023-08-25)
+
+
+### Bug Fixes
+
+* Ensure that AppMaps are un-marked as being scanned ([e051d8d](https://github.com/getappmap/appmap-js/commit/e051d8db4e7d7b6b8ad8420573f0f02939d9e3bc))
+
+# [@appland/scanner-v1.82.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.81.1...@appland/scanner-v1.82.0) (2023-08-11)
+
+
+### Bug Fixes
+
+* Fix caching of unparseable SQL ([e81db08](https://github.com/getappmap/appmap-js/commit/e81db08d6f6a7b661f77aa3aead5e800e15a7358))
+
+
+### Features
+
+* Analyze in worker threads ([612da06](https://github.com/getappmap/appmap-js/commit/612da06532e765469094aaeaaf614a52e75e46d2))
+
 # [@appland/scanner-v1.81.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.81.0...@appland/scanner-v1.81.1) (2023-08-11)
 
 

package/built/appMapIndex.js

@@ -15,12 +15,19 @@ class AppMapIndex {
         if (!event.sql)
             throw new Error(`${event.fqid} is not a SQL query`);
         const sql = this.sqlNormalized(event);
-        let ast = ASTBySQLString.get(sql);
-        if (!ast) {
-            ast = (0, models_1.parseSQL)(sql);
-            ast ? ASTBySQLString.set(sql, ast) : ASTBySQLString.set(sql, null);
+        let result;
+        const cachedAST = ASTBySQLString.get(sql);
+        if (cachedAST === 'parse-error') {
+            result = undefined;
         }
-        return ast;
+        else if (cachedAST) {
+            result = cachedAST;
+        }
+        else {
+            result = (0, models_1.parseSQL)(sql);
+            ASTBySQLString.set(sql, result ? result : 'parse-error');
+        }
+        return result;
     }
     sqlNormalized(event) {
         if (!event.sql)

package/built/cli/scan/watchScan.js

@@ -50,6 +50,7 @@ const events_1 = __importDefault(require("events"));
 const watchScanTelemetry_1 = require("./watchScanTelemetry");
 const isAncestorPath_1 = __importDefault(require("../../util/isAncestorPath"));
 const util_1 = require("util");
+const console_1 = require("console");
 const debug = (0, util_1.debuglog)('scanner:watch');
 function isDir(targetPath) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -176,25 +177,37 @@ 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`);
-            const appmapFile = [path_1.default.dirname(mtimePath), 'appmap.json'].join('.');
-            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;
-            const cut = (str) => str.substring(str.length - 8);
-            debug('%s: %s, findings: %s, config: %s', appmapFile, cut(appmapStats.mtimeMs.toFixed(3)), reportStats && cut(reportStats.mtimeMs.toFixed(3)), cut(this.config.timestampMs.toFixed(3)));
-            if (reportStats &&
-                reportStats.mtimeMs > appmapStats.mtimeMs - 1000 &&
-                reportStats.mtimeMs > this.config.timestampMs - 1000)
-                return; // report is up to date
-            const startTime = Date.now();
-            const scanner = yield (0, scanner_1.default)(true, this.config, [appmapFile]);
-            const rawScanResults = yield scanner.scan();
-            const elapsed = Date.now() - startTime;
-            this.scanEventEmitter.emit('scan', { scanResults: rawScanResults, elapsed });
-            // Always report the raw data
-            yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults));
-            this.processing.delete(mtimePath);
+            const perform = () => __awaiter(this, void 0, void 0, function* () {
+                const appmapFile = [path_1.default.dirname(mtimePath), 'appmap.json'].join('.');
+                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) {
+                    (0, console_1.warn)(`[scan] AppMap file ${appmapFile} does not exist`);
+                    return;
+                }
+                const cut = (str) => str.substring(str.length - 8);
+                (0, assert_1.default)(this.config);
+                debug('%s: %s, findings: %s, config: %s', appmapFile, cut(appmapStats.mtimeMs.toFixed(3)), reportStats && cut(reportStats.mtimeMs.toFixed(3)), cut(this.config.timestampMs.toFixed(3)));
+                if (reportStats &&
+                    reportStats.mtimeMs > appmapStats.mtimeMs - 1000 &&
+                    reportStats.mtimeMs > this.config.timestampMs - 1000) {
+                    (0, console_1.warn)(`[scan] Report file ${reportFile} is already up to date`);
+                    return;
+                }
+                const startTime = Date.now();
+                const scanner = yield (0, scanner_1.default)(true, this.config, [appmapFile]);
+                const rawScanResults = yield scanner.scan();
+                const elapsed = Date.now() - startTime;
+                this.scanEventEmitter.emit('scan', { scanResults: rawScanResults, elapsed });
+                // Always report the raw data
+                yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults));
+            });
+            try {
+                yield perform();
+            }
+            finally {
+                this.processing.delete(mtimePath);
+            }
         });
     }
     reloadConfig() {

package/built/telemetry.js

@@ -271,7 +271,7 @@ class GitProperties {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise((resolve) => {
                 try {
-                    const commandProcess = (0, child_process_1.spawn)('git', ['status'], {
+                    const commandProcess = (0, child_process_1.spawn)('git', ['status', '--porcelain'], {
                         shell: true,
                         cwd: cwd === null || cwd === void 0 ? void 0 : cwd.toString(),
                         stdio: 'ignore',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.81.1",
+  "version": "1.82.1",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "main": "built/index.js",