dcql 0.2.16 → 0.2.18

package/dist/src/u-dcql.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.vStringToJson = exports.vJsonValue = exports.vJsonRecord = exports.vJson = exports.vJsonArray = exports.vJsonLiteral = exports.vIdString = exports.vNonEmptyArray = exports.idRegex = void 0;
+exports.vStringToJson = exports.vJsonRecord = exports.vJsonWithJT = exports.vJson = exports.vJsonLiteral = exports.vWithJT = exports.vIdString = exports.vNonEmptyArray = exports.idRegex = void 0;
 const v = __importStar(require("valibot"));
 exports.idRegex = /^[a-zA-Z0-9_-]+$/;
 const vNonEmptyArray = () => {
@@ -31,16 +31,61 @@ const vNonEmptyArray = () => {
 };
 exports.vNonEmptyArray = vNonEmptyArray;
 exports.vIdString = v.pipe(v.string(), v.regex(exports.idRegex));
+function isToJsonable(value) {
+    if (value === null || typeof value !== 'object')
+        return false;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
+    const toJsonFn = value.toJson;
+    return typeof toJsonFn === 'function';
+}
+const vWithJT = (schema) => v.pipe(v.custom(() => true), v.rawTransform(({ dataset, addIssue, NEVER }) => {
+    const result = v.safeParse(schema, dataset.value);
+    if (result.success)
+        return dataset.value;
+    if (!isToJsonable(dataset.value)) {
+        for (const safeParseIssue of result.issues) {
+            addIssue({
+                ...safeParseIssue,
+                expected: safeParseIssue.expected ?? undefined,
+            });
+        }
+        return NEVER;
+    }
+    let json;
+    try {
+        json = dataset.value.toJson();
+    }
+    catch (error) {
+        for (const safeParseIssue of result.issues) {
+            addIssue({
+                ...safeParseIssue,
+                expected: safeParseIssue.expected ?? undefined,
+            });
+        }
+        addIssue({ message: 'Json Transformation failed' });
+        return NEVER;
+    }
+    const safeParseResult = v.safeParse(schema, json);
+    if (safeParseResult.success)
+        return dataset.value;
+    for (const safeParseIssue of safeParseResult.issues) {
+        addIssue({
+            ...safeParseIssue,
+            expected: safeParseIssue.expected ?? undefined,
+        });
+    }
+    return NEVER;
+}));
+exports.vWithJT = vWithJT;
 exports.vJsonLiteral = v.union([
     v.string(),
     v.number(),
     v.boolean(),
     v.null(),
 ]);
-exports.vJsonArray = v.array(exports.vJsonLiteral);
 exports.vJson = v.lazy(() => v.union([exports.vJsonLiteral, v.array(exports.vJson), v.record(v.string(), exports.vJson)]));
+exports.vJsonWithJT = v.lazy(() => (0, exports.vWithJT)(v.union([exports.vJsonLiteral, v.array(exports.vJson), v.record(v.string(), exports.vJson)])));
 exports.vJsonRecord = v.record(v.string(), exports.vJson);
-exports.vJsonValue = v.union([exports.vJsonLiteral, exports.vJsonArray, exports.vJsonRecord]);
 exports.vStringToJson = v.rawTransform(({ dataset, addIssue, NEVER }) => {
     try {
         return JSON.parse(dataset.value);

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

@@ -1 +1 @@
-{"version":3,"file":"u-dcql.js","sourceRoot":"","sources":["../../src/u-dcql.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA6B;AAChB,QAAA,OAAO,GAAG,kBAAkB,CAAC;AAEnC,MAAM,cAAc,GAAG,GAAwB,EAAE;IACtD,OAAO,CAAC,CAAC,MAAM,CAAoB,KAAK,CAAC,EAAE,CACxC,KAAW,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CACvC,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEW,QAAA,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,eAAO,CAAC,CAAC,CAAC;AAUjD,QAAA,YAAY,GAAG,CAAC,CAAC,KAAK,CAAC;IAClC,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,MAAM,EAAE;IACV,CAAC,CAAC,OAAO,EAAE;IACX,CAAC,CAAC,IAAI,EAAE;CACT,CAAC,CAAC;AAGU,QAAA,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,oBAAY,CAAC,CAAC;AAEnC,QAAA,KAAK,GAA0B,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACtD,CAAC,CAAC,KAAK,CAAC,CAAC,oBAAY,EAAE,CAAC,CAAC,KAAK,CAAC,aAAK,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,aAAK,CAAC,CAAC,CAAC,CACrE,CAAC;AAEW,QAAA,WAAW,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,aAAK,CAAC,CAAC;AAG1C,QAAA,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,oBAAY,EAAE,kBAAU,EAAE,mBAAW,CAAC,CAAC,CAAC;AAE9D,QAAA,aAAa,GAAG,CAAC,CAAC,YAAY,CACzC,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE;IAC/B,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAS,CAAC;IAC3C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,QAAQ,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC;QACtC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CACF,CAAC"}
+{"version":3,"file":"u-dcql.js","sourceRoot":"","sources":["../../src/u-dcql.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "dcql",
   "description": "Digital Credentials Query Language (DCQL)",
   "author": "Martin Auer",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "private": false,
   "main": "./dist/src/index.js",
   "module": "./dist/src/index.js",
@@ -19,7 +19,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "valibot": "0.37.0"
+    "valibot": "1.0.0-beta.8"
   },
   "devDependencies": {
     "@ausweis/eslint": "^0.2.43",