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

package/src/entities/contact/NaturalPersonEntity.ts

@@ -1,9 +1,9 @@
-import { Column, ChildEntity, BeforeInsert, BeforeUpdate } from 'typeorm'
-import { BaseContactEntity } from './BaseContactEntity'
-import { ValidationConstraint } from '../../types'
-import { validate, IsNotEmpty, ValidationError, Validate } from 'class-validator'
-import { IsNonEmptyStringConstraint } from '../validators'
+import { ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
+import { IsNotEmpty, validate, Validate, ValidationError } from 'class-validator'
+import { BeforeInsert, BeforeUpdate, ChildEntity, Column } from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { IsNonEmptyStringConstraint } from '../validators'
+import { BaseContactEntity } from './BaseContactEntity'
 
 @ChildEntity('NaturalPerson')
 export class NaturalPersonEntity extends BaseContactEntity {

package/src/entities/contact/OrganizationEntity.ts

@@ -1,6 +1,6 @@
+import { ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { BeforeInsert, BeforeUpdate, ChildEntity, Column } from 'typeorm'
-import { ValidationConstraint } from '../../types'
 import { getConstraint } from '../../utils/ValidatorUtils'
 import { BaseContactEntity } from './BaseContactEntity'
 

package/src/entities/contact/PartyEntity.ts

@@ -1,3 +1,6 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
+import { validate, ValidationError } from 'class-validator'
 import {
   BaseEntity,
   BeforeInsert,
@@ -12,15 +15,12 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import { ValidationConstraint } from '../../types'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { IdentityEntity } from './IdentityEntity'
-import { validate, ValidationError } from 'class-validator'
-import { PartyTypeEntity } from './PartyTypeEntity'
-import { BaseContactEntity } from './BaseContactEntity'
-import { PartyRelationshipEntity } from './PartyRelationshipEntity'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { BaseContactEntity } from './BaseContactEntity'
 import { ElectronicAddressEntity } from './ElectronicAddressEntity'
+import { IdentityEntity } from './IdentityEntity'
+import { PartyRelationshipEntity } from './PartyRelationshipEntity'
+import { PartyTypeEntity } from './PartyTypeEntity'
 import { PhysicalAddressEntity } from './PhysicalAddressEntity'
 
 @Entity('Party')

package/src/entities/contact/PartyRelationshipEntity.ts

@@ -1,16 +1,16 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import {
-  Entity,
-  PrimaryGeneratedColumn,
-  CreateDateColumn,
-  UpdateDateColumn,
-  ManyToOne,
-  Column,
-  Index,
   BeforeInsert,
   BeforeUpdate,
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
   JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
 } from 'typeorm'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { PartyEntity } from './PartyEntity'
 
 @Entity('PartyRelationship')

package/src/entities/contact/PartyTypeEntity.ts

@@ -1,10 +1,10 @@
-import { BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { PartyEntity } from './PartyEntity'
-import { PartyOrigin, PartyTypeType, ValidationConstraint } from '../../types'
+import { PartyOrigin, PartyTypeType, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, Validate, validate, ValidationError } from 'class-validator'
-import { IsNonEmptyStringConstraint } from '../validators'
+import { BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { IsNonEmptyStringConstraint } from '../validators'
+import { PartyEntity } from './PartyEntity'
 
 @Entity('PartyType')
 @Index('IDX_PartyType_type_tenant_id', ['type', 'tenantId'], { unique: true })

package/src/entities/contact/PhysicalAddressEntity.ts

@@ -1,3 +1,5 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import type { PhysicalAddressType, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, Validate, validate, ValidationError } from 'class-validator'
 import {
   BaseEntity,
@@ -10,11 +12,9 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { getConstraint } from '../../utils/ValidatorUtils'
-import type { PhysicalAddressType, ValidationConstraint } from '../../types/index'
-import { PartyEntity } from './PartyEntity'
 import { IsNonEmptyStringConstraint } from '../validators'
+import { PartyEntity } from './PartyEntity'
 
 @Entity('PhysicalAddress')
 export class PhysicalAddressEntity extends BaseEntity {

package/src/entities/digitalCredential/DigitalCredentialEntity.ts

@@ -1,14 +1,15 @@
 import { typeormDate, typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import {
   CredentialCorrelationType,
   CredentialDocumentFormat,
-  CredentialRole,
   CredentialStateType,
   type DigitalCredential,
   DocumentType,
   RegulationType,
-} from '../../types'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialRole } from '@sphereon/ssi-types'
+import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 @Entity('DigitalCredential')
 export class DigitalCredentialEntity extends BaseEntity implements DigitalCredential {

package/src/entities/eventLogger/AuditEventEntity.ts

@@ -1,3 +1,5 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import {
   type ActionSubType,
   ActionType,
@@ -8,8 +10,6 @@ import {
   System,
   SystemCorrelationIdType,
 } from '@sphereon/ssi-types'
-import { CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
 //TODO this entity, also contains some optional fields that are related to another event type (Activity) later we might want to refactor and reorganize this.

package/src/entities/issuanceBranding/BackgroundAttributesEntity.ts

@@ -1,7 +1,7 @@
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { ImageAttributesEntity } from './ImageAttributesEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
+import { ImageAttributesEntity } from './ImageAttributesEntity'
 
 @Entity('BackgroundAttributes')
 export class BackgroundAttributesEntity extends BaseEntity {

package/src/entities/issuanceBranding/BaseLocaleBrandingEntity.ts

@@ -1,5 +1,6 @@
-import typeorm from 'typeorm'
-const {
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { validate, Validate, ValidationError } from 'class-validator'
+import {
   BaseEntity,
   BeforeInsert,
   BeforeUpdate,
@@ -11,13 +12,11 @@ const {
   PrimaryGeneratedColumn,
   TableInheritance,
   UpdateDateColumn,
-} = typeorm
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { ImageAttributesEntity } from './ImageAttributesEntity'
+} from 'typeorm'
+import { IsNonEmptyStringConstraint } from '../validators'
 import { BackgroundAttributesEntity } from './BackgroundAttributesEntity'
+import { ImageAttributesEntity } from './ImageAttributesEntity'
 import { TextAttributesEntity } from './TextAttributesEntity'
-import { validate, Validate, ValidationError } from 'class-validator'
-import { IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('BaseLocaleBranding')
 @TableInheritance({ column: { type: 'varchar', name: 'type' } })

package/src/entities/issuanceBranding/CredentialBrandingEntity.ts

@@ -1,3 +1,5 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
 import {
   BaseEntity,
   BeforeInsert,
@@ -10,8 +12,6 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { CredentialLocaleBrandingEntity } from './CredentialLocaleBrandingEntity'
 
 @Entity('CredentialBranding')

package/src/entities/issuanceBranding/CredentialClaimsEntity.ts

@@ -1,7 +1,7 @@
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { CredentialLocaleBrandingEntity } from './CredentialLocaleBrandingEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, Index, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
+import { CredentialLocaleBrandingEntity } from './CredentialLocaleBrandingEntity'
 
 @Entity('CredentialClaims')
 @Index('IDX_CredentialClaimsEntity_credentialLocaleBranding_locale', ['credentialLocaleBranding', 'key'], { unique: true })

package/src/entities/issuanceBranding/CredentialLocaleBrandingEntity.ts

@@ -1,6 +1,6 @@
-import { ChildEntity, Column, JoinColumn, ManyToOne, Index, OneToMany } from 'typeorm'
-import { CredentialBrandingEntity } from './CredentialBrandingEntity'
+import { ChildEntity, Column, Index, JoinColumn, ManyToOne, OneToMany } from 'typeorm'
 import { BaseLocaleBrandingEntity } from './BaseLocaleBrandingEntity'
+import { CredentialBrandingEntity } from './CredentialBrandingEntity'
 import { CredentialClaimsEntity } from './CredentialClaimsEntity'
 
 @ChildEntity('CredentialLocaleBranding')

package/src/entities/issuanceBranding/ImageAttributesEntity.ts

@@ -1,7 +1,7 @@
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
-import { ImageDimensionsEntity } from './ImageDimensionsEntity'
 import { validate, Validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
+import { ImageDimensionsEntity } from './ImageDimensionsEntity'
 
 @Entity('ImageAttributes')
 export class ImageAttributesEntity extends BaseEntity {

package/src/entities/issuanceBranding/IssuerBrandingEntity.ts

@@ -1,3 +1,5 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
 import {
   BaseEntity,
   BeforeInsert,
@@ -10,8 +12,6 @@ import {
   PrimaryGeneratedColumn,
   UpdateDateColumn,
 } from 'typeorm'
-import { ArrayMinSize, IsNotEmpty, validate, ValidationError } from 'class-validator'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { IssuerLocaleBrandingEntity } from './IssuerLocaleBrandingEntity'
 
 @Entity('IssuerBranding')

package/src/entities/issuanceBranding/IssuerLocaleBrandingEntity.ts

@@ -1,8 +1,8 @@
+import { Validate } from 'class-validator'
 import { ChildEntity, Column, Index, JoinColumn, ManyToOne } from 'typeorm'
-import { IssuerBrandingEntity } from './IssuerBrandingEntity'
-import { BaseLocaleBrandingEntity } from './BaseLocaleBrandingEntity'
 import { IsNonEmptyStringConstraint } from '../validators'
-import { Validate } from 'class-validator'
+import { BaseLocaleBrandingEntity } from './BaseLocaleBrandingEntity'
+import { IssuerBrandingEntity } from './IssuerBrandingEntity'
 
 @ChildEntity('IssuerLocaleBranding')
 @Index('IDX_IssuerLocaleBrandingEntity_issuerBranding_locale', ['issuerBranding', 'locale'], { unique: true })

package/src/entities/issuanceBranding/TextAttributesEntity.ts

@@ -1,5 +1,5 @@
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
 import { validate, Validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, PrimaryGeneratedColumn } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
 
 @Entity('TextAttributes')

package/src/entities/machineState/MachineStateInfoEntity.ts

@@ -1,5 +1,5 @@
-import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryColumn, UpdateDateColumn } from 'typeorm'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryColumn, UpdateDateColumn } from 'typeorm'
 
 /**
  * @class MachineStateInfoEntity

package/src/entities/presentationDefinition/{PresentationDefinitionItemEntity.ts → DcqlQueryItemEntity.ts}

@@ -1,16 +1,16 @@
-import { BaseEntity, BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
-import { IsNotEmpty } from 'class-validator'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { IsNotEmpty } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 
-@Entity('PresentationDefinitionItem')
+@Entity('DcqlQueryItem')
 @Index(['version'], { unique: false })
-export class PresentationDefinitionItemEntity extends BaseEntity {
+export class DcqlQueryItemEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column({ name: 'definition_id', length: 255, type: 'varchar', nullable: false, unique: false })
-  @IsNotEmpty({ message: 'A blank definition id field is not allowed' })
-  definitionId!: string
+  @Column({ name: 'query_id', length: 255, type: 'varchar', nullable: false, unique: false })
+  @IsNotEmpty({ message: 'A blank query id field is not allowed' })
+  queryId!: string
 
   @Column({ name: 'version', length: 255, type: 'varchar', nullable: false, unique: false })
   @IsNotEmpty({ message: 'A blank version field is not allowed' })
@@ -25,13 +25,9 @@ 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 }) // 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
+  @Column({ name: 'query', type: 'text', nullable: false, unique: false })
+  @IsNotEmpty({ message: 'A blank dcql query payload field is not allowed' })
+  query!: string
 
   @CreateDateColumn({ name: 'created_at', nullable: false, type: typeOrmDateTime() })
   createdAt!: Date

package/src/entities/statusList/BitstringStatusListEntryEntity.ts

@@ -1,6 +1,6 @@
+import { BitstringStatusMessage } from '../../types'
 import { ChildEntity, Column } from 'typeorm'
 import { StatusListEntryEntity } from './StatusList2021EntryEntity'
-import { BitstringStatusMessage } from '../../types'
 
 @ChildEntity('bitstring')
 export class BitstringStatusListEntryEntity extends StatusListEntryEntity {

package/src/entities/statusList/StatusListEntities.ts

@@ -1,3 +1,4 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import {
   type CredentialProofFormat,
   type IIssuer,
@@ -9,12 +10,10 @@ import {
   type StatusPurpose2021,
 } from '@sphereon/ssi-types'
 
-import typeorm from 'typeorm'
-import { StatusListEntryEntity } from './StatusList2021EntryEntity'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { BaseEntity, ChildEntity, Column, Entity, OneToMany, PrimaryColumn, TableInheritance, Unique } from 'typeorm'
 import { BitstringStatusListEntryEntity } from './BitstringStatusListEntryEntity'
 
-const { BaseEntity, ChildEntity, Column, Entity, OneToMany, PrimaryColumn, TableInheritance, Unique } = typeorm
+import { StatusListEntryEntity } from './StatusList2021EntryEntity'
 
 @Entity('StatusList')
 @Unique('UQ_correlationId', ['correlationId'])

package/src/eventLogger/EventLoggerStore.ts

@@ -1,11 +1,11 @@
 import type { ActivityLoggingEvent, AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
+import type { GetActivityEventsArgs, GetAuditEventsArgs, StoreActivityEventArgs, StoreAuditEventArgs } from '@sphereon/ssi-sdk.data-store-types'
+import { AbstractEventLoggerStore } from '@sphereon/ssi-sdk.data-store-types'
 import { LoggingEventType, type OrPromise } from '@sphereon/ssi-types'
 import Debug, { Debugger } from 'debug'
 import { DataSource } from 'typeorm'
-import { AbstractEventLoggerStore } from './AbstractEventLoggerStore'
 import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
 import { activityEventEntityFrom, activityEventFrom, auditEventEntityFrom, auditEventFrom } from '../utils/eventLogger/MappingUtils'
-import type { GetActivityEventsArgs, GetAuditEventsArgs, StoreActivityEventArgs, StoreAuditEventArgs } from '../types'
 
 const debug: Debugger = Debug('sphereon:ssi-sdk:event-store')
 

package/src/index.ts

@@ -1,53 +1,48 @@
 import { BaseConfigEntity } from './entities/contact/BaseConfigEntity'
-import { BaseLocaleBrandingEntity } from './entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { BaseContactEntity } from './entities/contact/BaseContactEntity'
 import { ConnectionEntity } from './entities/contact/ConnectionEntity'
-import { PartyEntity } from './entities/contact/PartyEntity'
+import { ContactMetadataItemEntity } from './entities/contact/ContactMetadataItemEntity'
 import { CorrelationIdentifierEntity } from './entities/contact/CorrelationIdentifierEntity'
 import { DidAuthConfigEntity } from './entities/contact/DidAuthConfigEntity'
+import { ElectronicAddressEntity } from './entities/contact/ElectronicAddressEntity'
 import { IdentityEntity } from './entities/contact/IdentityEntity'
 import { IdentityMetadataItemEntity } from './entities/contact/IdentityMetadataItemEntity'
+import { NaturalPersonEntity } from './entities/contact/NaturalPersonEntity'
 import { OpenIdConfigEntity } from './entities/contact/OpenIdConfigEntity'
+import { OrganizationEntity } from './entities/contact/OrganizationEntity'
+import { PartyEntity } from './entities/contact/PartyEntity'
+// import { IStatusListEntity, IStatusListEntryEntity } from './types.'
+import { PartyRelationshipEntity } from './entities/contact/PartyRelationshipEntity'
+import { PartyTypeEntity } from './entities/contact/PartyTypeEntity'
+import { PhysicalAddressEntity } from './entities/contact/PhysicalAddressEntity'
+import { DigitalCredentialEntity } from './entities/digitalCredential/DigitalCredentialEntity'
+import { AuditEventEntity } from './entities/eventLogger/AuditEventEntity'
 import { BackgroundAttributesEntity } from './entities/issuanceBranding/BackgroundAttributesEntity'
+import { BaseLocaleBrandingEntity } from './entities/issuanceBranding/BaseLocaleBrandingEntity'
 import { CredentialBrandingEntity } from './entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialClaimsEntity } from './entities/issuanceBranding/CredentialClaimsEntity'
 import { CredentialLocaleBrandingEntity } from './entities/issuanceBranding/CredentialLocaleBrandingEntity'
 import { ImageAttributesEntity } from './entities/issuanceBranding/ImageAttributesEntity'
 import { ImageDimensionsEntity } from './entities/issuanceBranding/ImageDimensionsEntity'
-import { IssuerLocaleBrandingEntity } from './entities/issuanceBranding/IssuerLocaleBrandingEntity'
 import { IssuerBrandingEntity } from './entities/issuanceBranding/IssuerBrandingEntity'
+import { IssuerLocaleBrandingEntity } from './entities/issuanceBranding/IssuerLocaleBrandingEntity'
 import { TextAttributesEntity } from './entities/issuanceBranding/TextAttributesEntity'
-import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from './entities/statusList/StatusListEntities'
-import { StatusListEntryEntity } from './entities/statusList/StatusList2021EntryEntity'
-import { BitstringStatusListEntryEntity } from './entities/statusList/BitstringStatusListEntryEntity'
 import { MachineStateInfoEntity } from './entities/machineState/MachineStateInfoEntity'
-// import { IStatusListEntity, IStatusListEntryEntity } from './types.'
-import { PartyRelationshipEntity } from './entities/contact/PartyRelationshipEntity'
-import { PartyTypeEntity } from './entities/contact/PartyTypeEntity'
-import { OrganizationEntity } from './entities/contact/OrganizationEntity'
-import { NaturalPersonEntity } from './entities/contact/NaturalPersonEntity'
-import { ElectronicAddressEntity } from './entities/contact/ElectronicAddressEntity'
-import { PhysicalAddressEntity } from './entities/contact/PhysicalAddressEntity'
-import { AuditEventEntity } from './entities/eventLogger/AuditEventEntity'
-import { DigitalCredentialEntity } from './entities/digitalCredential/DigitalCredentialEntity'
-import { PresentationDefinitionItemEntity } from './entities/presentationDefinition/PresentationDefinitionItemEntity'
-import { ContactMetadataItemEntity } from './entities/contact/ContactMetadataItemEntity'
-import { CredentialClaimsEntity } from './entities/issuanceBranding/CredentialClaimsEntity'
 
 import { Oid4vcStateEntity } from './entities/oid4vcState/Oid4vcStateEntity'
+import { DcqlQueryItemEntity } from './entities/presentationDefinition/DcqlQueryItemEntity'
+import { BitstringStatusListEntryEntity } from './entities/statusList/BitstringStatusListEntryEntity'
+import { StatusListEntryEntity } from './entities/statusList/StatusList2021EntryEntity'
+import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from './entities/statusList/StatusListEntities'
 // import {PartyCorrelationType} from "@sphereon/ssi-sdk.core";
 
 export { ContactStore } from './contact/ContactStore'
-export { AbstractContactStore } from './contact/AbstractContactStore'
-export { AbstractDigitalCredentialStore } from './digitalCredential/AbstractDigitalCredentialStore'
 export { DigitalCredentialStore } from './digitalCredential/DigitalCredentialStore'
-export { AbstractIssuanceBrandingStore } from './issuanceBranding/AbstractIssuanceBrandingStore'
 export { IssuanceBrandingStore } from './issuanceBranding/IssuanceBrandingStore'
 export { StatusListStore } from './statusList/StatusListStore'
-export { AbstractEventLoggerStore } from './eventLogger/AbstractEventLoggerStore'
+export { AbstractEventLoggerStore } from '@sphereon/ssi-sdk.data-store-types'
 export { EventLoggerStore } from './eventLogger/EventLoggerStore'
-export { IAbstractMachineStateStore } from './machineState/IAbstractMachineStateStore'
 export { MachineStateStore } from './machineState/MachineStateStore'
-export { AbstractPDStore } from './presentationDefinition/AbstractPDStore'
 export { PDStore } from './presentationDefinition/PDStore'
 export {
   DataStoreMigrations,
@@ -99,7 +94,7 @@ export const DataStoreIssuanceBrandingEntities = [
   CredentialClaimsEntity,
 ]
 
-export const DataStorePresentationDefinitionEntities = [PresentationDefinitionItemEntity]
+export const DataStorePresentationDefinitionEntities = [DcqlQueryItemEntity]
 
 export const DataStoreStatusListEntities = [
   StatusListEntity,
@@ -158,7 +153,7 @@ export {
   AuditEventEntity,
   DigitalCredentialEntity,
   MachineStateInfoEntity,
-  PresentationDefinitionItemEntity,
+  DcqlQueryItemEntity,
   ContactMetadataItemEntity,
   CredentialClaimsEntity,
   Oid4vcStateEntity,

package/src/issuanceBranding/IssuanceBrandingStore.ts

@@ -1,25 +1,3 @@
-import { type OrPromise } from '@sphereon/ssi-types'
-import Debug from 'debug'
-import { DataSource, type DeleteResult, In, Not, type Repository } from 'typeorm'
-import {
-  credentialBrandingEntityFrom,
-  credentialBrandingFrom,
-  credentialLocaleBrandingEntityFrom,
-  issuerBrandingEntityFrom,
-  issuerBrandingFrom,
-  issuerLocaleBrandingEntityFrom,
-  localeBrandingFrom,
-} from '../utils/issuanceBranding/MappingUtils'
-import { BackgroundAttributesEntity } from '../entities/issuanceBranding/BackgroundAttributesEntity'
-import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
-import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
-import { IssuerBrandingEntity } from '../entities/issuanceBranding/IssuerBrandingEntity'
-import { CredentialBrandingEntity } from '../entities/issuanceBranding/CredentialBrandingEntity'
-import { CredentialLocaleBrandingEntity } from '../entities/issuanceBranding/CredentialLocaleBrandingEntity'
-import { IssuerLocaleBrandingEntity } from '../entities/issuanceBranding/IssuerLocaleBrandingEntity'
-import { BaseLocaleBrandingEntity } from '../entities/issuanceBranding/BaseLocaleBrandingEntity'
-import { TextAttributesEntity } from '../entities/issuanceBranding/TextAttributesEntity'
-import { AbstractIssuanceBrandingStore } from './AbstractIssuanceBrandingStore'
 import type {
   IAddCredentialBrandingArgs,
   IAddCredentialLocaleBrandingArgs,
@@ -28,7 +6,7 @@ import type {
   IBasicCredentialLocaleBranding,
   IBasicIssuerLocaleBranding,
   ICredentialBranding,
-  IPartialCredentialBranding,
+  ICredentialBrandingFilter,
   ICredentialLocaleBranding,
   ICredentialLocaleBrandingFilter,
   IGetCredentialBrandingArgs,
@@ -39,6 +17,7 @@ import type {
   IIssuerBrandingFilter,
   IIssuerLocaleBranding,
   IIssuerLocaleBrandingFilter,
+  IPartialCredentialBranding,
   IRemoveCredentialBrandingArgs,
   IRemoveCredentialLocaleBrandingArgs,
   IRemoveIssuerBrandingArgs,
@@ -47,8 +26,29 @@ import type {
   IUpdateCredentialLocaleBrandingArgs,
   IUpdateIssuerBrandingArgs,
   IUpdateIssuerLocaleBrandingArgs,
-  ICredentialBrandingFilter,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { AbstractIssuanceBrandingStore } from '@sphereon/ssi-sdk.data-store-types'
+import { type OrPromise } from '@sphereon/ssi-types'
+import Debug from 'debug'
+import { DataSource, type DeleteResult, In, Not, type Repository } from 'typeorm'
+import { BackgroundAttributesEntity } from '../entities/issuanceBranding/BackgroundAttributesEntity'
+import { BaseLocaleBrandingEntity } from '../entities/issuanceBranding/BaseLocaleBrandingEntity'
+import { CredentialBrandingEntity } from '../entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialLocaleBrandingEntity } from '../entities/issuanceBranding/CredentialLocaleBrandingEntity'
+import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
+import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
+import { IssuerBrandingEntity } from '../entities/issuanceBranding/IssuerBrandingEntity'
+import { IssuerLocaleBrandingEntity } from '../entities/issuanceBranding/IssuerLocaleBrandingEntity'
+import { TextAttributesEntity } from '../entities/issuanceBranding/TextAttributesEntity'
+import {
+  credentialBrandingEntityFrom,
+  credentialBrandingFrom,
+  credentialLocaleBrandingEntityFrom,
+  issuerBrandingEntityFrom,
+  issuerBrandingFrom,
+  issuerLocaleBrandingEntityFrom,
+  localeBrandingFrom,
+} from '../utils/issuanceBranding/MappingUtils'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:issuance-branding-store')
 

package/src/machineState/MachineStateStore.ts

@@ -1,8 +1,3 @@
-import { type OrPromise } from '@sphereon/ssi-types'
-import Debug from 'debug'
-import { Brackets, DataSource, type FindOptionsWhere, IsNull, LessThan, Not } from 'typeorm'
-
-import { MachineStateInfoEntity } from '../entities/machineState/MachineStateInfoEntity'
 import type {
   StoreFindMachineStatesArgs,
   StoreMachineStateDeleteArgs,
@@ -11,8 +6,13 @@ import type {
   StoreMachineStateInfo,
   StoreMachineStatePersistArgs,
   StoreMachineStatesFindActiveArgs,
-} from '../types'
-import { IAbstractMachineStateStore } from './IAbstractMachineStateStore'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { IAbstractMachineStateStore } from '@sphereon/ssi-sdk.data-store-types'
+import { type OrPromise } from '@sphereon/ssi-types'
+import Debug from 'debug'
+import { Brackets, DataSource, type FindOptionsWhere, IsNull, LessThan, Not } from 'typeorm'
+
+import { MachineStateInfoEntity } from '../entities/machineState/MachineStateInfoEntity'
 
 const debug = Debug('sphereon:ssi-sdk:machine-state:store')
 

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

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreateContacts1659463079428 } from '../postgres/1659463079428-CreateContacts'
 import { CreateContacts1659463069549 } from '../sqlite/1659463069549-CreateContacts'
 

package/src/migrations/generic/10-CreatePresentationDefinitions.ts

@@ -1,5 +1,5 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import { CreatePresentationDefinitions1716475165345 } from '../postgres/1716475165345-CreatePresentationDefinitions'
 import { CreatePresentationDefinitions1716475165344 } from '../sqlite/1716475165344-CreatePresentationDefinitions'
 

package/src/migrations/generic/11-FixCredentialClaimsReferenceUuid.ts

@@ -1,8 +1,8 @@
-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'
 import { FixCredentialClaimsReferencesUuidPG1741895822987 } from '../postgres/1741895822987-FixCredentialClaimsReferencesUuid'
+import { CreateIssuanceBranding1685628973231 } from '../sqlite/1685628973231-CreateIssuanceBranding'
 import { FixCredentialClaimsReferencesUuidSqlite1741895822987 } from '../sqlite/1741895822987-FixCredentialClaimsReferencesUuid'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')

package/src/migrations/generic/12-CreateBitstringStatusList.ts

@@ -1,10 +1,40 @@
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
 import Debug from 'debug'
-import { CreateBitstringStatusListPG1741895823000 } from '../postgres/1741895823000-CreateBitstringStatusList'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+
+import {
+  AddBitstringStatusListEnumPG1741895823000,
+  CreateBitstringStatusListPG1741895823000,
+} from '../postgres/1741895823000-CreateBitstringStatusList'
 import { CreateBitstringStatusListSqlite1741895823001 } from '../sqlite/1741895823001-CreateBitstringStatusList'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
 
+export class AddBitstringStatusListEnum1741895823000 implements MigrationInterface {
+  name = 'AddBitstringStatusListEnum1741895823000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: creating bitstring status list tables')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+    switch (dbType) {
+      case 'postgres': {
+        const mig = new AddBitstringStatusListEnumPG1741895823000()
+        await mig.up(queryRunner)
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        return
+      }
+      default:
+        return Promise.reject(`Migrations only supported for sqlite and postgres. Was ${dbType}`)
+    }
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async down(queryRunner: QueryRunner): Promise<void> {}
+}
+
 export class CreateBitstringStatusList1741895823000 implements MigrationInterface {
   name = 'CreateBitstringStatusList1741895823000'