@sphereon/ssi-sdk.data-store 0.32.1-fix.15 → 0.32.1-next.113

package/dist/entities/presentationDefinition/PresentationDefinitionItemEntity.d.ts

@@ -7,6 +7,7 @@ export declare class PresentationDefinitionItemEntity extends BaseEntity {
     purpose?: string;
     name?: string;
     definitionPayload: string;
+    dcqlPayload: string;
     createdAt: Date;
     lastUpdatedAt: Date;
     updateUpdatedDate(): void;

package/dist/entities/presentationDefinition/PresentationDefinitionItemEntity.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PresentationDefinitionItemEntity.d.ts","sourceRoot":"","sources":["../../../src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiH,MAAM,SAAS,CAAA;AAInJ,qBAEa,gCAAiC,SAAQ,UAAU;IAE9D,EAAE,EAAG,MAAM,CAAA;IAIX,YAAY,EAAG,MAAM,CAAA;IAIrB,OAAO,EAAG,MAAM,CAAA;IAGhB,QAAQ,CAAC,EAAE,MAAM,CAAA;IAGjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAGhB,IAAI,CAAC,EAAE,MAAM,CAAA;IAIb,iBAAiB,EAAG,MAAM,CAAA;IAG1B,SAAS,EAAG,IAAI,CAAA;IAGhB,aAAa,EAAG,IAAI,CAAA;IAKpB,iBAAiB,IAAI,IAAI;CAG1B"}
+{"version":3,"file":"PresentationDefinitionItemEntity.d.ts","sourceRoot":"","sources":["../../../src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAiH,MAAM,SAAS,CAAA;AAInJ,qBAEa,gCAAiC,SAAQ,UAAU;IAE9D,EAAE,EAAG,MAAM,CAAA;IAIX,YAAY,EAAG,MAAM,CAAA;IAIrB,OAAO,EAAG,MAAM,CAAA;IAGhB,QAAQ,CAAC,EAAE,MAAM,CAAA;IAGjB,OAAO,CAAC,EAAE,MAAM,CAAA;IAGhB,IAAI,CAAC,EAAE,MAAM,CAAA;IAIb,iBAAiB,EAAG,MAAM,CAAA;IAI1B,WAAW,EAAG,MAAM,CAAA;IAGpB,SAAS,EAAG,IAAI,CAAA;IAGhB,aAAa,EAAG,IAAI,CAAA;IAKpB,iBAAiB,IAAI,IAAI;CAG1B"}

package/dist/entities/presentationDefinition/PresentationDefinitionItemEntity.js

@@ -47,10 +47,16 @@ __decorate([
     __metadata("design:type", String)
 ], PresentationDefinitionItemEntity.prototype, "name", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ name: 'definition_payload', type: 'text', nullable: false, unique: false }),
-    (0, class_validator_1.IsNotEmpty)({ message: 'A blank definition payload field is not allowed' }),
+    (0, typeorm_1.Column)({ name: 'definition_payload', type: 'text', nullable: false, unique: false }) // TODO should this become nullable now we have dcqlPayload?
+    ,
+    (0, class_validator_1.IsNotEmpty)({ message: 'A blank PD definition payload field is not allowed' }),
     __metadata("design:type", String)
 ], PresentationDefinitionItemEntity.prototype, "definitionPayload", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ name: 'dcql_payload', type: 'text', nullable: true, unique: false }),
+    (0, class_validator_1.IsNotEmpty)({ message: 'A blank dcql definition payload field is not allowed' }),
+    __metadata("design:type", String)
+], PresentationDefinitionItemEntity.prototype, "dcqlPayload", void 0);
 __decorate([
     (0, typeorm_1.CreateDateColumn)({ name: 'created_at', nullable: false, type: (0, ssi_sdk_agent_config_1.typeOrmDateTime)() }),
     __metadata("design:type", Date)

package/dist/entities/presentationDefinition/PresentationDefinitionItemEntity.js.map

@@ -1 +1 @@
-{"version":3,"file":"PresentationDefinitionItemEntity.js","sourceRoot":"","sources":["../../../src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAmJ;AACnJ,qDAA4C;AAC5C,yEAAgE;AAIzD,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,oBAAU;IA+B9D,qHAAqH;IAGrH,iBAAiB;QACf,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAA;IACjC,CAAC;CACF,CAAA;AArCY,4EAAgC;AAE3C;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4DACpB;AAIX;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/F,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAC;;sEACjD;AAIrB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACzF,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC;;iEAChD;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;kEAC1E;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;iEACzE;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;8DACzE;AAIb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACpF,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,iDAAiD,EAAE,CAAC;;2EACjD;AAG1B;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,sCAAe,GAAE,EAAE,CAAC;8BACvE,IAAI;mEAAA;AAGhB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,sCAAe,GAAE,EAAE,CAAC;8BACxE,IAAI;IAEpB,qHAAqH;;uEAFjG;AAKpB;IAFC,IAAA,sBAAY,GAAE;IACd,IAAA,sBAAY,GAAE;;;;yEAGd;2CApCU,gCAAgC;IAF5C,IAAA,gBAAM,EAAC,4BAA4B,CAAC;IACpC,IAAA,eAAK,EAAC,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;GACzB,gCAAgC,CAqC5C"}
+{"version":3,"file":"PresentationDefinitionItemEntity.js","sourceRoot":"","sources":["../../../src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAmJ;AACnJ,qDAA4C;AAC5C,yEAAgE;AAIzD,IAAM,gCAAgC,GAAtC,MAAM,gCAAiC,SAAQ,oBAAU;IAmC9D,qHAAqH;IAGrH,iBAAiB;QACf,IAAI,CAAC,aAAa,GAAG,IAAI,IAAI,EAAE,CAAA;IACjC,CAAC;CACF,CAAA;AAzCY,4EAAgC;AAE3C;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4DACpB;AAIX;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC/F,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,4CAA4C,EAAE,CAAC;;sEACjD;AAIrB;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IACzF,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,sCAAsC,EAAE,CAAC;;iEAChD;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;kEAC1E;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;iEACzE;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;;8DACzE;AAIb;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,oBAAoB,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,4DAA4D;;IACjJ,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,oDAAoD,EAAE,CAAC;;2EACpD;AAI1B;IAFC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;IAC7E,IAAA,4BAAU,EAAC,EAAE,OAAO,EAAE,sDAAsD,EAAE,CAAC;;qEAC5D;AAGpB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,sCAAe,GAAE,EAAE,CAAC;8BACvE,IAAI;mEAAA;AAGhB;IADC,IAAA,0BAAgB,EAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,IAAA,sCAAe,GAAE,EAAE,CAAC;8BACxE,IAAI;IAEpB,qHAAqH;;uEAFjG;AAKpB;IAFC,IAAA,sBAAY,GAAE;IACd,IAAA,sBAAY,GAAE;;;;yEAGd;2CAxCU,gCAAgC;IAF5C,IAAA,gBAAM,EAAC,4BAA4B,CAAC;IACpC,IAAA,eAAK,EAAC,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;GACzB,gCAAgC,CAyC5C"}

package/dist/migrations/postgres/1716475165345-CreatePresentationDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1716475165345-CreatePresentationDefinitions.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEzD,qBAAa,0CAA2C,YAAW,kBAAkB;IACnF,IAAI,SAA+C;IAEtC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}
+{"version":3,"file":"1716475165345-CreatePresentationDefinitions.d.ts","sourceRoot":"","sources":["../../../src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEzD,qBAAa,0CAA2C,YAAW,kBAAkB;IACnF,IAAI,SAA+C;IAEtC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAiB3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}

package/dist/migrations/postgres/1716475165345-CreatePresentationDefinitions.js

@@ -25,6 +25,7 @@ CREATE TABLE "PresentationDefinitionItem" (
     "version" TEXT NOT NULL, 
     "purpose" TEXT, 
     "definition_payload" TEXT NOT NULL, 
+    "dcql_payload" TEXT, 
     "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
     CONSTRAINT "PK_PresentationDefinitionItem_id" PRIMARY KEY ("id"))

package/dist/migrations/postgres/1716475165345-CreatePresentationDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"1716475165345-CreatePresentationDefinitions.js","sourceRoot":"","sources":["../../../src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,0CAA0C;IAAvD;QACE,SAAI,GAAG,4CAA4C,CAAA;IAqBrD,CAAC;IAnBc,EAAE,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CAAC;;;;;;;;;;;;2CAYe,CAAC,CAAA;QAC1C,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACxC,MAAM,WAAW,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACpE,CAAC;KAAA;CACF;AAtBD,gGAsBC"}
+{"version":3,"file":"1716475165345-CreatePresentationDefinitions.js","sourceRoot":"","sources":["../../../src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,0CAA0C;IAAvD;QACE,SAAI,GAAG,4CAA4C,CAAA;IAsBrD,CAAC;IApBc,EAAE,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CAAC;;;;;;;;;;;;;2CAae,CAAC,CAAA;QAC1C,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACxC,MAAM,WAAW,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACpE,CAAC;KAAA;CACF;AAvBD,gGAuBC"}

package/dist/migrations/sqlite/1716475165344-CreatePresentationDefinitions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"1716475165344-CreatePresentationDefinitions.d.ts","sourceRoot":"","sources":["../../../src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEzD,qBAAa,0CAA2C,YAAW,kBAAkB;IACnF,IAAI,SAA+C;IAEtC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}
+{"version":3,"file":"1716475165344-CreatePresentationDefinitions.d.ts","sourceRoot":"","sources":["../../../src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAEzD,qBAAa,0CAA2C,YAAW,kBAAkB;IACnF,IAAI,SAA+C;IAEtC,EAAE,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAgB3C,IAAI,CAAC,WAAW,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;CAG3D"}

package/dist/migrations/sqlite/1716475165344-CreatePresentationDefinitions.js

@@ -24,6 +24,7 @@ class CreatePresentationDefinitions1716475165344 {
     "version" varchar NOT NULL,
     "purpose" varchar,
     "definition_payload" varchar NOT NULL,
+    "dcql_payload" varchar,
     "created_at" datetime NOT NULL DEFAULT (datetime('now')),
     "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
         });

package/dist/migrations/sqlite/1716475165344-CreatePresentationDefinitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"1716475165344-CreatePresentationDefinitions.js","sourceRoot":"","sources":["../../../src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,0CAA0C;IAAvD;QACE,SAAI,GAAG,4CAA4C,CAAA;IAoBrD,CAAC;IAlBc,EAAE,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CACrB;;;;;;;;;mEAS6D,CAC9D,CAAA;QACH,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACxC,MAAM,WAAW,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACpE,CAAC;KAAA;CACF;AArBD,gGAqBC"}
+{"version":3,"file":"1716475165344-CreatePresentationDefinitions.js","sourceRoot":"","sources":["../../../src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAEA,MAAa,0CAA0C;IAAvD;QACE,SAAI,GAAG,4CAA4C,CAAA;IAqBrD,CAAC;IAnBc,EAAE,CAAC,WAAwB;;YACtC,MAAM,WAAW,CAAC,KAAK,CACrB;;;;;;;;;;mEAU6D,CAC9D,CAAA;QACH,CAAC;KAAA;IAEY,IAAI,CAAC,WAAwB;;YACxC,MAAM,WAAW,CAAC,KAAK,CAAC,yCAAyC,CAAC,CAAA;QACpE,CAAC;KAAA;CACF;AAtBD,gGAsBC"}

package/dist/types/presentationDefinition/presentationDefinition.d.ts

@@ -1,4 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex';
+import { DcqlQueryREST } from '@sphereon/ssi-types';
 export type PresentationDefinitionItem = {
     id: string;
     definitionId: string;
@@ -7,10 +8,11 @@ export type PresentationDefinitionItem = {
     name?: string;
     purpose?: string;
     definitionPayload: IPresentationDefinition;
+    dcqlPayload?: DcqlQueryREST;
     createdAt: Date;
     lastUpdatedAt: Date;
 };
 export type NonPersistedPresentationDefinitionItem = Omit<PresentationDefinitionItem, 'id' | 'createdAt' | 'lastUpdatedAt'>;
 export type PartialPresentationDefinitionItem = Partial<PresentationDefinitionItem>;
-export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload'>>;
+export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload' | 'dcqlPayload'>>;
 //# sourceMappingURL=presentationDefinition.d.ts.map

package/dist/types/presentationDefinition/presentationDefinition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"presentationDefinition.d.ts","sourceRoot":"","sources":["../../../src/types/presentationDefinition/presentationDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AAEvD,MAAM,MAAM,0BAA0B,GAAG;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,uBAAuB,CAAA;IAC1C,SAAS,EAAE,IAAI,CAAA;IACf,aAAa,EAAE,IAAI,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,sCAAsC,GAAG,IAAI,CAAC,0BAA0B,EAAE,IAAI,GAAG,WAAW,GAAG,eAAe,CAAC,CAAA;AAC3H,MAAM,MAAM,iCAAiC,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACnF,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,CAAC,CAAC,CAAA"}
+{"version":3,"file":"presentationDefinition.d.ts","sourceRoot":"","sources":["../../../src/types/presentationDefinition/presentationDefinition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,eAAe,CAAA;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,MAAM,MAAM,0BAA0B,GAAG;IACvC,EAAE,EAAE,MAAM,CAAA;IACV,YAAY,EAAE,MAAM,CAAA;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,iBAAiB,EAAE,uBAAuB,CAAA;IAC1C,WAAW,CAAC,EAAE,aAAa,CAAA;IAC3B,SAAS,EAAE,IAAI,CAAA;IACf,aAAa,EAAE,IAAI,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,sCAAsC,GAAG,IAAI,CAAC,0BAA0B,EAAE,IAAI,GAAG,WAAW,GAAG,eAAe,CAAC,CAAA;AAC3H,MAAM,MAAM,iCAAiC,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;AACnF,MAAM,MAAM,gCAAgC,GAAG,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,mBAAmB,GAAG,aAAa,CAAC,CAAC,CAAA"}

package/dist/utils/presentationDefinition/MappingUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MappingUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/presentationDefinition/MappingUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,wEAAwE,CAAA;AAEzH,OAAO,EAAE,sCAAsC,EAAE,iCAAiC,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAA;AAInI,eAAO,MAAM,8BAA8B,WAAY,gCAAgC,KAAG,0BAczF,CAAA;AAED,eAAO,MAAM,oCAAoC,SAAU,sCAAsC,KAAG,gCAUnG,CAAA;AAMD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,iCAAiC,GAAG,OAAO,CAgB1I"}
+{"version":3,"file":"MappingUtils.d.ts","sourceRoot":"","sources":["../../../src/utils/presentationDefinition/MappingUtils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gCAAgC,EAAE,MAAM,wEAAwE,CAAA;AAEzH,OAAO,EAAE,sCAAsC,EAAE,iCAAiC,EAAE,0BAA0B,EAAE,MAAM,aAAa,CAAA;AAKnI,eAAO,MAAM,8BAA8B,WAAY,gCAAgC,KAAG,0BAezF,CAAA;AAED,eAAO,MAAM,oCAAoC,SAAU,sCAAsC,KAAG,gCAWnG,CAAA;AAMD,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,iCAAiC,EAAE,OAAO,EAAE,iCAAiC,GAAG,OAAO,CAgB1I"}

package/dist/utils/presentationDefinition/MappingUtils.js

@@ -14,6 +14,7 @@ const presentationDefinitionItemFrom = (entity) => {
         name: entity.name,
         purpose: entity.purpose,
         definitionPayload: JSON.parse(entity.definitionPayload),
+        dcqlPayload: JSON.parse(entity.dcqlPayload),
         createdAt: entity.createdAt,
         lastUpdatedAt: entity.lastUpdatedAt,
     };
@@ -28,6 +29,7 @@ const presentationDefinitionEntityItemFrom = (item) => {
     entity.name = item.name;
     entity.purpose = item.purpose;
     entity.definitionPayload = JSON.stringify(item.definitionPayload);
+    entity.dcqlPayload = JSON.stringify(item.dcqlPayload);
     return entity;
 };
 exports.presentationDefinitionEntityItemFrom = presentationDefinitionEntityItemFrom;

package/dist/utils/presentationDefinition/MappingUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"MappingUtils.js","sourceRoot":"","sources":["../../../src/utils/presentationDefinition/MappingUtils.ts"],"names":[],"mappings":";;;AAsCA,sEAgBC;AAtDD,6HAAyH;AAGzH,qCAAoC;AACpC,wDAA6D;AAEtD,MAAM,8BAA8B,GAAG,CAAC,MAAwC,EAA8B,EAAE;IACrH,MAAM,MAAM,GAA+B;QACzC,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAA4B;QAClF,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CAAA;IAED,OAAO,IAAA,0CAAwB,EAAC,MAAM,CAAC,CAAA;AACzC,CAAC,CAAA;AAdY,QAAA,8BAA8B,kCAc1C;AAEM,MAAM,oCAAoC,GAAG,CAAC,IAA4C,EAAoC,EAAE;IACrI,MAAM,MAAM,GAAG,IAAI,mEAAgC,EAAE,CAAA;IAErD,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC/B,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAa,CAAA;IACxC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACvB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7B,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAkB,CAAC,CAAA;IAClE,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAVY,QAAA,oCAAoC,wCAUhD;AAED,SAAS,WAAW,CAAC,OAAgC;IACnD,OAAO,IAAA,oBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,SAAgB,6BAA6B,CAAC,IAAuC,EAAE,OAA0C;IAC/H,IACE,IAAI,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY;QAC1C,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ;QACjC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;QAChC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;QACzB,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAC/B,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,IAAI,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACvF,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}
+{"version":3,"file":"MappingUtils.js","sourceRoot":"","sources":["../../../src/utils/presentationDefinition/MappingUtils.ts"],"names":[],"mappings":";;;AAyCA,sEAgBC;AAzDD,6HAAyH;AAGzH,qCAAoC;AACpC,wDAA6D;AAGtD,MAAM,8BAA8B,GAAG,CAAC,MAAwC,EAA8B,EAAE;IACrH,MAAM,MAAM,GAA+B;QACzC,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,YAAY,EAAE,MAAM,CAAC,YAAY;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,CAA4B;QAClF,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAkB;QAC5D,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,aAAa,EAAE,MAAM,CAAC,aAAa;KACpC,CAAA;IAED,OAAO,IAAA,0CAAwB,EAAC,MAAM,CAAC,CAAA;AACzC,CAAC,CAAA;AAfY,QAAA,8BAA8B,kCAe1C;AAEM,MAAM,oCAAoC,GAAG,CAAC,IAA4C,EAAoC,EAAE;IACrI,MAAM,MAAM,GAAG,IAAI,mEAAgC,EAAE,CAAA;IAErD,MAAM,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;IAC/B,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAa,CAAA;IACxC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;IACvB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAA;IAC7B,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,iBAAkB,CAAC,CAAA;IAClE,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,WAAY,CAAC,CAAA;IACtD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA;AAXY,QAAA,oCAAoC,wCAWhD;AAED,SAAS,WAAW,CAAC,OAAgC;IACnD,OAAO,IAAA,oBAAU,EAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,SAAgB,6BAA6B,CAAC,IAAuC,EAAE,OAA0C;IAC/H,IACE,IAAI,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY;QAC1C,IAAI,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ;QACjC,IAAI,CAAC,OAAO,KAAK,OAAO,CAAC,OAAO;QAChC,IAAI,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI;QACzB,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAC/B,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAED,IAAI,IAAI,CAAC,iBAAiB,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;QACxD,OAAO,WAAW,CAAC,IAAI,CAAC,iBAAiB,CAAC,KAAK,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAA;IACvF,CAAC;IAED,OAAO,KAAK,CAAA;AACd,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.32.1-fix.15+1619ae43",
+  "version": "0.32.1-next.113+5b666268",
   "source": "src/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,13 +18,14 @@
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
-    "@sphereon/ssi-sdk.agent-config": "0.32.1-fix.15+1619ae43",
-    "@sphereon/ssi-sdk.core": "0.32.1-fix.15+1619ae43",
-    "@sphereon/ssi-types": "0.32.1-fix.15+1619ae43",
+    "@sphereon/ssi-sdk.agent-config": "0.32.1-next.113+5b666268",
+    "@sphereon/ssi-sdk.core": "0.32.1-next.113+5b666268",
+    "@sphereon/ssi-types": "0.32.1-next.113+5b666268",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "^0.14.1",
+    "dcql": "0.2.19",
     "debug": "^4.3.5",
     "typeorm": "^0.3.20"
   },
@@ -53,5 +54,5 @@
     "Contact Store"
   ],
   "nx": {},
-  "gitHead": "1619ae43e4fdee49a2bf6bfb6196cce25d33e5a3"
+  "gitHead": "5b666268b482b6a08a6edc00b4b713faf69247e1"
 }

package/src/__tests__/pd-manager.entities.test.ts

@@ -24,6 +24,83 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     await dbConnection.destroy()
   })
 
+  it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+    expect(savedEntity.id).toBeDefined()
+    expect(savedEntity.dcqlPayload).toBeDefined()
+
+    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
+    expect(retrievedEntity).toBeDefined()
+    expect(retrievedEntity!.dcqlPayload).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
+    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+  })
+
+  it('should update PresentationDefinitionItemEntity dcqlPayload', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
+    const entity = new PresentationDefinitionItemEntity()
+    entity.definitionId = 'definition1'
+    entity.version = '1.0'
+    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
+    entity.dcqlPayload = JSON.stringify({
+      credentials: [
+        {
+          id: 'credential1',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'testClaim',
+            },
+          ],
+        },
+      ],
+    })
+
+    const savedEntity = await repository.save(entity)
+    expect(savedEntity).toBeDefined()
+
+    const updatedDcql = {
+      credentials: [
+        {
+          id: 'credential2',
+          format: 'jwt_vc',
+          claims: [
+            {
+              namespace: 'test',
+              claim_name: 'updatedClaim',
+            },
+          ],
+        },
+      ],
+    }
+    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
+    const updatedEntity = await repository.save(savedEntity)
+    expect(updatedEntity).toBeDefined()
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
+  })
+
   it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()

package/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -25,10 +25,14 @@ export class PresentationDefinitionItemEntity extends BaseEntity {
   @Column({ name: 'name', length: 255, type: 'varchar', nullable: true, unique: false })
   name?: string
 
-  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false })
-  @IsNotEmpty({ message: 'A blank definition payload field is not allowed' })
+  @Column({ name: 'definition_payload', type: 'text', nullable: false, unique: false }) // TODO should this become nullable now we have dcqlPayload?
+  @IsNotEmpty({ message: 'A blank PD definition payload field is not allowed' })
   definitionPayload!: string
 
+  @Column({ name: 'dcql_payload', type: 'text', nullable: true, unique: false })
+  @IsNotEmpty({ message: 'A blank dcql definition payload field is not allowed' })
+  dcqlPayload!: string
+
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date
 

package/src/migrations/postgres/1716475165345-CreatePresentationDefinitions.ts

@@ -13,6 +13,7 @@ CREATE TABLE "PresentationDefinitionItem" (
     "version" TEXT NOT NULL, 
     "purpose" TEXT, 
     "definition_payload" TEXT NOT NULL, 
+    "dcql_payload" TEXT, 
     "created_at" TIMESTAMP NOT NULL DEFAULT now(), 
     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), 
     CONSTRAINT "PK_PresentationDefinitionItem_id" PRIMARY KEY ("id"))

package/src/migrations/sqlite/1716475165344-CreatePresentationDefinitions.ts

@@ -13,6 +13,7 @@ export class CreatePresentationDefinitions1716475165344 implements MigrationInte
     "version" varchar NOT NULL,
     "purpose" varchar,
     "definition_payload" varchar NOT NULL,
+    "dcql_payload" varchar,
     "created_at" datetime NOT NULL DEFAULT (datetime('now')),
     "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`,
     )

package/src/types/presentationDefinition/presentationDefinition.ts

@@ -1,4 +1,5 @@
 import { IPresentationDefinition } from '@sphereon/pex'
+import { DcqlQueryREST } from '@sphereon/ssi-types'
 
 export type PresentationDefinitionItem = {
   id: string
@@ -8,10 +9,11 @@ export type PresentationDefinitionItem = {
   name?: string
   purpose?: string
   definitionPayload: IPresentationDefinition
+  dcqlPayload?: DcqlQueryREST
   createdAt: Date
   lastUpdatedAt: Date
 }
 
 export type NonPersistedPresentationDefinitionItem = Omit<PresentationDefinitionItem, 'id' | 'createdAt' | 'lastUpdatedAt'>
 export type PartialPresentationDefinitionItem = Partial<PresentationDefinitionItem>
-export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload'>> // TODO add logic to linearize & hash definitionPayload into a separate column so we can filter on it?
+export type PresentationDefinitionItemFilter = Partial<Omit<PresentationDefinitionItem, 'definitionPayload' | 'dcqlPayload'>>

package/src/utils/presentationDefinition/MappingUtils.ts

@@ -3,6 +3,7 @@ import { IPresentationDefinition } from '@sphereon/pex'
 import { NonPersistedPresentationDefinitionItem, PartialPresentationDefinitionItem, PresentationDefinitionItem } from '../../types'
 import { blake2bHex } from 'blakejs'
 import { replaceNullWithUndefined } from '../FormattingUtils'
+import { DcqlQueryREST } from '@sphereon/ssi-types'
 
 export const presentationDefinitionItemFrom = (entity: PresentationDefinitionItemEntity): PresentationDefinitionItem => {
   const result: PresentationDefinitionItem = {
@@ -13,6 +14,7 @@ export const presentationDefinitionItemFrom = (entity: PresentationDefinitionIte
     name: entity.name,
     purpose: entity.purpose,
     definitionPayload: JSON.parse(entity.definitionPayload) as IPresentationDefinition,
+    dcqlPayload: JSON.parse(entity.dcqlPayload) as DcqlQueryREST,
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt,
   }
@@ -29,6 +31,7 @@ export const presentationDefinitionEntityItemFrom = (item: NonPersistedPresentat
   entity.name = item.name
   entity.purpose = item.purpose
   entity.definitionPayload = JSON.stringify(item.definitionPayload!)
+  entity.dcqlPayload = JSON.stringify(item.dcqlPayload!)
   return entity
 }