@sphereon/ssi-sdk.data-store 0.34.1-next.3 → 0.34.1-next.323

package/src/entities/contact/ContactMetadataItemEntity.ts

@@ -1,10 +1,9 @@
-import typeorm from 'typeorm'
-const { Entity, Column, PrimaryGeneratedColumn, BaseEntity, ManyToOne, BeforeInsert, BeforeUpdate } = typeorm
-import { IMetadataEntity, ValidationConstraint } from '../../types'
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { BaseContactEntity } from './BaseContactEntity'
+import { IMetadataEntity, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { BaseContactEntity } from './BaseContactEntity'
 
 @Entity('ContactMetadata')
 export class ContactMetadataItemEntity extends BaseEntity implements IMetadataEntity {

package/src/entities/contact/CorrelationIdentifierEntity.ts

@@ -1,9 +1,8 @@
-import typeorm from 'typeorm'
-const { Entity, Column, PrimaryGeneratedColumn, BaseEntity, OneToOne, JoinColumn, BeforeInsert, BeforeUpdate } = typeorm
-import { CorrelationIdentifierType, ValidationConstraint } from '../../types'
-import { IdentityEntity } from './IdentityEntity'
+import { CorrelationIdentifierType, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { IdentityEntity } from './IdentityEntity'
 
 @Entity('CorrelationIdentifier')
 export class CorrelationIdentifierEntity extends BaseEntity {

package/src/entities/contact/DidAuthConfigEntity.ts

@@ -1,5 +1,4 @@
-import typeorm from 'typeorm'
-const { ChildEntity, Column } = typeorm
+import { ChildEntity, Column } from 'typeorm'
 import { BaseConfigEntity } from './BaseConfigEntity'
 
 @ChildEntity('DidAuthConfig')

package/src/entities/contact/ElectronicAddressEntity.ts

@@ -1,10 +1,20 @@
-import { IsNotEmpty, validate, ValidationError } from 'class-validator'
-import typeorm from 'typeorm'
-const { Entity, Column, PrimaryGeneratedColumn, BaseEntity, ManyToOne, BeforeInsert, BeforeUpdate, CreateDateColumn, UpdateDateColumn } = typeorm
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import type { ElectronicAddressType, ValidationConstraint } from '../../types/index'
-import { PartyEntity } from './PartyEntity'
+import type { ElectronicAddressType, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
+import { IsNotEmpty, validate, ValidationError } from 'class-validator'
+
+import {
+  BaseEntity,
+  BeforeInsert,
+  BeforeUpdate,
+  Column,
+  CreateDateColumn,
+  Entity,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { PartyEntity } from './PartyEntity'
 
 @Entity('ElectronicAddress')
 export class ElectronicAddressEntity extends BaseEntity {

package/src/entities/contact/IdentityEntity.ts

@@ -1,25 +1,26 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { IdentityOrigin, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialRole } from '@sphereon/ssi-types'
+import { IsNotEmpty, validate, ValidationError } from 'class-validator'
 import {
   BaseEntity,
+  BeforeInsert,
+  BeforeUpdate,
+  Column,
   CreateDateColumn,
   Entity,
-  PrimaryGeneratedColumn,
-  UpdateDateColumn,
-  OneToOne,
   JoinColumn,
   ManyToOne,
-  Column,
   OneToMany,
-  BeforeInsert,
-  BeforeUpdate,
+  OneToOne,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
 } from 'typeorm'
-import { IsNotEmpty, validate, ValidationError } from 'class-validator'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { CorrelationIdentifierEntity } from './CorrelationIdentifierEntity'
+import { getConstraint } from '../../utils/ValidatorUtils'
 import { ConnectionEntity } from './ConnectionEntity'
+import { CorrelationIdentifierEntity } from './CorrelationIdentifierEntity'
 import { IdentityMetadataItemEntity } from './IdentityMetadataItemEntity'
-import { CredentialRole, IdentityOrigin, ValidationConstraint } from '../../types'
 import { PartyEntity } from './PartyEntity'
-import { getConstraint } from '../../utils/ValidatorUtils'
 
 @Entity('Identity')
 export class IdentityEntity extends BaseEntity {

package/src/entities/contact/IdentityMetadataItemEntity.ts

@@ -1,9 +1,9 @@
 import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { Entity, Column, PrimaryGeneratedColumn, BaseEntity, ManyToOne, BeforeInsert, BeforeUpdate } from 'typeorm'
-import { IMetadataEntity, ValidationConstraint } from '../../types'
-import { IdentityEntity } from './IdentityEntity'
+import { IMetadataEntity, ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
+import { BaseEntity, BeforeInsert, BeforeUpdate, Column, Entity, ManyToOne, PrimaryGeneratedColumn } from 'typeorm'
 import { getConstraint } from '../../utils/ValidatorUtils'
+import { IdentityEntity } from './IdentityEntity'
 
 @Entity('IdentityMetadata')
 export class IdentityMetadataItemEntity extends BaseEntity implements IMetadataEntity {

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

@@ -0,0 +1,60 @@
+import { BitstringStatusMessage } from '../../types'
+import { ChildEntity, Column } from 'typeorm'
+import { StatusListEntryEntity } from './StatusList2021EntryEntity'
+
+@ChildEntity('bitstring')
+export class BitstringStatusListEntryEntity extends StatusListEntryEntity {
+  @Column({ type: 'varchar', name: 'statusPurpose', nullable: false })
+  statusPurpose!: string
+
+  @Column({ type: 'integer', name: 'bitsPerStatus', nullable: true, default: 1 })
+  bitsPerStatus?: number
+
+  @Column({
+    type: 'text',
+    name: 'statusMessage',
+    nullable: true,
+    transformer: {
+      from(value: string): Array<BitstringStatusMessage> | undefined {
+        if (!value) {
+          return undefined
+        }
+        return JSON.parse(value)
+      },
+      to(value: Array<BitstringStatusMessage> | undefined): string | undefined {
+        if (!value) {
+          return undefined
+        }
+        return JSON.stringify(value)
+      },
+    },
+  })
+  statusMessage?: Array<BitstringStatusMessage>
+
+  @Column({
+    type: 'text',
+    name: 'statusReference',
+    nullable: true,
+    transformer: {
+      from(value: string): string | string[] | undefined {
+        if (!value) {
+          return undefined
+        }
+        if (value.startsWith('[')) {
+          return JSON.parse(value)
+        }
+        return value
+      },
+      to(value: string | string[] | undefined): string | undefined {
+        if (!value) {
+          return undefined
+        }
+        if (Array.isArray(value)) {
+          return JSON.stringify(value)
+        }
+        return value
+      },
+    },
+  })
+  statusReference?: string | string[]
+}

package/src/entities/statusList/StatusList2021EntryEntity.ts

@@ -1,11 +1,12 @@
 import { Validate } from 'class-validator'
-import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'
+import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryColumn, TableInheritance } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
-import { StatusListEntity } from './StatusListEntities'
+import { StatusList2021Entity, StatusListEntity } from './StatusListEntities'
 
 @Entity('StatusListEntry')
 // @Unique('uq_credential_statuslist', ['statusList', 'credentialId']) // disabled because one prop can be null
 // @Unique('uq_credentialHash_statuslistId', ['statusList', 'credentialHash']) // disabled because one prop can be null
+@TableInheritance({ column: { type: 'varchar', name: 'type' } })
 export class StatusListEntryEntity extends BaseEntity {
   @PrimaryColumn({ name: 'statusListId', type: 'varchar', nullable: false, unique: false })
   @Validate(IsNonEmptyStringConstraint, { message: 'Status list id is required' })
@@ -15,7 +16,7 @@ export class StatusListEntryEntity extends BaseEntity {
   @Validate(IsNonEmptyStringConstraint, { message: 'Status list index is required' })
   statusListIndex!: number
 
-  @ManyToOne(() => StatusListEntity, (statusList) => statusList.statusListEntries)
+  @ManyToOne(() => StatusList2021Entity, (statusList) => statusList.statusListEntries)
   @JoinColumn({ name: 'statusListId' })
   statusList!: StatusListEntity
 

package/src/entities/statusList/StatusListEntities.ts

@@ -1,4 +1,6 @@
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import {
+  type CredentialProofFormat,
   type IIssuer,
   type StatusListCredential,
   StatusListCredentialIdMode,
@@ -6,12 +8,12 @@ import {
   type StatusListIndexingDirection,
   StatusListType,
   type StatusPurpose2021,
-  type CredentialProofFormat,
 } from '@sphereon/ssi-types'
-import typeorm from 'typeorm'
-const { BaseEntity, ChildEntity, Column, Entity, OneToMany, PrimaryColumn, TableInheritance, Unique } = typeorm
+
+import { BaseEntity, ChildEntity, Column, Entity, OneToMany, PrimaryColumn, TableInheritance, Unique } from 'typeorm'
+import { BitstringStatusListEntryEntity } from './BitstringStatusListEntryEntity'
+
 import { StatusListEntryEntity } from './StatusList2021EntryEntity'
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 
 @Entity('StatusList')
 @Unique('UQ_correlationId', ['correlationId'])
@@ -26,6 +28,13 @@ export abstract class StatusListEntity extends BaseEntity {
   @Column({ name: 'length', type: 'integer', nullable: false, unique: false })
   length!: number
 
+  @Column('simple-enum', {
+    name: 'type',
+    enum: StatusListType,
+    nullable: false,
+  })
+  type!: StatusListType
+
   @Column({
     name: 'issuer',
     type: 'text',
@@ -88,9 +97,6 @@ export abstract class StatusListEntity extends BaseEntity {
     },
   })
   statusListCredential?: StatusListCredential
-
-  @OneToMany((type) => StatusListEntryEntity, (entry) => entry.statusList)
-  statusListEntries!: StatusListEntryEntity[]
 }
 
 @ChildEntity(StatusListType.StatusList2021)
@@ -106,6 +112,9 @@ export class StatusList2021Entity extends StatusListEntity {
 
   @Column({ type: 'varchar', name: 'statusPurpose', nullable: false, default: 'revocation' })
   statusPurpose!: StatusPurpose2021
+
+  @OneToMany((type) => StatusListEntryEntity, (entry) => entry.statusList)
+  statusListEntries!: StatusListEntryEntity[]
 }
 
 @ChildEntity(StatusListType.OAuthStatusList)
@@ -115,3 +124,42 @@ export class OAuthStatusListEntity extends StatusListEntity {
   @Column({ name: 'expiresAt', nullable: true, type: typeOrmDateTime() })
   expiresAt?: Date
 }
+
+@ChildEntity(StatusListType.BitstringStatusList)
+export class BitstringStatusListEntity extends StatusListEntity {
+  @Column({
+    type: 'varchar',
+    name: 'statusPurpose',
+    nullable: false,
+    transformer: {
+      from(value: string): string | string[] {
+        if (value?.includes(',')) {
+          return value.split(',').map((v) => v.trim() as string)
+        }
+        return value as string
+      },
+      to(value: string | string[]): string {
+        if (Array.isArray(value)) {
+          return value.join(',')
+        }
+        return value
+      },
+    },
+  })
+  statusPurpose!: string | string[]
+
+  @Column({ type: 'integer', name: 'bitsPerStatus', nullable: false })
+  bitsPerStatus?: number
+
+  @Column({ name: 'validFrom', nullable: true, type: typeOrmDateTime() })
+  validFrom?: Date
+
+  @Column({ name: 'validUntil', nullable: true, type: typeOrmDateTime() })
+  validUntil?: Date
+
+  @Column({ type: 'integer', name: 'ttl', nullable: true })
+  ttl?: number
+
+  @OneToMany((type) => BitstringStatusListEntryEntity, (entry) => entry.statusList)
+  statusListEntries!: BitstringStatusListEntryEntity[]
+}

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')