fix: do not include claim indexes not applicable for the current claim_set

Signed-off-by: Timo Glastra <timo@animo.id>

Author: TimoGlastra

.changeset/thirty-meals-battle.md

@@ -0,0 +1,5 @@
+---
+"dcql": patch
+---
+
+fix: do not include claim indexes not applicable for the current claim_set

dcql/src/dcql-parser/dcql-claims-query-result.ts

@@ -243,16 +243,19 @@ export const runClaimsQuery = (
         success: true,
         claim_set_index: claimSetIndex,
         output,
-        valid_claim_indexes: validClaims.map((claim) => claim.claim_index),
+        valid_claim_indexes: claims.map((claim) => claim.claim_index),
       })
     } else {
       const issues = failedClaims.reduce((merged, claim) => deepMerge(claim.issues, merged), {})
       failedClaimSets.push({
         success: false,
         issues,
         claim_set_index: claimSetIndex,
-        failed_claim_indexes: failedClaims.map((claim) => claim.claim_index) as [number, ...number[]],
-        valid_claim_indexes: validClaims.map((claim) => claim.claim_index),
+        failed_claim_indexes: claims.filter((claim) => !claim.success).map((claim) => claim.claim_index) as [
+          number,
+          ...number[],
+        ],
+        valid_claim_indexes: claims.filter((claim) => claim.success).map((claim) => claim.claim_index),
       })
     }
   }

dcql/src/dcql-presentation/dcql-presentation.test.ts

@@ -159,7 +159,7 @@ describe('DCQL presentation with claim sets', () => {
                       family_name: ["Expected claim 'family_name' to be defined"],
                     },
                     failed_claim_indexes: [0, 1],
-                    valid_claim_indexes: [2],
+                    valid_claim_indexes: [],
                   },
                 ],
                 valid_claim_sets: [
@@ -289,7 +289,7 @@ describe('DCQL presentation with claim sets', () => {
                     },
                     claim_set_index: 0,
                     failed_claim_indexes: [2],
-                    valid_claim_indexes: [0, 1],
+                    valid_claim_indexes: [],
                   },
                 ],
                 valid_claim_sets: [
@@ -435,7 +435,7 @@ describe('DCQL presentation with claim sets', () => {
                     },
                     claim_set_index: 0,
                     failed_claim_indexes: [2],
-                    valid_claim_indexes: [0, 1],
+                    valid_claim_indexes: [],
                   },
                 ],
                 valid_claim_sets: [
@@ -591,7 +591,7 @@ describe('DCQL presentation with claim sets', () => {
                     },
                     claim_set_index: 0,
                     failed_claim_indexes: [2],
-                    valid_claim_indexes: [0, 1],
+                    valid_claim_indexes: [],
                   },
                 ],
                 valid_claim_sets: [
@@ -759,7 +759,7 @@ describe('DCQL presentation with claim sets', () => {
                     },
                     claim_set_index: 0,
                     failed_claim_indexes: [2],
-                    valid_claim_indexes: [0, 1],
+                    valid_claim_indexes: [],
                   },
                 ],
                 valid_claim_sets: [