@appland/appmap 3.7.4 → 3.10.1

package/built/src/service/config/validator.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateConfig = exports.ConfigValidationError = void 0;
+const ajv_1 = __importDefault(require("ajv"));
+const better_ajv_errors_1 = __importDefault(require("@sidvind/better-ajv-errors"));
+class ConfigValidationError extends Error {
+    constructor(result) {
+        super(result.errors.js.toString());
+        this.result = result;
+    }
+}
+exports.ConfigValidationError = ConfigValidationError;
+function validateConfig(schema, config) {
+    const ajv = new ajv_1.default();
+    const validate = ajv.compile(schema);
+    const valid = validate(config);
+    let result = { valid };
+    if (!valid) {
+        result = Object.assign(Object.assign({}, result), { errors: {
+                js: better_ajv_errors_1.default(schema, config, validate.errors, { format: 'js' }),
+                cli: better_ajv_errors_1.default(schema, config, validate.errors, { format: 'cli' }),
+            } });
+    }
+    return result;
+}
+exports.validateConfig = validateConfig;
+//# sourceMappingURL=validator.js.map

package/built/src/service/config/validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,mFAA2E;AAU3E,MAAa,qBAAsB,SAAQ,KAAK;IAC9C,YAAqB,MAAwB;QAC3C,KAAK,CAAC,MAAM,CAAC,MAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;QADjB,WAAM,GAAN,MAAM,CAAkB;IAE7C,CAAC;CACF;AAJD,sDAIC;AAED,SAAgB,cAAc,CAAC,MAAc,EAAE,MAAc;IAC3D,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;IACtB,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAS,MAAM,CAAC,CAAC;IAE7C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,MAAM,GAAqB,EAAC,KAAK,EAAC,CAAC;IACvC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,mCACD,MAAM,KACT,MAAM,EAAE;gBACN,EAAE,EAAE,2BAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,IAAI,EAAC,CAAC;gBACpE,GAAG,EAAE,2BAAe,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,KAAK,EAAC,CAAC;aACvE,GACF,CAAA;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAhBD,wCAgBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.7.4",
+  "version": "3.10.1",
   "description": "",
   "bin": "built/src/cli.js",
   "publishConfig": {
@@ -28,6 +28,7 @@
     "@types/fs-extra": "^9.0.12",
     "@types/inquirer": "^7.3.3",
     "@types/jest": "^27.0.1",
+    "@types/jest-sinon": "^1.0.2",
     "@types/jsdom": "^16.2.13",
     "@types/node": "^16.6.2",
     "@types/sinon": "^10.0.2",
@@ -43,6 +44,7 @@
     "html-inline-script-webpack-plugin": "^1",
     "html-webpack-plugin": "4",
     "jest": "^26.5.6",
+    "jest-sinon": "^1.0.4",
     "lint-staged": "^10.5.4",
     "prettier": "^2.2.1",
     "sinon": "^11.1.2",
@@ -50,6 +52,7 @@
     "tmp": "^0.2.1",
     "ts-jest": "^26.0.0",
     "ts-node": "^10.2.1",
+    "ts-sinon": "^2.0.2",
     "tsc": "^2.0.3",
     "typescript": "^4.3.5",
     "webpack": "5",
@@ -62,10 +65,12 @@
     "vuex"
   ],
   "dependencies": {
-    "@appland/components": "1.13.1",
+    "@appland/components": "1.14.2",
     "@appland/diagrams": "1.5.0",
     "@appland/models": "1.5.1",
+    "@sidvind/better-ajv-errors": "^0.9.1",
     "@types/moo": "^0.5.5",
+    "ajv": "^8.6.3",
     "applicationinsights": "^2.1.4",
     "async": "^3.2.0",
     "boxen": "^5.0.1",

package/built/src/swagger/command.js

@@ -1,38 +0,0 @@
-"use strict";
-const { promises: fsp } = require('fs');
-const { queue } = require('async');
-const { glob } = require('glob');
-const { parseHTTPServerRequests } = require('./util');
-const Model = require('./model');
-class SwaggerCommand {
-    constructor(directory) {
-        this.directory = directory;
-    }
-    async execute() {
-        this.count = 0;
-        this.model = new Model();
-        const q = queue(this.collectAppMap.bind(this), 5);
-        q.pause();
-        const files = await new Promise((resolve, reject) => {
-            glob(`${this.directory}/**/*.appmap.json`, (err, globFiles) => {
-                if (err) {
-                    return reject(err);
-                }
-                return resolve(globFiles);
-            });
-        });
-        files.forEach((f) => q.push(f));
-        await new Promise((resolve, reject) => {
-            q.drain(resolve);
-            q.error(reject);
-            q.resume();
-        });
-        return this.model.swagger();
-    }
-    async collectAppMap(file) {
-        this.count += 1;
-        parseHTTPServerRequests(JSON.parse(await fsp.readFile(file)), (e) => this.model.addRequest(e));
-    }
-}
-module.exports = SwaggerCommand;
-//# sourceMappingURL=command.js.map

package/built/src/swagger/command.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/swagger/command.js"],"names":[],"mappings":";AAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACxC,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AACnC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,MAAM,EAAE,uBAAuB,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;AACtD,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;AAEjC,MAAM,cAAc;IAClB,YAAY,SAAS;QACnB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACf,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;QACzB,MAAM,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClD,CAAC,CAAC,KAAK,EAAE,CAAC;QACV,MAAM,KAAK,GAAG,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAClD,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,mBAAmB,EAAE,CAAC,GAAG,EAAE,SAAS,EAAE,EAAE;gBAC5D,IAAI,GAAG,EAAE;oBACP,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACpC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YACjB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAChB,CAAC,CAAC,MAAM,EAAE,CAAC;QACb,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAI;QACtB,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC;QAChB,uBAAuB,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAClE,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CACzB,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,OAAO,GAAG,cAAc,CAAC"}