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

package/dist/index.cjs

@@ -72,6 +72,7 @@ __export(index_exports, {
   DataStorePresentationDefinitionMigrations: () => DataStorePresentationDefinitionMigrations,
   DataStoreStatusListEntities: () => DataStoreStatusListEntities,
   DataStoreStatusListMigrations: () => DataStoreStatusListMigrations,
+  DcqlQueryItemEntity: () => DcqlQueryItemEntity,
   DidAuthConfigEntity: () => DidAuthConfigEntity,
   DigitalCredentialEntity: () => DigitalCredentialEntity,
   DigitalCredentialStore: () => DigitalCredentialStore,
@@ -97,7 +98,6 @@ __export(index_exports, {
   PartyOrigin: () => PartyOrigin,
   PartyTypeType: () => PartyTypeType,
   PhysicalAddressEntity: () => PhysicalAddressEntity,
-  PresentationDefinitionItemEntity: () => PresentationDefinitionItemEntity,
   RegulationType: () => RegulationType,
   StatusList2021Entity: () => StatusList2021Entity,
   StatusListEntity: () => StatusListEntity,
@@ -173,55 +173,55 @@ var import_typeorm12 = __toESM(require("typeorm"), 1);
 var import_typeorm11 = __toESM(require("typeorm"), 1);
 
 // src/types/contact/contact.ts
-var ConnectionType = /* @__PURE__ */ function(ConnectionType2) {
+var ConnectionType = /* @__PURE__ */ (function(ConnectionType2) {
   ConnectionType2["OPENID_CONNECT"] = "OIDC";
   ConnectionType2["SIOPv2"] = "SIOPv2";
   ConnectionType2["SIOPv2_OpenID4VP"] = "SIOPv2+OpenID4VP";
   return ConnectionType2;
-}({});
-var CorrelationIdentifierType = /* @__PURE__ */ function(CorrelationIdentifierType2) {
+})({});
+var CorrelationIdentifierType = /* @__PURE__ */ (function(CorrelationIdentifierType2) {
   CorrelationIdentifierType2["DID"] = "did";
   CorrelationIdentifierType2["URL"] = "url";
   return CorrelationIdentifierType2;
-}({});
-var PartyTypeType = /* @__PURE__ */ function(PartyTypeType2) {
+})({});
+var PartyTypeType = /* @__PURE__ */ (function(PartyTypeType2) {
   PartyTypeType2["NATURAL_PERSON"] = "naturalPerson";
   PartyTypeType2["ORGANIZATION"] = "organization";
   return PartyTypeType2;
-}({});
-var PartyOrigin = /* @__PURE__ */ function(PartyOrigin2) {
+})({});
+var PartyOrigin = /* @__PURE__ */ (function(PartyOrigin2) {
   PartyOrigin2["INTERNAL"] = "INTERNAL";
   PartyOrigin2["EXTERNAL"] = "EXTERNAL";
   return PartyOrigin2;
-}({});
-var IdentityOrigin = /* @__PURE__ */ function(IdentityOrigin2) {
+})({});
+var IdentityOrigin = /* @__PURE__ */ (function(IdentityOrigin2) {
   IdentityOrigin2["INTERNAL"] = "INTERNAL";
   IdentityOrigin2["EXTERNAL"] = "EXTERNAL";
   return IdentityOrigin2;
-}({});
+})({});
 
 // src/types/digitalCredential/enums.ts
-var DocumentType = /* @__PURE__ */ function(DocumentType2) {
+var DocumentType = /* @__PURE__ */ (function(DocumentType2) {
   DocumentType2["VC"] = "VC";
   DocumentType2["VP"] = "VP";
   DocumentType2["P"] = "P";
   DocumentType2["C"] = "C";
   return DocumentType2;
-}({});
-var RegulationType = /* @__PURE__ */ function(RegulationType2) {
+})({});
+var RegulationType = /* @__PURE__ */ (function(RegulationType2) {
   RegulationType2["PID"] = "PID";
   RegulationType2["QEAA"] = "QEAA";
   RegulationType2["EAA"] = "EAA";
   RegulationType2["NON_REGULATED"] = "NON_REGULATED";
   return RegulationType2;
-}({});
-var CredentialDocumentFormat = /* @__PURE__ */ function(CredentialDocumentFormat2) {
+})({});
+var CredentialDocumentFormat = /* @__PURE__ */ (function(CredentialDocumentFormat2) {
   CredentialDocumentFormat2["JSON_LD"] = "JSON_LD";
   CredentialDocumentFormat2["JWT"] = "JWT";
   CredentialDocumentFormat2["SD_JWT"] = "SD_JWT";
   CredentialDocumentFormat2["MSO_MDOC"] = "MSO_MDOC";
   return CredentialDocumentFormat2;
-}({});
+})({});
 (function(CredentialDocumentFormat2) {
   function fromSpecValue(credentialFormat) {
     const format = credentialFormat.toLowerCase();
@@ -254,19 +254,19 @@ var CredentialDocumentFormat = /* @__PURE__ */ function(CredentialDocumentFormat
   __name(toSpecValue, "toSpecValue");
   CredentialDocumentFormat2.toSpecValue = toSpecValue;
 })(CredentialDocumentFormat || (CredentialDocumentFormat = {}));
-var CredentialCorrelationType = /* @__PURE__ */ function(CredentialCorrelationType2) {
+var CredentialCorrelationType = /* @__PURE__ */ (function(CredentialCorrelationType2) {
   CredentialCorrelationType2["DID"] = "DID";
   CredentialCorrelationType2["X509_SAN"] = "X509_SAN";
   CredentialCorrelationType2["KID"] = "KID";
   CredentialCorrelationType2["URL"] = "URL";
   return CredentialCorrelationType2;
-}({});
-var CredentialStateType = /* @__PURE__ */ function(CredentialStateType2) {
+})({});
+var CredentialStateType = /* @__PURE__ */ (function(CredentialStateType2) {
   CredentialStateType2["REVOKED"] = "REVOKED";
   CredentialStateType2["VERIFIED"] = "VERIFIED";
   CredentialStateType2["EXPIRED"] = "EXPIRED";
   return CredentialStateType2;
-}({});
+})({});
 
 // src/entities/contact/IdentityEntity.ts
 var import_typeorm10 = require("typeorm");
@@ -4187,7 +4187,7 @@ DigitalCredentialEntity = _ts_decorate33([
   (0, import_typeorm32.Entity)("DigitalCredential")
 ], DigitalCredentialEntity);
 
-// src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts
+// src/entities/presentationDefinition/DcqlQueryItemEntity.ts
 var import_typeorm33 = require("typeorm");
 var import_class_validator21 = require("class-validator");
 var import_ssi_sdk18 = require("@sphereon/ssi-sdk.agent-config");
@@ -4202,17 +4202,16 @@ function _ts_metadata33(k, v) {
   if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 }
 __name(_ts_metadata33, "_ts_metadata");
-var PresentationDefinitionItemEntity = class extends import_typeorm33.BaseEntity {
+var DcqlQueryItemEntity = class extends import_typeorm33.BaseEntity {
   static {
-    __name(this, "PresentationDefinitionItemEntity");
+    __name(this, "DcqlQueryItemEntity");
   }
   id;
-  definitionId;
+  queryId;
   version;
   tenantId;
   purpose;
   name;
-  definitionPayload;
   dcqlPayload;
   createdAt;
   lastUpdatedAt;
@@ -4224,20 +4223,20 @@ var PresentationDefinitionItemEntity = class extends import_typeorm33.BaseEntity
 _ts_decorate34([
   (0, import_typeorm33.PrimaryGeneratedColumn)("uuid"),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "id", void 0);
+], DcqlQueryItemEntity.prototype, "id", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
-    name: "definition_id",
+    name: "query_id",
     length: 255,
     type: "varchar",
     nullable: false,
     unique: false
   }),
   (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank definition id field is not allowed"
+    message: "A blank query id field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "definitionId", void 0);
+], DcqlQueryItemEntity.prototype, "queryId", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "version",
@@ -4250,7 +4249,7 @@ _ts_decorate34([
     message: "A blank version field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "version", void 0);
+], DcqlQueryItemEntity.prototype, "version", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "tenant_id",
@@ -4260,7 +4259,7 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "tenantId", void 0);
+], DcqlQueryItemEntity.prototype, "tenantId", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "purpose",
@@ -4270,7 +4269,7 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "purpose", void 0);
+], DcqlQueryItemEntity.prototype, "purpose", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "name",
@@ -4280,31 +4279,19 @@ _ts_decorate34([
     unique: false
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "name", void 0);
-_ts_decorate34([
-  (0, import_typeorm33.Column)({
-    name: "definition_payload",
-    type: "text",
-    nullable: true,
-    unique: false
-  }),
-  (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank PD definition payload field is not allowed"
-  }),
-  _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "definitionPayload", void 0);
+], DcqlQueryItemEntity.prototype, "name", void 0);
 _ts_decorate34([
   (0, import_typeorm33.Column)({
     name: "dcql_payload",
     type: "text",
-    nullable: true,
+    nullable: false,
     unique: false
   }),
   (0, import_class_validator21.IsNotEmpty)({
-    message: "A blank dcql definition payload field is not allowed"
+    message: "A blank dcql query payload field is not allowed"
   }),
   _ts_metadata33("design:type", String)
-], PresentationDefinitionItemEntity.prototype, "dcqlPayload", void 0);
+], DcqlQueryItemEntity.prototype, "dcqlPayload", void 0);
 _ts_decorate34([
   (0, import_typeorm33.CreateDateColumn)({
     name: "created_at",
@@ -4312,7 +4299,7 @@ _ts_decorate34([
     type: (0, import_ssi_sdk18.typeOrmDateTime)()
   }),
   _ts_metadata33("design:type", typeof Date === "undefined" ? Object : Date)
-], PresentationDefinitionItemEntity.prototype, "createdAt", void 0);
+], DcqlQueryItemEntity.prototype, "createdAt", void 0);
 _ts_decorate34([
   (0, import_typeorm33.UpdateDateColumn)({
     name: "last_updated_at",
@@ -4320,22 +4307,22 @@ _ts_decorate34([
     type: (0, import_ssi_sdk18.typeOrmDateTime)()
   }),
   _ts_metadata33("design:type", typeof Date === "undefined" ? Object : Date)
-], PresentationDefinitionItemEntity.prototype, "lastUpdatedAt", void 0);
+], DcqlQueryItemEntity.prototype, "lastUpdatedAt", void 0);
 _ts_decorate34([
   (0, import_typeorm33.BeforeInsert)(),
   (0, import_typeorm33.BeforeUpdate)(),
   _ts_metadata33("design:type", Function),
   _ts_metadata33("design:paramtypes", []),
   _ts_metadata33("design:returntype", void 0)
-], PresentationDefinitionItemEntity.prototype, "updateUpdatedDate", null);
-PresentationDefinitionItemEntity = _ts_decorate34([
-  (0, import_typeorm33.Entity)("PresentationDefinitionItem"),
+], DcqlQueryItemEntity.prototype, "updateUpdatedDate", null);
+DcqlQueryItemEntity = _ts_decorate34([
+  (0, import_typeorm33.Entity)("DcqlQueryItem"),
   (0, import_typeorm33.Index)([
     "version"
   ], {
     unique: false
   })
-], PresentationDefinitionItemEntity);
+], DcqlQueryItemEntity);
 
 // src/entities/oid4vcState/Oid4vcStateEntity.ts
 var import_ssi_sdk19 = require("@sphereon/ssi-sdk.agent-config");
@@ -6937,40 +6924,36 @@ 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,
     tenantId: entity.tenantId,
-    definitionId: entity.definitionId,
+    queryId: entity.queryId,
     version: entity.version,
     name: entity.name,
     purpose: entity.purpose,
-    definitionPayload: JSON.parse(entity.definitionPayload),
-    ...entity.dcqlPayload && {
-      dcqlPayload: {
-        queryId: entity.definitionId,
-        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.dcqlQuery) {
+    import_dcql.DcqlQuery.validate(result.dcqlQuery);
+  }
   return replaceNullWithUndefined(result);
 }, "presentationDefinitionItemFrom");
 var presentationDefinitionEntityItemFrom = /* @__PURE__ */ __name((item) => {
-  const entity = new PresentationDefinitionItemEntity();
+  const entity = new DcqlQueryItemEntity();
   entity.tenantId = item.tenantId;
-  entity.definitionId = item.definitionId;
+  entity.queryId = item.queryId;
   entity.version = item.version;
   entity.name = item.name;
   entity.purpose = item.purpose;
-  if (item.definitionPayload) {
-    entity.definitionPayload = JSON.stringify(item.definitionPayload);
-  }
-  if (item.dcqlPayload) {
-    entity.dcqlPayload = JSON.stringify(item.dcqlPayload.dcqlQuery);
+  if (item.dcqlQuery) {
+    const dcqlQuery = import_dcql.DcqlQuery.parse(item.dcqlQuery);
+    import_dcql.DcqlQuery.validate(dcqlQuery);
+    entity.dcqlPayload = JSON.stringify(item.dcqlQuery);
   }
   return entity;
 }, "presentationDefinitionEntityItemFrom");
@@ -6979,21 +6962,14 @@ function hashPayload(payload) {
 }
 __name(hashPayload, "hashPayload");
 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) {
+  if (base.queryId !== compare.queryId || 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) {
-    return false;
-  }
-  if (base.definitionPayload && compare.definitionPayload) {
-    if (hashPayload(base.definitionPayload) !== hashPayload(compare.definitionPayload)) {
-      return false;
-    }
-  } else if (base.definitionPayload || compare.definitionPayload) {
+  } else if (base.dcqlQuery || compare.dcqlQuery) {
     return false;
   }
   return true;
@@ -7013,7 +6989,7 @@ var PDStore = class extends AbstractPDStore {
   }
   getDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args ?? {};
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const result = await pdRepository.findOne({
       where: {
         id: itemId
@@ -7026,7 +7002,7 @@ var PDStore = class extends AbstractPDStore {
   }, "getDefinition");
   hasDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args ?? {};
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const resultCount = await pdRepository.count({
       where: {
         id: itemId
@@ -7036,7 +7012,7 @@ var PDStore = class extends AbstractPDStore {
   }, "hasDefinition");
   hasDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const resultCount = await pdRepository.count({
       ...filter && {
         where: cleanFilter(filter)
@@ -7046,7 +7022,7 @@ var PDStore = class extends AbstractPDStore {
   }, "hasDefinitions");
   getDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
@@ -7059,7 +7035,7 @@ var PDStore = class extends AbstractPDStore {
     return result.map((entity) => presentationDefinitionItemFrom(entity));
   }, "getDefinitions");
   addDefinition = /* @__PURE__ */ __name(async (item) => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const entity = presentationDefinitionEntityItemFrom(item);
     debug7("Adding presentation definition entity", item);
     const result = await pdRepository.save(entity, {
@@ -7068,7 +7044,7 @@ var PDStore = class extends AbstractPDStore {
     return presentationDefinitionItemFrom(result);
   }, "addDefinition");
   updateDefinition = /* @__PURE__ */ __name(async (item) => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const result = await pdRepository.findOne({
       where: {
         id: item.id
@@ -7081,16 +7057,11 @@ var PDStore = class extends AbstractPDStore {
       ...result
     };
     updatedEntity.tenantId = item.tenantId;
-    updatedEntity.definitionId = item.definitionId;
+    updatedEntity.queryId = item.queryId;
     updatedEntity.version = item.version;
     updatedEntity.name = item.name;
     updatedEntity.purpose = item.purpose;
-    if (item.definitionPayload) {
-      updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload);
-    }
-    if (item.dcqlPayload) {
-      updatedEntity.dcqlPayload = JSON.stringify(item.dcqlPayload.dcqlQuery);
-    }
+    updatedEntity.dcqlPayload = JSON.stringify(item.dcqlQuery);
     debug7("Updating presentation definition entity", updatedEntity);
     const updateResult = await pdRepository.save(updatedEntity, {
       transaction: true
@@ -7099,7 +7070,7 @@ var PDStore = class extends AbstractPDStore {
   }, "updateDefinition");
   deleteDefinition = /* @__PURE__ */ __name(async (args) => {
     const { itemId } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const entity = await pdRepository.findOne({
       where: {
         id: itemId
@@ -7113,7 +7084,7 @@ var PDStore = class extends AbstractPDStore {
   }, "deleteDefinition");
   deleteDefinitions = /* @__PURE__ */ __name(async (args) => {
     const { filter } = args;
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity);
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity);
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
@@ -7966,105 +7937,72 @@ var CreateBitstringStatusList1741895823000 = class {
   }
 };
 
-// src/migrations/generic/13-UpdatePresentationDefinitionItemNullable.ts
+// src/migrations/generic/13-CreateDcqlQueryItem.ts
 var import_debug12 = __toESM(require("debug"), 1);
 
-// src/migrations/postgres/1756975509000-UpdatePresentationDefinitionItemNullable.ts
-var UpdatePresentationDefinitionItemNullablePG1741895824000 = class {
+// src/migrations/postgres/1726588800000-CreateDcqlQueryItem.ts
+var CreateDcqlQueryItemPG1726588800000 = class {
   static {
-    __name(this, "UpdatePresentationDefinitionItemNullablePG1741895824000");
+    __name(this, "CreateDcqlQueryItemPG1726588800000");
   }
-  name = "UpdatePresentationDefinitionItemNullable1741895824000";
+  name = "CreateDcqlQueryItemPG1726588800000";
   async up(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" DROP NOT NULL`);
+    await queryRunner.query(`
+      CREATE TABLE "DcqlQueryItem" (
+                                     "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
+                                     "tenant_id" TEXT,
+                                     "query_id" TEXT NOT NULL,
+                                     "name" TEXT,
+                                     "version" TEXT NOT NULL,
+                                     "purpose" TEXT,
+                                     "dcql_payload" TEXT NOT NULL,
+                                     "created_at" TIMESTAMP NOT NULL DEFAULT now(),
+                                     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
+                                     CONSTRAINT "PK_DcqlQueryItem_id" PRIMARY KEY ("id"))
+    `);
   }
   async down(queryRunner) {
-    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" SET NOT NULL`);
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`);
   }
 };
 
-// src/migrations/sqlite/1756975340000-UpdatePresentationDefinitionItemNullable.ts
-var UpdatePresentationDefinitionItemNullableSqlite1756975340000 = class {
+// src/migrations/sqlite/1726617600000-CreateDcqlQueryItem.ts
+var CreateDcqlQueryItemSQlite1726617600000 = class {
   static {
-    __name(this, "UpdatePresentationDefinitionItemNullableSqlite1756975340000");
+    __name(this, "CreateDcqlQueryItemSQlite1726617600000");
   }
-  name = "UpdatePresentationDefinitionItemNullable1756975340000";
+  name = "CreateDcqlQueryItemSQlite1726617600000";
   async up(queryRunner) {
-    await queryRunner.query(`
-      CREATE TABLE "temporary_PresentationDefinitionItem" (
-                                                            "id" varchar PRIMARY KEY NOT NULL,
-                                                            "definition_id" varchar(255) NOT NULL,
-                                                            "version" varchar(255) NOT NULL,
-                                                            "tenant_id" varchar(255),
-                                                            "purpose" varchar(255),
-                                                            "name" varchar(255),
-                                                            "definition_payload" text,
-                                                            "dcql_payload" text,
-                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_PresentationDefinitionItem"(
-        "id", "definition_id", "version", "tenant_id", "purpose", "name",
-        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
-      )
-      SELECT
-        "id", "definition_id", "version", "tenant_id", "purpose", "name",
-        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
-      FROM "PresentationDefinitionItem"
-    `);
-    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
-    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`);
-    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`);
+    await queryRunner.query(`CREATE TABLE "DcqlQueryItem" (
+                                      "id" varchar PRIMARY KEY NOT NULL,
+                                      "tenant_id" varchar,
+                                      "query_id" varchar NOT NULL,
+                                      "name" varchar,
+                                      "version" varchar NOT NULL,
+                                      "purpose" varchar,
+                                      "dcql_payload" varchar NOT NULL,
+                                      "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                      "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`);
   }
   async down(queryRunner) {
-    await queryRunner.query(`
-      CREATE TABLE "temporary_PresentationDefinitionItem" (
-                                                            "id" varchar PRIMARY KEY NOT NULL,
-                                                            "definition_id" varchar(255) NOT NULL,
-                                                            "version" varchar(255) NOT NULL,
-                                                            "tenant_id" varchar(255),
-                                                            "purpose" varchar(255),
-                                                            "name" varchar(255),
-                                                            "definition_payload" text NOT NULL,
-                                                            "dcql_payload" text,
-                                                            "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                                            "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                                            CONSTRAINT "UQ_PresentationDefinitionItem_definition_id_version" UNIQUE ("definition_id", "version")
-      )
-    `);
-    await queryRunner.query(`
-      INSERT INTO "temporary_PresentationDefinitionItem"(
-        "id", "definition_id", "version", "tenant_id", "purpose", "name",
-        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
-      )
-      SELECT
-        "id", "definition_id", "version", "tenant_id", "purpose", "name",
-        "definition_payload", "dcql_payload", "created_at", "last_updated_at"
-      FROM "PresentationDefinitionItem"
-    `);
-    await queryRunner.query(`DROP TABLE "PresentationDefinitionItem"`);
-    await queryRunner.query(`ALTER TABLE "temporary_PresentationDefinitionItem" RENAME TO "PresentationDefinitionItem"`);
-    await queryRunner.query(`CREATE INDEX "IDX_PresentationDefinitionItem_version" ON "PresentationDefinitionItem" ("version")`);
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`);
   }
 };
 
-// src/migrations/generic/13-UpdatePresentationDefinitionItemNullable.ts
+// src/migrations/generic/13-CreateDcqlQueryItem.ts
 var debug12 = (0, import_debug12.default)("sphereon:ssi-sdk:migrations");
-var UpdatePresentationDefinitionItemNullable1741895824000 = class {
+var CreateDcqlQueryItem1726617600000 = class {
   static {
-    __name(this, "UpdatePresentationDefinitionItemNullable1741895824000");
+    __name(this, "CreateDcqlQueryItem1726617600000");
   }
-  name = "UpdatePresentationDefinitionItemNullable1741895824000";
+  name = "CreateDcqlQueryItem1726617600000";
   async up(queryRunner) {
     debug12("migration: updating presentation definition item nullable fields");
     const dbType = queryRunner.connection.driver.options.type;
     switch (dbType) {
       case "postgres": {
         debug12("using postgres migration file");
-        const mig = new UpdatePresentationDefinitionItemNullablePG1741895824000();
+        const mig = new CreateDcqlQueryItemPG1726588800000();
         await mig.up(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8073,7 +8011,7 @@ var UpdatePresentationDefinitionItemNullable1741895824000 = class {
       case "expo":
       case "react-native": {
         debug12("using sqlite/react-native migration file");
-        const mig = new UpdatePresentationDefinitionItemNullableSqlite1756975340000();
+        const mig = new CreateDcqlQueryItemSQlite1726617600000();
         await mig.up(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8088,7 +8026,7 @@ var UpdatePresentationDefinitionItemNullable1741895824000 = class {
     switch (dbType) {
       case "postgres": {
         debug12("using postgres migration file");
-        const mig = new UpdatePresentationDefinitionItemNullablePG1741895824000();
+        const mig = new CreateDcqlQueryItemPG1726588800000();
         await mig.down(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -8097,7 +8035,7 @@ var UpdatePresentationDefinitionItemNullable1741895824000 = class {
       case "expo":
       case "react-native": {
         debug12("using sqlite/react-native migration file");
-        const mig = new UpdatePresentationDefinitionItemNullableSqlite1756975340000();
+        const mig = new CreateDcqlQueryItemSQlite1726617600000();
         await mig.down(queryRunner);
         debug12("Migration statements executed");
         return;
@@ -9512,7 +9450,7 @@ var DataStoreMachineStateMigrations = [
 ];
 var DataStorePresentationDefinitionMigrations = [
   CreatePresentationDefinitions1716533767523,
-  UpdatePresentationDefinitionItemNullable1741895824000
+  CreateDcqlQueryItem1726617600000
 ];
 var DataStoreMigrations = [
   ...DataStoreContactMigrations,
@@ -9699,7 +9637,7 @@ var DataStoreIssuanceBrandingEntities = [
   CredentialClaimsEntity
 ];
 var DataStorePresentationDefinitionEntities = [
-  PresentationDefinitionItemEntity
+  DcqlQueryItemEntity
 ];
 var DataStoreStatusListEntities = [
   StatusListEntity,