@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.82.and.SSISDK.70.349 → 0.34.1-feature.SSISDK.82.and.SSISDK.70.353

package/dist/index.cjs

@@ -2076,6 +2076,7 @@ var DigitalCredentialEntity = class extends import_typeorm17.BaseEntity {
   tenantId;
   linkedVpId;
   linkedVpFrom;
+  linkedVpUntil;
   createdAt;
   presentedAt;
   lastUpdatedAt;
@@ -2253,6 +2254,14 @@ _ts_decorate18([
   }),
   _ts_metadata17("design:type", typeof Date === "undefined" ? Object : Date)
 ], DigitalCredentialEntity.prototype, "linkedVpFrom", void 0);
+_ts_decorate18([
+  (0, import_typeorm17.CreateDateColumn)({
+    name: "linked_vp_until",
+    nullable: true,
+    type: (0, import_ssi_sdk14.typeOrmDateTime)()
+  }),
+  _ts_metadata17("design:type", typeof Date === "undefined" ? Object : Date)
+], DigitalCredentialEntity.prototype, "linkedVpUntil", void 0);
 _ts_decorate18([
   (0, import_typeorm17.CreateDateColumn)({
     name: "created_at",
@@ -5386,6 +5395,7 @@ var ContactStore = class extends import_ssi_sdk25.AbstractContactStore {
 var import_ssi_sdk26 = require("@sphereon/ssi-sdk.data-store-types");
 var import_ssi_types4 = require("@sphereon/ssi-types");
 var import_debug2 = __toESM(require("debug"), 1);
+var import_typeorm36 = require("typeorm");
 
 // src/utils/SortingUtils.ts
 var parseAndValidateOrderOptions = /* @__PURE__ */ __name((order) => {
@@ -5439,8 +5449,25 @@ var DigitalCredentialStore = class extends import_ssi_sdk26.AbstractDigitalCrede
     const { filter = {}, offset, limit, order = "createdAt.asc" } = args ?? {};
     const sortOptions = order && typeof order === "string" ? parseAndValidateOrderOptions(order) : order;
     const dcRepo = await this.getRepository();
+    const processLinkedVpUntil = /* @__PURE__ */ __name((filterItem) => {
+      const processed = {
+        ...filterItem
+      };
+      if (filterItem.linkedVpUntil) {
+        processed.linkedVpUntil = (0, import_typeorm36.LessThanOrEqual)(filterItem.linkedVpUntil);
+      }
+      return processed;
+    }, "processLinkedVpUntil");
+    let whereClause;
+    if (Array.isArray(filter) && filter.length > 0) {
+      whereClause = filter.map(processLinkedVpUntil);
+    } else if (Object.keys(filter).length > 0) {
+      whereClause = processLinkedVpUntil(filter);
+    } else {
+      whereClause = filter;
+    }
     const [result, total] = await dcRepo.findAndCount({
-      where: filter,
+      where: whereClause,
       skip: offset,
       take: limit,
       order: sortOptions
@@ -5572,7 +5599,7 @@ var DigitalCredentialStore = class extends import_ssi_sdk26.AbstractDigitalCrede
 // src/issuanceBranding/IssuanceBrandingStore.ts
 var import_ssi_sdk27 = require("@sphereon/ssi-sdk.data-store-types");
 var import_debug3 = __toESM(require("debug"), 1);
-var import_typeorm36 = require("typeorm");
+var import_typeorm37 = require("typeorm");
 
 // src/utils/issuanceBranding/MappingUtils.ts
 var credentialBrandingFrom = /* @__PURE__ */ __name((credentialBranding) => {
@@ -5766,7 +5793,7 @@ var IssuanceBrandingStore = class extends import_ssi_sdk27.AbstractIssuanceBrand
         credentialBranding: {
           id: credentialBrandingId
         },
-        locale: (0, import_typeorm36.In)(localeBranding.map((localeBranding2) => localeBranding2.locale))
+        locale: (0, import_typeorm37.In)(localeBranding.map((localeBranding2) => localeBranding2.locale))
       }
     });
     if (locales && locales.length > 0) {
@@ -5834,7 +5861,7 @@ var IssuanceBrandingStore = class extends import_ssi_sdk27.AbstractIssuanceBrand
         credentialBranding: {
           id: result.credentialBrandingId
         },
-        id: (0, import_typeorm36.Not)((0, import_typeorm36.In)([
+        id: (0, import_typeorm37.Not)((0, import_typeorm37.In)([
           localeBranding.id
         ])),
         locale: localeBranding.locale
@@ -5937,7 +5964,7 @@ var IssuanceBrandingStore = class extends import_ssi_sdk27.AbstractIssuanceBrand
         issuerBranding: {
           id: issuerBrandingId
         },
-        locale: (0, import_typeorm36.In)(localeBranding.map((localeBranding2) => localeBranding2.locale))
+        locale: (0, import_typeorm37.In)(localeBranding.map((localeBranding2) => localeBranding2.locale))
       }
     });
     if (locales && locales.length > 0) {
@@ -6005,7 +6032,7 @@ var IssuanceBrandingStore = class extends import_ssi_sdk27.AbstractIssuanceBrand
         issuerBranding: {
           id: result.issuerBrandingId
         },
-        id: (0, import_typeorm36.Not)((0, import_typeorm36.In)([
+        id: (0, import_typeorm37.Not)((0, import_typeorm37.In)([
           localeBranding.id
         ])),
         locale: localeBranding.locale
@@ -6067,7 +6094,7 @@ var IssuanceBrandingStore = class extends import_ssi_sdk27.AbstractIssuanceBrand
 // src/statusList/StatusListStore.ts
 var import_ssi_types6 = require("@sphereon/ssi-types");
 var import_debug4 = __toESM(require("debug"), 1);
-var import_typeorm37 = require("typeorm");
+var import_typeorm38 = require("typeorm");
 
 // src/utils/statusList/MappingUtils.ts
 var import_ssi_types5 = require("@sphereon/ssi-types");
@@ -6207,7 +6234,7 @@ var StatusListStore = class {
     const results = (await repo.find({
       where: {
         statusListId: statusList.id,
-        statusListIndex: (0, import_typeorm37.In)(statusListIndex)
+        statusListIndex: (0, import_typeorm38.In)(statusListIndex)
       }
     })).map((index) => index.statusListIndex);
     return statusListIndex.filter((index) => !results.includes(index));
@@ -6677,7 +6704,7 @@ var EventLoggerStore = class extends import_ssi_sdk28.AbstractEventLoggerStore {
 // src/machineState/MachineStateStore.ts
 var import_ssi_sdk29 = require("@sphereon/ssi-sdk.data-store-types");
 var import_debug6 = __toESM(require("debug"), 1);
-var import_typeorm38 = require("typeorm");
+var import_typeorm39 = require("typeorm");
 var debug6 = (0, import_debug6.default)("sphereon:ssi-sdk:machine-state:store");
 var MachineStateStore = class _MachineStateStore extends import_ssi_sdk29.IAbstractMachineStateStore {
   static {
@@ -6713,7 +6740,7 @@ var MachineStateStore = class _MachineStateStore extends import_ssi_sdk29.IAbstr
     const { tenantId, machineName, instanceId } = args;
     const connection = await this._dbConnection;
     debug6(`Executing findActiveMachineStates query with machineName: ${machineName}, tenantId: ${tenantId}`);
-    const queryBuilder = connection.getRepository(MachineStateInfoEntity).createQueryBuilder("state").where("state.completedAt IS NULL").andWhere(new import_typeorm38.Brackets((qb) => {
+    const queryBuilder = connection.getRepository(MachineStateInfoEntity).createQueryBuilder("state").where("state.completedAt IS NULL").andWhere(new import_typeorm39.Brackets((qb) => {
       qb.where("state.expiresAt IS NULL").orWhere("state.expiresAt > :now", {
         now: /* @__PURE__ */ new Date()
       });
@@ -6783,10 +6810,10 @@ var MachineStateStore = class _MachineStateStore extends import_ssi_sdk29.IAbstr
         },
         // When deleteOnDone state is set we only look at completedAt, in other cases we compare current time with expiresAt
         ...!deleteDoneStates && {
-          expiresAt: (0, import_typeorm38.LessThan)(/* @__PURE__ */ new Date())
+          expiresAt: (0, import_typeorm39.LessThan)(/* @__PURE__ */ new Date())
         },
         ...deleteDoneStates && {
-          completedAt: (0, import_typeorm38.Not)((0, import_typeorm38.IsNull)())
+          completedAt: (0, import_typeorm39.Not)((0, import_typeorm39.IsNull)())
         }
       };
       const result = await connection.getRepository(MachineStateInfoEntity).delete(deleteCriteria);
@@ -6809,7 +6836,7 @@ var MachineStateStore = class _MachineStateStore extends import_ssi_sdk29.IAbstr
 // src/presentationDefinition/PDStore.ts
 var import_ssi_sdk30 = require("@sphereon/ssi-sdk.data-store-types");
 var import_debug7 = __toESM(require("debug"), 1);
-var import_typeorm39 = require("typeorm");
+var import_typeorm40 = require("typeorm");
 
 // src/utils/presentationDefinition/MappingUtils.ts
 var blakepkg = __toESM(require("blakejs"), 1);
@@ -6914,7 +6941,7 @@ var PDStore = class extends import_ssi_sdk30.AbstractPDStore {
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
-        id: (0, import_typeorm39.In)(initialResult.map((entity) => entity.id))
+        id: (0, import_typeorm40.In)(initialResult.map((entity) => entity.id))
       },
       order: {
         version: "DESC"
@@ -6976,7 +7003,7 @@ var PDStore = class extends import_ssi_sdk30.AbstractPDStore {
     const initialResult = await this.findIds(pdRepository, filter);
     const result = await pdRepository.find({
       where: {
-        id: (0, import_typeorm39.In)(initialResult.map((entity) => entity.id))
+        id: (0, import_typeorm40.In)(initialResult.map((entity) => entity.id))
       }
     });
     for (const entity of result) {
@@ -6990,7 +7017,7 @@ var PDStore = class extends import_ssi_sdk30.AbstractPDStore {
     if (idFilters && idFilters.length > 0 && idFilters.length === filter?.length) {
       return await pdRepository.find({
         where: {
-          id: (0, import_typeorm39.In)(idFilters)
+          id: (0, import_typeorm40.In)(idFilters)
         }
       });
     } else {
@@ -7953,8 +7980,16 @@ var AddLinkedVpFields1763387280001 = class {
       ALTER TABLE "DigitalCredential" 
       ADD COLUMN "linked_vp_from" TIMESTAMP
     `);
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_until" TIMESTAMP
+    `);
   }
   async down(queryRunner) {
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential"
+        DROP COLUMN "linked_vp_until"
+    `);
     await queryRunner.query(`
       ALTER TABLE "DigitalCredential" 
       DROP COLUMN "linked_vp_from"
@@ -7981,12 +8016,20 @@ var AddLinkedVpFields1763387280002 = class {
       ALTER TABLE "DigitalCredential" 
       ADD COLUMN "linked_vp_from" datetime
     `);
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      ADD COLUMN "linked_vp_until" datetime
+    `);
   }
   async down(queryRunner) {
     await queryRunner.query(`
       ALTER TABLE "DigitalCredential" 
       DROP COLUMN "linked_vp_from"
     `);
+    await queryRunner.query(`
+      ALTER TABLE "DigitalCredential" 
+      DROP COLUMN "linked_vp_until"
+    `);
     await queryRunner.query(`
       ALTER TABLE "DigitalCredential" 
       DROP COLUMN "linked_vp_id"
@@ -9600,7 +9643,8 @@ var persistedDigitalCredentialEntityFromUpdateArgs = /* @__PURE__ */ __name((exi
   Object.assign(entity, existingCredential);
   const normalizedUpdates = normalizeNullableFields(updates, [
     "linkedVpId",
-    "linkedVpFrom"
+    "linkedVpFrom",
+    "linkedVpUntil"
   ]);
   Object.assign(entity, normalizedUpdates);
   entity.id = existingCredential.id;