dcql 0.2.20-alpha-20250114153338 → 0.2.20-alpha-20250212083101

package/dist/index.mjs

@@ -113,7 +113,7 @@ var idRegex = /^[a-zA-Z0-9_-]+$/;
 var vNonEmptyArray = () => {
   return v.custom((input) => input.length > 0);
 };
-var vIdString = v.pipe(v.string(), v.regex(idRegex));
+var vIdString = v.pipe(v.string(), v.regex(idRegex), v.nonEmpty());
 function isToJsonable(value) {
   if (value === null || typeof value !== "object") return false;
   const toJsonFn = value.toJson;
@@ -296,34 +296,130 @@ var DcqlCredentialPresentation;
 import * as v11 from "valibot";
 
 // src/dcql-parser/dcql-credential-query-result.ts
-import * as v6 from "valibot";
+import * as v7 from "valibot";
 
 // src/dcql-parser/dcql-claims-query-result.ts
+import * as v6 from "valibot";
+
+// src/dcql-query/m-dcql-claims-query.ts
 import * as v5 from "valibot";
+var DcqlClaimsQuery;
+((DcqlClaimsQuery2) => {
+  DcqlClaimsQuery2.vValue = v5.union([v5.string(), v5.pipe(v5.number(), v5.integer()), v5.boolean()]);
+  DcqlClaimsQuery2.vPath = v5.union([v5.string(), v5.pipe(v5.number(), v5.integer(), v5.minValue(0)), v5.null()]);
+  DcqlClaimsQuery2.vW3cSdJwtVc = v5.object({
+    id: v5.pipe(
+      v5.optional(vIdString),
+      v5.description(
+        "A string identifying the particular claim. The value MUST be a non-empty string consisting of alphanumeric, underscore (_) or hyphen (-) characters. Within the particular claims array, the same id MUST NOT be present more than once."
+      )
+    ),
+    path: v5.pipe(
+      v5.array(DcqlClaimsQuery2.vPath),
+      vNonEmptyArray(),
+      v5.description(
+        "A non-empty array representing a claims path pointer that specifies the path to a claim within the Verifiable Credential."
+      )
+    ),
+    values: v5.pipe(
+      v5.optional(v5.array(DcqlClaimsQuery2.vValue)),
+      v5.description(
+        "An array of strings, integers or boolean values that specifies the expected values of the claim. If the values property is present, the Wallet SHOULD return the claim only if the type and value of the claim both match for at least one of the elements in the array."
+      )
+    )
+  });
+  const vMdocBase = v5.object({
+    id: v5.pipe(
+      v5.optional(vIdString),
+      v5.description(
+        "A string identifying the particular claim. The value MUST be a non-empty string consisting of alphanumeric, underscore (_) or hyphen (-) characters. Within the particular claims array, the same id MUST NOT be present more than once."
+      )
+    ),
+    values: v5.pipe(
+      v5.optional(v5.array(DcqlClaimsQuery2.vValue)),
+      v5.description(
+        "An array of strings, integers or boolean values that specifies the expected values of the claim. If the values property is present, the Wallet SHOULD return the claim only if the type and value of the claim both match for at least one of the elements in the array."
+      )
+    )
+  });
+  DcqlClaimsQuery2.vMdocNamespace = v5.object({
+    ...vMdocBase.entries,
+    namespace: v5.pipe(
+      v5.string(),
+      v5.description(
+        "A string that specifies the namespace of the data element within the mdoc, e.g., org.iso.18013.5.1."
+      )
+    ),
+    claim_name: v5.pipe(
+      v5.string(),
+      v5.description(
+        "A string that specifies the data element identifier of the data element within the provided namespace in the mdoc, e.g., first_name."
+      )
+    )
+  });
+  DcqlClaimsQuery2.vMdocPath = v5.object({
+    ...vMdocBase.entries,
+    intent_to_retain: v5.pipe(
+      v5.optional(v5.boolean()),
+      v5.description(
+        "A boolean that is equivalent to `IntentToRetain` variable defined in Section 8.3.2.1.2.1 of [@ISO.18013-5]."
+      )
+    ),
+    path: v5.pipe(
+      v5.tuple([
+        v5.pipe(
+          v5.string(),
+          v5.description(
+            "A string that specifies the namespace of the data element within the mdoc, e.g., org.iso.18013.5.1."
+          )
+        ),
+        v5.pipe(
+          v5.string(),
+          v5.description(
+            "A string that specifies the data element identifier of the data element within the provided namespace in the mdoc, e.g., first_name."
+          )
+        )
+      ]),
+      v5.description(
+        "An array defining a claims path pointer into an mdoc. It must contain two elements of type string. The first element refers to a namespace and the second element refers to a data element identifier."
+      )
+    )
+  });
+  DcqlClaimsQuery2.vMdoc = v5.union([DcqlClaimsQuery2.vMdocNamespace, DcqlClaimsQuery2.vMdocPath]);
+  DcqlClaimsQuery2.vModel = v5.union([DcqlClaimsQuery2.vMdoc, DcqlClaimsQuery2.vW3cSdJwtVc]);
+})(DcqlClaimsQuery || (DcqlClaimsQuery = {}));
+
+// src/dcql-parser/dcql-claims-query-result.ts
 var getClaimParser = (input) => {
   const { value, values } = input;
   if (value) {
-    return vWithJT(v5.literal(value));
+    return vWithJT(v6.literal(value));
   }
   if (values) {
-    return vWithJT(v5.union(values.map((val) => v5.literal(val))));
+    return vWithJT(v6.union(values.map((val) => v6.literal(val))));
   }
-  return v5.nonNullish(v5.any());
+  return v6.nonNullish(v6.any());
 };
 var getNamespacesParser = (claimsQueries) => {
   const claimsForNamespace = {};
   for (const claimQuery of claimsQueries) {
-    if (claimsForNamespace[claimQuery.namespace]) {
-      claimsForNamespace[claimQuery.namespace]?.push({ ...claimQuery });
+    const mdocPathQuery = v6.is(DcqlClaimsQuery.vMdocNamespace, claimQuery) ? {
+      id: claimQuery.id,
+      path: [claimQuery.namespace, claimQuery.claim_name],
+      values: claimQuery.values
+    } : claimQuery;
+    const namespace = mdocPathQuery.path[0];
+    if (claimsForNamespace[namespace]) {
+      claimsForNamespace[namespace]?.push({ ...mdocPathQuery });
     } else {
-      claimsForNamespace[claimQuery.namespace] = [{ ...claimQuery }];
+      claimsForNamespace[namespace] = [{ ...mdocPathQuery }];
     }
   }
   const parsersForNamespaces = Object.entries(claimsForNamespace).map(([namespace, claims]) => {
-    const claimParsers = Object.fromEntries(claims.map((claim) => [claim.claim_name, getClaimParser(claim)]));
-    return [namespace, v5.object(claimParsers)];
+    const claimParsers = Object.fromEntries(claims.map((claim) => [claim.path[1], getClaimParser(claim)]));
+    return [namespace, v6.object(claimParsers)];
   });
-  return v5.object(Object.fromEntries(parsersForNamespaces));
+  return v6.object(Object.fromEntries(parsersForNamespaces));
 };
 var getClaimQueryParser = (claimQuery, ctx) => {
   const { index, presentation } = ctx;
@@ -333,31 +429,31 @@ var getClaimQueryParser = (claimQuery, ctx) => {
   if (typeof pathElement === "number") {
     const elementParser = isLast ? vClaimParser : getClaimQueryParser(claimQuery, { ...ctx, index: index + 1 });
     if (presentation) {
-      return v5.union([
-        v5.pipe(
-          v5.array(vJson),
-          v5.length(1),
-          v5.transform((input) => input[0]),
+      return v6.union([
+        v6.pipe(
+          v6.array(vJson),
+          v6.length(1),
+          v6.transform((input) => input[0]),
           elementParser
         ),
         elementParser
       ]);
     }
-    return v5.pipe(
-      v5.array(vJson),
-      v5.transform((input) => input[pathElement]),
+    return v6.pipe(
+      v6.array(vJson),
+      v6.transform((input) => input[pathElement]),
       elementParser
     );
   }
   if (typeof pathElement === "string") {
-    return v5.object({
+    return v6.object({
       [pathElement]: isLast ? vClaimParser : getClaimQueryParser(claimQuery, { ...ctx, index: index + 1 })
     });
   }
-  return isLast ? v5.array(vClaimParser) : v5.array(getClaimQueryParser(claimQuery, { ...ctx, index: index + 1 }));
+  return isLast ? v6.array(vClaimParser) : v6.array(getClaimQueryParser(claimQuery, { ...ctx, index: index + 1 }));
 };
 var getJsonClaimsParser = (claimsQueries, ctx) => {
-  const claimParser = v5.intersect(
+  const claimParser = v6.intersect(
     claimsQueries.map(
       (claimQuery) => getClaimQueryParser(claimQuery, {
         ...ctx,
@@ -391,12 +487,12 @@ var getJsonClaimsQueriesForClaimSet = (claimsQueries, claimSet) => {
 };
 var getMdocParser = (credentialQuery, ctx) => {
   const { claimSet } = ctx;
-  const vDoctype = credentialQuery.meta?.doctype_value ? v5.literal(credentialQuery.meta.doctype_value) : v5.string();
+  const vDoctype = credentialQuery.meta?.doctype_value ? v6.literal(credentialQuery.meta.doctype_value) : v6.string();
   const claimSetQueries = credentialQuery.claims && claimSet ? getMdocClaimsQueriesForClaimSet(credentialQuery.claims, claimSet) : credentialQuery.claims;
-  const credentialParser = v5.object({
-    credential_format: v5.literal("mso_mdoc"),
+  const credentialParser = v6.object({
+    credential_format: v6.literal("mso_mdoc"),
     doctype: vDoctype,
-    namespaces: claimSetQueries ? getNamespacesParser(claimSetQueries) : v5.record(v5.string(), v5.record(v5.string(), v5.unknown()))
+    namespaces: claimSetQueries ? getNamespacesParser(claimSetQueries) : v6.record(v6.string(), v6.record(v6.string(), v6.unknown()))
   });
   return credentialParser;
 };
@@ -404,14 +500,14 @@ var getW3cVcSdJwtVcParser = (credentialQuery, ctx) => {
   const { claimSet } = ctx;
   const claimSetQueries = credentialQuery.claims && claimSet ? getJsonClaimsQueriesForClaimSet(credentialQuery.claims, claimSet) : credentialQuery.claims;
   if (credentialQuery.format === "vc+sd-jwt" || credentialQuery.format === "dc+sd-jwt") {
-    return v5.object({
-      credential_format: v5.literal(credentialQuery.format),
-      vct: credentialQuery.meta?.vct_values ? v5.picklist(credentialQuery.meta.vct_values) : v5.string(),
+    return v6.object({
+      credential_format: v6.literal(credentialQuery.format),
+      vct: credentialQuery.meta?.vct_values ? v6.picklist(credentialQuery.meta.vct_values) : v6.string(),
       claims: claimSetQueries ? getJsonClaimsParser(claimSetQueries, ctx) : vJsonRecord
     });
   }
-  const credentialParser = v5.object({
-    credential_format: v5.picklist(["jwt_vc_json", "jwt_vc_json-ld"]),
+  const credentialParser = v6.object({
+    credential_format: v6.picklist(["jwt_vc_json", "jwt_vc_json-ld"]),
     claims: claimSetQueries ? getJsonClaimsParser(claimSetQueries, ctx) : vJsonRecord
   });
   return credentialParser;
@@ -448,11 +544,11 @@ var runCredentialQuery = (credentialQuery, ctx) => {
           continue;
         }
       }
-      const parseResult = v6.safeParse(credentialParser, credential);
+      const parseResult = v7.safeParse(credentialParser, credential);
       credentialQueryResult[claimSetIndex]?.push({
         ...parseResult,
         ...parseResult.issues && {
-          flattened: v6.flatten(parseResult.issues)
+          flattened: v7.flatten(parseResult.issues)
         },
         input_credential_index: credentialIndex,
         claim_set_index: credentialQuery.claim_sets ? claimSetIndex : void 0
@@ -467,63 +563,6 @@ import * as v10 from "valibot";
 
 // src/dcql-query/m-dcql-credential-query.ts
 import * as v8 from "valibot";
-
-// src/dcql-query/m-dcql-claims-query.ts
-import * as v7 from "valibot";
-var DcqlClaimsQuery;
-((DcqlClaimsQuery2) => {
-  DcqlClaimsQuery2.vValue = v7.union([v7.string(), v7.pipe(v7.number(), v7.integer()), v7.boolean()]);
-  DcqlClaimsQuery2.vPath = v7.union([v7.string(), v7.pipe(v7.number(), v7.integer(), v7.minValue(0)), v7.null()]);
-  DcqlClaimsQuery2.vW3cSdJwtVc = v7.object({
-    id: v7.pipe(
-      v7.optional(v7.pipe(v7.string(), v7.regex(idRegex))),
-      v7.description(
-        "A string identifying the particular claim. The value MUST be a non-empty string consisting of alphanumeric, underscore (_) or hyphen (-) characters. Within the particular claims array, the same id MUST NOT be present more than once."
-      )
-    ),
-    path: v7.pipe(
-      v7.array(DcqlClaimsQuery2.vPath),
-      v7.description(
-        "A non-empty array representing a claims path pointer that specifies the path to a claim within the Verifiable Credential."
-      )
-    ),
-    values: v7.pipe(
-      v7.optional(v7.array(DcqlClaimsQuery2.vValue)),
-      v7.description(
-        "An array of strings, integers or boolean values that specifies the expected values of the claim. If the values property is present, the Wallet SHOULD return the claim only if the type and value of the claim both match for at least one of the elements in the array."
-      )
-    )
-  });
-  DcqlClaimsQuery2.vMdoc = v7.object({
-    id: v7.pipe(
-      v7.optional(v7.pipe(v7.string(), v7.regex(idRegex))),
-      v7.description(
-        "A string identifying the particular claim. The value MUST be a non-empty string consisting of alphanumeric, underscore (_) or hyphen (-) characters. Within the particular claims array, the same id MUST NOT be present more than once."
-      )
-    ),
-    namespace: v7.pipe(
-      v7.string(),
-      v7.description(
-        "A string that specifies the namespace of the data element within the mdoc, e.g., org.iso.18013.5.1."
-      )
-    ),
-    claim_name: v7.pipe(
-      v7.string(),
-      v7.description(
-        "A string that specifies the data element identifier of the data element within the provided namespace in the mdoc, e.g., first_name."
-      )
-    ),
-    values: v7.pipe(
-      v7.optional(v7.array(DcqlClaimsQuery2.vValue)),
-      v7.description(
-        "An array of strings, integers or boolean values that specifies the expected values of the claim. If the values property is present, the Wallet SHOULD return the claim only if the type and value of the claim both match for at least one of the elements in the array."
-      )
-    )
-  });
-  DcqlClaimsQuery2.vModel = v7.union([DcqlClaimsQuery2.vMdoc, DcqlClaimsQuery2.vW3cSdJwtVc]);
-})(DcqlClaimsQuery || (DcqlClaimsQuery = {}));
-
-// src/dcql-query/m-dcql-credential-query.ts
 var DcqlCredentialQuery;
 ((DcqlCredentialQuery2) => {
   const vBase = v8.object({
@@ -535,7 +574,7 @@ var DcqlCredentialQuery;
       )
     ),
     claim_sets: v8.pipe(
-      v8.optional(v8.pipe(v8.array(v8.array(v8.pipe(v8.string(), v8.regex(idRegex)))), vNonEmptyArray())),
+      v8.optional(v8.pipe(v8.array(v8.pipe(v8.array(vIdString), vNonEmptyArray())), vNonEmptyArray())),
       v8.description(
         `OPTIONAL. A non-empty array containing arrays of identifiers for elements in 'claims' that specifies which combinations of 'claims' for the Credential are requested.`
       )
@@ -662,7 +701,7 @@ var DcqlQueryResult;
       )
     ),
     credential_matches: v10.record(
-      v10.pipe(v10.string(), v10.regex(idRegex)),
+      v10.pipe(vIdString),
       v10.union([
         v10.object({
           ...DcqlCredential.vParseSuccess.entries,
@@ -715,19 +754,19 @@ var DcqlPresentationResult;
     ...v11.omit(DcqlQueryResult.vModel, ["credential_matches"]).entries,
     invalid_matches: v11.union([
       v11.record(
-        v11.pipe(v11.string(), v11.regex(idRegex)),
+        v11.pipe(vIdString),
         v11.object({
           ...v11.omit(DcqlCredential.vParseFailure, ["input_credential_index"]).entries,
-          presentation_id: v11.pipe(v11.string(), v11.regex(idRegex))
+          presentation_id: v11.pipe(vIdString)
         })
       ),
       v11.undefined()
     ]),
     valid_matches: v11.record(
-      v11.pipe(v11.string(), v11.regex(idRegex)),
+      v11.pipe(vIdString),
       v11.object({
         ...v11.omit(DcqlCredential.vParseSuccess, ["issues", "input_credential_index"]).entries,
-        presentation_id: v11.pipe(v11.string(), v11.regex(idRegex))
+        presentation_id: v11.pipe(vIdString)
       })
     )
   });
@@ -804,7 +843,7 @@ var DcqlPresentationResult;
 import * as v12 from "valibot";
 var DcqlPresentation;
 ((DcqlPresentation2) => {
-  DcqlPresentation2.vModel = v12.record(v12.pipe(v12.string(), v12.regex(idRegex)), v12.union([v12.string(), vJsonRecord]));
+  DcqlPresentation2.vModel = v12.record(vIdString, v12.union([v12.string(), vJsonRecord]));
   DcqlPresentation2.parse = (input) => {
     if (typeof input === "string") {
       return v12.parse(v12.pipe(v12.string(), vStringToJson, DcqlPresentation2.vModel), input);