@appland/scanner 1.86.0 → 1.87.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@appland/scanner-v1.87.1](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.87.0...@appland/scanner-v1.87.1) (2024-07-25)
+
+
+### Bug Fixes
+
+* conditionally create sql_warnings.txt ([737f59f](https://github.com/getappmap/appmap-js/commit/737f59f323b3c9300bc6985cb179fa7264c8f7fd))
+
+# [@appland/scanner-v1.87.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.86.0...@appland/scanner-v1.87.0) (2024-04-30)
+
+
+### Features
+
+* Build scanner binary packages with Node 18 ([37c939b](https://github.com/getappmap/appmap-js/commit/37c939b7b3e19a098bfe81d2e5a66bacb413f6e3))
+
 # [@appland/scanner-v1.86.0](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.85.0...@appland/scanner-v1.86.0) (2023-12-28)
 
 

package/LICENSE.txt

@@ -12,7 +12,7 @@ Software: @appland/scanner
 
 License: MIT License
 
-Copyright 2023, AppLand Inc
+Copyright 2024, AppLand Inc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,

package/built/ruleChecker.js

@@ -106,20 +106,7 @@ class RuleChecker {
             if (!checkInstance.filterEvent(event, appMapIndex)) {
                 return;
             }
-            let appmapConfigDir;
-            {
-                let searchDir = (0, path_1.dirname)((0, path_1.resolve)(appMapFileName));
-                while (!appmapConfigDir) {
-                    if (yield (0, util_1.fileExists)((0, path_1.join)(searchDir, 'appmap.yml'))) {
-                        appmapConfigDir = searchDir;
-                    }
-                    else {
-                        if ((0, path_1.dirname)(searchDir) === searchDir)
-                            break;
-                        searchDir = (0, path_1.dirname)(searchDir);
-                    }
-                }
-            }
+            const appmapConfigDir = yield findConfigDir(appMapFileName);
             const resolvePath = (path) => __awaiter(this, void 0, void 0, function* () {
                 const candidates = [path];
                 if (appmapConfigDir)
@@ -272,3 +259,26 @@ class RuleChecker {
     }
 }
 exports.default = RuleChecker;
+const configDirs = new Map();
+function findConfigDir(appMapFileName) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (configDirs.has(appMapFileName))
+            return configDirs.get(appMapFileName);
+        let appmapConfigDir;
+        {
+            let searchDir = (0, path_1.dirname)((0, path_1.resolve)(appMapFileName));
+            while (!appmapConfigDir) {
+                if (yield (0, util_1.fileExists)((0, path_1.join)(searchDir, 'appmap.yml'))) {
+                    appmapConfigDir = searchDir;
+                }
+                else {
+                    if ((0, path_1.dirname)(searchDir) === searchDir)
+                        break;
+                    searchDir = (0, path_1.dirname)(searchDir);
+                }
+            }
+        }
+        configDirs.set(appMapFileName, appmapConfigDir);
+        return appmapConfigDir;
+    });
+}

package/built/sampleConfig/default.yml

@@ -25,4 +25,5 @@ checks:
   - rule: too-many-updates
   # - rule: unbatched-materialized-query
   - rule: unauthenticated-encryption
+  - rule: unfulfilled-promise
   - rule: update-in-get-request

package/built/sqlWarning.js

@@ -17,12 +17,22 @@ function writeErrorToFile(error) {
     return __awaiter(this, void 0, void 0, function* () {
         const flags = SqlParseErrorFileOpened ? 'a' : 'w';
         SqlParseErrorFileOpened = true;
-        (0, promises_1.open)(SqlParseErrorFileName, flags).then((handle) => {
-            handle.write([error.toString(), ''].join('\n')).finally(handle.close.bind(handle));
-        });
+        const msg = [String(error), ''].join('\n');
+        try {
+            (0, promises_1.open)(SqlParseErrorFileName, flags).then((handle) => {
+                handle.write([error.toString(), ''].join('\n')).finally(handle.close.bind(handle));
+            });
+        }
+        catch (e) {
+            console.warn(e);
+            console.warn(`SQL Error: ${msg}`);
+        }
     });
 }
 function sqlWarning(parseError) {
+    if (!process.env['APPMAP_SQL_WARNING']) {
+        return;
+    }
     if (!SqlErrors.has(parseError.sql)) {
         writeErrorToFile(parseError);
         SqlErrors.add(parseError.sql);

package/built/telemetry.js

@@ -368,12 +368,14 @@ class GitProperties {
     }
 }
 const gitCache = new Map();
+const noCacheList = ['clearCache'];
 // GitProperties is available externally as Git.
 // This export provides a simple caching layer around GitProperties to avoid
 // excessive shelling out to git.
 exports.Git = new Proxy(GitProperties, {
     get(target, prop) {
-        if (typeof target[prop] === 'function') {
+        if (!noCacheList.includes(prop.toString()) &&
+            typeof target[prop] === 'function') {
             return new Proxy(target[prop], {
                 apply(target, thisArg, argArray) {
                     const cacheKey = `${prop.toString()}(${JSON.stringify(argArray)})`;
@@ -382,12 +384,7 @@ exports.Git = new Proxy(GitProperties, {
                     }
                     /* eslint-disable-next-line @typescript-eslint/ban-types */
                     const result = Reflect.apply(target, thisArg, argArray);
-                    if (result instanceof Promise) {
-                        return result.then((r) => {
-                            gitCache.set(cacheKey, r);
-                            return r;
-                        });
-                    }
+                    gitCache.set(cacheKey, result);
                     return result;
                 },
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.86.0",
+  "version": "1.87.1",
   "description": "Analyze AppMaps for code flaws",
   "bin": "built/cli.js",
   "main": "built/index.js",
@@ -19,7 +19,7 @@
     "doc-up-to-date": "git diff --exit-code doc/",
     "lint": "eslint src --ext .ts",
     "ci": "yarn lint && yarn build && yarn schema-up-to-date && yarn doc-up-to-date && yarn test",
-    "test": "jest --filter=./test/testFilter.js --detectOpenHandles",
+    "test": "yarn jest",
     "jest": "jest --filter=./test/testFilter.js --detectOpenHandles",
     "semantic-release": "semantic-release",
     "watch": "node bin/preBuild.js && tsc -p tsconfig.build.json --watch"
@@ -51,7 +51,7 @@
     "jest": "^29.5.0",
     "nock": "^13.2.2",
     "openapi-types": "^9.3.0",
-    "pkg": "^5.5.2",
+    "pkg": "^5.8.0",
     "prettier": "^2.7.1",
     "semantic-release": "^19.0.2",
     "sinon": "^13.0.1",
@@ -98,10 +98,10 @@
   },
   "pkg": {
     "targets": [
-      "node16-linux-x64",
-      "node16-win-x64",
-      "node16-macos-x64",
-      "node16-macos-arm64"
+      "node18-linux-x64",
+      "node18-win-x64",
+      "node18-macos-x64",
+      "node18-macos-arm64"
     ],
     "scripts": [
       "built/scanner/*.js",