@appland/scanner 1.71.5 → 1.71.7

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+# [@appland/scanner-v1.71.7](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.71.6...@appland/scanner-v1.71.7) (2022-10-21)
+
+
+### Bug Fixes
+
+* scanner works on windows ([a2bf89f](https://github.com/getappmap/appmap-js/commit/a2bf89f7921d65bf16aee2a341c4902e4d84b6d8))
+
+# [@appland/scanner-v1.71.6](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.71.5...@appland/scanner-v1.71.6) (2022-10-17)
+
+
+### Bug Fixes
+
+* fix scanner tests in windows ([e565f30](https://github.com/getappmap/appmap-js/commit/e565f30b7c4f7b43e7eb5652fc9afc58b511da2d))
+
 # [@appland/scanner-v1.71.5](https://github.com/getappmap/appmap-js/compare/@appland/scanner-v1.71.4...@appland/scanner-v1.71.5) (2022-10-17)
 
 

package/built/cli/scan/watchScan.js

@@ -128,7 +128,7 @@ class Watcher {
             return;
         this.queue.push(mtimePath);
     }
-    scan(mtimePath) {
+    scan(mtimePath, callback) {
         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('.');
@@ -144,6 +144,10 @@ class Watcher {
             const rawScanResults = yield scanner.scan();
             // Always report the raw data
             yield (0, promises_1.writeFile)(reportFile, (0, formatReport_1.formatReport)(rawScanResults));
+            // tell the queue that the current task is complete
+            if (callback) {
+                yield callback();
+            }
         });
     }
     reloadConfig() {

package/built/rules/lib/parseRuleDescription.js

@@ -10,7 +10,8 @@ function parseRuleDescription(id) {
     const docPath = (0, path_1.join)(__dirname, `../../../doc/rules/${(0, util_1.dasherize)(id)}.md`);
     if (!fs_1.default.existsSync(docPath))
         return `No doc exists for rule ${id}`;
-    const content = fs_1.default.readFileSync(docPath, 'utf-8');
+    // replace any carriage return with a newline
+    const content = fs_1.default.readFileSync(docPath, 'utf-8').replace(/\r\n/g, '\n');
     const propertiesContent = content.match(/---\n((?:.*\n)+)---\n((?:.*\n)+?)##?#?/);
     if (!propertiesContent) {
         // This is probably a new doc that doesn't have front matter yet.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/scanner",
-  "version": "1.71.5",
+  "version": "1.71.7",
   "description": "",
   "bin": "built/cli.js",
   "files": [
@@ -10,7 +10,7 @@
   ],
   "types": "src/types.d.ts",
   "scripts": {
-    "build": "mkdir -p built && cp -r src/sampleConfig built && tsc -p tsconfig.build.json && yarn schema && yarn doc",
+    "build": "node bin/preBuild.js && tsc -p tsconfig.build.json && yarn schema && yarn doc",
     "build-native": "yarn build && ./bin/build-native",
     "start": "ts-node src/cli.ts",
     "doc": "ts-node ./bin/verify-rules-doc.ts && ts-node ./bin/verify-labels-doc.ts && ts-node ./bin/front-matter.ts",
@@ -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",
+    "test": "jest --filter=./test/testFilter.js",
     "semantic-release": "semantic-release"
   },
   "author": "AppLand, Inc.",
@@ -61,7 +61,7 @@
   "dependencies": {
     "@appland/client": "^1.3.0",
     "@appland/models": "^1.18.1",
-    "@appland/openapi": "1.0.2",
+    "@appland/openapi": "1.0.3",
     "@appland/sql-parser": "^1.5.0",
     "@types/cli-progress": "^3.9.2",
     "ajv": "^8.8.2",