@appland/appmap 3.102.1 → 3.104.0

package/built/diffArchive/ChangeAnalysis.js

@@ -0,0 +1,232 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ChangeAnalysisImpl = exports.analyzeChanges = exports.isChanged = exports.isAdded = void 0;
+const promises_1 = require("fs/promises");
+const path_1 = require("path");
+const async_1 = require("async");
+const assert_1 = __importDefault(require("assert"));
+const console_1 = require("console");
+const Paths_1 = require("../diffArchive/Paths");
+const Digests_1 = require("../diffArchive/Digests");
+const RevisionName_1 = require("../diffArchive/RevisionName");
+const utils_1 = require("../utils");
+const loadFindings_1 = __importDefault(require("./loadFindings"));
+class ReferencedAppMaps {
+    constructor() {
+        this.referencedAppMaps = new Set();
+    }
+    add(revisionName, appmap) {
+        (0, assert_1.default)(!appmap.endsWith('.appmap.json'), `AppMap ${appmap} must not have an extension`);
+        this.referencedAppMaps.add((0, path_1.join)(revisionName, appmap));
+    }
+    test(revisionName, appmap) {
+        (0, assert_1.default)(!appmap.endsWith('.appmap.json'), `AppMap ${appmap} must not have an extension`);
+        return this.referencedAppMaps.has((0, path_1.join)(revisionName, appmap));
+    }
+}
+// Gets a function that returns true if the given appmap is a test.
+function isTest(revisionName, appMapMetadata) {
+    return (appmap) => {
+        const metadata = appMapMetadata[revisionName].get(appmap);
+        return !!(metadata && metadata.recorder.type === 'tests');
+    };
+}
+// Selects AppMaps that have stable names, and are not found in a base reference set.
+function isAdded(referenceSet, isTestFn) {
+    return (appmap) => isTestFn(appmap) && !referenceSet.has(appmap);
+}
+exports.isAdded = isAdded;
+// Selects AppMaps that is present in the reference set, and have different digests.
+function isChanged(referenceSet, isTestFn, digests) {
+    return (appmap) => {
+        const baseDigest = digests.appmapDigest(RevisionName_1.RevisionName.Base, appmap);
+        const headDigest = digests.appmapDigest(RevisionName_1.RevisionName.Head, appmap);
+        return (isTestFn(appmap) &&
+            referenceSet.has(appmap) &&
+            !!baseDigest &&
+            !!headDigest &&
+            baseDigest !== headDigest);
+    };
+}
+exports.isChanged = isChanged;
+async function analyzeChanges(workingDir, srcDir, baseRevision, headRevision) {
+    const changeAnalysis = new ChangeAnalysisImpl(workingDir, srcDir, baseRevision, headRevision);
+    await changeAnalysis.initialize();
+    (0, assert_1.default)(changeAnalysis.baseManifest &&
+        changeAnalysis.headManifest &&
+        changeAnalysis.baseAppMaps &&
+        changeAnalysis.headAppMaps &&
+        changeAnalysis.appMapMetadata &&
+        changeAnalysis.newAppMaps &&
+        changeAnalysis.removedAppMaps &&
+        changeAnalysis.changedAppMaps &&
+        changeAnalysis.failedAppMaps);
+    return {
+        workingDir: changeAnalysis.workingDir,
+        srcDir: changeAnalysis.srcDir,
+        baseRevision: changeAnalysis.baseRevision,
+        headRevision: changeAnalysis.headRevision,
+        paths: changeAnalysis.paths,
+        digests: changeAnalysis.digests,
+        baseManifest: changeAnalysis.baseManifest,
+        headManifest: changeAnalysis.headManifest,
+        baseAppMaps: changeAnalysis.baseAppMaps,
+        headAppMaps: changeAnalysis.headAppMaps,
+        appMapMetadata: changeAnalysis.appMapMetadata,
+        newAppMaps: changeAnalysis.newAppMaps,
+        removedAppMaps: changeAnalysis.removedAppMaps,
+        changedAppMaps: changeAnalysis.changedAppMaps,
+        failedAppMaps: changeAnalysis.failedAppMaps,
+        findingDiff: changeAnalysis.findingDiff,
+        referencedAppMaps: changeAnalysis.referencedAppMaps,
+    };
+}
+exports.analyzeChanges = analyzeChanges;
+class ChangeAnalysisImpl {
+    constructor(workingDir, srcDir, baseRevision, headRevision) {
+        this.workingDir = workingDir;
+        this.srcDir = srcDir;
+        this.baseRevision = baseRevision;
+        this.headRevision = headRevision;
+        this.referencedAppMaps = new ReferencedAppMaps();
+        this.paths = new Paths_1.Paths(workingDir);
+        this.digests = new Digests_1.Digests(this.paths);
+    }
+    async initialize() {
+        var _a;
+        await this.digests.build();
+        this.baseManifest = JSON.parse(await (0, promises_1.readFile)(this.paths.manifestPath(RevisionName_1.RevisionName.Base), 'utf-8'));
+        this.headManifest = JSON.parse(await (0, promises_1.readFile)(this.paths.manifestPath(RevisionName_1.RevisionName.Head), 'utf-8'));
+        this.baseAppMaps = new Set(await this.paths.appmaps(RevisionName_1.RevisionName.Base));
+        this.headAppMaps = new Set(await this.paths.appmaps(RevisionName_1.RevisionName.Head));
+        await this.loadMetadata();
+        await this.loadFailedAppMaps();
+        await this.loadAppMapChanges();
+        if (((_a = this.failedAppMaps) === null || _a === void 0 ? void 0 : _a.size) === 0)
+            await this.loadFindingDiff();
+        await this.computeReferencedAppMaps();
+    }
+    async loadAppMapChanges() {
+        const { baseAppMaps, headAppMaps, appMapMetadata } = this;
+        (0, assert_1.default)(baseAppMaps && headAppMaps && appMapMetadata);
+        const isNewFn = isAdded(baseAppMaps, isTest(RevisionName_1.RevisionName.Head, appMapMetadata));
+        const isRemovedFn = isAdded(headAppMaps, isTest(RevisionName_1.RevisionName.Base, appMapMetadata));
+        const isChangedFn = isChanged(baseAppMaps, isTest(RevisionName_1.RevisionName.Head, appMapMetadata), this.digests);
+        this.newAppMaps = [...headAppMaps].filter(isNewFn);
+        this.removedAppMaps = [...baseAppMaps].filter(isRemovedFn);
+        this.changedAppMaps = [...headAppMaps].filter(isChangedFn);
+    }
+    async computeReferencedAppMaps() {
+        const { appMapMetadata, failedAppMaps, findingDiff, newAppMaps, removedAppMaps, changedAppMaps, } = this;
+        (0, assert_1.default)(appMapMetadata && failedAppMaps && newAppMaps && removedAppMaps && changedAppMaps);
+        (0, assert_1.default)(failedAppMaps || findingDiff);
+        const referenceAppMapFn = (appmap) => [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head].forEach((revisionName) => this.referencedAppMaps.add(revisionName, appmap));
+        const referenceFindingAppMapFn = async (revisionName, finding) => {
+            const { appMapFile } = finding;
+            const appmap = appMapFile.slice(0, -'.appmap.json'.length);
+            const path = this.paths.appmapPath(revisionName, appmap);
+            // A sanity check
+            if (!(await (0, utils_1.exists)(path)))
+                (0, console_1.warn)(`AppMap ${path}, referenced by finding ${finding.hash_v2}, does not exist.`);
+            referenceAppMapFn(appmap);
+        };
+        newAppMaps.forEach((appmap) => referenceAppMapFn(appmap));
+        removedAppMaps.forEach((appmap) => referenceAppMapFn(appmap));
+        changedAppMaps.forEach((appmap) => referenceAppMapFn(appmap));
+        failedAppMaps.forEach((appmap) => referenceAppMapFn(appmap));
+        if (findingDiff) {
+            for (const finding of findingDiff.new || [])
+                referenceFindingAppMapFn(RevisionName_1.RevisionName.Head, finding);
+            for (const finding of findingDiff.resolved || [])
+                referenceFindingAppMapFn(RevisionName_1.RevisionName.Base, finding);
+        }
+        const sequenceDiagramExists = async (revisionName, appmap) => {
+            const path = this.paths.sequenceDiagramPath(revisionName, appmap);
+            return await (0, utils_1.exists)(path);
+        };
+        // Limit AppMap metadata to only those AppMaps that have a sequence diagram.
+        for (const revisionName of [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head]) {
+            const metadataByPath = appMapMetadata[revisionName];
+            for (const appmap of metadataByPath.keys()) {
+                if (!(await sequenceDiagramExists(revisionName, appmap)))
+                    metadataByPath.delete(appmap);
+            }
+        }
+    }
+    async loadMetadata() {
+        const appMapMetadata = {
+            base: new Map(),
+            head: new Map(),
+        };
+        const q = (0, async_1.queue)(async (appmap) => {
+            const metadataPath = this.paths.metadataPath(appmap.revisionName, appmap.name);
+            if (!(await (0, utils_1.exists)(metadataPath))) {
+                console.warn(`Metadata file ${metadataPath} does not exist!`);
+                return;
+            }
+            const metadata = JSON.parse(await (0, promises_1.readFile)(metadataPath, 'utf-8'));
+            appMapMetadata[appmap.revisionName].set(appmap.name, metadata);
+        }, 2);
+        q.error(console.warn);
+        for (const revisionName of [RevisionName_1.RevisionName.Base, RevisionName_1.RevisionName.Head]) {
+            (await this.paths.appmaps(revisionName)).forEach((appmap) => q.push({
+                revisionName: revisionName,
+                name: appmap,
+            }));
+        }
+        if (!q.idle())
+            await q.drain();
+        this.appMapMetadata = appMapMetadata;
+    }
+    async loadFailedAppMaps() {
+        (0, assert_1.default)(this.appMapMetadata);
+        const failedAppMaps = new Set();
+        {
+            for (const appmap of await this.paths.appmaps(RevisionName_1.RevisionName.Head)) {
+                const metadata = this.appMapMetadata[RevisionName_1.RevisionName.Head].get(appmap);
+                if (!metadata) {
+                    console.warn(`Metadata for ${appmap} not found`);
+                    continue;
+                }
+                if (metadata.test_status === 'failed')
+                    failedAppMaps.add(appmap);
+            }
+        }
+        this.failedAppMaps = failedAppMaps;
+    }
+    async loadFindingDiff() {
+        const { baseManifest, headManifest, paths } = this;
+        (0, assert_1.default)(baseManifest && headManifest && paths);
+        const baseFindings = await (0, loadFindings_1.default)(paths, RevisionName_1.RevisionName.Base, baseManifest.appMapDir);
+        const headFindings = await (0, loadFindings_1.default)(paths, RevisionName_1.RevisionName.Head, headManifest.appMapDir);
+        let newFindings;
+        let resolvedFindings;
+        const baseFindingHashes = baseFindings.reduce((memo, finding) => (memo.add(finding.hash_v2), memo), new Set());
+        const headFindingHashes = headFindings.reduce((memo, finding) => (memo.add(finding.hash_v2), memo), new Set());
+        const newFindingHashes = [...headFindingHashes].filter((hash) => !baseFindingHashes.has(hash));
+        const resolvedFindingHashes = [...baseFindingHashes].filter((hash) => !headFindingHashes.has(hash));
+        newFindings = Object.values(headFindings
+            .filter((finding) => newFindingHashes.includes(finding.hash_v2))
+            .reduce((memo, finding) => {
+            if (!(finding.hash_v2 in memo))
+                memo[finding.hash_v2] = finding;
+            return memo;
+        }, {}));
+        resolvedFindings = Object.values(baseFindings
+            .filter((finding) => resolvedFindingHashes.includes(finding.hash_v2))
+            .reduce((memo, finding) => {
+            if (!(finding.hash_v2 in memo))
+                memo[finding.hash_v2] = finding;
+            return memo;
+        }, {}));
+        this.findingDiff = {
+            new: newFindings,
+            resolved: resolvedFindings,
+        };
+    }
+}
+exports.ChangeAnalysisImpl = ChangeAnalysisImpl;
+//# sourceMappingURL=ChangeAnalysis.js.map

package/built/diffArchive/ChangeAnalysis.js.map

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

package/built/{cmds/compare → diffArchive}/Digests.js

@@ -4,7 +4,7 @@ exports.Digests = void 0;
 const async_1 = require("async");
 const RevisionName_1 = require("./RevisionName");
 const SequenceDiagramDigest_1 = require("./SequenceDiagramDigest");
-const utils_1 = require("../../utils");
+const utils_1 = require("../utils");
 class Digests {
     constructor(paths) {
         this.paths = paths;

package/built/diffArchive/Digests.js.map

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

package/built/{cmds/compare → diffArchive}/Paths.js

@@ -26,16 +26,19 @@ class Paths {
         return (0, path_1.join)(this.workingDir, revisionName, 'openapi.yml');
     }
     appmapPath(revisionName, appmap) {
-        return (0, path_1.join)(this.workingDir, revisionName, appmap);
+        return [(0, path_1.join)(this.workingDir, revisionName, appmap), 'appmap.json'].join('.');
+    }
+    indexFilePath(revisionName, appmap, indexFile) {
+        return (0, path_1.join)(this.workingDir, revisionName, appmap, indexFile);
     }
     metadataPath(revisionName, appmap) {
-        return (0, path_1.join)(this.workingDir, revisionName, appmap, 'metadata.json');
+        return this.indexFilePath(revisionName, appmap, 'metadata.json');
     }
     classMapPath(revisionName, appmap) {
-        return (0, path_1.join)(this.workingDir, revisionName, appmap, 'classMap.json');
+        return this.indexFilePath(revisionName, appmap, 'classMap.json');
     }
     sequenceDiagramPath(revisionName, appmap) {
-        return (0, path_1.join)(this.workingDir, revisionName, appmap, 'sequence.json');
+        return this.indexFilePath(revisionName, appmap, 'sequence.json');
     }
     sequenceDiagramDiffPath(appmap) {
         return (0, path_1.join)(this.workingDir, RevisionName_1.RevisionName.Diff, [appmap, 'diff.sequence.json'].join('.'));

package/built/diffArchive/Paths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Paths.js","sourceRoot":"","sources":["../../src/diffArchive/Paths.ts"],"names":[],"mappings":";;;AAAA,+BAA4B;AAC5B,+BAA+C;AAC/C,+BAAiC;AAEjC,iDAA8C;AAE9C,MAAa,KAAK;IAChB,YAAmB,UAAkB;QAAlB,eAAU,GAAV,UAAU,CAAQ;IAAG,CAAC;IAEzC,KAAK,CAAC,OAAO,CAAC,YAA0B;QACtC,MAAM,aAAa,GAAG,MAAM,IAAA,gBAAS,EAAC,WAAI,CAAC,CACzC,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,kBAAkB,CAAC,CACxD,CAAC;QACF,OAAO,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAChC,IAAA,eAAQ,EAAC,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,CAAC,CAC7D,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,YAA0B;QACrC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,qBAAqB,CAAC,CAAC;IACtE,CAAC;IAED,YAAY,CAAC,YAA0B;QACrC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,sBAAsB,CAAC,CAAC;IACrE,CAAC;IAED,YAAY,CAAC,YAA0B;QACrC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC7C,CAAC;IAED,WAAW,CAAC,YAA0B;QACpC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC;IAC5D,CAAC;IAED,UAAU,CAAC,YAA0B,EAAE,MAAc;QACnD,OAAO,CAAC,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,CAAC,EAAE,aAAa,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAChF,CAAC;IAED,aAAa,CAAC,YAA0B,EAAE,MAAc,EAAE,SAAiB;QACzE,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAChE,CAAC;IAED,YAAY,CAAC,YAA0B,EAAE,MAAc;QACrD,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,YAAY,CAAC,YAA0B,EAAE,MAAc;QACrD,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,mBAAmB,CAAC,YAA0B,EAAE,MAAc;QAC5D,OAAO,IAAI,CAAC,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC;IACnE,CAAC;IAED,uBAAuB,CAAC,MAAc;QACpC,OAAO,IAAA,WAAI,EAAC,IAAI,CAAC,UAAU,EAAE,2BAAY,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5F,CAAC;CACF;AAnDD,sBAmDC"}

package/built/diffArchive/RevisionName.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"RevisionName.js","sourceRoot":"","sources":["../../src/diffArchive/RevisionName.ts"],"names":[],"mappings":";;;AAAA,IAAY,YAIX;AAJD,WAAY,YAAY;IACtB,6BAAa,CAAA;IACb,6BAAa,CAAA;IACb,6BAAa,CAAA;AACf,CAAC,EAJW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAIvB"}

package/built/{cmds/compare → diffArchive}/SequenceDiagramDigest.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SequenceDiagramDigest = void 0;
 const crypto_1 = require("crypto");
-const loadSequenceDiagram_1 = require("./loadSequenceDiagram");
+const loadSequenceDiagram_1 = require("../cmds/compare/loadSequenceDiagram");
 class SequenceDiagramDigest {
     constructor(paths, revisionName, appmap) {
         this.paths = paths;

package/built/diffArchive/SequenceDiagramDigest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SequenceDiagramDigest.js","sourceRoot":"","sources":["../../src/diffArchive/SequenceDiagramDigest.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAGpC,6EAA0E;AAE1E,MAAa,qBAAqB;IAChC,YAAmB,KAAY,EAAS,YAA0B,EAAS,MAAc;QAAtE,UAAK,GAAL,KAAK,CAAO;QAAS,iBAAY,GAAZ,YAAY,CAAc;QAAS,WAAM,GAAN,MAAM,CAAQ;IAAG,CAAC;IAE7F,KAAK,CAAC,MAAM;QACV,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,QAAQ,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,MAAM,IAAA,yCAAmB,EACvC,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,CAC/D,CAAC;QACF,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC;QAC7E,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC;CACF;AAXD,sDAWC"}

package/built/{cmds/compare/DiffLoader.js → diffArchive/SourceDiff.js}

@@ -3,15 +3,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DiffLoaderQueue = exports.MAX_DIFF_LENGTH = void 0;
+exports.SourceDiffQueue = exports.MAX_DIFF_LENGTH = void 0;
 const parse_diff_1 = __importDefault(require("parse-diff"));
 const console_1 = require("console");
 const assert_1 = __importDefault(require("assert"));
-const executeCommand_1 = require("../../lib/executeCommand");
+const executeCommand_1 = require("../lib/executeCommand");
 const async_1 = require("async");
 const fs_1 = require("fs");
 exports.MAX_DIFF_LENGTH = 1000 * 1000;
-class DiffLoaderQueue {
+class SourceDiffQueue {
     constructor(baseRevision, headRevision) {
         this.baseRevision = baseRevision;
         this.headRevision = headRevision;
@@ -53,13 +53,13 @@ class DiffLoaderQueue {
         }
     }
 }
-exports.DiffLoaderQueue = DiffLoaderQueue;
-class DiffLoader {
+exports.SourceDiffQueue = SourceDiffQueue;
+class SourceDiff {
     constructor(baseRevision, headRevision) {
         this.baseRevision = baseRevision;
         this.headRevision = headRevision;
         this.sourcePathRoots = new Set();
-        this.diffLoaderQueue = new DiffLoaderQueue(baseRevision, headRevision);
+        this.diffLoaderQueue = new SourceDiffQueue(baseRevision, headRevision);
     }
     lookupDiff(path) {
         if (!this.diffByFile)
@@ -85,7 +85,7 @@ class DiffLoader {
         for (const root of sourcePathRoots) {
             if (!this.sourcePathRoots.has(root)) {
                 this.sourcePathRoots.add(root);
-                if (DiffLoader.isEligibleFile(root))
+                if (SourceDiff.isEligibleFile(root))
                     diffRoots.add(root);
             }
         }
@@ -113,5 +113,5 @@ class DiffLoader {
         }, this.diffByFile);
     }
 }
-exports.default = DiffLoader;
-//# sourceMappingURL=DiffLoader.js.map
+exports.default = SourceDiff;
+//# sourceMappingURL=SourceDiff.js.map

package/built/diffArchive/SourceDiff.js.map

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

package/built/{cmds/compare → diffArchive}/loadFindings.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const promises_1 = require("fs/promises");
-const utils_1 = require("../../utils");
+const utils_1 = require("../utils");
 async function loadFindings(paths, revisionName, appMapDir) {
     const findings = new Array();
     const collectFindings = (findings) => {

package/built/diffArchive/loadFindings.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadFindings.js","sourceRoot":"","sources":["../../src/diffArchive/loadFindings.ts"],"names":[],"mappings":";;AAAA,0CAAuC;AAKvC,oCAA6C;AAE9B,KAAK,UAAU,YAAY,CACxC,KAAY,EACZ,YAA0B,EAC1B,SAAiB;IAEjB,MAAM,QAAQ,GAAG,IAAI,KAAK,EAAW,CAAC;IAEtC,MAAM,eAAe,GAAG,CAAC,QAAmB,EAA6C,EAAE;QACzF,OAAO,KAAK,EAAE,YAAoB,EAAE,EAAE;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC;YACvE,QAAQ,CAAC,IAAI,CAAC,GAAI,YAAY,CAAC,QAAsB,CAAC,CAAC;QACzD,CAAC,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,IAAA,yBAAiB,EACrB,KAAK,CAAC,YAAY,CAAC,YAAY,CAAC,EAChC,sBAAsB,EACtB,eAAe,CAAC,QAAQ,CAAC,CAC1B,CAAC;IAEF,OAAO,CAAC,IAAI,CAAC,SAAS,QAAQ,CAAC,MAAM,iBAAiB,YAAY,WAAW,CAAC,CAAC;IAE/E,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC9B,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC5C,OAAO,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACrE;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AA5BD,+BA4BC"}

package/built/lib/ArchiveMetadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ArchiveMetadata.js","sourceRoot":"","sources":["../../src/lib/ArchiveMetadata.ts"],"names":[],"mappings":""}

package/built/lib/normalizeAppMapId.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"normalizeAppMapId.js","sourceRoot":"","sources":["../../src/lib/normalizeAppMapId.ts"],"names":[],"mappings":";;AAAA,qCAA+B;AAE/B,SAAwB,iBAAiB,CAAC,EAAU;IAClD,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,IAAI,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClF,IAAI,YAAY,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE;QACzC,IAAA,cAAI,EAAC,aAAa,EAAE,wCAAwC,CAAC,CAAC;QAC9D,YAAY,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;KAClE;IACD,OAAO,YAAY,CAAC;AACtB,CAAC;AARD,oCAQC"}

package/built/lib/resolvePath.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePath = void 0;
+const path_1 = require("path");
+const utils_1 = require("../utils");
+const glob_1 = require("glob");
+const util_1 = require("util");
+/**
+ * Resolve a path to an actual file that exists within the working directory.
+ * If the languageName is Java, the directory tree will be searched for the path. This is
+ * because Java files are organized into a directory structure that matches the package
+ * names, but the root of that directory structure is not known.
+ * If there are multiple matching files, the shortest path is returned.
+ */
+async function resolvePath(path, languageName) {
+    // Normalize absolute path to relative path, if the path is within the source tree.
+    if (path.startsWith(process.cwd()))
+        path = path.slice(process.cwd().length + 1);
+    // Discard paths that are outside the source tree.
+    if ((0, path_1.isAbsolute)(path))
+        return;
+    // Return the path if it exists.
+    if (await (0, utils_1.exists)(path))
+        return path;
+    // Search for the path if the language is Java.
+    if (!languageName)
+        return;
+    if (languageName.toLowerCase() === 'java') {
+        const matches = (await (0, util_1.promisify)(glob_1.glob)(`**/${path}`)).sort((a, b) => a.length - b.length);
+        if (matches.length === 0)
+            return;
+        return matches[0];
+    }
+}
+exports.resolvePath = resolvePath;
+//# sourceMappingURL=resolvePath.js.map

package/built/lib/resolvePath.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolvePath.js","sourceRoot":"","sources":["../../src/lib/resolvePath.ts"],"names":[],"mappings":";;;AAAA,+BAAkC;AAClC,oCAAkC;AAClC,+BAA4B;AAC5B,+BAAiC;AAEjC;;;;;;GAMG;AACI,KAAK,UAAU,WAAW,CAC/B,IAAY,EACZ,YAAqB;IAErB,mFAAmF;IACnF,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAEhF,kDAAkD;IAClD,IAAI,IAAA,iBAAU,EAAC,IAAI,CAAC;QAAE,OAAO;IAE7B,gCAAgC;IAChC,IAAI,MAAM,IAAA,cAAM,EAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAEpC,+CAA+C;IAC/C,IAAI,CAAC,YAAY;QAAE,OAAO;IAE1B,IAAI,YAAY,CAAC,WAAW,EAAE,KAAK,MAAM,EAAE;QACzC,MAAM,OAAO,GAAG,CAAC,MAAM,IAAA,gBAAS,EAAC,WAAI,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;QAC1F,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO;QAEjC,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;KACnB;AACH,CAAC;AAtBD,kCAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appland/appmap",
-  "version": "3.102.1",
+  "version": "3.104.0",
   "description": "",
   "bin": "built/cli.js",
   "engines": {
@@ -122,6 +122,7 @@
     "ps-node": "^0.1.6",
     "read-pkg-up": "^7.0.1",
     "semver": "^7.3.5",
+    "sql-formatter": "^4.0.2",
     "strip-ansi": "^6.0.0",
     "validator": "^13.7.0",
     "w3c-xmlserializer": "^2.0.0",

package/resources/change-report/changed-appmaps/details.hbs

@@ -12,13 +12,13 @@ Review changes
 ```
 {{{@key}}}
 ```
-
     {{#each this}}
-- [{{name}}]({{ appmap_diff_url . }})
+
+[{{name}}]({{ appmap_diff_url . }})
     {{/each}}
   {{/each}}
-
   {{#if pruned}}
+
 Because there are many changed AppMaps, some of them are not listed in this report.
   {{/if}}
 </details>

package/resources/change-report/changed-appmaps/heading.hbs

@@ -1,4 +1,4 @@
-| [Changed AppMaps](#changed-appmaps) |
+| {{ section_link 'Changed AppMaps' 'changed-appmaps' (length changedAppMaps) }} |
   {{~#unless (length changedAppMaps) }}
   :zero: No changes
   {{~else}}

package/resources/change-report/failed-tests/details.hbs

@@ -10,7 +10,7 @@
 <p/>
 
 <!-- testLocation -->
-[{{testLocation}}]({{ source_url testLocation }}) failed with error:
+{{ source_link testLocation }} failed with error:
 
     {{#if failureMessage}}
 <!-- failureMessage -->
@@ -21,7 +21,7 @@
 
 <!-- failureLocation -->
     {{#if failureLocation}}
-The error occurred at [{{failureLocation}}]({{ source_url failureLocation }}):
+The error occurred at {{ source_link failureLocation }}:
     {{/if}}
 
     {{#if testSnippet}}
@@ -52,6 +52,7 @@ The error occurred at [{{failureLocation}}]({{ source_url failureLocation }}):
 
   {{/each}}
   {{#if pruned}}
+
 Because there are many failed tests, some of them are not listed in this report.
   {{/if}}
 {{/if}}

package/resources/change-report/failed-tests/heading.hbs

@@ -1 +1 @@
-| [Failed tests](#failed-tests) | {{#if testFailures.length}}:warning: {{testFailures.length}} failed{{else}}:white_check_mark: All tests passed{{/if}} |
+| {{ section_link 'Failed tests' 'failed-tests' (length testFailures) }} | {{#if testFailures.length}}:warning: {{testFailures.length}} failed{{else}}:white_check_mark: All tests passed{{/if}} |

package/resources/change-report/findings/details.hbs

@@ -1,11 +1,7 @@
 {{#*inline "finding-stack" }}
 {{#with stack }}
   {{#each this }}
-    {{#if (source_url this)}}
-- [{{this}}]({{ source_url this }})
-    {{else}}
-- {{ this }}
-    {{/if}}
+- {{ source_link this }}
   {{/each}}
 {{/with}}
 
@@ -51,7 +47,7 @@
 
 </details>
 {{/inline}}
-{{#if (length findingDiff.newFindings findingDiff.resolvedFindings)}}
+{{#if (every findingDiff (length findingDiff.newFindings findingDiff.resolvedFindings)) }}
 <h2 id="{{ metadata.anchor }}">{{ metadata.title }}</h2>
   {{#if (length findingDiff.newFindings) }}
 

package/resources/change-report/findings/heading.hbs

@@ -1,4 +1,5 @@
-| [{{ metadata.title }}](#{{ metadata.anchor }}) |
+{{#if findingDiff }}
+| {{ section_link metadata.title metadata.anchor (length findingDiff.newFindings findingDiff.resolvedFindings) }} |
   {{~#unless (length findingDiff.newFindings findingDiff.resolvedFindings) }}
   :white_check_mark: None detected
   {{~/unless}}
@@ -8,4 +9,5 @@
   {{~#if (length findingDiff.resolvedFindings) }}
   :tada: {{length findingDiff.resolvedFindings}} resolved
   {{~/if}}
-  |
+  |
+{{~/if}}

package/resources/change-report/new-appmaps/details.hbs

@@ -1,11 +1,12 @@
 {{#if newAppMaps.length }}
 <h2 id="new-appmaps">⭐ New AppMaps</h2>
-  {{#each newAppMaps}}
 
-- [{{appmap_title this}}]({{ appmap_url 'head' this }})
+  {{#each newAppMaps}}
 
+[{{appmap_title this}}]({{ appmap_url 'head' this }}){{#if metadata.source_location }} from {{ source_link metadata.source_location }}{{/if}}
   {{/each}}
   {{#if pruned}}
+
 Because there are many new AppMaps, some of them are not listed in this report.
   {{/if}}
 {{/if}}

package/resources/change-report/new-appmaps/heading.hbs

@@ -1,3 +1,3 @@
-| [New AppMaps](#new-appmaps) |
+| {{ section_link 'New AppMaps' 'new-appmaps' (length newAppMaps) }} |
   {{~#with (group_appmaps_by_recorder_name newAppMaps) }} :star: {{#each @this}}{{#unless @first }}, {{/unless}}{{ count }} new {{ recorderName }}{{#if isTest}} {{ pluralize count 'test' }}{{/if}}{{/each}} {{else}} :zero: No new AppMaps {{/with~}}
 |

package/resources/change-report/openapi-diff/details.hbs

@@ -1,5 +1,5 @@
 {{#*inline "api-change"}}
-{{title}} {{#each sourceSpecEntityDetails}}`{{location}}`{{/each}} {{#each destinationSpecEntityDetails}}`{{location}}`{{/each}}
+{{title}} `{{location}}`
 {{~/inline}}
 {{#if openapiDiff.differenceCount}}
 <h2 id="openapi-changes">🔄 API changes</h2>
@@ -35,11 +35,12 @@
 - {{> api-change }}
       {{/each}}
     {{/if}}
-
     {{#if pruned}}
+
 Because there are many OpenAPI changes, some of them are not listed in this report,
 and the full diff has not been printed either.
     {{else}}
+
 <details>
 <summary>
 Detailed OpenAPI diff

package/resources/change-report/openapi-diff/heading.hbs

@@ -1,5 +1,5 @@
 {{#with openapiDiff }}
-| [API changes](#openapi-changes) | 
+| {{ section_link 'API changes' 'openapi-changes' differenceCount }} | 
   {{~#if differenceCount }}
     {{~#if breakingDifferenceCount }} 🚧 {{breakingDifferenceCount}} breaking{{~/if}}
     {{~#if nonBreakingDifferenceCount }}{{#if breakingDifferenceCount }},{{~/if}} :wrench: {{nonBreakingDifferenceCount}} non-breaking{{/if~}}

package/resources/change-report/removed-appmaps/details.hbs

@@ -2,10 +2,10 @@
 <h2 id="removed-appmaps">✖️ Removed AppMaps</h2>
   {{#each removedAppMaps}}
 
-- [{{appmap_title this}}]({{ appmap_url 'base' this }})
-
+[{{appmap_title this}}]({{ appmap_url 'base' this }})
   {{/each}}
   {{#if pruned}}
+
 Because there are many removed AppMaps, some of them are not listed in this report.
   {{/if}}
 {{/if}}

package/resources/change-report/removed-appmaps/heading.hbs

@@ -1,5 +1,5 @@
 {{#if removedAppMaps.length ~}}
-| [Removed AppMaps](#removed-appmaps) | 
+| {{ section_link 'Removed AppMaps' 'removed-appmaps' (length removedAppMaps) }} | 
   {{~#with (group_appmaps_by_recorder_name removedAppMaps) }} :heavy_multiplication_x: {{#each @this}}{{#unless @first }}, {{/unless}}{{ count }} removed {{ recorderName }}{{#if isTest}} {{ pluralize count 'test' }}{{/if}}{{/each}} {{/with~}}
   |
 {{~/if}}