@sphereon/ssi-sdk.data-store 0.34.1-fix.80 → 0.34.1-next.278

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-fix.80+f71b3901",
+  "version": "0.34.1-next.278+0eacb25b",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,16 +28,17 @@
   "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.80+f71b3901",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.80+f71b3901",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.80+f71b3901",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.80+f71b3901",
-    "@sphereon/ssi-types": "0.34.1-fix.80+f71b3901",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-next.278+0eacb25b",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-next.278+0eacb25b",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-next.278+0eacb25b",
+    "@sphereon/ssi-sdk.core": "0.34.1-next.278+0eacb25b",
+    "@sphereon/ssi-sdk.data-store-types": "0.34.1-next.278+0eacb25b",
+    "@sphereon/ssi-types": "0.34.1-next.278+0eacb25b",
     "@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 +66,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "f71b39017a0bd9ac33fab56d2d61287d8d5c14f4"
+  "gitHead": "0eacb25b6e38cef88d04d696d84e3c2ebcf89ede"
 }

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'
@@ -16,18 +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,
-  CredentialRole,
-  DataStoreContactEntities,
-  DataStoreMigrations,
-  identityMetadataItemEntityFrom,
   IdentityOrigin,
   MetadataTypes,
   PartyOrigin,
-  partyTypeFrom,
-} from '../index'
-import {
   ConnectionType,
   CorrelationIdentifierType,
   NaturalPerson,
@@ -43,7 +38,7 @@ import {
   NonPersistedPhysicalAddress,
   Organization,
   PartyTypeType,
-} from '../types'
+} from '@sphereon/ssi-sdk.data-store-types'
 import {
   connectionEntityFrom,
   didAuthConfigEntityFrom,
@@ -57,7 +52,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

@@ -1,10 +1,7 @@
 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,
-  CredentialRole,
   ElectronicAddress,
   GetElectronicAddressesArgs,
   GetIdentitiesArgs,
@@ -12,6 +9,9 @@ import {
   GetPhysicalAddressesArgs,
   GetRelationshipsArgs,
   Identity,
+  IdentityOrigin,
+  MetadataItem,
+  MetadataTypes,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -21,12 +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 { 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,13 +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 { CredentialRole, DataStoreDigitalCredentialEntities } from '../index'
-import { DataStoreDigitalCredentialMigrations } from '../migrations'
+import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 import { DigitalCredentialEntity } from '../entities/digitalCredential/DigitalCredentialEntity'
-import { computeEntryHash } from '@veramo/utils'
+import { DataStoreDigitalCredentialEntities } from '../index'
+import { DataStoreDigitalCredentialMigrations } from '../migrations'
 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

@@ -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,
@@ -13,9 +15,7 @@ import {
   DocumentType,
   GetCredentialsArgs,
   GetCredentialsResponse,
-} from '../types'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
-import { afterEach, beforeEach, describe, expect, it } from 'vitest'
+} 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.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')
   })
 })