@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.26.RP.58 → 0.34.1-feature.SSISDK.45.189

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
+  "version": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,16 +28,16 @@
   "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-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.26.RP.58+9389054b",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.45.189+b7e0c23f",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
     "class-validator": "0.14.1",
-    "dcql": "0.2.19",
+    "dcql": "1.0.1",
     "debug": "^4.3.5",
     "typeorm": "0.3.20"
   },
@@ -65,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "9389054b1da3dda085e28b2ec27063e20cc296c6"
+  "gitHead": "b7e0c23f77ccaa650fc21d52315e28de54f38188"
 }

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

@@ -1,6 +1,8 @@
 import { getDID } from '@sphereon/ssi-sdk-ext.did-utils'
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { DataSource, FindOptionsWhere } from 'typeorm'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { BaseContactEntity } from '../entities/contact/BaseContactEntity'
 import { ConnectionEntity } from '../entities/contact/ConnectionEntity'
 import { ContactMetadataItemEntity } from '../entities/contact/ContactMetadataItemEntity'
@@ -18,7 +20,6 @@ import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
 import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
 import {
   contactMetadataItemEntityFrom,
-  CredentialRole,
   DataStoreContactEntities,
   DataStoreMigrations,
   identityMetadataItemEntityFrom,
@@ -57,7 +58,6 @@ import {
   partyTypeEntityFrom,
   physicalAddressEntityFrom,
 } from '../utils/contact/MappingUtils'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 // TODO write test adding two contacts reusing the same contactType
 
 describe('Database entities tests', (): void => {

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

@@ -4,7 +4,6 @@ import { ConnectionType, DataStoreContactEntities, DataStoreMigrations, Identity
 import { ContactStore } from '../contact/ContactStore'
 import {
   CorrelationIdentifierType,
-  CredentialRole,
   ElectronicAddress,
   GetElectronicAddressesArgs,
   GetIdentitiesArgs,
@@ -27,6 +26,7 @@ import {
   PhysicalAddress,
 } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { CredentialRole } from "@sphereon/ssi-types"
 
 describe('Contact store tests', (): void => {
   let dbConnection: DataSource

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

@@ -1,6 +1,7 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
+import { DataStoreDigitalCredentialEntities } from '../index'
 import { DataStoreDigitalCredentialMigrations } from '../migrations'
 import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
 import { computeEntryHash } from '@veramo/utils'

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

@@ -1,9 +1,11 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
-import { IVerifiablePresentation } from '@sphereon/ssi-types'
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
+import { CredentialRole, IVerifiablePresentation } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
-import { DataStoreDigitalCredentialMigrations } from '../migrations'
-import { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DigitalCredentialStore } from '../digitalCredential/DigitalCredentialStore'
+import { DataStoreDigitalCredentialEntities } from '../index'
+import { DataStoreDigitalCredentialMigrations } from '../migrations'
 import {
   AddCredentialArgs,
   CredentialCorrelationType,
@@ -14,8 +16,6 @@ import {
   GetCredentialsArgs,
   GetCredentialsResponse,
 } 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__/pd-manager.entities.test.ts

@@ -1,11 +1,12 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { DataSource } from 'typeorm'
-import { PresentationDefinitionItemEntity } from '../entities/presentationDefinition/PresentationDefinitionItemEntity'
-import { DataStorePresentationDefinitionMigrations } from '../migrations'
-import { DataStorePresentationDefinitionEntities } from '../index'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import { DcqlQueryItemEntity } from '../entities/presentationDefinition/DcqlQueryItemEntity'
+import { DataStorePresentationDefinitionEntities } from '../index'
+import { DataStorePresentationDefinitionMigrations } from '../migrations'
+import { SAMPLE_DCQL_QUERY_IMPORT } from './pd-manager.store.test'
 
-describe('PresentationDefinitionItemEntity tests', (): void => {
+describe('DcqlQueryItemEntity tests', (): void => {
   let dbConnection: DataSource
 
   beforeEach(async (): Promise<void> => {
@@ -25,59 +26,34 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     await dbConnection.destroy()
   })
 
-  it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
+  it('should create and retrieve DcqlQueryItemEntity', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
+    const entity = new DcqlQueryItemEntity()
+    entity.queryId = 'ajax-club'
     entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-    entity.dcqlPayload = JSON.stringify({
-      credentials: [
-        {
-          id: 'credential1',
-          format: 'jwt_vc',
-          claims: [
-            {
-              namespace: 'test',
-              claim_name: 'testClaim',
-            },
-          ],
-        },
-      ],
-    })
+    entity.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
     expect(savedEntity.id).toBeDefined()
-    expect(savedEntity.dcqlPayload).toBeDefined()
+    expect(savedEntity.query).toBeDefined()
 
     const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
     expect(retrievedEntity).toBeDefined()
-    expect(retrievedEntity!.dcqlPayload).toBeDefined()
-    const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
-    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+    expect(retrievedEntity!.query).toBeDefined()
+    const parsedDcql = JSON.parse(retrievedEntity!.query)
+    expect(parsedDcql.credentials[0].id).toEqual('clubcard-v1')
+    expect(parsedDcql.credentials[0].format).toEqual('dc+sd-jwt')
+    expect(parsedDcql.credentials[0].meta.vct_values).toContain('clubcard-v1')
+    expect(parsedDcql.credentials[0].claims).toHaveLength(4)
   })
 
-  it('should update PresentationDefinitionItemEntity dcqlPayload', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
+  it('should update DcqlQueryItemEntity dcql query', async (): Promise<void> => {
+    const repository = dbConnection.getRepository(DcqlQueryItemEntity)
+    const entity = new DcqlQueryItemEntity()
+    entity.queryId = 'ajax-club'
     entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-    entity.dcqlPayload = JSON.stringify({
-      credentials: [
-        {
-          id: 'credential1',
-          format: 'jwt_vc',
-          claims: [
-            {
-              namespace: 'test',
-              claim_name: 'testClaim',
-            },
-          ],
-        },
-      ],
-    })
+    entity.query = JSON.stringify(SAMPLE_DCQL_QUERY_IMPORT.query)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -85,67 +61,20 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     const updatedDcql = {
       credentials: [
         {
-          id: 'credential2',
+          id: 'updated-clubcard',
           format: 'jwt_vc',
           claims: [
             {
-              namespace: 'test',
-              claim_name: 'updatedClaim',
+              path: ['name'],
             },
           ],
         },
       ],
     }
-    savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
+    savedEntity.query = JSON.stringify(updatedDcql)
     const updatedEntity = await repository.save(savedEntity)
     expect(updatedEntity).toBeDefined()
-    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
-  })
-
-  it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
-    entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-    expect(savedEntity.id).toBeDefined()
-
-    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
-    expect(retrievedEntity).toBeDefined()
-    expect(retrievedEntity!.definitionId).toEqual('definition1')
-  })
-
-  it('should update PresentationDefinitionItemEntity', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
-    entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-
-    savedEntity.version = '1.1'
-    const updatedEntity = await repository.save(savedEntity)
-    expect(updatedEntity).toBeDefined()
-    expect(updatedEntity.version).toEqual('1.1')
-  })
-
-  it('should delete PresentationDefinitionItemEntity', async (): Promise<void> => {
-    const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
-    const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
-    entity.version = '1.0'
-    entity.definitionPayload = JSON.stringify({ id: 'definition1', input_descriptors: [] })
-
-    const savedEntity = await repository.save(entity)
-    expect(savedEntity).toBeDefined()
-
-    await repository.delete(savedEntity.id)
-    const retrievedEntity = await repository.findOneBy({ id: savedEntity.id })
-    expect(retrievedEntity).toBeNull()
+    expect(JSON.parse(updatedEntity.query).credentials[0].id).toEqual('updated-clubcard')
+    expect(JSON.parse(updatedEntity.query).credentials[0].format).toEqual('jwt_vc')
   })
 })

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

@@ -1,8 +1,46 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DcqlQuery } from 'dcql'
 import { DataSource } from 'typeorm'
-import { DataStorePresentationDefinitionEntities, DataStorePresentationDefinitionMigrations, PDStore } from '../index'
-import { GetDefinitionsArgs, NonPersistedPresentationDefinitionItem, PresentationDefinitionItem } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+import {
+  DataStorePresentationDefinitionEntities,
+  DataStorePresentationDefinitionMigrations,
+  type DeleteDefinitionsArgs,
+  ImportDcqlQueryItem,
+  PDStore,
+} from '../index'
+import { DcqlQueryItem, GetDefinitionsArgs, NonPersistedDcqlQueryItem } from '../types'
+
+export const SAMPLE_DCQL_QUERY_IMPORT: ImportDcqlQueryItem = {
+  queryId: 'ajax-club',
+  query: {
+    credentials: [
+      {
+        id: 'clubcard-v1',
+        format: 'dc+sd-jwt',
+        require_cryptographic_holder_binding: true,
+        multiple: false,
+        meta: {
+          vct_values: ['clubcard-v1'],
+        },
+        claims: [
+          {
+            path: ['personData', 'name'],
+          },
+          {
+            path: ['personData', 'birthDate'],
+          },
+          {
+            path: ['membershipData', 'membershipId'],
+          },
+          {
+            path: ['membershipData', 'season'],
+          },
+        ],
+      },
+    ],
+  },
+}
 
 describe('PDStore tests', (): void => {
   let dbConnection: DataSource
@@ -28,136 +66,148 @@ describe('PDStore tests', (): void => {
     await dbConnection.destroy()
   })
 
-  it('should check if definition exists', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const exists: boolean = await pdStore.hasDefinition({ itemId: savedDefinition.id })
-
-    expect(exists).toBeTruthy()
-  })
-
-  it('should check if definitions exist by filter', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const exists: boolean = await pdStore.hasDefinitions({ filter: [{ definitionId: 'definition1' }] })
-
-    expect(exists).toBeTruthy()
-  })
-
-  it('should get definition by id', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
-      version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
-    }
-
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
-    expect(savedDefinition).toBeDefined()
-
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
-
-    expect(result).toBeDefined()
-  })
-
-  it('should throw error when getting definition with unknown id', async (): Promise<void> => {
+  it('should throw error when getting query with unknown id', async (): Promise<void> => {
     const itemId = 'unknownDefinitionId'
 
     await expect(pdStore.getDefinition({ itemId })).rejects.toThrow(`No presentation definition item found for id: ${itemId}`)
   })
 
-  it('should get all definitions', async (): Promise<void> => {
-    const definition1: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should get all queries', async (): Promise<void> => {
+    const definition1: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: {
+        credentials: [
+          {
+            id: 'id-card-v1',
+            format: 'dc+sd-jwt',
+            require_cryptographic_holder_binding: true,
+            multiple: false,
+            claims: [
+              {
+                path: ['name'],
+              },
+            ],
+          },
+        ],
+      },
     }
-    const savedDefinition1: PresentationDefinitionItem = await pdStore.addDefinition(definition1)
+    const savedDefinition1: DcqlQueryItem = await pdStore.addDefinition(definition1)
     expect(savedDefinition1).toBeDefined()
 
-    const definition2: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition2',
+    const definition2: NonPersistedDcqlQueryItem = {
+      queryId: 'definition2',
       version: '1.0',
-      definitionPayload: { id: 'definition2', input_descriptors: [] },
+      query: {
+        credentials: [
+          {
+            id: 'driver-license-v1',
+            format: 'dc+sd-jwt',
+            require_cryptographic_holder_binding: true,
+            multiple: false,
+            claims: [
+              {
+                path: ['dateOfBirth'],
+              },
+            ],
+          },
+        ],
+      },
     }
-    const savedDefinition2: PresentationDefinitionItem = await pdStore.addDefinition(definition2)
+    const savedDefinition2: DcqlQueryItem = await pdStore.addDefinition(definition2)
     expect(savedDefinition2).toBeDefined()
 
-    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions({})
+    const result: Array<DcqlQueryItem> = await pdStore.getDefinitions({})
 
     expect(result).toBeDefined()
     expect(result.length).toEqual(2)
   })
 
-  it('should get definitions by filter', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should update dcql query', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
-    const args: GetDefinitionsArgs = {
-      filter: [{ definitionId: 'definition1' }],
+    const updatedDcqlQuery = DcqlQuery.parse({
+      credentials: [
+        {
+          id: 'updated-clubcard',
+          format: 'dc+sd-jwt',
+          claims: [
+            {
+              path: ['name'],
+            },
+          ],
+        },
+      ],
+    })
+
+    const updatedDefinition: DcqlQueryItem = {
+      ...savedDefinition,
+      version: '1.1',
+      query: updatedDcqlQuery,
     }
-    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions(args)
 
-    expect(result.length).toEqual(1)
+    await pdStore.updateDefinition(updatedDefinition)
+    const result: DcqlQueryItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+
+    expect(result).toBeDefined()
+    expect(result.version).toEqual('1.1')
+    expect(result.query?.credentials[0].id).toEqual('updated-clubcard')
+    expect(result.query?.credentials[0].format).toEqual('dc+sd-jwt')
   })
 
-  it('should add definition', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should get dcql queries by id', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
 
-    const result: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const result: DcqlQueryItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
 
     expect(result).toBeDefined()
-    expect(result.definitionId).toEqual(definition.definitionId)
+    expect(result.query).toBeDefined()
+    expect(result.query.credentials[0].format).toBe('dc+sd-jwt')
+    if (result.query.credentials[0].format === 'dc+sd-jwt') {
+      expect(result.query.credentials[0].meta?.vct_values).toContain('clubcard-v1')
+    }
+    expect(result.query.credentials[0].claims).toHaveLength(4)
   })
 
-  it('should update definition', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should get dcql queries by filter', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: SAMPLE_DCQL_QUERY_IMPORT.queryId,
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
-    const updatedDefinition: PresentationDefinitionItem = {
-      ...savedDefinition,
-      version: '1.1',
+    const args: GetDefinitionsArgs = {
+      filter: [{ queryId: 'ajax-club' }],
     }
+    const result: Array<DcqlQueryItem> = await pdStore.getDefinitions(args)
 
-    await pdStore.updateDefinition(updatedDefinition)
-    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
-
-    expect(result).toBeDefined()
-    expect(result.version).toEqual('1.1')
+    expect(result.length).toEqual(1)
+    expect(result[0].query).toBeDefined()
+    expect(result[0].query.credentials[0].id).toEqual('clubcard-v1')
   })
 
-  it('should delete definition', async (): Promise<void> => {
-    const definition: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should delete dcql query', async (): Promise<void> => {
+    const definition: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    const savedDefinition: DcqlQueryItem = await pdStore.addDefinition(definition)
     expect(savedDefinition).toBeDefined()
 
     await pdStore.deleteDefinition({ itemId: savedDefinition.id })
@@ -167,28 +217,28 @@ describe('PDStore tests', (): void => {
     )
   })
 
-  it('should delete definitions by filter', async (): Promise<void> => {
-    const definition1: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition1',
+  it('should delete dcql queries by filter', async (): Promise<void> => {
+    const definition1: NonPersistedDcqlQueryItem = {
+      queryId: 'definition1',
       version: '1.0',
-      definitionPayload: { id: 'definition1', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition1: PresentationDefinitionItem = await pdStore.addDefinition(definition1)
+    const savedDefinition1: DcqlQueryItem = await pdStore.addDefinition(definition1)
     expect(savedDefinition1).toBeDefined()
 
-    const definition2: NonPersistedPresentationDefinitionItem = {
-      definitionId: 'definition2',
+    const definition2: NonPersistedDcqlQueryItem = {
+      queryId: 'definition2',
       version: '1.0',
-      definitionPayload: { id: 'definition2', input_descriptors: [] },
+      query: SAMPLE_DCQL_QUERY_IMPORT.query,
     }
-    const savedDefinition2: PresentationDefinitionItem = await pdStore.addDefinition(definition2)
+    const savedDefinition2: DcqlQueryItem = await pdStore.addDefinition(definition2)
     expect(savedDefinition2).toBeDefined()
 
-    const filter = { filter: [{ definitionId: 'definition1' }] }
+    const filter = { filter: [{ queryId: 'definition1' }] } satisfies DeleteDefinitionsArgs
     await pdStore.deleteDefinitions(filter)
 
-    const remainingDefinitions: Array<PresentationDefinitionItem> = await pdStore.getDefinitions({})
+    const remainingDefinitions: Array<DcqlQueryItem> = await pdStore.getDefinitions({})
     expect(remainingDefinitions.length).toEqual(1)
-    expect(remainingDefinitions[0].definitionId).toEqual('definition2')
+    expect(remainingDefinitions[0].queryId).toEqual('definition2')
   })
 })

package/src/digitalCredential/DigitalCredentialStore.ts

@@ -1,7 +1,11 @@
-import { AbstractDigitalCredentialStore } from './AbstractDigitalCredentialStore'
+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 {
   AddCredentialArgs,
-  CredentialRole,
   CredentialStateType,
   DigitalCredential,
   GetCredentialArgs,
@@ -11,14 +15,10 @@ import {
   RemoveCredentialArgs,
   UpdateCredentialStateArgs,
 } from '../types'
-import { OrPromise } from '@sphereon/ssi-types'
-import { DataSource, type FindOptionsOrder, type FindOptionsWhere, Repository } from 'typeorm'
-import Debug from 'debug'
-import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
-
-import { digitalCredentialFrom, digitalCredentialsFrom, nonPersistedDigitalCredentialEntityFromAddArgs } from '../../src'
 import { parseAndValidateOrderOptions } from '../utils/SortingUtils'
 
+import { AbstractDigitalCredentialStore } from './AbstractDigitalCredentialStore'
+
 const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:credential-store')
 
 export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
@@ -78,7 +78,7 @@ export class DigitalCredentialStore extends AbstractDigitalCredentialStore {
       return false
     }
 
-    let query: FindOptionsWhere<DigitalCredentialEntity> = {}
+    const query: FindOptionsWhere<DigitalCredentialEntity> = {}
 
     if ('id' in args) {
       query.id = args.id

package/src/entities/contact/IdentityEntity.ts

@@ -17,7 +17,8 @@ import { typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
 import { CorrelationIdentifierEntity } from './CorrelationIdentifierEntity'
 import { ConnectionEntity } from './ConnectionEntity'
 import { IdentityMetadataItemEntity } from './IdentityMetadataItemEntity'
-import { CredentialRole, IdentityOrigin, ValidationConstraint } from '../../types'
+import { IdentityOrigin, ValidationConstraint } from '../../types'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { PartyEntity } from './PartyEntity'
 import { getConstraint } from '../../utils/ValidatorUtils'