@elisra-devops/docgen-data-provider 1.99.0 → 1.101.0

package/bin/modules/ResultDataProvider.d.ts

@@ -227,7 +227,14 @@ export default class ResultDataProvider {
      * Returns true when the snapshot includes a non-empty test steps XML payload.
      */
     private hasStepsInWorkItemSnapshot;
-    private logRunlessSnapshotDecision;
+    /**
+     * Resolves the suite-aware revision for a test point.
+     */
+    private resolvePointRevision;
+    /**
+     * Builds ordered keys used to match a point with fetched iteration payloads.
+     */
+    private buildIterationLookupCandidates;
     /**
      * Resolves runless test case data using ordered fallbacks:
      * 1) point-based `asOf` snapshot, 2) explicit revision, 3) suite payload snapshot, 4) latest WI.
@@ -338,6 +345,12 @@ export default class ResultDataProvider {
      * Creates a mapping of iterations by their unique keys.
      */
     private createIterationsMap;
+    /**
+     * Builds a stable lookup key for joining points to fetched iteration payloads.
+     * Run-backed items are keyed by run/result/testCase, while runless items prefer
+     * testPointId to avoid collisions across suites that share the same testCaseId.
+     */
+    private buildIterationLookupKey;
     /**
      * Fetches test data for all suites, including test points and test cases.
      */

package/bin/modules/ResultDataProvider.js

@@ -2764,7 +2764,6 @@ class ResultDataProvider {
         const parsedAsOf = new Date(String(asOfTimestamp || '').trim());
         if (!Number.isFinite(id) || id <= 0 || Number.isNaN(parsedAsOf.getTime()))
             return null;
-        logger_1.default.debug(`[RunlessResolver] Fetching work item ${id} by asOf (raw="${String(asOfTimestamp || '')}", normalized="${parsedAsOf.toISOString()}", expandAll=${String(expandAll)})`);
         const query = [`asOf=${encodeURIComponent(parsedAsOf.toISOString())}`];
         if (expandAll) {
             query.push(`$expand=all`);
@@ -2799,15 +2798,34 @@ class ResultDataProvider {
         const stepsXml = this.extractStepsXmlFromFieldsMap((workItemData === null || workItemData === void 0 ? void 0 : workItemData.fields) || {});
         return String(stepsXml || '').trim() !== '';
     }
-    logRunlessSnapshotDecision(testCaseId, source, snapshot) {
-        var _a;
-        if (!snapshot) {
-            logger_1.default.debug(`[RunlessResolver] TC ${testCaseId}: source=${source}, snapshot=none`);
-            return;
+    /**
+     * Resolves the suite-aware revision for a test point.
+     */
+    resolvePointRevision(testCase, point) {
+        return Number(this.resolveSuiteTestCaseRevision(testCase) ||
+            this.resolveSuiteTestCaseRevision(point === null || point === void 0 ? void 0 : point.suiteTestCase) ||
+            0);
+    }
+    /**
+     * Builds ordered keys used to match a point with fetched iteration payloads.
+     */
+    buildIterationLookupCandidates(input) {
+        const candidates = [];
+        const addCandidate = (key) => {
+            if (key && !candidates.includes(key)) {
+                candidates.push(key);
+            }
+        };
+        addCandidate(this.buildIterationLookupKey(input));
+        const revision = Number((input === null || input === void 0 ? void 0 : input.testCaseRevision) || 0);
+        if (Number.isFinite(revision) && revision > 0) {
+            addCandidate(this.buildIterationLookupKey({
+                testCaseId: input === null || input === void 0 ? void 0 : input.testCaseId,
+                testCaseRevision: revision,
+            }));
         }
-        const stepsXml = this.extractStepsXmlFromFieldsMap((snapshot === null || snapshot === void 0 ? void 0 : snapshot.fields) || {});
-        const stepsLength = String(stepsXml || '').trim().length;
-        logger_1.default.debug(`[RunlessResolver] TC ${testCaseId}: source=${source}, rev=${String((_a = snapshot === null || snapshot === void 0 ? void 0 : snapshot.rev) !== null && _a !== void 0 ? _a : '')}, hasSteps=${String(stepsLength > 0)}, stepsLength=${String(stepsLength)}`);
+        addCandidate(`${Number((input === null || input === void 0 ? void 0 : input.testCaseId) || 0)}`);
+        return candidates;
     }
     /**
      * Resolves runless test case data using ordered fallbacks:
@@ -2817,31 +2835,24 @@ class ResultDataProvider {
         let bestSnapshotWithoutSteps = null;
         if (pointAsOfTimestamp) {
             const asOfSnapshot = await this.fetchWorkItemByAsOf(projectName, testCaseId, pointAsOfTimestamp, expandAll);
-            this.logRunlessSnapshotDecision(testCaseId, 'asOf', asOfSnapshot);
             if (asOfSnapshot) {
                 if (this.hasStepsInWorkItemSnapshot(asOfSnapshot))
                     return asOfSnapshot;
                 bestSnapshotWithoutSteps = asOfSnapshot;
             }
         }
-        else {
-            logger_1.default.debug(`[RunlessResolver] TC ${testCaseId}: asOf timestamp is empty, skipping asOf fetch`);
-        }
         const revisionSnapshot = await this.fetchWorkItemByRevision(projectName, testCaseId, suiteTestCaseRevision, expandAll);
-        this.logRunlessSnapshotDecision(testCaseId, `revision:${String(suiteTestCaseRevision)}`, revisionSnapshot);
         if (revisionSnapshot) {
             if (this.hasStepsInWorkItemSnapshot(revisionSnapshot))
                 return revisionSnapshot;
             bestSnapshotWithoutSteps = bestSnapshotWithoutSteps || revisionSnapshot;
         }
-        this.logRunlessSnapshotDecision(testCaseId, 'suiteSnapshot', fallbackSnapshot);
         if (fallbackSnapshot) {
             if (this.hasStepsInWorkItemSnapshot(fallbackSnapshot))
                 return fallbackSnapshot;
             bestSnapshotWithoutSteps = bestSnapshotWithoutSteps || fallbackSnapshot;
         }
         const latestSnapshot = await this.fetchWorkItemLatest(projectName, testCaseId, expandAll);
-        this.logRunlessSnapshotDecision(testCaseId, 'latest', latestSnapshot);
         if (latestSnapshot) {
             if (this.hasStepsInWorkItemSnapshot(latestSnapshot))
                 return latestSnapshot;
@@ -2881,7 +2892,6 @@ class ResultDataProvider {
                 const pointAsOfTimestamp = useRunlessAsOf
                     ? String((point === null || point === void 0 ? void 0 : point.pointAsOfTimestamp) || '').trim()
                     : '';
-                logger_1.default.debug(`[RunlessResolver] Start TC ${String(testCaseId)}: useRunlessAsOf=${String(useRunlessAsOf)}, pointAsOfTimestamp="${pointAsOfTimestamp}", suiteRevision=${String(suiteTestCaseRevision)}, pointOutcome="${String((point === null || point === void 0 ? void 0 : point.outcome) || '')}"`);
                 const fallbackSnapshot = this.buildWorkItemSnapshotFromSuiteTestCase(suiteTestCaseItem, testCaseId, String((point === null || point === void 0 ? void 0 : point.testCaseName) || ''));
                 const testCaseData = await this.resolveRunlessTestCaseData(projectName, testCaseId, suiteTestCaseRevision, pointAsOfTimestamp, fallbackSnapshot, isTestReporter);
                 if (!testCaseData) {
@@ -3522,9 +3532,6 @@ class ResultDataProvider {
                 };
                 if (!Number.isFinite(pointTestCaseId) || pointTestCaseId <= 0)
                     continue;
-                if (!testCaseById.has(pointTestCaseId) && isTestReporter) {
-                    logger_1.default.debug(`[RunlessResolver] Missing suite testCase payload for point testCaseId=${String(pointTestCaseId)}; using point fallback for alignment`);
-                }
                 const testCaseWorkItemFields = Array.isArray((_d = testCase === null || testCase === void 0 ? void 0 : testCase.workItem) === null || _d === void 0 ? void 0 : _d.workItemFields)
                     ? testCase.workItem.workItemFields
                     : [];
@@ -3534,10 +3541,16 @@ class ResultDataProvider {
                         continue;
                     }
                 }
-                const iterationKey = !point.lastRunId || !point.lastResultId
-                    ? `${testCase.workItem.id}`
-                    : `${point.lastRunId}-${point.lastResultId}-${testCase.workItem.id}`;
-                const fetchedTestCase = iterationsMap[iterationKey] || (includeNotRunTestCases ? testCase : undefined);
+                const iterationLookupKeys = this.buildIterationLookupCandidates({
+                    testCaseId: testCase.workItem.id,
+                    lastRunId: point === null || point === void 0 ? void 0 : point.lastRunId,
+                    lastResultId: point === null || point === void 0 ? void 0 : point.lastResultId,
+                    testPointId: point === null || point === void 0 ? void 0 : point.testPointId,
+                    testCaseRevision: this.resolvePointRevision(testCase, point),
+                });
+                const fetchedTestCaseFromMap = iterationLookupKeys.find((key) => iterationsMap[key]) || '';
+                const fetchedTestCase = (fetchedTestCaseFromMap ? iterationsMap[fetchedTestCaseFromMap] : undefined) ||
+                    (includeNotRunTestCases ? testCase : undefined);
                 // First check if fetchedTestCase exists
                 if (!fetchedTestCase)
                     continue;
@@ -3590,7 +3603,6 @@ class ResultDataProvider {
                 detailedResults.push(...resultObjectsToAdd);
             }
             else {
-                logger_1.default.debug(`[RunlessResolver] No step rows generated for testCaseId=${String((point === null || point === void 0 ? void 0 : point.testCaseId) || '')}; falling back to test-level row`);
                 detailedResults.push(options.createResultObject({
                     testItem,
                     point,
@@ -3649,23 +3661,64 @@ class ResultDataProvider {
                 (iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastResultId) !== null &&
                 String(iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastResultId).trim() !== '';
             if (hasRunIdentifiers) {
-                const key = `${iterationItem.lastRunId}-${iterationItem.lastResultId}-${iterationItem.testCaseId}`;
+                const key = this.buildIterationLookupKey({
+                    testCaseId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseId,
+                    lastRunId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastRunId,
+                    lastResultId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastResultId,
+                    testPointId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testPointId,
+                    testCaseRevision: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseRevision,
+                });
                 map[key] = iterationItem;
             }
             else if (includeNotRunTestCases) {
-                const key = `${iterationItem.testCaseId}`;
+                const key = this.buildIterationLookupKey({
+                    testCaseId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseId,
+                    lastRunId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastRunId,
+                    lastResultId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastResultId,
+                    testPointId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testPointId,
+                    testCaseRevision: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseRevision,
+                });
                 map[key] = iterationItem;
-                if (isTestReporter && (iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.iteration)) {
-                    logger_1.default.debug(`[RunlessResolver] createIterationsMap: mapped runless testCaseId=${String(iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseId)} to case-only key`);
-                }
             }
             else if ((iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.iteration) && !isTestReporter) {
-                const key = `${iterationItem.lastRunId}-${iterationItem.lastResultId}-${iterationItem.testCaseId}`;
+                const key = this.buildIterationLookupKey({
+                    testCaseId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseId,
+                    lastRunId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastRunId,
+                    lastResultId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.lastResultId,
+                    testPointId: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testPointId,
+                    testCaseRevision: iterationItem === null || iterationItem === void 0 ? void 0 : iterationItem.testCaseRevision,
+                });
                 map[key] = iterationItem;
             }
             return map;
         }, {});
     }
+    /**
+     * Builds a stable lookup key for joining points to fetched iteration payloads.
+     * Run-backed items are keyed by run/result/testCase, while runless items prefer
+     * testPointId to avoid collisions across suites that share the same testCaseId.
+     */
+    buildIterationLookupKey(input) {
+        const testCaseId = Number((input === null || input === void 0 ? void 0 : input.testCaseId) || 0);
+        const hasRunIdentifiers = (input === null || input === void 0 ? void 0 : input.lastRunId) !== undefined &&
+            (input === null || input === void 0 ? void 0 : input.lastRunId) !== null &&
+            String(input === null || input === void 0 ? void 0 : input.lastRunId).trim() !== '' &&
+            (input === null || input === void 0 ? void 0 : input.lastResultId) !== undefined &&
+            (input === null || input === void 0 ? void 0 : input.lastResultId) !== null &&
+            String(input === null || input === void 0 ? void 0 : input.lastResultId).trim() !== '';
+        if (hasRunIdentifiers) {
+            return `${input === null || input === void 0 ? void 0 : input.lastRunId}-${input === null || input === void 0 ? void 0 : input.lastResultId}-${testCaseId}`;
+        }
+        const testPointId = Number((input === null || input === void 0 ? void 0 : input.testPointId) || 0);
+        if (Number.isFinite(testPointId) && testPointId > 0) {
+            return `point-${testPointId}-${testCaseId}`;
+        }
+        const testCaseRevision = Number((input === null || input === void 0 ? void 0 : input.testCaseRevision) || 0);
+        if (Number.isFinite(testCaseRevision) && testCaseRevision > 0) {
+            return `rev-${testCaseId}-${testCaseRevision}`;
+        }
+        return `${testCaseId}`;
+    }
     /**
      * Fetches test data for all suites, including test points and test cases.
      */
@@ -3755,7 +3808,7 @@ class ResultDataProvider {
      * Fetches result Data for a specific test point
      */
     async fetchResultDataBase(projectName, testSuiteId, point, fetchResultMethod, createResponseObject, additionalArgs = []) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a;
         try {
             const { lastRunId, lastResultId } = point;
             const resultData = await fetchResultMethod(projectName, (lastRunId === null || lastRunId === void 0 ? void 0 : lastRunId.toString()) || '0', (lastResultId === null || lastResultId === void 0 ? void 0 : lastResultId.toString()) || '0', ...additionalArgs);
@@ -3780,7 +3833,6 @@ class ResultDataProvider {
                     });
                 }
                 const stepsList = await this.testStepParserHelper.parseTestSteps(resultData.stepsResultXml, sharedStepIdToRevisionLookupMap);
-                logger_1.default.debug(`[RunlessResolver] TC ${String((point === null || point === void 0 ? void 0 : point.testCaseId) || ((_b = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _b === void 0 ? void 0 : _b.id) || '')}: parseTestSteps xmlLength=${String(String(resultData.stepsResultXml || '').length)}, parsedSteps=${String(stepsList.length)}, actionResultsBeforeMap=${String(actionResults.length)}`);
                 sharedStepIdToRevisionLookupMap.clear();
                 const stepMap = new Map();
                 for (const step of stepsList) {
@@ -3800,7 +3852,6 @@ class ResultDataProvider {
                     iteration.actionResults = actionResults
                         .filter((result) => result.stepPosition)
                         .sort((a, b) => this.compareActionResults(a.stepPosition, b.stepPosition));
-                    logger_1.default.debug(`[RunlessResolver] TC ${String((point === null || point === void 0 ? void 0 : point.testCaseId) || ((_c = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _c === void 0 ? void 0 : _c.id) || '')}: mappedActionResults=${String(((_d = iteration.actionResults) === null || _d === void 0 ? void 0 : _d.length) || 0)} (from existing iteration actionResults)`);
                 }
                 else {
                     // Fallback for runs that have no action results: emit test definition steps as Not Run.
@@ -3820,7 +3871,6 @@ class ResultDataProvider {
                         });
                     })
                         .sort((a, b) => this.compareActionResults(a.stepPosition, b.stepPosition));
-                    logger_1.default.debug(`[RunlessResolver] TC ${String((point === null || point === void 0 ? void 0 : point.testCaseId) || ((_e = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _e === void 0 ? void 0 : _e.id) || '')}: fallbackActionResults=${String(((_f = iteration.actionResults) === null || _f === void 0 ? void 0 : _f.length) || 0)} (from parsed steps)`);
                 }
             }
             return (resultData === null || resultData === void 0 ? void 0 : resultData.testCase)
@@ -4326,6 +4376,7 @@ class ResultDataProvider {
                 const resultDataResponse = {
                     testCaseName: `${(_e = (_d = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _d === void 0 ? void 0 : _d.name) !== null && _e !== void 0 ? _e : ''} - ${(_g = (_f = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _f === void 0 ? void 0 : _f.id) !== null && _g !== void 0 ? _g : ''}`,
                     testCaseId: (_h = resultData === null || resultData === void 0 ? void 0 : resultData.testCase) === null || _h === void 0 ? void 0 : _h.id,
+                    testPointId: point === null || point === void 0 ? void 0 : point.testPointId,
                     testSuiteName: `${(_k = (_j = resultData === null || resultData === void 0 ? void 0 : resultData.testSuite) === null || _j === void 0 ? void 0 : _j.name) !== null && _k !== void 0 ? _k : ''}`,
                     testSuiteId,
                     lastRunId,