@sphereon/ssi-sdk.data-store 0.34.1-fix.114 → 0.34.1-fix.141

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-fix.114+ee98a3e1",
+  "version": "0.34.1-fix.141+ea643e42",
   "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-fix.114+ee98a3e1",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.114+ee98a3e1",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.114+ee98a3e1",
-    "@sphereon/ssi-sdk.core": "0.34.1-fix.114+ee98a3e1",
-    "@sphereon/ssi-types": "0.34.1-fix.114+ee98a3e1",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.34.1-fix.141+ea643e42",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.34.1-fix.141+ea643e42",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-fix.141+ea643e42",
+    "@sphereon/ssi-sdk.core": "0.34.1-fix.141+ea643e42",
+    "@sphereon/ssi-types": "0.34.1-fix.141+ea643e42",
     "@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": "ee98a3e17c1241de776e164fcfe1e73d162c5902"
+  "gitHead": "ea643e42804501f2a323a73971465d527981123d"
 }

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,9 +1,11 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DcqlQuery } from 'dcql'
 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 { SAMPLE_DCQL_QUERY_PAYLOAD } from './pd-manager.store.test'
 
 describe('PresentationDefinitionItemEntity tests', (): void => {
   let dbConnection: DataSource
@@ -28,23 +30,9 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
   it('should create and retrieve PresentationDefinitionItemEntity with dcqlPayload', async (): Promise<void> => {
     const repository = dbConnection.getRepository(PresentationDefinitionItemEntity)
     const entity = new PresentationDefinitionItemEntity()
-    entity.definitionId = 'definition1'
+    entity.definitionId = '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.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -55,29 +43,18 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     expect(retrievedEntity).toBeDefined()
     expect(retrievedEntity!.dcqlPayload).toBeDefined()
     const parsedDcql = JSON.parse(retrievedEntity!.dcqlPayload)
-    expect(parsedDcql.credentials[0].id).toEqual('credential1')
+    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'
+    entity.definitionId = '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.dcqlPayload = JSON.stringify(SAMPLE_DCQL_QUERY_PAYLOAD.dcqlQuery)
 
     const savedEntity = await repository.save(entity)
     expect(savedEntity).toBeDefined()
@@ -85,12 +62,11 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     const updatedDcql = {
       credentials: [
         {
-          id: 'credential2',
+          id: 'updated-clubcard',
           format: 'jwt_vc',
           claims: [
             {
-              namespace: 'test',
-              claim_name: 'updatedClaim',
+              path: ['name'],
             },
           ],
         },
@@ -99,7 +75,8 @@ describe('PresentationDefinitionItemEntity tests', (): void => {
     savedEntity.dcqlPayload = JSON.stringify(updatedDcql)
     const updatedEntity = await repository.save(savedEntity)
     expect(updatedEntity).toBeDefined()
-    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('credential2')
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].id).toEqual('updated-clubcard')
+    expect(JSON.parse(updatedEntity.dcqlPayload).credentials[0].format).toEqual('jwt_vc')
   })
 
   it('should create and retrieve PresentationDefinitionItemEntity', async (): Promise<void> => {

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

@@ -1,9 +1,41 @@
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
+import { DcqlQueryPayload } from '@sphereon/ssi-types'
 import { DataSource } from 'typeorm'
 import { DataStorePresentationDefinitionEntities, DataStorePresentationDefinitionMigrations, PDStore } from '../index'
 import { GetDefinitionsArgs, NonPersistedPresentationDefinitionItem, PresentationDefinitionItem } from '../types'
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
+export const SAMPLE_DCQL_QUERY_PAYLOAD: DcqlQueryPayload = {
+  queryId: 'ajax-club',
+  dcqlQuery: {
+    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
   let pdStore: PDStore
@@ -130,6 +162,23 @@ describe('PDStore tests', (): void => {
     expect(result.definitionId).toEqual(definition.definitionId)
   })
 
+  it('should add definition with dcqlPayload', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+
+    const result: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+
+    expect(result).toBeDefined()
+    expect(result.definitionId).toEqual(definition.definitionId)
+    expect(result.dcqlPayload).toBeDefined()
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('clubcard-v1')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toEqual('dc+sd-jwt')
+  })
+
   it('should update definition', async (): Promise<void> => {
     const definition: NonPersistedPresentationDefinitionItem = {
       definitionId: 'definition1',
@@ -151,6 +200,90 @@ describe('PDStore tests', (): void => {
     expect(result.version).toEqual('1.1')
   })
 
+  it('should update definition with dcqlPayload', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const updatedDcqlQueryPayload = {
+      ...SAMPLE_DCQL_QUERY_PAYLOAD,
+      dcqlQuery: {
+        credentials: [
+          {
+            id: 'updated-clubcard',
+            format: 'dc+sd-jwt',
+            claims: [
+              {
+                path: ['name'],
+              },
+            ],
+          },
+        ],
+      },
+    } as unknown as DcqlQueryPayload // FIXME I do not have another solution for this atm, I can do Partial<DcqlQuery> but that does not work for its child entities
+
+    const updatedDefinition: PresentationDefinitionItem = {
+      ...savedDefinition,
+      version: '1.1',
+      dcqlPayload: updatedDcqlQueryPayload,
+    }
+
+    await pdStore.updateDefinition(updatedDefinition)
+    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+
+    expect(result).toBeDefined()
+    expect(result.version).toEqual('1.1')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('updated-clubcard')
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toEqual('dc+sd-jwt')
+  })
+
+  it('should get definition with dcqlPayload by id', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const result: PresentationDefinitionItem = await pdStore.getDefinition({ itemId: savedDefinition.id })
+
+    expect(result).toBeDefined()
+    expect(result.dcqlPayload).toBeDefined()
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].format).toBe('dc+sd-jwt')
+    if (result.dcqlPayload?.dcqlQuery.credentials[0].format === 'dc+sd-jwt') {
+      expect(result.dcqlPayload.dcqlQuery.credentials[0].meta?.vct_values).toContain('clubcard-v1')
+    }
+    expect(result.dcqlPayload?.dcqlQuery.credentials[0].claims).toHaveLength(4)
+  })
+
+  it('should get definitions with dcqlPayload by filter', async (): Promise<void> => {
+    const definition: NonPersistedPresentationDefinitionItem = {
+      definitionId: 'ajax-club',
+      version: '1.0',
+      definitionPayload: { id: 'ajax-club', input_descriptors: [] },
+      dcqlPayload: SAMPLE_DCQL_QUERY_PAYLOAD,
+    }
+    const savedDefinition: PresentationDefinitionItem = await pdStore.addDefinition(definition)
+    expect(savedDefinition).toBeDefined()
+
+    const args: GetDefinitionsArgs = {
+      filter: [{ definitionId: 'ajax-club' }],
+    }
+    const result: Array<PresentationDefinitionItem> = await pdStore.getDefinitions(args)
+
+    expect(result.length).toEqual(1)
+    expect(result[0].dcqlPayload).toBeDefined()
+    expect(result[0].dcqlPayload?.dcqlQuery.credentials[0].id).toEqual('clubcard-v1')
+  })
+
   it('should delete definition', async (): Promise<void> => {
     const definition: NonPersistedPresentationDefinitionItem = {
       definitionId: 'definition1',

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'
 

package/src/entities/digitalCredential/DigitalCredentialEntity.ts

@@ -1,9 +1,10 @@
 import { typeormDate, typeOrmDateTime } from '@sphereon/ssi-sdk.agent-config'
+import { CredentialRole } from '@sphereon/ssi-types'
 import { BaseEntity, Column, CreateDateColumn, Entity, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
+
 import {
   CredentialCorrelationType,
   CredentialDocumentFormat,
-  CredentialRole,
   CredentialStateType,
   type DigitalCredential,
   DocumentType,

package/src/entities/presentationDefinition/PresentationDefinitionItemEntity.ts

@@ -25,7 +25,7 @@ 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?
+  @Column({ name: 'definition_payload', type: 'text', nullable: true, unique: false })
   @IsNotEmpty({ message: 'A blank PD definition payload field is not allowed' })
   definitionPayload!: string
 

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

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

package/src/migrations/generic/13-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,67 @@
+import Debug from 'debug'
+import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
+
+import { UpdatePresentationDefinitionItemNullablePG1741895824000 } from '../postgres/1756975509000-UpdatePresentationDefinitionItemNullable'
+import { UpdatePresentationDefinitionItemNullableSqlite1756975340000 } from '../sqlite/1756975340000-UpdatePresentationDefinitionItemNullable'
+
+const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
+
+export class UpdatePresentationDefinitionItemNullable1741895824000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1741895824000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: updating presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: UpdatePresentationDefinitionItemNullablePG1741895824000 = new UpdatePresentationDefinitionItemNullablePG1741895824000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: UpdatePresentationDefinitionItemNullableSqlite1756975340000 = new UpdatePresentationDefinitionItemNullableSqlite1756975340000()
+        await mig.up(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    debug('migration: reverting presentation definition item nullable fields')
+    const dbType: DatabaseType = queryRunner.connection.driver.options.type
+
+    switch (dbType) {
+      case 'postgres': {
+        debug('using postgres migration file')
+        const mig: UpdatePresentationDefinitionItemNullablePG1741895824000 = new UpdatePresentationDefinitionItemNullablePG1741895824000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      case 'sqlite':
+      case 'expo':
+      case 'react-native': {
+        debug('using sqlite/react-native migration file')
+        const mig: UpdatePresentationDefinitionItemNullableSqlite1756975340000 = new UpdatePresentationDefinitionItemNullableSqlite1756975340000()
+        await mig.down(queryRunner)
+        debug('Migration statements executed')
+        return
+      }
+      default:
+        return Promise.reject(
+          `Migrations are currently only supported for sqlite, react-native, expo and postgres. Was ${dbType}. Please run your database without migrations and with 'migrationsRun: false' and 'synchronize: true' for now`,
+        )
+    }
+  }
+}

package/src/migrations/generic/index.ts

@@ -1,4 +1,8 @@
 import { CreateContacts1659463079429 } from './1-CreateContacts'
+import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
+import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
+import { AddBitstringStatusListEnum1741895823000, CreateBitstringStatusList1741895823000 } from './12-CreateBitstringStatusList'
+import { UpdatePresentationDefinitionItemNullable1741895824000 } from './13-UpdatePresentationDefinitionItemNullable'
 import { CreateIssuanceBranding1659463079429 } from './2-CreateIssuanceBranding'
 import { CreateContacts1690925872318 } from './3-CreateContacts'
 import { CreateStatusList1693866470000 } from './4-CreateStatusList'
@@ -7,9 +11,6 @@ import { CreateDigitalCredential1708525189000 } from './6-CreateDigitalCredentia
 import { CreateMachineStateStore1708098041262 } from './7-CreateMachineStateStore'
 import { CreateContacts1708525189000 } from './8-CreateContacts'
 import { CreateContacts1715761125000 } from './9-CreateContacts'
-import { CreatePresentationDefinitions1716533767523 } from './10-CreatePresentationDefinitions'
-import { FixCredentialClaimsReferencesUuid1741895822987 } from './11-FixCredentialClaimsReferenceUuid'
-import { CreateBitstringStatusList1741895823000 } from './12-CreateBitstringStatusList'
 
 /**
  * The migrations array that SHOULD be used when initializing a TypeORM database connection.
@@ -27,11 +28,18 @@ export const DataStoreContactMigrations = [
   CreateContacts1715761125000,
 ]
 export const DataStoreIssuanceBrandingMigrations = [CreateIssuanceBranding1659463079429, FixCredentialClaimsReferencesUuid1741895822987]
-export const DataStoreStatusListMigrations = [CreateStatusList1693866470000, CreateBitstringStatusList1741895823000]
+export const DataStoreStatusListMigrations = [
+  CreateStatusList1693866470000,
+  AddBitstringStatusListEnum1741895823000,
+  CreateBitstringStatusList1741895823000,
+]
 export const DataStoreEventLoggerMigrations = [CreateAuditEvents1701635835330]
 export const DataStoreDigitalCredentialMigrations = [CreateDigitalCredential1708525189000]
 export const DataStoreMachineStateMigrations = [CreateMachineStateStore1708098041262]
-export const DataStorePresentationDefinitionMigrations = [CreatePresentationDefinitions1716533767523]
+export const DataStorePresentationDefinitionMigrations = [
+  CreatePresentationDefinitions1716533767523,
+  UpdatePresentationDefinitionItemNullable1741895824000,
+]
 
 // All migrations together
 export const DataStoreMigrations = [

package/src/migrations/postgres/1741895823000-CreateBitstringStatusList.ts

@@ -1,13 +1,24 @@
 import { MigrationInterface, QueryRunner } from 'typeorm'
 
-export class CreateBitstringStatusListPG1741895823000 implements MigrationInterface {
-  name = 'CreateBitstringStatusList1741895823000'
+export class AddBitstringStatusListEnumPG1741895823000 implements MigrationInterface {
+  name = 'AddBitstringStatusListEnum1741895823000'
 
   public async up(queryRunner: QueryRunner): Promise<void> {
     await queryRunner.startTransaction()
     await queryRunner.query(`ALTER TYPE "StatusList_type_enum" ADD VALUE 'BitstringStatusList'`)
     await queryRunner.commitTransaction()
+  }
 
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Note: Cannot remove enum value in Postgres without recreating the type
+  }
+}
+
+export class CreateBitstringStatusListPG1741895823000 implements MigrationInterface {
+  name = 'CreateBitstringStatusList1741895823000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
     // Add BitstringStatusList columns to StatusList table
     await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "ttl" integer`)
     await queryRunner.query(`ALTER TABLE "StatusList" ADD COLUMN "validFrom" TIMESTAMP`)

package/src/migrations/postgres/1756975509000-UpdatePresentationDefinitionItemNullable.ts

@@ -0,0 +1,15 @@
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+export class UpdatePresentationDefinitionItemNullablePG1741895824000 implements MigrationInterface {
+  name = 'UpdatePresentationDefinitionItemNullable1741895824000'
+
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    // Make definition_payload nullable
+    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" DROP NOT NULL`)
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    // Make definition_payload NOT NULL again
+    await queryRunner.query(`ALTER TABLE "PresentationDefinitionItem" ALTER COLUMN "definition_payload" SET NOT NULL`)
+  }
+}