@sphereon/ssi-sdk.data-store 0.34.1-next.91 → 0.36.0

package/src/migrations/generic/13-CreateDcqlQueryItem.ts

@@ -0,0 +1,67 @@
+import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+
+import { CreateDcqlQueryItemPG1726588800000 } from '../postgres/1726588800000-CreateDcqlQueryItem'
+import { CreateDcqlQueryItemSQlite1726617600000 } from '../sqlite/1726617600000-CreateDcqlQueryItem'
+
+const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class CreateDcqlQueryItem1726617600000 implements MigrationInterface {
+  name = 'CreateDcqlQueryItem1726617600000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: updating presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: CreateDcqlQueryItemPG1726588800000 = new CreateDcqlQueryItemPG1726588800000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: CreateDcqlQueryItemSQlite1726617600000 = new CreateDcqlQueryItemSQlite1726617600000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: reverting presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: CreateDcqlQueryItemPG1726588800000 = new CreateDcqlQueryItemPG1726588800000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: CreateDcqlQueryItemSQlite1726617600000 = new CreateDcqlQueryItemSQlite1726617600000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+}

package/src/migrations/generic/2-CreateIssuanceBranding.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateIssuanceBranding1685628974232 } from '../postgres/1685628974232-CreateIssuanceBranding'
 import { CreateIssuanceBranding1685628973231 } from '../sqlite/1685628973231-CreateIssuanceBranding'
 

package/src/migrations/generic/3-CreateContacts.ts

@@ -1,7 +1,7 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
-import { CreateContacts1690925872693 } from '../sqlite/1690925872693-CreateContacts'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateContacts1690925872592 } from '../postgres/1690925872592-CreateContacts'
+import { CreateContacts1690925872693 } from '../sqlite/1690925872693-CreateContacts'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
 

package/src/migrations/generic/4-CreateStatusList.ts

@@ -1,8 +1,8 @@
 import Debug from 'debug'
 import { MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateStatusList1693866470001 } from '../postgres/1693866470001-CreateStatusList'
-import { CreateStatusList1693866470002 } from '../sqlite/1693866470000-CreateStatusList'
 import { UpdateStatusList1737110469001 } from '../postgres/1737110469001-UpdateStatusList'
+import { CreateStatusList1693866470002 } from '../sqlite/1693866470000-CreateStatusList'
 import { UpdateStatusList1737110469000 } from '../sqlite/1737110469000-UpdateStatusList'
 
 const debug = Debug('sphereon:ssi-sdk:migrations')

package/src/migrations/generic/5-CreateAuditEvents.ts

@@ -1,7 +1,7 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug, { Debugger } from 'debug'
-import { CreateAuditEvents1701634819487 } from '../sqlite/1701634819487-CreateAuditEvents'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateAuditEvents1701634812183 } from '../postgres/1701634812183-CreateAuditEvents'
+import { CreateAuditEvents1701634819487 } from '../sqlite/1701634819487-CreateAuditEvents'
 
 const debug: Debugger = Debug('sphereon:ssi-sdk:migrations')
 

package/src/migrations/generic/6-CreateDigitalCredential.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug, { Debugger } from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateDigitalCredential1708525189001 } from '../postgres/1708525189001-CreateDigitalCredential'
 import { CreateDigitalCredential1708525189002 } from '../sqlite/1708525189002-CreateDigitalCredential'
 

package/src/migrations/generic/7-CreateMachineStateStore.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateMachineStateStore1708797018115 } from '../postgres/1708797018115-CreateMachineStateStore'
 import { CreateMachineStateStore1708796002272 } from '../sqlite/1708796002272-CreateMachineStateStore'
 

package/src/migrations/generic/8-CreateContacts.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateContacts1710438363001 } from '../postgres/1710438363001-CreateContacts'
 import { CreateContacts1710438363002 } from '../sqlite/1710438363002-CreateContacts'
 

package/src/migrations/generic/9-CreateContacts.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateContacts1715761125001 } from '../postgres/1715761125001-CreateContacts'
 import { CreateContacts1715761125002 } from '../sqlite/1715761125002-CreateContacts'
 

package/src/migrations/generic/index.ts

@@ -1,4 +1,8 @@
 import { CreateContacts1659463079429 } from './1-CreateContacts'
+import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
+import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
+import { AddBitstringStatusListEnum1741895823000, CreateBitstringStatusList1741895823000 } from './12-CreateBitstringStatusList'
+import { CreateDcqlQueryItem1726617600000 } from './13-CreateDcqlQueryItem'
 import { CreateIssuanceBranding1659463079429 } from './2-CreateIssuanceBranding'
 import { CreateContacts1690925872318 } from './3-CreateContacts'
 import { CreateStatusList1693866470000 } from './4-CreateStatusList'
@@ -7,9 +11,6 @@ import { CreateDigitalCredential1708525189000 } from './6-CreateDigitalCredentia
 import { CreateMachineStateStore1708098041262 } from './7-CreateMachineStateStore'
 import { CreateContacts1708525189000 } from './8-CreateContacts'
 import { CreateContacts1715761125000 } from './9-CreateContacts'
-import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
-import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
-import { CreateBitstringStatusList1741895823000 } from './12-CreateBitstringStatusList'
 
 /**
  * The migrations array that SHOULD be used when initializing a TypeORM database connection.
@@ -27,11 +28,15 @@ export const DataStoreContactMigrations = [
   CreateContacts1715761125000,
 ]
 export const DataStoreIssuanceBrandingMigrations = [CreateIssuanceBranding1659463079429, FixCredentialClaimsReferencesUuid1741895822987]
-export const DataStoreStatusListMigrations = [CreateStatusList1693866470000, CreateBitstringStatusList1741895823000]
+export const DataStoreStatusListMigrations = [
+  CreateStatusList1693866470000,
+  AddBitstringStatusListEnum1741895823000,
+  CreateBitstringStatusList1741895823000,
+]
 export const DataStoreEventLoggerMigrations = [CreateAuditEvents1701635835330]
 export const DataStoreDigitalCredentialMigrations = [CreateDigitalCredential1708525189000]
 export const DataStoreMachineStateMigrations = [CreateMachineStateStore1708098041262]
-export const DataStorePresentationDefinitionMigrations = [CreatePresentationDefinitions1716533767523]
+export const DataStorePresentationDefinitionMigrations = [CreatePresentationDefinitions1716533767523, CreateDcqlQueryItem1726617600000]
 
 // All migrations together
 export const DataStoreMigrations = [

package/src/migrations/postgres/1659463079428-CreateContacts.ts

@@ -1,5 +1,5 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 export class CreateContacts1659463079428 implements MigrationInterface {
   name = 'CreateContacts1659463079428'

package/src/migrations/postgres/1685628974232-CreateIssuanceBranding.ts

@@ -1,5 +1,5 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 export class CreateIssuanceBranding1685628974232 implements MigrationInterface {
   name = 'CreateIssuanceBranding1685628974232'

package/src/migrations/postgres/1690925872592-CreateContacts.ts

@@ -1,5 +1,5 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
 import { enablePostgresUuidExtension } from '@sphereon/ssi-sdk.core'
+import { MigrationInterface, QueryRunner } from 'typeorm'
 
 export class CreateContacts1690925872592 implements MigrationInterface {
   name = 'CreateContacts1690925872592'

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

@@ -13,7 +13,7 @@ CREATE TABLE "PresentationDefinitionItem" (
     "version" TEXT NOT NULL, 
     "purpose" TEXT, 
     "definition_payload" TEXT NOT NULL, 
-    "dcql_payload" TEXT, 
+    "query" 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/postgres/1726588800000-CreateDcqlQueryItem.ts

@@ -0,0 +1,25 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class CreateDcqlQueryItemPG1726588800000 implements MigrationInterface {
+  name = 'CreateDcqlQueryItemPG1726588800000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    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,
+                                     "query" 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"))
+    `)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`)
+  }
+}

package/src/migrations/postgres/1741895823000-CreateBitstringStatusList.ts

@@ -1,13 +1,24 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
 
-export class CreateBitstringStatusListPG1741895823000 implements MigrationInterface {
-  name = 'CreateBitstringStatusList1741895823000'
+export class AddBitstringStatusListEnumPG1741895823000 implements MigrationInterface {
+  name = 'AddBitstringStatusListEnum1741895823000'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.startTransaction()
     await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'BitstringStatusList'`)
     await queryRunner.commitTransaction()
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Note: Cannot remove enum value in Postgres without recreating the type
+  }
+}
+
+export class CreateBitstringStatusListPG1741895823000 implements MigrationInterface {
+  name = 'CreateBitstringStatusList1741895823000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
     // Add BitstringStatusList columns to StatusList table
     await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "ttl" integer`)
     await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validFrom" TIMESTAMP`)
@@ -24,6 +35,7 @@ export class CreateBitstringStatusListPG1741895823000 implements MigrationInterf
 
     // Add BitstringStatusListEntry specific columns to StatusListEntry table
     await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusPurpose" character varying`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "bitsPerStatus" integer DEFAULT 1`)
     await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusMessage" text`)
     await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusReference" text`)
 

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

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

package/src/migrations/sqlite/1726617600000-CreateDcqlQueryItem.ts

@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class CreateDcqlQueryItemSQlite1726617600000 implements MigrationInterface {
+  name = 'CreateDcqlQueryItemSQlite1726617600000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    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,
+                                      "query" varchar NOT NULL,
+                                      "created_at" datetime NOT NULL DEFAULT (datetime('now')),
+                                      "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`,
+    )
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`)
+  }
+}

package/src/presentationDefinition/PDStore.ts

@@ -1,20 +1,20 @@
-import { type OrPromise } from '@sphereon/ssi-types'
-import { DataSource, In, Repository } from 'typeorm'
-import { AbstractPDStore } from './AbstractPDStore'
-import Debug from 'debug'
 import type {
+  DcqlQueryItem,
+  DcqlQueryItemFilter,
   DeleteDefinitionArgs,
   DeleteDefinitionsArgs,
   GetDefinitionArgs,
   GetDefinitionsArgs,
   HasDefinitionArgs,
   HasDefinitionsArgs,
-  NonPersistedPresentationDefinitionItem,
-  PresentationDefinitionItem,
-  PresentationDefinitionItemFilter,
-} from '../types'
-import { PresentationDefinitionItemEntity } from '../entities/presentationDefinition/PresentationDefinitionItemEntity'
-import { presentationDefinitionEntityItemFrom, presentationDefinitionItemFrom } from '../utils/presentationDefinition/MappingUtils'
+  NonPersistedDcqlQueryItem,
+} from '@sphereon/ssi-sdk.data-store-types'
+import { AbstractPDStore } from '@sphereon/ssi-sdk.data-store-types'
+import { type OrPromise } from '@sphereon/ssi-types'
+import Debug from 'debug'
+import { DataSource, In, Repository } from 'typeorm'
+import { DcqlQueryItemEntity } from '../entities/presentationDefinition/DcqlQueryItemEntity'
+import { dcqlQueryEntityItemFrom, dcqlQueryItemFrom } from '../utils/presentationDefinition/MappingUtils'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:pd-store')
 
@@ -26,22 +26,22 @@ export class PDStore extends AbstractPDStore {
     this.dbConnection = dbConnection
   }
 
-  getDefinition = async (args: GetDefinitionArgs): Promise<PresentationDefinitionItem> => {
+  getDefinition = async (args: GetDefinitionArgs): Promise<DcqlQueryItem> => {
     const { itemId } = args ?? {}
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
-    const result: PresentationDefinitionItemEntity | null = await pdRepository.findOne({
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
+    const result: DcqlQueryItemEntity | null = await pdRepository.findOne({
       where: { id: itemId },
     })
     if (!result) {
       return Promise.reject(Error(`No presentation definition item found for id: ${itemId}`))
     }
 
-    return presentationDefinitionItemFrom(result)
+    return dcqlQueryItemFrom(result)
   }
 
   hasDefinition = async (args: HasDefinitionArgs): Promise<boolean> => {
     const { itemId } = args ?? {}
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
 
     const resultCount: number = await pdRepository.count({
       where: { id: itemId },
@@ -52,7 +52,7 @@ export class PDStore extends AbstractPDStore {
 
   hasDefinitions = async (args: HasDefinitionsArgs): Promise<boolean> => {
     const { filter } = args
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
 
     const resultCount: number = await pdRepository.count({
       ...(filter && { where: cleanFilter(filter) }),
@@ -60,67 +60,67 @@ export class PDStore extends AbstractPDStore {
     return resultCount > 0
   }
 
-  getDefinitions = async (args: GetDefinitionsArgs): Promise<Array<PresentationDefinitionItem>> => {
+  getDefinitions = async (args: GetDefinitionsArgs): Promise<Array<DcqlQueryItem>> => {
     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: Array<PresentationDefinitionItemEntity> = await pdRepository.find({
+    const result: Array<DcqlQueryItemEntity> = await pdRepository.find({
       where: {
-        id: In(initialResult.map((entity: PresentationDefinitionItemEntity) => entity.id)),
+        id: In(initialResult.map((entity: DcqlQueryItemEntity) => entity.id)),
       },
       order: {
         version: 'DESC',
       },
     })
 
-    return result.map((entity: PresentationDefinitionItemEntity) => presentationDefinitionItemFrom(entity))
+    return result.map((entity: DcqlQueryItemEntity) => dcqlQueryItemFrom(entity))
   }
 
-  addDefinition = async (item: NonPersistedPresentationDefinitionItem): Promise<PresentationDefinitionItem> => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
+  addDefinition = async (item: NonPersistedDcqlQueryItem): Promise<DcqlQueryItem> => {
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
 
-    const entity: PresentationDefinitionItemEntity = presentationDefinitionEntityItemFrom(item)
+    const entity: DcqlQueryItemEntity = dcqlQueryEntityItemFrom(item)
     debug('Adding presentation definition entity', item)
-    const result: PresentationDefinitionItemEntity = await pdRepository.save(entity, {
+    const result: DcqlQueryItemEntity = await pdRepository.save(entity, {
       transaction: true,
     })
 
-    return presentationDefinitionItemFrom(result)
+    return dcqlQueryItemFrom(result)
   }
 
-  updateDefinition = async (item: PresentationDefinitionItem): Promise<PresentationDefinitionItem> => {
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
+  updateDefinition = async (item: DcqlQueryItem): Promise<DcqlQueryItem> => {
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
 
-    const result: PresentationDefinitionItemEntity | null = await pdRepository.findOne({
+    const result: DcqlQueryItemEntity | null = await pdRepository.findOne({
       where: { id: item.id },
     })
     if (!result) {
       return Promise.reject(Error(`No presentation definition entity found for id: ${item.id}`))
     }
 
-    const updatedEntity: Partial<PresentationDefinitionItemEntity> = {
+    const updatedEntity: Partial<DcqlQueryItemEntity> = {
       ...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
-    updatedEntity.definitionPayload = JSON.stringify(item.definitionPayload!)
+    updatedEntity.query = JSON.stringify(item.query)
 
     debug('Updating presentation definition entity', updatedEntity)
-    const updateResult: PresentationDefinitionItemEntity = await pdRepository.save(updatedEntity, {
+    const updateResult: DcqlQueryItemEntity = await pdRepository.save(updatedEntity, {
       transaction: true,
     })
 
-    return presentationDefinitionItemFrom(updateResult)
+    return dcqlQueryItemFrom(updateResult)
   }
 
   deleteDefinition = async (args: DeleteDefinitionArgs): Promise<void> => {
     const { itemId } = args
 
-    const pdRepository = (await this.dbConnection).getRepository(PresentationDefinitionItemEntity)
-    const entity: PresentationDefinitionItemEntity | null = await pdRepository.findOne({
+    const pdRepository = (await this.dbConnection).getRepository(DcqlQueryItemEntity)
+    const entity: DcqlQueryItemEntity | null = await pdRepository.findOne({
       where: { id: itemId },
     })
 
@@ -134,12 +134,12 @@ export class PDStore extends AbstractPDStore {
 
   deleteDefinitions = async (args: DeleteDefinitionsArgs): Promise<number> => {
     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: Array<PresentationDefinitionItemEntity> = await pdRepository.find({
+    const result: Array<DcqlQueryItemEntity> = await pdRepository.find({
       where: {
-        id: In(initialResult.map((entity: PresentationDefinitionItemEntity) => entity.id)),
+        id: In(initialResult.map((entity: DcqlQueryItemEntity) => entity.id)),
       },
     })
 
@@ -151,9 +151,9 @@ export class PDStore extends AbstractPDStore {
   }
 
   findIds = async (
-    pdRepository: Repository<PresentationDefinitionItemEntity>,
-    filter: Array<PresentationDefinitionItemFilter> | undefined,
-  ): Promise<Array<PresentationDefinitionItemEntity>> => {
+    pdRepository: Repository<DcqlQueryItemEntity>,
+    filter: Array<DcqlQueryItemFilter> | undefined,
+  ): Promise<Array<DcqlQueryItemEntity>> => {
     const idFilters = filter?.map((f) => f.id).filter((id) => id !== undefined && id !== null)
     if (idFilters && idFilters.length > 0 && idFilters.length === filter?.length) {
       return await pdRepository.find({
@@ -167,15 +167,15 @@ export class PDStore extends AbstractPDStore {
   }
 }
 
-const cleanFilter = (filter: Array<PresentationDefinitionItemFilter> | undefined): Array<PresentationDefinitionItemFilter> | undefined => {
+const cleanFilter = (filter: Array<DcqlQueryItemFilter> | undefined): Array<DcqlQueryItemFilter> | undefined => {
   if (filter === undefined) {
     return undefined
   }
 
   return filter.map((item) => {
-    const cleanedItem: PresentationDefinitionItemFilter = {}
+    const cleanedItem: DcqlQueryItemFilter = {}
     for (const key in item) {
-      const value = item[key as keyof PresentationDefinitionItemFilter]
+      const value = item[key as keyof DcqlQueryItemFilter]
       if (value !== undefined) {
         ;(cleanedItem as any)[key] = value
       }

package/src/statusList/IStatusListStore.ts

@@ -1,3 +1,4 @@
+import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
 import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
 import type {
   IAddStatusListArgs,
@@ -14,7 +15,6 @@ import type {
   IUpdateStatusListIndexArgs,
 } from '../types'
 import { IStatusListEntity, IStatusListEntryEntity } from '../types'
-import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
 
 export interface IStatusListStore {
   getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity | IBitstringStatusListEntity>

package/src/statusList/StatusListStore.ts

@@ -1,9 +1,9 @@
 import { type OrPromise, StatusListType } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, In, type Repository } from 'typeorm'
-import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
-import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
 import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
+import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
+import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
 import {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
@@ -20,8 +20,8 @@ import {
   IStatusListEntryEntity,
   IUpdateStatusListIndexArgs,
 } from '../types'
-import type { IStatusListStore } from './IStatusListStore'
 import { statusListEntityFrom, statusListFrom } from '../utils/statusList/MappingUtils'
+import type { IStatusListStore } from './IStatusListStore'
 
 const debug = Debug('sphereon:ssi-sdk:data-store:status-list')
 

package/src/types/index.ts

@@ -1,14 +1,2 @@
-export * from './issuanceBranding/issuanceBranding'
-export * from './issuanceBranding/IAbstractIssuanceBrandingStore'
-export * from './contact/contact'
-export * from './contact/IAbstractContactStore'
-export * from './presentationDefinition/presentationDefinition'
-export * from './presentationDefinition/IAbstractPDStore'
-export * from './validation/validation'
 export * from './statusList/statusList'
 export * from './statusList/IAbstractStatusListStore'
-export * from './eventLogger/IAbstractEventLoggerStore'
-export * from './eventLogger/eventLogger'
-export * from './machineState/IAbstractMachineStateStore'
-export * from './digitalCredential'
-export * from './digitalCredential/IAbstractDigitalCredentialStore'

package/src/types/statusList/IAbstractStatusListStore.ts

@@ -1,11 +1,3 @@
-import { FindOptionsWhere } from 'typeorm'
-import {
-  BitstringStatusPurpose,
-  IBitstringStatusListEntryEntity,
-  IOAuthStatusListEntity,
-  IStatusList2021Entity,
-  IStatusListEntryEntity,
-} from './statusList'
 import {
   CredentialProofFormat,
   IIssuer,
@@ -16,8 +8,16 @@ import {
   StatusListType,
   StatusPurpose2021,
 } from '@sphereon/ssi-types'
+import { FindOptionsWhere } from 'typeorm'
+import {
+  BitstringStatusPurpose,
+  IBitstringStatusListEntryEntity,
+  IOAuthStatusListEntity,
+  IStatusList2021Entity,
+  IStatusListEntryEntity,
+} from './statusList'
 
-export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[]
+export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[] // TODO export our own FindOptionsWhere
 export type FindStatusListEntryArgs = FindOptionsWhere<IStatusListEntryEntity>[] | FindOptionsWhere<IStatusListEntryEntity>
 
 export interface IStatusListEntryAvailableArgs {

package/src/utils/ValidatorUtils.ts

@@ -1,5 +1,5 @@
+import { type ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { ValidationError } from 'class-validator'
-import { type ValidationConstraint } from '../types'
 
 export const getConstraint = (validation: ValidationError): ValidationConstraint | undefined => {
   if (validation.children && validation.children.length > 0) {