@sphereon/ssi-sdk.data-store 0.34.1-fix.223 → 0.34.1-fix.247

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-fix.223+9c86d039",
+  "version": "0.34.1-fix.247+6c4b1882",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,11 +28,12 @@
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.223+9c86d039",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.223+9c86d039",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.223+9c86d039",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.223+9c86d039",
-    "@sphereon/ssi-types": "0.34.1-fix.223+9c86d039",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.247+6c4b1882",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.247+6c4b1882",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.247+6c4b1882",
+    "@sphereon/ssi-sdk.core": "0.34.1-fix.247+6c4b1882",
+    "@sphereon/ssi-sdk.data-store-types": "0.34.1-fix.247+6c4b1882",
+    "@sphereon/ssi-types": "0.34.1-fix.247+6c4b1882",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
@@ -65,5 +66,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "9c86d03951f1267495e456d1fbfd9eb380f27e78"
+  "gitHead": "6c4b188290980043b16a2aecce8bb0670d6e8ef2"
 }

package/src/__tests__/contact.entities.test.ts

@@ -18,17 +18,11 @@ import { PartyEntity } from '../entities/contact/PartyEntity'
 import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
 import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
 import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
+import { contactMetadataItemEntityFrom, DataStoreContactEntities, DataStoreMigrations, identityMetadataItemEntityFrom, partyTypeFrom } from '../index'
 import {
-  contactMetadataItemEntityFrom,
-  DataStoreContactEntities,
-  DataStoreMigrations,
-  identityMetadataItemEntityFrom,
   IdentityOrigin,
   MetadataTypes,
   PartyOrigin,
-  partyTypeFrom,
-} from '../index'
-import {
   ConnectionType,
   CorrelationIdentifierType,
   NaturalPerson,
@@ -44,7 +38,7 @@ import {
   NonPersistedPhysicalAddress,
   Organization,
   PartyTypeType,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
 import {
   connectionEntityFrom,
   didAuthConfigEntityFrom,

package/src/__tests__/contact.store.test.ts

@@ -1,8 +1,6 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { DataSource } from 'typeorm'
-import { ConnectionType, DataStoreContactEntities, DataStoreMigrations, IdentityOrigin, MetadataItem, MetadataTypes, PartyOrigin } from '../index'
-import { ContactStore } from '../contact/ContactStore'
 import {
+  ConnectionType,
   CorrelationIdentifierType,
   ElectronicAddress,
   GetElectronicAddressesArgs,
@@ -11,6 +9,9 @@ import {
   GetPhysicalAddressesArgs,
   GetRelationshipsArgs,
   Identity,
+  IdentityOrigin,
+  MetadataItem,
+  MetadataTypes,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -20,13 +21,17 @@ import {
   NonPersistedPartyType,
   NonPersistedPhysicalAddress,
   Party,
+  PartyOrigin,
   PartyRelationship,
   PartyType,
   PartyTypeType,
   PhysicalAddress,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialRole } from '@sphereon/ssi-types'
+import { DataSource } from 'typeorm'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
-import { CredentialRole } from "@sphereon/ssi-types"
+import { ContactStore } from '../contact/ContactStore'
+import { DataStoreContactEntities, DataStoreMigrations } from '../index'
 
 describe('Contact store tests', (): void => {
   let dbConnection: DataSource
@@ -49,7 +54,7 @@ describe('Contact store tests', (): void => {
   })
 
   afterEach(async (): Promise<void> => {
-    await (await dbConnection).destroy()
+    await dbConnection.destroy()
   })
 
   it('should get party by contact metadata', async (): Promise<void> => {

package/src/__tests__/digitalCredential.entities.test.ts

@@ -1,14 +1,20 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
+import {
+  AddCredentialArgs,
+  CredentialCorrelationType,
+  CredentialDocumentFormat,
+  DocumentType,
+  NonPersistedDigitalCredential,
+} from '@sphereon/ssi-sdk.data-store-types'
 import { CredentialRole } from '@sphereon/ssi-types'
+import { computeEntryHash } from '@veramo/utils'
 import { DataSource } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
 import { DataStoreDigitalCredentialEntities } from '../index'
 import { DataStoreDigitalCredentialMigrations } from '../migrations'
-import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
-import { computeEntryHash } from '@veramo/utils'
 import { nonPersistedDigitalCredentialEntityFromAddArgs } from '../utils/digitalCredential/MappingUtils'
-import { AddCredentialArgs, CredentialCorrelationType, CredentialDocumentFormat, DocumentType, NonPersistedDigitalCredential } from '../types'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/digitalCredential.store.test.ts

@@ -15,7 +15,7 @@ import {
   DocumentType,
   GetCredentialsArgs,
   GetCredentialsResponse,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/eventLogger.entities.test.ts

@@ -2,12 +2,12 @@ import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { ActionType, InitiatorType, LoggingEventType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
 import { DataStoreEventLoggerEntities } from '../index'
 import { DataStoreEventLoggerMigrations } from '../migrations'
-import { AuditEventEntity } from '../entities/eventLogger/AuditEventEntity'
-import { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../types'
+import { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '@sphereon/ssi-sdk.data-store-types'
 import { activityEventEntityFrom, auditEventEntityFrom } from '../utils/eventLogger/MappingUtils'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/eventLogger.store.test.ts

@@ -2,11 +2,16 @@ import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { ActivityLoggingEvent, AuditLoggingEvent, CredentialType, PartyCorrelationType } from '@sphereon/ssi-sdk.core'
 import { ActionType, InitiatorType, LoggingEventType, LogLevel, SubSystem, System, SystemCorrelationIdType } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { DataStoreEventLoggerMigrations } from '../migrations'
-import { DataStoreEventLoggerEntities } from '../index'
-import { EventLoggerStore } from '../eventLogger/EventLoggerStore'
-import { GetActivityEventsArgs, GetAuditEventsArgs, NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { EventLoggerStore } from '../eventLogger/EventLoggerStore'
+import { DataStoreEventLoggerEntities } from '../index'
+import { DataStoreEventLoggerMigrations } from '../migrations'
+import {
+  GetActivityEventsArgs,
+  GetAuditEventsArgs,
+  NonPersistedActivityLoggingEvent,
+  NonPersistedAuditLoggingEvent,
+} from '@sphereon/ssi-sdk.data-store-types'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/issuanceBranding.entities.test.ts

@@ -1,6 +1,6 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource, Repository } from 'typeorm'
-import { DataStoreMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   CredentialBrandingEntity,
   credentialBrandingEntityFrom,
@@ -16,7 +16,7 @@ import {
   IssuerLocaleBrandingEntity,
   issuerLocaleBrandingEntityFrom,
 } from '../index'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { DataStoreMigrations } from '../migrations'
 
 describe('Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/issuanceBranding.store.test.ts

@@ -1,7 +1,6 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
-import { DataStoreMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import {
   BackgroundAttributesEntity,
   CredentialLocaleBrandingEntity,
@@ -26,7 +25,8 @@ import {
   IUpdateIssuerLocaleBrandingArgs,
   TextAttributesEntity,
 } from '../index'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { IssuanceBrandingStore } from '../issuanceBranding/IssuanceBrandingStore'
+import { DataStoreMigrations } from '../migrations'
 
 describe('Issuance branding store tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/machineState.entities.test.ts

@@ -1,9 +1,9 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { MachineStateInfoEntity } from '../entities/machineState/MachineStateInfoEntity'
 
 import { DataStoreMachineStateEntities, DataStoreMachineStateMigrations, MachineStateStore, StoreMachineStatePersistArgs } from '../index'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Machine State Info Database entities tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/machineState.store.test.ts

@@ -1,8 +1,8 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DataStoreMachineStateEntities, MachineStateStore, StoreMachineStatePersistArgs, StoreMachineStatesFindActiveArgs } from '../index'
 import { DataStoreMachineStateMigrations } from '../migrations'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Machine State store tests', (): void => {
   let dbConnection: DataSource

package/src/__tests__/pd-manager.store.test.ts

@@ -9,7 +9,7 @@ import {
   ImportDcqlQueryItem,
   PDStore,
 } from '../index'
-import { DcqlQueryItem, GetDefinitionsArgs, NonPersistedDcqlQueryItem } from '../types'
+import { DcqlQueryItem, GetDefinitionsArgs, NonPersistedDcqlQueryItem } from '@sphereon/ssi-sdk.data-store-types'
 
 export const SAMPLE_DCQL_QUERY_IMPORT: ImportDcqlQueryItem = {
   queryId: 'ajax-club',

package/src/__tests__/statusList.entities.test.ts

@@ -1,10 +1,10 @@
-import { DataSource } from 'typeorm'
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { BitstringStatusListEntity, BitstringStatusListEntryEntity, DataStoreStatusListEntities, StatusListEntryEntity } from '../index'
-import { DataStoreStatusListMigrations } from '../migrations'
-import { OAuthStatusListEntity, StatusList2021Entity } from '../entities/statusList/StatusListEntities'
 import { IIssuer, StatusListCredentialIdMode, StatusListDriverType } from '@sphereon/ssi-types'
+import { DataSource } from 'typeorm'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { OAuthStatusListEntity, StatusList2021Entity } from '../entities/statusList/StatusListEntities'
+import { BitstringStatusListEntity, BitstringStatusListEntryEntity, DataStoreStatusListEntities, StatusListEntryEntity } from '../index'
+import { DataStoreStatusListMigrations } from '../migrations'
 
 describe('Status list entities tests', () => {
   let dbConnection: DataSource

package/src/__tests__/statusList.store.test.ts

@@ -1,11 +1,11 @@
-import { DataSource } from 'typeorm'
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { StatusListCredentialIdMode, StatusListDriverType, StatusListType } from '@sphereon/ssi-types'
+import { DataSource } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DataStoreStatusListEntities, IBitstringStatusListEntity } from '../index'
 import { DataStoreStatusListMigrations } from '../migrations'
 import { StatusListStore } from '../statusList/StatusListStore'
 import { IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntryEntity } from '../types'
-import { StatusListCredentialIdMode, StatusListDriverType, StatusListType } from '@sphereon/ssi-types'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
 describe('Status list store tests', () => {
   let dbConnection: DataSource

package/src/contact/ContactStore.ts

@@ -1,37 +1,5 @@
-import { OrPromise } from '@sphereon/ssi-types'
-import { BaseEntity, DataSource, type FindOptionsWhere, In, type Repository } from 'typeorm'
-import Debug from 'debug'
-import { AbstractContactStore } from './AbstractContactStore'
-import { PartyEntity } from '../entities/contact/PartyEntity'
-import { IdentityEntity } from '../entities/contact/IdentityEntity'
-import { IdentityMetadataItemEntity } from '../entities/contact/IdentityMetadataItemEntity'
-import { CorrelationIdentifierEntity } from '../entities/contact/CorrelationIdentifierEntity'
-import { ConnectionEntity } from '../entities/contact/ConnectionEntity'
-import { BaseConfigEntity } from '../entities/contact/BaseConfigEntity'
-import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
-import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
-import { BaseContactEntity } from '../entities/contact/BaseContactEntity'
-import { ElectronicAddressEntity } from '../entities/contact/ElectronicAddressEntity'
-import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
-import {
-  electronicAddressEntityFrom,
-  electronicAddressFrom,
-  identityEntityFrom,
-  identityFrom,
-  isDidAuthConfig,
-  isNaturalPerson,
-  isOpenIdConfig,
-  isOrganization,
-  partyEntityFrom,
-  partyFrom,
-  partyRelationshipEntityFrom,
-  partyRelationshipFrom,
-  partyTypeEntityFrom,
-  partyTypeFrom,
-  physicalAddressEntityFrom,
-  physicalAddressFrom,
-} from '../utils/contact/MappingUtils'
 import {
+  AbstractContactStore,
   AddElectronicAddressArgs,
   AddIdentityArgs,
   AddPartyArgs,
@@ -53,8 +21,8 @@ import {
   GetPhysicalAddressesArgs,
   GetRelationshipArgs,
   GetRelationshipsArgs,
-  IMetadataEntity,
   Identity,
+  IMetadataEntity,
   MetadataItem,
   MetadataTypes,
   NonPersistedConnectionConfig,
@@ -76,7 +44,39 @@ import {
   UpdatePartyTypeArgs,
   UpdatePhysicalAddressArgs,
   UpdateRelationshipArgs,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { OrPromise } from '@sphereon/ssi-types'
+import Debug from 'debug'
+import { BaseEntity, DataSource, type FindOptionsWhere, In, type Repository } from 'typeorm'
+import { BaseConfigEntity } from '../entities/contact/BaseConfigEntity'
+import { BaseContactEntity } from '../entities/contact/BaseContactEntity'
+import { ConnectionEntity } from '../entities/contact/ConnectionEntity'
+import { CorrelationIdentifierEntity } from '../entities/contact/CorrelationIdentifierEntity'
+import { ElectronicAddressEntity } from '../entities/contact/ElectronicAddressEntity'
+import { IdentityEntity } from '../entities/contact/IdentityEntity'
+import { IdentityMetadataItemEntity } from '../entities/contact/IdentityMetadataItemEntity'
+import { PartyEntity } from '../entities/contact/PartyEntity'
+import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
+import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
+import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
+import {
+  electronicAddressEntityFrom,
+  electronicAddressFrom,
+  identityEntityFrom,
+  identityFrom,
+  isDidAuthConfig,
+  isNaturalPerson,
+  isOpenIdConfig,
+  isOrganization,
+  partyEntityFrom,
+  partyFrom,
+  partyRelationshipEntityFrom,
+  partyRelationshipFrom,
+  partyTypeEntityFrom,
+  partyTypeFrom,
+  physicalAddressEntityFrom,
+  physicalAddressFrom,
+} from '../utils/contact/MappingUtils'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:contact-store')
 

package/src/digitalCredential/DigitalCredentialStore.ts

@@ -1,10 +1,5 @@
-import { CredentialRole, OrPromise } from '@sphereon/ssi-types'
-import Debug from 'debug'
-import { DataSource, type FindOptionsOrder, type FindOptionsWhere, Repository } from 'typeorm'
-
-import { digitalCredentialFrom, digitalCredentialsFrom, nonPersistedDigitalCredentialEntityFromAddArgs } from '../../src'
-import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
 import {
+  AbstractDigitalCredentialStore,
   AddCredentialArgs,
   CredentialStateType,
   DigitalCredential,
@@ -14,10 +9,14 @@ import {
   NonPersistedDigitalCredential,
   RemoveCredentialArgs,
   UpdateCredentialStateArgs,
-} from '../types'
-import { parseAndValidateOrderOptions } from '../utils/SortingUtils'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialRole, OrPromise } from '@sphereon/ssi-types'
+import Debug from 'debug'
+import { DataSource, type FindOptionsOrder, type FindOptionsWhere, Repository } from 'typeorm'
 
-import { AbstractDigitalCredentialStore } from './AbstractDigitalCredentialStore'
+import { digitalCredentialFrom, digitalCredentialsFrom, nonPersistedDigitalCredentialEntityFromAddArgs } from '../../src'
+import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
+import { parseAndValidateOrderOptions } from '../utils/SortingUtils'
 
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:credential-store')
 

package/src/entities/contact/BaseConfigEntity.ts

@@ -1,5 +1,5 @@
-import typeorm from 'typeorm'
-const { BaseEntity, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn, TableInheritance } = typeorm
+import { BaseEntity, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn, TableInheritance } from 'typeorm'
+
 import { ConnectionEntity } from './ConnectionEntity'
 
 @Entity('BaseConfig')

package/src/entities/contact/BaseContactEntity.ts

@@ -1,5 +1,5 @@
-import typeorm from 'typeorm'
-const {
+import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import {
   BaseEntity,
   BeforeInsert,
   BeforeUpdate,
@@ -11,10 +11,9 @@ const {
   PrimaryGeneratedColumn,
   TableInheritance,
   UpdateDateColumn,
-} = typeorm
-import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
-import { PartyEntity } from './PartyEntity'
+} from 'typeorm'
 import { ContactMetadataItemEntity } from './ContactMetadataItemEntity'
+import { PartyEntity } from './PartyEntity'
 
 @Entity('BaseContact')
 @TableInheritance({ column: { type: 'varchar', name: 'type' } })

package/src/entities/contact/ConnectionEntity.ts

@@ -1,10 +1,10 @@
-import typeorm from 'typeorm'
-const { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, BaseEntity } = typeorm
+import { ConnectionType } from '@sphereon/ssi-sdk.data-store-types'
+import { BaseEntity, Column, Entity, JoinColumn, OneToOne, PrimaryGeneratedColumn } from 'typeorm'
+
 import { BaseConfigEntity } from './BaseConfigEntity'
-import { ConnectionType } from '../../types'
+import { DidAuthConfigEntity } from './DidAuthConfigEntity'
 import { IdentityEntity } from './IdentityEntity'
 import { OpenIdConfigEntity } from './OpenIdConfigEntity'
-import { DidAuthConfigEntity } from './DidAuthConfigEntity'
 
 @Entity('Connection')
 export class ConnectionEntity extends BaseEntity {

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,26 +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 { IdentityOrigin, ValidationConstraint } from '../../types'
-import { CredentialRole } from '@sphereon/ssi-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')