dcql 0.2.12 → 0.2.14

package/dist/src/dcql-query-result/m-dcql-query-result.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"m-dcql-query-result.d.ts","sourceRoot":"","sources":["../../../src/dcql-query-result/m-dcql-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAY7B,yBAAiB,eAAe,CAAC;IAC/B,MAAM,CAAC,MAAM,yBAAyB;;iBAAoC,CAAC;IAC3E,MAAM,MAAM,wBAAwB,GAAG,CAAC,CAAC,WAAW,CAClD,OAAO,yBAAyB,CACjC,CAAC;IAEF,MAAM,CAAC,MAAM,2BAA2B;;;iBAGtC,CAAC;IACH,MAAM,MAAM,0BAA0B,GAAG,CAAC,CAAC,WAAW,CACpD,OAAO,2BAA2B,CACnC,CAAC;IAEF,MAAM,CAAC,MAAM,0BAA0B;;;iBAGrC,CAAC;IACH,MAAM,MAAM,yBAAyB,GAAG,CAAC,CAAC,WAAW,CACnD,OAAO,0BAA0B,CAClC,CAAC;IAEF,MAAM,uBAAuB;;;;;;;;;;;;;;;iBAO3B,CAAC;IAEH,MAAM,MAAM,sBAAsB,GAAG,CAAC,CAAC,WAAW,CAChD,OAAO,uBAAuB,CAC/B,CAAC;IAEF,MAAM,CAAC,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;8BAGjC,CAAC;IAEH,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,sBAAsB,CAC9B,CAAC;IAEF,MAAM,CAAC,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAKlC,CAAC;IAEF,MAAM,MAAM,qBAAqB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,sBAAsB,CAC9B,CAAC;IAEF,MAAM,CAAC,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsEjB,CAAC;IACH,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;IAChD,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,MAAM,CAAC,CAAC;IAElD,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;IAClE,MAAM,MAAM,qBAAqB,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC;;CACjE;AACD,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC"}
+{"version":3,"file":"m-dcql-query-result.d.ts","sourceRoot":"","sources":["../../../src/dcql-query-result/m-dcql-query-result.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAG7B,OAAO,EAGL,uBAAuB,EAExB,MAAM,cAAc,CAAC;AAEtB,yBAAiB,eAAe,CAAC;IAC/B,KAAY,sBAAsB,GAAG,CAAC,CAAC,WAAW,CAChD,OAAO,uBAAuB,CAC/B,CAAC;IAEK,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAWlC,CAAC;IAEF,KAAY,qBAAqB,GAAG,CAAC,CAAC,WAAW,CAC/C,OAAO,sBAAsB,CAC9B,CAAC;IAEK,MAAM,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iBAsEjB,CAAC;IACH,KAAY,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;IAChD,KAAY,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,MAAM,CAAC,CAAC;IAElD,KAAY,eAAe,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC,MAAM,CAAC,CAAC;IAClE,KAAY,qBAAqB,GAAG,KAAK,CAAC,oBAAoB,CAAC,CAAC;CACjE;AACD,MAAM,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC"}

package/dist/src/dcql-query-result/m-dcql-query-result.js

@@ -27,49 +27,31 @@ exports.DcqlQueryResult = void 0;
 const v = __importStar(require("valibot"));
 const m_dcql_credential_query_js_1 = require("../dcql-query/m-dcql-credential-query.js");
 const m_dcql_credential_set_query_js_1 = require("../dcql-query/m-dcql-credential-set-query.js");
-const u_dcql_credential_js_1 = require("../u-dcql-credential.js");
 const u_dcql_js_1 = require("../u-dcql.js");
 var DcqlQueryResult;
 (function (DcqlQueryResult) {
-    DcqlQueryResult.vW3cCredentialParseOutput = v.object({ claims: u_dcql_js_1.vJsonRecord });
-    DcqlQueryResult.vSdJwtCredentialParseOutput = v.object({
-        vct: v.string(),
-        claims: u_dcql_js_1.vJsonRecord,
-    });
-    DcqlQueryResult.vMdocCredentialParseOutput = v.object({
-        docType: v.string(),
-        namespaces: u_dcql_credential_js_1.DcqlMdocCredential.vNamespaces,
-    });
-    const vCredentialParseSuccess = v.object({
-        ...u_dcql_js_1.vParseSuccess.entries,
-        output: v.union([
-            DcqlQueryResult.vW3cCredentialParseOutput,
-            DcqlQueryResult.vSdJwtCredentialParseOutput,
-            DcqlQueryResult.vMdocCredentialParseOutput,
-        ]),
-    });
-    DcqlQueryResult.vCredentialParseResult = v.union([
-        vCredentialParseSuccess,
-        u_dcql_js_1.vParseFailure,
-    ]);
-    DcqlQueryResult.vCredentialQueryResult = v.pipe(v.array(v.array(v.union([v.undefined(), ...DcqlQueryResult.vCredentialParseResult.options]))), (0, u_dcql_js_1.vNonEmptyArray)());
+    DcqlQueryResult.vCredentialQueryResult = v.pipe(v.array(v.array(v.union([
+        v.undefined(),
+        u_dcql_js_1.vCredentialParseSuccess,
+        u_dcql_js_1.vCredentialParseFailure,
+    ]))), (0, u_dcql_js_1.vNonEmptyArray)());
     DcqlQueryResult.vModel = v.object({
         credentials: v.pipe(v.array(m_dcql_credential_query_js_1.DcqlCredentialQuery.vModel), (0, u_dcql_js_1.vNonEmptyArray)(), v.description(`REQUIRED. A non-empty array of Credential Queries that specify the requested Verifiable Credentials.`)),
         credential_matches: v.record(v.pipe(v.string(), v.regex(u_dcql_js_1.idRegex)), v.union([
             v.object({
-                ...vCredentialParseSuccess.entries,
+                ...u_dcql_js_1.vCredentialParseSuccess.entries,
                 all: v.pipe(v.array(v.pipe(v.array(v.union([
                     v.undefined(),
-                    vCredentialParseSuccess,
-                    u_dcql_js_1.vParseFailure,
+                    u_dcql_js_1.vCredentialParseSuccess,
+                    u_dcql_js_1.vCredentialParseFailure,
                 ])), (0, u_dcql_js_1.vNonEmptyArray)())), (0, u_dcql_js_1.vNonEmptyArray)()),
             }),
             v.object({
-                ...u_dcql_js_1.vParseFailure.entries,
+                success: u_dcql_js_1.vCredentialParseFailure.entries.success,
                 all: v.pipe(v.array(v.pipe(v.array(v.union([
                     v.undefined(),
-                    vCredentialParseSuccess,
-                    u_dcql_js_1.vParseFailure,
+                    u_dcql_js_1.vCredentialParseSuccess,
+                    u_dcql_js_1.vCredentialParseFailure,
                 ])), (0, u_dcql_js_1.vNonEmptyArray)())), (0, u_dcql_js_1.vNonEmptyArray)()),
             }),
         ])),

package/dist/src/dcql-query-result/m-dcql-query-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"m-dcql-query-result.js","sourceRoot":"","sources":["../../../src/dcql-query-result/m-dcql-query-result.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,yFAA+E;AAC/E,iGAAkF;AAClF,kEAA6D;AAC7D,4CAMsB;AAEtB,IAAiB,eAAe,CAmI/B;AAnID,WAAiB,eAAe;IACjB,yCAAyB,GAAG,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,uBAAW,EAAE,CAAC,CAAC;IAK9D,2CAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;QAClD,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;QACf,MAAM,EAAE,uBAAW;KACpB,CAAC,CAAC;IAKU,0CAA0B,GAAG,CAAC,CAAC,MAAM,CAAC;QACjD,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACnB,UAAU,EAAE,yCAAkB,CAAC,WAAW;KAC3C,CAAC,CAAC;IAKH,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;QACvC,GAAG,yBAAa,CAAC,OAAO;QACxB,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC;YACd,gBAAA,yBAAyB;YACzB,gBAAA,2BAA2B;YAC3B,gBAAA,0BAA0B;SAC3B,CAAC;KACH,CAAC,CAAC;IAMU,sCAAsB,GAAG,CAAC,CAAC,KAAK,CAAC;QAC5C,uBAAuB;QACvB,yBAAa;KACd,CAAC,CAAC;IAMU,sCAAsB,GAAG,CAAC,CAAC,IAAI,CAC1C,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,EAAE,GAAG,gBAAA,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,CACrE,EACD,IAAA,0BAAc,GAAE,CACjB,CAAC;IAMW,sBAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,WAAW,EAAE,CAAC,CAAC,IAAI,CACjB,CAAC,CAAC,KAAK,CAAC,gDAAmB,CAAC,MAAM,CAAC,EACnC,IAAA,0BAAc,GAAE,EAChB,CAAC,CAAC,WAAW,CACX,sGAAsG,CACvG,CACF;QAED,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAC1B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,mBAAO,CAAC,CAAC,EACpC,CAAC,CAAC,KAAK,CAAC;YACN,CAAC,CAAC,MAAM,CAAC;gBACP,GAAG,uBAAuB,CAAC,OAAO;gBAClC,GAAG,EAAE,CAAC,CAAC,IAAI,CACT,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC;oBACN,CAAC,CAAC,SAAS,EAAE;oBACb,uBAAuB;oBACvB,yBAAa;iBACd,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,CACjB,CACF,EACD,IAAA,0BAAc,GAAE,CACjB;aACF,CAAC;YACF,CAAC,CAAC,MAAM,CAAC;gBACP,GAAG,yBAAa,CAAC,OAAO;gBACxB,GAAG,EAAE,CAAC,CAAC,IAAI,CACT,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC;oBACN,CAAC,CAAC,SAAS,EAAE;oBACb,uBAAuB;oBACvB,yBAAa;iBACd,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,CACjB,CACF,EACD,IAAA,0BAAc,GAAE,CACjB;aACF,CAAC;SACH,CAAC,CACH;QAED,eAAe,EAAE,CAAC,CAAC,QAAQ,CACzB,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,MAAM,CAAC;YACP,GAAG,mDAAkB,CAAC,MAAM,CAAC,OAAO;YACpC,gBAAgB,EAAE,CAAC,CAAC,KAAK,CAAC;gBACxB,CAAC,CAAC,SAAS,EAAE;gBACb,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,IAAA,0BAAc,GAAE,CAAC;aACvD,CAAC;SACH,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,EAChB,CAAC,CAAC,WAAW,CACX,yJAAyJ,CAC1J,CACF,CACF;QAED,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;KAC5B,CAAC,CAAC;AAML,CAAC,EAnIgB,eAAe,+BAAf,eAAe,QAmI/B"}
+{"version":3,"file":"m-dcql-query-result.js","sourceRoot":"","sources":["../../../src/dcql-query-result/m-dcql-query-result.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,yFAA+E;AAC/E,iGAAkF;AAClF,4CAKsB;AAEtB,IAAiB,eAAe,CAkG/B;AAlGD,WAAiB,eAAe;IAKjB,sCAAsB,GAAG,CAAC,CAAC,IAAI,CAC1C,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC;QACN,CAAC,CAAC,SAAS,EAAE;QACb,mCAAuB;QACvB,mCAAuB;KACxB,CAAC,CACH,CACF,EACD,IAAA,0BAAc,GAAE,CACjB,CAAC;IAMW,sBAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,WAAW,EAAE,CAAC,CAAC,IAAI,CACjB,CAAC,CAAC,KAAK,CAAC,gDAAmB,CAAC,MAAM,CAAC,EACnC,IAAA,0BAAc,GAAE,EAChB,CAAC,CAAC,WAAW,CACX,sGAAsG,CACvG,CACF;QAED,kBAAkB,EAAE,CAAC,CAAC,MAAM,CAC1B,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,mBAAO,CAAC,CAAC,EACpC,CAAC,CAAC,KAAK,CAAC;YACN,CAAC,CAAC,MAAM,CAAC;gBACP,GAAG,mCAAuB,CAAC,OAAO;gBAClC,GAAG,EAAE,CAAC,CAAC,IAAI,CACT,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC;oBACN,CAAC,CAAC,SAAS,EAAE;oBACb,mCAAuB;oBACvB,mCAAuB;iBACxB,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,CACjB,CACF,EACD,IAAA,0BAAc,GAAE,CACjB;aACF,CAAC;YACF,CAAC,CAAC,MAAM,CAAC;gBACP,OAAO,EAAE,mCAAuB,CAAC,OAAO,CAAC,OAAO;gBAChD,GAAG,EAAE,CAAC,CAAC,IAAI,CACT,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,KAAK,CAAC;oBACN,CAAC,CAAC,SAAS,EAAE;oBACb,mCAAuB;oBACvB,mCAAuB;iBACxB,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,CACjB,CACF,EACD,IAAA,0BAAc,GAAE,CACjB;aACF,CAAC;SACH,CAAC,CACH;QAED,eAAe,EAAE,CAAC,CAAC,QAAQ,CACzB,CAAC,CAAC,IAAI,CACJ,CAAC,CAAC,KAAK,CACL,CAAC,CAAC,MAAM,CAAC;YACP,GAAG,mDAAkB,CAAC,MAAM,CAAC,OAAO;YACpC,gBAAgB,EAAE,CAAC,CAAC,KAAK,CAAC;gBACxB,CAAC,CAAC,SAAS,EAAE;gBACb,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,IAAA,0BAAc,GAAE,CAAC;aACvD,CAAC;SACH,CAAC,CACH,EACD,IAAA,0BAAc,GAAE,EAChB,CAAC,CAAC,WAAW,CACX,yJAAyJ,CAC1J,CACF,CACF;QAED,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;KAC5B,CAAC,CAAC;AAML,CAAC,EAlGgB,eAAe,+BAAf,eAAe,QAkG/B"}

package/dist/src/dcql-query-result/run-dcql-query.d.ts

@@ -0,0 +1,8 @@
+import type { DcqlQuery } from '../dcql-query/m-dcql-query.js';
+import type { DcqlCredential } from '../u-dcql-credential.js';
+import type { DcqlQueryResult } from './m-dcql-query-result.js';
+export declare const runDcqlQuery: (dcqlQuery: DcqlQuery.Output, ctx: {
+    credentials: DcqlCredential[];
+    presentation: boolean;
+}) => DcqlQueryResult;
+//# sourceMappingURL=run-dcql-query.d.ts.map

package/dist/src/dcql-query-result/run-dcql-query.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-dcql-query.d.ts","sourceRoot":"","sources":["../../../src/dcql-query-result/run-dcql-query.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAEhE,eAAO,MAAM,YAAY,cACZ,SAAS,CAAC,MAAM,OACtB;IACH,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,YAAY,EAAE,OAAO,CAAC;CACvB,KACA,eA2EF,CAAC"}

package/dist/src/{dcql-query/dcql-query.js → dcql-query-result/run-dcql-query.js}

@@ -1,33 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.performDcqlQuery = void 0;
-const dcql_credential_query_result_js_1 = require("../dcql-query-result/dcql-credential-query-result.js");
-const performDcqlQuery = (dcqlQuery, ctx) => {
+exports.runDcqlQuery = void 0;
+const dcql_credential_query_result_js_1 = require("../dcql-parser/dcql-credential-query-result.js");
+const runDcqlQuery = (dcqlQuery, ctx) => {
     const credentialQueriesResults = Object.fromEntries(dcqlQuery.credentials.map(credentialQuery => [
         credentialQuery.id,
-        (0, dcql_credential_query_result_js_1.queryCredentialFromCredentialQuery)(credentialQuery, ctx),
+        (0, dcql_credential_query_result_js_1.runCredentialQuery)(credentialQuery, ctx),
     ]));
     const credentialMatches = Object.fromEntries(Object.entries(credentialQueriesResults).map(([key, credentialQueryResult]) => {
         // Find the best match for each credential query
         let bestMatch = undefined;
         for (const credentialParseResult of credentialQueryResult) {
             const bestMatchForCredential = credentialParseResult.find(result => result?.success == true);
-            if (!bestMatch) {
-                bestMatch = bestMatchForCredential;
+            if (!bestMatch && bestMatchForCredential) {
+                const { issues, ...matchWithoutIssues } = bestMatchForCredential;
+                bestMatch = matchWithoutIssues;
                 continue;
             }
             if (bestMatchForCredential &&
                 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                bestMatchForCredential.claim_set_index < bestMatch.claim_set_index) {
-                bestMatch = bestMatchForCredential;
+                bestMatchForCredential.claim_set_index <
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/no-non-null-asserted-optional-chain
+                    bestMatch?.claim_set_index) {
+                const { issues, ...matchWithoutIssues } = bestMatchForCredential;
+                bestMatch = matchWithoutIssues;
             }
         }
         return [
             key,
             bestMatch
                 ? { ...bestMatch, all: credentialQueryResult }
-                : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-                    { ...credentialQueryResult[0][0], all: credentialQueryResult },
+                : { success: false, all: credentialQueryResult },
         ];
     }));
     const credentialSetResults = dcqlQuery.credential_sets?.map(set => {
@@ -49,5 +52,5 @@ const performDcqlQuery = (dcqlQuery, ctx) => {
         credential_sets: credentialSetResults,
     };
 };
-exports.performDcqlQuery = performDcqlQuery;
-//# sourceMappingURL=dcql-query.js.map
+exports.runDcqlQuery = runDcqlQuery;
+//# sourceMappingURL=run-dcql-query.js.map

package/dist/src/dcql-query-result/run-dcql-query.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-dcql-query.js","sourceRoot":"","sources":["../../../src/dcql-query-result/run-dcql-query.ts"],"names":[],"mappings":";;;AAAA,oGAAoF;AAK7E,MAAM,YAAY,GAAG,CAC1B,SAA2B,EAC3B,GAGC,EACgB,EAAE;IACnB,MAAM,wBAAwB,GAAG,MAAM,CAAC,WAAW,CACjD,SAAS,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,EAAE,CAAC;QAC3C,eAAe,CAAC,EAAE;QAClB,IAAA,oDAAkB,EAAC,eAAe,EAAE,GAAG,CAAC;KACzC,CAAC,CACH,CAAC;IAEF,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAC1C,MAAM,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC,GAAG,CAC1C,CAAC,CAAC,GAAG,EAAE,qBAAqB,CAAC,EAAE,EAAE;QAC/B,gDAAgD;QAChD,IAAI,SAAS,GACX,SAAS,CAAC;QAEZ,KAAK,MAAM,qBAAqB,IAAI,qBAAqB,EAAE,CAAC;YAC1D,MAAM,sBAAsB,GAAG,qBAAqB,CAAC,IAAI,CACvD,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,IAAI,IAAI,CAClC,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,sBAAsB,EAAE,CAAC;gBACzC,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;gBACjE,SAAS,GAAG,kBAAkB,CAAC;gBAC/B,SAAS;YACX,CAAC;YAED,IACE,sBAAsB;gBACtB,oEAAoE;gBACpE,sBAAsB,CAAC,eAAgB;oBACrC,4HAA4H;oBAC5H,SAAS,EAAE,eAAgB,EAC7B,CAAC;gBACD,MAAM,EAAE,MAAM,EAAE,GAAG,kBAAkB,EAAE,GAAG,sBAAsB,CAAC;gBACjE,SAAS,GAAG,kBAAkB,CAAC;YACjC,CAAC;QACH,CAAC;QAED,OAAO;YACL,GAAG;YACH,SAAS;gBACP,CAAC,CAAC,EAAE,GAAG,SAAS,EAAE,GAAG,EAAE,qBAAqB,EAAE;gBAC9C,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,qBAAqB,EAAE;SACnD,CAAC;IACJ,CAAC,CACF,CAC8C,CAAC;IAElD,MAAM,oBAAoB,GAAG,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE;QAChE,MAAM,eAAe,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAClD,MAAM,CAAC,KAAK,CACV,iBAAiB,CAAC,EAAE,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,EAAE,OAAO,CACnE,CACF,CAAC;QAEF,OAAO;YACL,GAAG,GAAG;YACN,gBAAgB,EACd,eAAe,CAAC,MAAM,GAAG,CAAC;gBACxB,CAAC,CAAE,eAA6C;gBAChD,CAAC,CAAC,SAAS;SAChB,CAAC;IACJ,CAAC,CAA8C,CAAC;IAEhD,MAAM,gBAAgB,GAAG,oBAAoB;QAC3C,CAAC,CAAC,oBAAoB,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,gBAAgB,CAAC;QAC1E,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAEnE,OAAO;QACL,GAAG,SAAS;QACZ,cAAc,EAAE,gBAAgB;QAChC,kBAAkB,EAChB,iBAA0D;QAC5D,eAAe,EAAE,oBAAoB;KACtC,CAAC;AACJ,CAAC,CAAC;AAjFW,QAAA,YAAY,gBAiFvB"}

package/dist/src/index.d.ts

@@ -1,10 +1,6 @@
-export { DcqlPresentation, DcqlPresentationResult, } from './dcql-presentation/index.js';
-export { DcqlQueryResult } from './dcql-query-result/m-dcql-query-result.js';
-export { DcqlClaimsQuery as ClaimsQuery } from './dcql-query/m-dcql-claims-query.js';
-export { DcqlCredentialQuery } from './dcql-query/m-dcql-credential-query.js';
-export { DcqlQuery } from './dcql-query/m-dcql-query.js';
-export * from './e-base.js';
-export * from './e-dcql.js';
+export * from './dcql-error/index.js';
+export * from './dcql-presentation/index.js';
+export * from './dcql-query-result/index.js';
+export * from './dcql-query/index.js';
 export { DcqlCredential, DcqlMdocCredential, DcqlSdJwtVcCredential, DcqlW3cVcCredential, } from './u-dcql-credential.js';
-export { DcqlCredentialPresentation, DcqlMdocPresentation, DcqlSdJwtVcPresentation, DcqlW3cVcPresentation, } from './u-dcql-credential-presentation.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,sBAAsB,GACvB,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAC7E,OAAO,EAAE,eAAe,IAAI,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACrF,OAAO,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAC;AAC9E,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAE5B,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EACL,0BAA0B,EAC1B,oBAAoB,EACpB,uBAAuB,EACvB,qBAAqB,GACtB,MAAM,qCAAqC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AAEtC,OAAO,EACL,cAAc,EACd,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,wBAAwB,CAAC"}

package/dist/src/index.js

@@ -14,28 +14,14 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DcqlW3cVcPresentation = exports.DcqlSdJwtVcPresentation = exports.DcqlMdocPresentation = exports.DcqlCredentialPresentation = exports.DcqlW3cVcCredential = exports.DcqlSdJwtVcCredential = exports.DcqlMdocCredential = exports.DcqlCredential = exports.DcqlQuery = exports.DcqlCredentialQuery = exports.ClaimsQuery = exports.DcqlQueryResult = exports.DcqlPresentationResult = exports.DcqlPresentation = void 0;
-var index_js_1 = require("./dcql-presentation/index.js");
-Object.defineProperty(exports, "DcqlPresentation", { enumerable: true, get: function () { return index_js_1.DcqlPresentation; } });
-Object.defineProperty(exports, "DcqlPresentationResult", { enumerable: true, get: function () { return index_js_1.DcqlPresentationResult; } });
-var m_dcql_query_result_js_1 = require("./dcql-query-result/m-dcql-query-result.js");
-Object.defineProperty(exports, "DcqlQueryResult", { enumerable: true, get: function () { return m_dcql_query_result_js_1.DcqlQueryResult; } });
-var m_dcql_claims_query_js_1 = require("./dcql-query/m-dcql-claims-query.js");
-Object.defineProperty(exports, "ClaimsQuery", { enumerable: true, get: function () { return m_dcql_claims_query_js_1.DcqlClaimsQuery; } });
-var m_dcql_credential_query_js_1 = require("./dcql-query/m-dcql-credential-query.js");
-Object.defineProperty(exports, "DcqlCredentialQuery", { enumerable: true, get: function () { return m_dcql_credential_query_js_1.DcqlCredentialQuery; } });
-var m_dcql_query_js_1 = require("./dcql-query/m-dcql-query.js");
-Object.defineProperty(exports, "DcqlQuery", { enumerable: true, get: function () { return m_dcql_query_js_1.DcqlQuery; } });
-__exportStar(require("./e-base.js"), exports);
-__exportStar(require("./e-dcql.js"), exports);
+exports.DcqlW3cVcCredential = exports.DcqlSdJwtVcCredential = exports.DcqlMdocCredential = exports.DcqlCredential = void 0;
+__exportStar(require("./dcql-error/index.js"), exports);
+__exportStar(require("./dcql-presentation/index.js"), exports);
+__exportStar(require("./dcql-query-result/index.js"), exports);
+__exportStar(require("./dcql-query/index.js"), exports);
 var u_dcql_credential_js_1 = require("./u-dcql-credential.js");
 Object.defineProperty(exports, "DcqlCredential", { enumerable: true, get: function () { return u_dcql_credential_js_1.DcqlCredential; } });
 Object.defineProperty(exports, "DcqlMdocCredential", { enumerable: true, get: function () { return u_dcql_credential_js_1.DcqlMdocCredential; } });
 Object.defineProperty(exports, "DcqlSdJwtVcCredential", { enumerable: true, get: function () { return u_dcql_credential_js_1.DcqlSdJwtVcCredential; } });
 Object.defineProperty(exports, "DcqlW3cVcCredential", { enumerable: true, get: function () { return u_dcql_credential_js_1.DcqlW3cVcCredential; } });
-var u_dcql_credential_presentation_js_1 = require("./u-dcql-credential-presentation.js");
-Object.defineProperty(exports, "DcqlCredentialPresentation", { enumerable: true, get: function () { return u_dcql_credential_presentation_js_1.DcqlCredentialPresentation; } });
-Object.defineProperty(exports, "DcqlMdocPresentation", { enumerable: true, get: function () { return u_dcql_credential_presentation_js_1.DcqlMdocPresentation; } });
-Object.defineProperty(exports, "DcqlSdJwtVcPresentation", { enumerable: true, get: function () { return u_dcql_credential_presentation_js_1.DcqlSdJwtVcPresentation; } });
-Object.defineProperty(exports, "DcqlW3cVcPresentation", { enumerable: true, get: function () { return u_dcql_credential_presentation_js_1.DcqlW3cVcPresentation; } });
 //# sourceMappingURL=index.js.map

package/dist/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,yDAGsC;AAFpC,4GAAA,gBAAgB,OAAA;AAChB,kHAAA,sBAAsB,OAAA;AAExB,qFAA6E;AAApE,yHAAA,eAAe,OAAA;AACxB,8EAAqF;AAA5E,qHAAA,eAAe,OAAe;AACvC,sFAA8E;AAArE,iIAAA,mBAAmB,OAAA;AAC5B,gEAAyD;AAAhD,4GAAA,SAAS,OAAA;AAClB,8CAA4B;AAC5B,8CAA4B;AAE5B,+DAKgC;AAJ9B,sHAAA,cAAc,OAAA;AACd,0HAAA,kBAAkB,OAAA;AAClB,6HAAA,qBAAqB,OAAA;AACrB,2HAAA,mBAAmB,OAAA;AAGrB,yFAK6C;AAJ3C,+IAAA,0BAA0B,OAAA;AAC1B,yIAAA,oBAAoB,OAAA;AACpB,4IAAA,uBAAuB,OAAA;AACvB,0IAAA,qBAAqB,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,+DAA6C;AAC7C,+DAA6C;AAC7C,wDAAsC;AAEtC,+DAKgC;AAJ9B,sHAAA,cAAc,OAAA;AACd,0HAAA,kBAAkB,OAAA;AAClB,6HAAA,qBAAqB,OAAA;AACrB,2HAAA,mBAAmB,OAAA"}

package/dist/src/u-dcql-credential.d.ts

@@ -1,13 +1,15 @@
 import * as v from 'valibot';
-import type { InferModelTypes } from './model';
+import type { InferModelTypes } from './u-model';
 export declare namespace DcqlMdocCredential {
     const vNamespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
     const vModel: v.ObjectSchema<{
-        readonly docType: v.StringSchema<undefined>;
+        readonly credential_format: v.LiteralSchema<"mso_mdoc", undefined>;
+        readonly doctype: v.StringSchema<undefined>;
         readonly namespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
     }, undefined>;
-    const model: import("./model").Model<v.ObjectSchema<{
-        readonly docType: v.StringSchema<undefined>;
+    const model: import("./u-model").Model<v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"mso_mdoc", undefined>;
+        readonly doctype: v.StringSchema<undefined>;
         readonly namespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
     }, undefined>>;
     type Model = InferModelTypes<typeof model>;
@@ -17,10 +19,12 @@ export type DcqlMdocCredential = DcqlMdocCredential.Model['Output'];
 export declare namespace DcqlSdJwtVcCredential {
     const vClaims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     const vModel: v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"vc+sd-jwt", undefined>;
         readonly vct: v.StringSchema<undefined>;
         readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     }, undefined>;
-    const model: import("./model").Model<v.ObjectSchema<{
+    const model: import("./u-model").Model<v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"vc+sd-jwt", undefined>;
         readonly vct: v.StringSchema<undefined>;
         readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     }, undefined>>;
@@ -31,43 +35,43 @@ export type DcqlSdJwtVcCredential = DcqlSdJwtVcCredential.Model['Output'];
 export declare namespace DcqlW3cVcCredential {
     const vClaims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     const vModel: v.ObjectSchema<{
+        readonly credential_format: v.PicklistSchema<["jwt_vc_json-ld", "jwt_vc_json"], undefined>;
         readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     }, undefined>;
-    type Input = v.InferInput<typeof vModel>;
-    type Output = v.InferOutput<typeof vModel>;
-    const parse: (input: Input) => Output;
-    type Claims = Output['claims'];
+    const model: import("./u-model").Model<v.ObjectSchema<{
+        readonly credential_format: v.PicklistSchema<["jwt_vc_json-ld", "jwt_vc_json"], undefined>;
+        readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
+    }, undefined>>;
+    type Model = InferModelTypes<typeof model>;
+    type Claims = Model['Output']['claims'];
 }
-export type DcqlW3cVcCredential = DcqlW3cVcCredential.Output;
+export type DcqlW3cVcCredential = DcqlW3cVcCredential.Model['Output'];
 export declare namespace DcqlCredential {
-    const vModel: v.UnionSchema<[v.ObjectSchema<{
-        readonly docType: v.StringSchema<undefined>;
+    const vModel: v.VariantSchema<"credential_format", [v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"mso_mdoc", undefined>;
+        readonly doctype: v.StringSchema<undefined>;
         readonly namespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
     }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"vc+sd-jwt", undefined>;
         readonly vct: v.StringSchema<undefined>;
         readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.PicklistSchema<["jwt_vc_json-ld", "jwt_vc_json"], undefined>;
         readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
     }, undefined>], undefined>;
-    type Input = v.InferInput<typeof vModel>;
-    type Output = v.InferOutput<typeof vModel>;
-    const parse: (input: Input) => {
-        docType: string;
-        namespaces: {
-            [x: string]: {
-                [x: string]: unknown;
-            };
-        };
-    } | {
-        claims: {
-            [x: string]: import("./u-dcql.js").Json;
-        };
-        vct: string;
-    } | {
-        claims: {
-            [x: string]: import("./u-dcql.js").Json;
-        };
-    };
+    const model: import("./u-model").Model<v.VariantSchema<"credential_format", [v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"mso_mdoc", undefined>;
+        readonly doctype: v.StringSchema<undefined>;
+        readonly namespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"vc+sd-jwt", undefined>;
+        readonly vct: v.StringSchema<undefined>;
+        readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.PicklistSchema<["jwt_vc_json-ld", "jwt_vc_json"], undefined>;
+        readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<import("./u-dcql.js").Json, import("./u-dcql.js").Json, v.BaseIssue<unknown>>, undefined>;
+    }, undefined>], undefined>>;
+    type Model = InferModelTypes<typeof model>;
 }
-export type DcqlCredential = DcqlCredential.Output;
+export type DcqlCredential = DcqlCredential.Model['Output'];
 //# sourceMappingURL=u-dcql-credential.d.ts.map

package/dist/src/u-dcql-credential.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"u-dcql-credential.d.ts","sourceRoot":"","sources":["../../src/u-dcql-credential.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAI/C,yBAAiB,kBAAkB,CAAC;IAC3B,MAAM,WAAW,6HAGvB,CAAC;IACK,MAAM,MAAM;;;iBAGjB,CAAC;IAEI,MAAM,KAAK;;;kBAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;IAClD,KAAY,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAC;CAC5D;AACD,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAEpE,yBAAiB,qBAAqB,CAAC;IAC9B,MAAM,OAAO,qJAAc,CAAC;IAC5B,MAAM,MAAM;;;iBAGjB,CAAC;IACI,MAAM,KAAK;;;kBAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;IAClD,KAAY,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;CAChD;AACD,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAE1E,yBAAiB,mBAAmB,CAAC;IAC5B,MAAM,OAAO,qJAAc,CAAC;IAC5B,MAAM,MAAM;;iBAEjB,CAAC;IACH,KAAY,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;IAChD,KAAY,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,MAAM,KAAK,UAAW,KAAK,KAAG,MAEpC,CAAC;IACF,KAAY,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC;CACvC;AACD,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,MAAM,CAAC;AAE7D,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM;;;;;;;;8BAIjB,CAAC;IACH,KAAY,KAAK,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC;IAChD,KAAY,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,MAAM,CAAC,CAAC;IAC3C,MAAM,KAAK,UAAW,KAAK;;;;;;;;;;;;;;;;KAEjC,CAAC;CACH;AACD,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC"}
+{"version":3,"file":"u-dcql-credential.d.ts","sourceRoot":"","sources":["../../src/u-dcql-credential.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AAGjD,yBAAiB,kBAAkB,CAAC;IAC3B,MAAM,WAAW,6HAGvB,CAAC;IACK,MAAM,MAAM;;;;iBAIjB,CAAC;IAEI,MAAM,KAAK;;;;kBAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;IAClD,KAAY,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAC;CAC5D;AACD,MAAM,MAAM,kBAAkB,GAAG,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAEpE,yBAAiB,qBAAqB,CAAC;IAC9B,MAAM,OAAO,qJAAc,CAAC;IAC5B,MAAM,MAAM;;;;iBAIjB,CAAC;IACI,MAAM,KAAK;;;;kBAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;IAClD,KAAY,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;CAChD;AACD,MAAM,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAE1E,yBAAiB,mBAAmB,CAAC;IAC5B,MAAM,OAAO,qJAAc,CAAC;IAC5B,MAAM,MAAM;;;iBAGjB,CAAC;IAEI,MAAM,KAAK;;;kBAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;IAClD,KAAY,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,CAAC;CAChD;AACD,MAAM,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AAEtE,yBAAiB,cAAc,CAAC;IACvB,MAAM,MAAM;;;;;;;;;;;8BAIjB,CAAC;IACI,MAAM,KAAK;;;;;;;;;;;+BAAwB,CAAC;IAC3C,KAAY,KAAK,GAAG,eAAe,CAAC,OAAO,KAAK,CAAC,CAAC;CACnD;AACD,MAAM,MAAM,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC"}

package/dist/src/u-dcql-credential.js

@@ -25,45 +25,44 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DcqlCredential = exports.DcqlW3cVcCredential = exports.DcqlSdJwtVcCredential = exports.DcqlMdocCredential = void 0;
 const v = __importStar(require("valibot"));
-const model_js_1 = require("./model.js");
 const u_dcql_js_1 = require("./u-dcql.js");
+const u_model_js_1 = require("./u-model.js");
 var DcqlMdocCredential;
 (function (DcqlMdocCredential) {
     DcqlMdocCredential.vNamespaces = v.record(v.string(), v.record(v.string(), v.unknown()));
     DcqlMdocCredential.vModel = v.object({
-        docType: v.string(),
+        credential_format: v.literal('mso_mdoc'),
+        doctype: v.string(),
         namespaces: DcqlMdocCredential.vNamespaces,
     });
-    DcqlMdocCredential.model = new model_js_1.Model({ vModel: DcqlMdocCredential.vModel });
+    DcqlMdocCredential.model = new u_model_js_1.Model({ vModel: DcqlMdocCredential.vModel });
 })(DcqlMdocCredential || (exports.DcqlMdocCredential = DcqlMdocCredential = {}));
 var DcqlSdJwtVcCredential;
 (function (DcqlSdJwtVcCredential) {
     DcqlSdJwtVcCredential.vClaims = u_dcql_js_1.vJsonRecord;
     DcqlSdJwtVcCredential.vModel = v.object({
+        credential_format: v.literal('vc+sd-jwt'),
         vct: v.string(),
         claims: DcqlSdJwtVcCredential.vClaims,
     });
-    DcqlSdJwtVcCredential.model = new model_js_1.Model({ vModel: DcqlSdJwtVcCredential.vModel });
+    DcqlSdJwtVcCredential.model = new u_model_js_1.Model({ vModel: DcqlSdJwtVcCredential.vModel });
 })(DcqlSdJwtVcCredential || (exports.DcqlSdJwtVcCredential = DcqlSdJwtVcCredential = {}));
 var DcqlW3cVcCredential;
 (function (DcqlW3cVcCredential) {
     DcqlW3cVcCredential.vClaims = u_dcql_js_1.vJsonRecord;
     DcqlW3cVcCredential.vModel = v.object({
+        credential_format: v.picklist(['jwt_vc_json-ld', 'jwt_vc_json']),
         claims: DcqlW3cVcCredential.vClaims,
     });
-    DcqlW3cVcCredential.parse = (input) => {
-        return v.parse(DcqlW3cVcCredential.vModel, input);
-    };
+    DcqlW3cVcCredential.model = new u_model_js_1.Model({ vModel: DcqlW3cVcCredential.vModel });
 })(DcqlW3cVcCredential || (exports.DcqlW3cVcCredential = DcqlW3cVcCredential = {}));
 var DcqlCredential;
 (function (DcqlCredential) {
-    DcqlCredential.vModel = v.union([
+    DcqlCredential.vModel = v.variant('credential_format', [
         DcqlMdocCredential.vModel,
         DcqlSdJwtVcCredential.vModel,
         DcqlW3cVcCredential.vModel,
     ]);
-    DcqlCredential.parse = (input) => {
-        return v.parse(DcqlCredential.vModel, input);
-    };
+    DcqlCredential.model = new u_model_js_1.Model({ vModel: DcqlCredential.vModel });
 })(DcqlCredential || (exports.DcqlCredential = DcqlCredential = {}));
 //# sourceMappingURL=u-dcql-credential.js.map

package/dist/src/u-dcql-credential.js.map

@@ -1 +1 @@
-{"version":3,"file":"u-dcql-credential.js","sourceRoot":"","sources":["../../src/u-dcql-credential.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAE7B,yCAAmC;AACnC,2CAA0C;AAE1C,IAAiB,kBAAkB,CAalC;AAbD,WAAiB,kBAAkB;IACpB,8BAAW,GAAG,CAAC,CAAC,MAAM,CACjC,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAClC,CAAC;IACW,yBAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACnB,UAAU,EAAE,mBAAA,WAAW;KACxB,CAAC,CAAC;IAEU,wBAAK,GAAG,IAAI,gBAAK,CAAC,EAAE,MAAM,EAAN,mBAAA,MAAM,EAAE,CAAC,CAAC;AAG7C,CAAC,EAbgB,kBAAkB,kCAAlB,kBAAkB,QAalC;AAGD,IAAiB,qBAAqB,CASrC;AATD,WAAiB,qBAAqB;IACvB,6BAAO,GAAG,uBAAW,CAAC;IACtB,4BAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;QACf,MAAM,EAAE,sBAAA,OAAO;KAChB,CAAC,CAAC;IACU,2BAAK,GAAG,IAAI,gBAAK,CAAC,EAAE,MAAM,EAAN,sBAAA,MAAM,EAAE,CAAC,CAAC;AAG7C,CAAC,EATgB,qBAAqB,qCAArB,qBAAqB,QASrC;AAGD,IAAiB,mBAAmB,CAWnC;AAXD,WAAiB,mBAAmB;IACrB,2BAAO,GAAG,uBAAW,CAAC;IACtB,0BAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,MAAM,EAAE,oBAAA,OAAO;KAChB,CAAC,CAAC;IAGU,yBAAK,GAAG,CAAC,KAAY,EAAU,EAAE;QAC5C,OAAO,CAAC,CAAC,KAAK,CAAC,oBAAA,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC;AAEJ,CAAC,EAXgB,mBAAmB,mCAAnB,mBAAmB,QAWnC;AAGD,IAAiB,cAAc,CAW9B;AAXD,WAAiB,cAAc;IAChB,qBAAM,GAAG,CAAC,CAAC,KAAK,CAAC;QAC5B,kBAAkB,CAAC,MAAM;QACzB,qBAAqB,CAAC,MAAM;QAC5B,mBAAmB,CAAC,MAAM;KAC3B,CAAC,CAAC;IAGU,oBAAK,GAAG,CAAC,KAAY,EAAE,EAAE;QACpC,OAAO,CAAC,CAAC,KAAK,CAAC,eAAA,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC,CAAC;AACJ,CAAC,EAXgB,cAAc,8BAAd,cAAc,QAW9B"}
+{"version":3,"file":"u-dcql-credential.js","sourceRoot":"","sources":["../../src/u-dcql-credential.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,2CAA0C;AAE1C,6CAAqC;AAErC,IAAiB,kBAAkB,CAclC;AAdD,WAAiB,kBAAkB;IACpB,8BAAW,GAAG,CAAC,CAAC,MAAM,CACjC,CAAC,CAAC,MAAM,EAAE,EACV,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAClC,CAAC;IACW,yBAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;QACxC,OAAO,EAAE,CAAC,CAAC,MAAM,EAAE;QACnB,UAAU,EAAE,mBAAA,WAAW;KACxB,CAAC,CAAC;IAEU,wBAAK,GAAG,IAAI,kBAAK,CAAC,EAAE,MAAM,EAAN,mBAAA,MAAM,EAAE,CAAC,CAAC;AAG7C,CAAC,EAdgB,kBAAkB,kCAAlB,kBAAkB,QAclC;AAGD,IAAiB,qBAAqB,CAUrC;AAVD,WAAiB,qBAAqB;IACvB,6BAAO,GAAG,uBAAW,CAAC;IACtB,4BAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;QACzC,GAAG,EAAE,CAAC,CAAC,MAAM,EAAE;QACf,MAAM,EAAE,sBAAA,OAAO;KAChB,CAAC,CAAC;IACU,2BAAK,GAAG,IAAI,kBAAK,CAAC,EAAE,MAAM,EAAN,sBAAA,MAAM,EAAE,CAAC,CAAC;AAG7C,CAAC,EAVgB,qBAAqB,qCAArB,qBAAqB,QAUrC;AAGD,IAAiB,mBAAmB,CAUnC;AAVD,WAAiB,mBAAmB;IACrB,2BAAO,GAAG,uBAAW,CAAC;IACtB,0BAAM,GAAG,CAAC,CAAC,MAAM,CAAC;QAC7B,iBAAiB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,gBAAgB,EAAE,aAAa,CAAC,CAAC;QAChE,MAAM,EAAE,oBAAA,OAAO;KAChB,CAAC,CAAC;IAEU,yBAAK,GAAG,IAAI,kBAAK,CAAC,EAAE,MAAM,EAAN,oBAAA,MAAM,EAAE,CAAC,CAAC;AAG7C,CAAC,EAVgB,mBAAmB,mCAAnB,mBAAmB,QAUnC;AAGD,IAAiB,cAAc,CAQ9B;AARD,WAAiB,cAAc;IAChB,qBAAM,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE;QACnD,kBAAkB,CAAC,MAAM;QACzB,qBAAqB,CAAC,MAAM;QAC5B,mBAAmB,CAAC,MAAM;KAC3B,CAAC,CAAC;IACU,oBAAK,GAAG,IAAI,kBAAK,CAAC,EAAE,MAAM,EAAN,eAAA,MAAM,EAAE,CAAC,CAAC;AAE7C,CAAC,EARgB,cAAc,8BAAd,cAAc,QAQ9B"}

package/dist/src/u-dcql.d.ts

@@ -1,6 +1,5 @@
 import * as v from 'valibot';
 export declare const idRegex: RegExp;
-export declare const vCredentialFormat: v.PicklistSchema<["mso_mdoc", "vc+sd-jwt", "jwt_vc_json", "jwt_vc_json-ld"], undefined>;
 export declare const vNonEmptyArray: <T extends unknown[]>() => v.CustomSchema<[T[number], ...T], undefined>;
 export declare const vIdString: v.SchemaWithPipe<[v.StringSchema<undefined>, v.RegexAction<string, undefined>]>;
 export type Json = string | number | boolean | null | {
@@ -14,35 +13,31 @@ export declare const vJsonRecord: v.RecordSchema<v.StringSchema<undefined>, v.Ge
 export type JsonRecord = v.InferOutput<typeof vJsonRecord>;
 export declare const vJsonValue: v.UnionSchema<[v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.BooleanSchema<undefined>, v.NullSchema<undefined>], undefined>, v.ArraySchema<v.UnionSchema<[v.StringSchema<undefined>, v.NumberSchema<undefined>, v.BooleanSchema<undefined>, v.NullSchema<undefined>], undefined>, undefined>, v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<Json, Json, v.BaseIssue<unknown>>, undefined>], undefined>;
 export declare const vStringToJson: v.RawTransformAction<string, Json>;
-export declare const vParseSuccess: v.ObjectSchema<{
+export declare const vCredentialParseSuccess: v.ObjectSchema<{
     readonly success: v.LiteralSchema<true, undefined>;
     readonly typed: v.LiteralSchema<true, undefined>;
-    readonly output: v.UnknownSchema;
     readonly issues: v.OptionalSchema<v.UndefinedSchema<undefined>, never>;
-    readonly credential_index: v.NumberSchema<undefined>;
+    readonly input_credential_index: v.NumberSchema<undefined>;
     readonly claim_set_index: v.UnionSchema<[v.NumberSchema<undefined>, v.UndefinedSchema<undefined>], undefined>;
+    readonly output: v.VariantSchema<"credential_format", [v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"mso_mdoc", undefined>;
+        readonly doctype: v.StringSchema<undefined>;
+        readonly namespaces: v.RecordSchema<v.StringSchema<undefined>, v.RecordSchema<v.StringSchema<undefined>, v.UnknownSchema, undefined>, undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.LiteralSchema<"vc+sd-jwt", undefined>;
+        readonly vct: v.StringSchema<undefined>;
+        readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<Json, Json, v.BaseIssue<unknown>>, undefined>;
+    }, undefined>, v.ObjectSchema<{
+        readonly credential_format: v.PicklistSchema<["jwt_vc_json-ld", "jwt_vc_json"], undefined>;
+        readonly claims: v.RecordSchema<v.StringSchema<undefined>, v.GenericSchema<Json, Json, v.BaseIssue<unknown>>, undefined>;
+    }, undefined>], undefined>;
 }, undefined>;
-export declare const vParseFailure: v.ObjectSchema<{
+export declare const vCredentialParseFailure: v.ObjectSchema<{
     readonly success: v.LiteralSchema<false, undefined>;
     readonly typed: v.BooleanSchema<undefined>;
     readonly output: v.UnknownSchema;
     readonly issues: v.SchemaWithPipe<[v.ArraySchema<v.UnknownSchema, undefined>, v.CustomSchema<[unknown, ...unknown[]], undefined>]>;
-    readonly credential_index: v.NumberSchema<undefined>;
+    readonly input_credential_index: v.NumberSchema<undefined>;
     readonly claim_set_index: v.UnionSchema<[v.NumberSchema<undefined>, v.UndefinedSchema<undefined>], undefined>;
 }, undefined>;
-export declare const vParseResult: v.UnionSchema<[v.ObjectSchema<{
-    readonly success: v.LiteralSchema<true, undefined>;
-    readonly typed: v.LiteralSchema<true, undefined>;
-    readonly output: v.UnknownSchema;
-    readonly issues: v.OptionalSchema<v.UndefinedSchema<undefined>, never>;
-    readonly credential_index: v.NumberSchema<undefined>;
-    readonly claim_set_index: v.UnionSchema<[v.NumberSchema<undefined>, v.UndefinedSchema<undefined>], undefined>;
-}, undefined>, v.ObjectSchema<{
-    readonly success: v.LiteralSchema<false, undefined>;
-    readonly typed: v.BooleanSchema<undefined>;
-    readonly output: v.UnknownSchema;
-    readonly issues: v.SchemaWithPipe<[v.ArraySchema<v.UnknownSchema, undefined>, v.CustomSchema<[unknown, ...unknown[]], undefined>]>;
-    readonly credential_index: v.NumberSchema<undefined>;
-    readonly claim_set_index: v.UnionSchema<[v.NumberSchema<undefined>, v.UndefinedSchema<undefined>], undefined>;
-}, undefined>], undefined>;
 //# sourceMappingURL=u-dcql.d.ts.map

package/dist/src/u-dcql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"u-dcql.d.ts","sourceRoot":"","sources":["../../src/u-dcql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,eAAO,MAAM,OAAO,QAAqB,CAAC;AAE1C,eAAO,MAAM,iBAAiB,yFAK5B,CAAC;AAEH,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,OAAO,EAAE,mDAIjD,CAAC;AAEF,eAAO,MAAM,SAAS,iFAAuC,CAAC;AAE9D,MAAM,MAAM,IAAI,GACZ,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACvB,IAAI,EAAE,CAAC;AAEX,eAAO,MAAM,YAAY,uIAKvB,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,YAAY,CAAC,CAAC;AAE7D,eAAO,MAAM,UAAU,iKAAwB,CAAC;AAEhD,eAAO,MAAM,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAEvC,CAAC;AAEF,eAAO,MAAM,WAAW,yGAA8B,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAC;AAE3D,eAAO,MAAM,UAAU,6aAAmD,CAAC;AAE3E,eAAO,MAAM,aAAa,oCASzB,CAAC;AAEF,eAAO,MAAM,aAAa;;;;;;;aAOxB,CAAC;AAEH,eAAO,MAAM,aAAa;;;;;;;aAOxB,CAAC;AAEH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;0BAA0C,CAAC"}
+{"version":3,"file":"u-dcql.d.ts","sourceRoot":"","sources":["../../src/u-dcql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAE7B,eAAO,MAAM,OAAO,QAAqB,CAAC;AAE1C,eAAO,MAAM,cAAc,GAAI,CAAC,SAAS,OAAO,EAAE,mDAIjD,CAAC;AAEF,eAAO,MAAM,SAAS,iFAAuC,CAAC;AAE9D,MAAM,MAAM,IAAI,GACZ,MAAM,GACN,MAAM,GACN,OAAO,GACP,IAAI,GACJ;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GACvB,IAAI,EAAE,CAAC;AAEX,eAAO,MAAM,YAAY,uIAKvB,CAAC;AACH,MAAM,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,YAAY,CAAC,CAAC;AAE7D,eAAO,MAAM,UAAU,iKAAwB,CAAC;AAEhD,eAAO,MAAM,KAAK,EAAE,CAAC,CAAC,aAAa,CAAC,IAAI,CAEvC,CAAC;AAEF,eAAO,MAAM,WAAW,yGAA8B,CAAC;AACvD,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,WAAW,CAAC,CAAC;AAE3D,eAAO,MAAM,UAAU,6aAAmD,CAAC;AAE3E,eAAO,MAAM,aAAa,oCASzB,CAAC;AAEF,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;aAOlC,CAAC;AAEH,eAAO,MAAM,uBAAuB;;;;;;;aAOlC,CAAC"}

package/dist/src/u-dcql.js

@@ -23,15 +23,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vParseResult = exports.vParseFailure = exports.vParseSuccess = exports.vStringToJson = exports.vJsonValue = exports.vJsonRecord = exports.vJson = exports.vJsonArray = exports.vJsonLiteral = exports.vIdString = exports.vNonEmptyArray = exports.vCredentialFormat = exports.idRegex = void 0;
+exports.vCredentialParseFailure = exports.vCredentialParseSuccess = exports.vStringToJson = exports.vJsonValue = exports.vJsonRecord = exports.vJson = exports.vJsonArray = exports.vJsonLiteral = exports.vIdString = exports.vNonEmptyArray = exports.idRegex = void 0;
 const v = __importStar(require("valibot"));
+const u_dcql_credential_1 = require("./u-dcql-credential");
 exports.idRegex = /^[a-zA-Z0-9_-]+$/;
-exports.vCredentialFormat = v.picklist([
-    'mso_mdoc',
-    'vc+sd-jwt',
-    'jwt_vc_json',
-    'jwt_vc_json-ld',
-]);
 const vNonEmptyArray = () => {
     return v.custom(input => input.length > 0 ? true : false);
 };
@@ -56,21 +51,20 @@ exports.vStringToJson = v.rawTransform(({ dataset, addIssue, NEVER }) => {
         return NEVER;
     }
 });
-exports.vParseSuccess = v.object({
+exports.vCredentialParseSuccess = v.object({
     success: v.literal(true),
     typed: v.literal(true),
-    output: v.unknown(),
     issues: v.optional(v.undefined()),
-    credential_index: v.number(),
+    input_credential_index: v.number(),
     claim_set_index: v.union([v.number(), v.undefined()]),
+    output: u_dcql_credential_1.DcqlCredential.model.v,
 });
-exports.vParseFailure = v.object({
+exports.vCredentialParseFailure = v.object({
     success: v.literal(false),
     typed: v.boolean(),
     output: v.unknown(),
     issues: v.pipe(v.array(v.unknown()), (0, exports.vNonEmptyArray)()),
-    credential_index: v.number(),
+    input_credential_index: v.number(),
     claim_set_index: v.union([v.number(), v.undefined()]),
 });
-exports.vParseResult = v.union([exports.vParseSuccess, exports.vParseFailure]);
 //# sourceMappingURL=u-dcql.js.map

package/dist/src/u-dcql.js.map

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

package/dist/src/{model.d.ts → u-model.d.ts}

@@ -1,5 +1,5 @@
 import * as v from 'valibot';
-import { DcqlParseError } from './e-dcql';
+import { DcqlParseError } from './dcql-error/e-dcql';
 export type UnknownBaseSchema = v.BaseSchema<unknown, unknown, v.BaseIssue<unknown>>;
 type EnsureOutputAssignableToInput<T extends UnknownBaseSchema> = v.InferOutput<T> extends v.InferInput<T> ? T : never;
 export declare class Model<T extends UnknownBaseSchema> {
@@ -24,4 +24,4 @@ export type InferModelTypes<T extends Model<any>> = T extends Model<infer U> ? {
     Output: v.InferOutput<U>;
 } : never;
 export {};
-//# sourceMappingURL=model.d.ts.map
+//# sourceMappingURL=u-model.d.ts.map

package/dist/src/u-model.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"u-model.d.ts","sourceRoot":"","sources":["../../src/u-model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAC;AAC7B,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAErD,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,UAAU,CAC1C,OAAO,EACP,OAAO,EACP,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CACrB,CAAC;AAEF,KAAK,6BAA6B,CAAC,CAAC,SAAS,iBAAiB,IAC5D,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;AAEvD,qBAAa,KAAK,CAAC,CAAC,SAAS,iBAAiB;IAChC,OAAO,CAAC,KAAK;gBAAL,KAAK,EAAE;QAAE,MAAM,EAAE,6BAA6B,CAAC,CAAC,CAAC,CAAA;KAAE;IAEvE,IAAW,CAAC,qCAEX;IAEM,KAAK,CAAC,KAAK,EAAE,CAAC;IAad,SAAS,CACd,KAAK,EAAE,OAAO,GAEZ;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;KAAE,GAC3C;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,SAAS,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAAC,KAAK,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;KAAE;IAalE,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;CAGrD;AAGD,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,KAAK,CAAC,GAAG,CAAC,IAC9C,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,CAAC,GACpB;IACE,KAAK,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACvB,MAAM,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;CAC1B,GACD,KAAK,CAAC"}

package/dist/src/{model.js → u-model.js}

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = void 0;
 const v = __importStar(require("valibot"));
-const e_dcql_1 = require("./e-dcql");
+const e_dcql_1 = require("./dcql-error/e-dcql");
 class Model {
     input;
     constructor(input) {
@@ -62,4 +62,4 @@ class Model {
     }
 }
 exports.Model = Model;
-//# sourceMappingURL=model.js.map
+//# sourceMappingURL=u-model.js.map

package/dist/src/u-model.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"u-model.js","sourceRoot":"","sources":["../../src/u-model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAC7B,gDAAqD;AAWrD,MAAa,KAAK;IACI;IAApB,YAAoB,KAAmD;QAAnD,UAAK,GAAL,KAAK,CAA8C;IAAG,CAAC;IAE3E,IAAW,CAAC;QACV,OAAO,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;IAC3B,CAAC;IAEM,KAAK,CAAC,KAAQ;QACnB,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAErC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC,MAAM,CAAC;QACvB,CAAC;QAED,OAAO,IAAI,uBAAc,CAAC;YACxB,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC;YACzC,KAAK,EAAE,MAAM,CAAC,KAAK;SACpB,CAAC,CAAC;IACL,CAAC;IAEM,SAAS,CACd,KAAc;QAId,MAAM,GAAG,GAAG,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAClD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;YAChB,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,CAAC;QAC/C,CAAC;aAAM,CAAC;YACN,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,KAAK,EAAE,IAAI,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC;gBAClC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAI,GAAG,CAAC,MAAM,CAAC;aACpC,CAAC;QACJ,CAAC;IACH,CAAC;IAEM,EAAE,CAAC,KAAc;QACtB,OAAO,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;CACF;AAxCD,sBAwCC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "dcql",
   "description": "Digital Credentials Query Language (DCQL)",
   "author": "Martin Auer",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "private": false,
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",