@appland/appmap 3.47.0 → 3.49.2

package/built/sequenceDiagram/analyzeAppMaps.js

@@ -0,0 +1,79 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const findCodeObjects_1 = __importDefault(require("../search/findCodeObjects"));
+const utils_1 = require("../utils");
+const specification_1 = __importDefault(require("@appland/sequence-diagram/dist/specification"));
+const priority_1 = __importDefault(require("@appland/sequence-diagram/dist/priority"));
+async function analyzeAppMaps(appmapDir, codeObjectPatterns) {
+    const requiredPatterns = new Set();
+    const uniquePatterns = new Set();
+    const priority = new priority_1.default();
+    const requiredCodeObjectIds = new Set();
+    const includedCodeObjectIds = new Set();
+    const interpretCodeObjectPattern = (pattern) => {
+        if (pattern.charAt(0) === '+') {
+            pattern = pattern.slice(1);
+            requiredPatterns.add(pattern);
+        }
+        uniquePatterns.add(pattern);
+        priority.enrollPattern(pattern);
+    };
+    const collectCodeObject = (codeObjectIds, codeObject) => {
+        codeObjectIds.add(codeObject.fqid);
+    };
+    codeObjectPatterns.forEach(interpretCodeObjectPattern);
+    const appmaps = new Set();
+    // Match non-required patterns
+    await Promise.all([...uniquePatterns]
+        .filter((pattern) => !requiredPatterns.has(pattern))
+        .map(async (codeObjectPattern) => {
+        const matches = await new findCodeObjects_1.default(appmapDir, codeObjectPattern).find();
+        const codeObjectIds = new Set();
+        matches.forEach((match) => {
+            collectCodeObject(includedCodeObjectIds, match.codeObject);
+            collectCodeObject(codeObjectIds, match.codeObject);
+        });
+        priority.expandPattern(codeObjectPattern, [...codeObjectIds]);
+    }));
+    // Collect AppMaps which match every required pattern.
+    if (requiredPatterns.size > 0) {
+        // Figure out which AppMaps these code objects reside in
+        const appmapsForRequiredPattern = await Promise.all([...requiredPatterns].map(async (codeObjectPattern) => {
+            const matches = await new findCodeObjects_1.default(appmapDir, codeObjectPattern).find();
+            const codeObjectIds = new Set();
+            const appmaps = new Set();
+            matches.forEach((match) => {
+                appmaps.add(match.appmap);
+                collectCodeObject(includedCodeObjectIds, match.codeObject);
+                collectCodeObject(requiredCodeObjectIds, match.codeObject);
+                collectCodeObject(codeObjectIds, match.codeObject);
+            });
+            priority.expandPattern(codeObjectPattern, Array.from(codeObjectIds));
+            return appmaps;
+        }));
+        const firstSet = appmapsForRequiredPattern.pop();
+        if (firstSet) {
+            for (const appmap of firstSet) {
+                // every is true for empty arrays
+                if (appmapsForRequiredPattern.every((appmaps) => appmaps.has(appmap))) {
+                    appmaps.add(appmap);
+                }
+            }
+        }
+    }
+    else {
+        await (0, utils_1.processFiles)(`${appmapDir}/**/*.appmap.json`, (file, cb) => {
+            appmaps === null || appmaps === void 0 ? void 0 : appmaps.add(file.slice(0, file.length - '.appmap.json'.length));
+            cb();
+        });
+    }
+    return {
+        appmaps: [...appmaps].sort(),
+        specification: new specification_1.default(priority, includedCodeObjectIds, requiredCodeObjectIds),
+    };
+}
+exports.default = analyzeAppMaps;
+//# sourceMappingURL=analyzeAppMaps.js.map

package/built/sequenceDiagram/analyzeAppMaps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"analyzeAppMaps.js","sourceRoot":"","sources":["../../src/sequenceDiagram/analyzeAppMaps.ts"],"names":[],"mappings":"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"}

package/built/sequenceDiagram/buildDiagrams.js

@@ -0,0 +1,29 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const models_1 = require("@appland/models");
+const async_1 = require("async");
+const promises_1 = require("fs/promises");
+const analyzeAppMaps_1 = __importDefault(require("./analyzeAppMaps"));
+const buildDiagram_1 = __importDefault(require("@appland/sequence-diagram/dist/buildDiagram"));
+async function buildDiagrams(appmapDir, codeObjectPatterns) {
+    const { appmaps, specification } = await (0, analyzeAppMaps_1.default)(appmapDir, codeObjectPatterns);
+    const diagrams = [];
+    const diagramQueue = (0, async_1.queue)(async (appmapFile) => {
+        const appmapData = JSON.parse(await (0, promises_1.readFile)([appmapFile, 'appmap.json'].join('.'), 'utf-8'));
+        const appmap = (0, models_1.buildAppMap)().source(appmapData).build();
+        diagrams.push({
+            appmapFile,
+            diagram: (0, buildDiagram_1.default)([appmapFile, 'appmap.json'].join('.'), appmap, specification),
+        });
+    }, 5);
+    for (const appmap of appmaps)
+        diagramQueue.push(appmap);
+    diagramQueue.error((err) => console.warn(err));
+    await diagramQueue.drain();
+    return diagrams;
+}
+exports.default = buildDiagrams;
+//# sourceMappingURL=buildDiagrams.js.map

package/built/sequenceDiagram/buildDiagrams.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildDiagrams.js","sourceRoot":"","sources":["../../src/sequenceDiagram/buildDiagrams.ts"],"names":[],"mappings":";;;;;AAAA,4CAA8C;AAC9C,iCAA8B;AAC9B,0CAAuC;AACvC,sEAA8C;AAC9C,+FAAuE;AAGxD,KAAK,UAAU,aAAa,CACzC,SAAiB,EACjB,kBAA4B;IAE5B,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,MAAM,IAAA,wBAAc,EAAC,SAAS,EAAE,kBAAkB,CAAC,CAAC;IACvF,MAAM,QAAQ,GAA+C,EAAE,CAAC;IAEhE,MAAM,YAAY,GAAG,IAAA,aAAK,EAAC,KAAK,EAAE,UAAkB,EAAE,EAAE;QACtD,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;QAC9F,MAAM,MAAM,GAAG,IAAA,oBAAW,GAAE,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE,CAAC;QACxD,QAAQ,CAAC,IAAI,CAAC;YACZ,UAAU;YACV,OAAO,EAAE,IAAA,sBAAY,EAAC,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC;SACpF,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,CAAC,CAAC;IACN,KAAK,MAAM,MAAM,IAAI,OAAO;QAAE,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACxD,YAAY,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC/C,MAAM,YAAY,CAAC,KAAK,EAAE,CAAC;IAE3B,OAAO,QAAQ,CAAC;AAClB,CAAC;AApBD,gCAoBC"}

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

@@ -1 +1 @@
-{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AACtB,mFAAyD;AAUzD,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,wEAAwE;IACxE,yEAAyE;IACzE,8EAA8E;IAC9E,kBAAkB;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAY,CAAC;IAC1C,IAAI,MAAM,GAAqB,EAAE,KAAK,EAAE,CAAC;IACzC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,mCACD,MAAM,KACT,MAAM,EAAE;gBACN,EAAE,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACtE,GAAG,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE;oBACpD,MAAM,EAAE,KAAK;iBACd,CAAC;aACH,GACF,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAvBD,wCAuBC"}
+{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../../src/service/config/validator.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAqC;AACrC,mFAAyD;AAUzD,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,MAA+B,EAAE,MAAc;IAC5E,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;IACtB,wEAAwE;IACxE,yEAAyE;IACzE,8EAA8E;IAC9E,kBAAkB;IAClB,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC/D,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACjC,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,QAAQ,CAAE,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,CAAY,CAAC;IAC1C,IAAI,MAAM,GAAqB,EAAE,KAAK,EAAE,CAAC;IACzC,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,mCACD,MAAM,KACT,MAAM,EAAE;gBACN,EAAE,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;gBACtE,GAAG,EAAE,IAAA,2BAAe,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE;oBACpD,MAAM,EAAE,KAAK;iBACd,CAAC;aACH,GACF,CAAC;KACH;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAvBD,wCAuBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.47.0",
+  "version": "3.49.2",
   "description": "",
   "bin": "built/cli.js",
   "publishConfig": {
@@ -57,6 +57,7 @@
     "ts-node": "^10.2.1",
     "ts-sinon": "^2.0.2",
     "tsc": "^2.0.3",
+    "type-fest": "^3.1.0",
     "typescript": "^4.3.5",
     "webpack": "5",
     "webpack-cli": "^4.8.0"
@@ -68,10 +69,12 @@
     "vuex"
   ],
   "dependencies": {
-    "@appland/components": "2.18.2",
+    "@appland/components": "2.18.3",
     "@appland/diagrams": "1.5.3",
     "@appland/models": "1.21.0",
-    "@appland/openapi": "1.0.3",
+    "@appland/openapi": "1.1.0",
+    "@appland/sequence-diagram": "1.1.0",
+    "@datastructures-js/priority-queue": "^6.1.3",
     "@sidvind/better-ajv-errors": "^0.9.1",
     "@types/moo": "^0.5.5",
     "JSONStream": "^1.3.5",