@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.50.137 → 0.34.1-feature.SSISDK.50.type.refactor.142

package/dist/index.cjs

@@ -6937,8 +6937,8 @@ var import_typeorm39 = require("typeorm");
 var import_debug7 = __toESM(require("debug"), 1);
 
 // src/utils/presentationDefinition/MappingUtils.ts
-var import_dcql = require("dcql");
 var blakepkg = __toESM(require("blakejs"), 1);
+var import_dcql = require("dcql");
 var presentationDefinitionItemFrom = /* @__PURE__ */ __name((entity) => {
   const result = {
     id: entity.id,
@@ -6949,18 +6949,13 @@ var presentationDefinitionItemFrom = /* @__PURE__ */ __name((entity) => {
     purpose: entity.purpose,
     definitionPayload: JSON.parse(entity.definitionPayload),
     ...entity.dcqlPayload && {
-      dcqlPayload: {
-        queryId: entity.definitionId,
-        name: entity.name,
-        defaultPurpose: entity.purpose,
-        dcqlQuery: import_dcql.DcqlQuery.parse(JSON.parse(entity.dcqlPayload))
-      }
+      dcqlQuery: import_dcql.DcqlQuery.parse(JSON.parse(entity.dcqlPayload))
     },
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt
   };
-  if (result.dcqlPayload?.dcqlQuery) {
-    import_dcql.DcqlQuery.validate(result.dcqlPayload?.dcqlQuery);
+  if (result.dcqlQuery) {
+    import_dcql.DcqlQuery.validate(result.dcqlQuery);
   }
   return replaceNullWithUndefined(result);
 }, "presentationDefinitionItemFrom");
@@ -6974,10 +6969,10 @@ var presentationDefinitionEntityItemFrom = /* @__PURE__ */ __name((item) => {
   if (item.definitionPayload) {
     entity.definitionPayload = JSON.stringify(item.definitionPayload);
   }
-  if (item.dcqlPayload) {
-    const dcqlQuery = import_dcql.DcqlQuery.parse(item.dcqlPayload.dcqlQuery);
+  if (item.dcqlQuery) {
+    const dcqlQuery = import_dcql.DcqlQuery.parse(item.dcqlQuery);
     import_dcql.DcqlQuery.validate(dcqlQuery);
-    entity.dcqlPayload = JSON.stringify(item.dcqlPayload.dcqlQuery);
+    entity.dcqlPayload = JSON.stringify(item.dcqlQuery);
   }
   return entity;
 }, "presentationDefinitionEntityItemFrom");
@@ -6989,11 +6984,11 @@ function isPresentationDefinitionEqual(base, compare) {
   if (base.definitionId !== compare.definitionId || base.tenantId !== compare.tenantId || base.version !== compare.version || base.name !== compare.name || base.purpose !== compare.purpose) {
     return false;
   }
-  if (base.dcqlPayload && compare.dcqlPayload) {
-    if (hashPayload(base.dcqlPayload) !== hashPayload(compare.dcqlPayload)) {
+  if (base.dcqlQuery && compare.dcqlQuery) {
+    if (hashPayload(base.dcqlQuery) !== hashPayload(compare.dcqlQuery)) {
       return false;
     }
-  } else if (base.dcqlPayload || compare.dcqlPayload) {
+  } else if (base.dcqlQuery || compare.dcqlQuery) {
     return false;
   }
   if (base.definitionPayload && compare.definitionPayload) {
@@ -7095,8 +7090,8 @@ var PDStore = class extends AbstractPDStore {
     if (item.definitionPayload) {
       updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload);
     }
-    if (item.dcqlPayload) {
-      updatedEntity.dcqlPayload = JSON.stringify(item.dcqlPayload.dcqlQuery);
+    if (item.dcqlQuery) {
+      updatedEntity.dcqlPayload = JSON.stringify(item.dcqlQuery);
     }
     debug7("Updating presentation definition entity", updatedEntity);
     const updateResult = await pdRepository.save(updatedEntity, {