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

package/src/statusList/StatusListStore.ts

@@ -1,11 +1,14 @@
 import { type OrPromise, StatusListType } from '@sphereon/ssi-types'
 import Debug from 'debug'
 import { DataSource, In, type Repository } from 'typeorm'
-import { OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
+import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
 import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
-import type {
+import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
+import {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
+  IBitstringStatusListEntity,
+  IBitstringStatusListEntryEntity,
   IGetStatusListArgs,
   IGetStatusListEntriesArgs,
   IGetStatusListEntryByCredentialIdArgs,
@@ -17,8 +20,8 @@ import type {
   IStatusListEntryEntity,
   IUpdateStatusListIndexArgs,
 } from '../types'
-import type { IStatusListStore } from './IStatusListStore'
 import { statusListEntityFrom, statusListFrom } from '../utils/statusList/MappingUtils'
+import type { IStatusListStore } from './IStatusListStore'
 
 const debug = Debug('sphereon:ssi-sdk:data-store:status-list')
 
@@ -41,11 +44,11 @@ export class StatusListStore implements IStatusListStore {
   async availableStatusListEntries(args: IStatusListEntryAvailableArgs): Promise<number[]> {
     const statusListIndex = Array.isArray(args.statusListIndex) ? args.statusListIndex : [args.statusListIndex]
     const statusList = await this.getStatusList({ ...args, id: args.statusListId })
-    const repo = await this.getStatusListEntryRepo()
+    const repo = await this.getStatusListEntryRepo(statusList.type)
     const results = (
       await repo.find({
         where: {
-          statusList,
+          statusListId: statusList.id,
           statusListIndex: In(statusListIndex),
         },
       })
@@ -53,33 +56,42 @@ export class StatusListStore implements IStatusListStore {
     return statusListIndex.filter((index) => !results.includes(index))
   }
 
-  async addStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity> {
-    return (await this.getStatusListEntryRepo()).save(args)
+  async addStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity | IBitstringStatusListEntryEntity> {
+    if (!args.statusListId) {
+      throw new Error('statusListId is required')
+    }
+
+    const statusList = await this.getStatusList({ id: args.statusListId })
+    return await (await this.getStatusListEntryRepo(statusList.type)).save(args)
   }
 
-  async updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity> {
-    const statusListId = args.statusListId ?? args.statusList?.id
+  async updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity | IBitstringStatusListEntryEntity> {
+    const statusListId = args.statusListId
+    if (!statusListId) {
+      throw new Error('statusListId is required')
+    }
+
+    const statusList = await this.getStatusList({ id: statusListId })
     const result = await this.getStatusListEntryByIndex({ ...args, statusListId, errorOnNotFound: false })
     const updatedEntry: Partial<IStatusListEntryEntity> = {
-      value: args.value,
-      correlationId: args.correlationId,
-      credentialHash: args.credentialHash,
-      credentialId: args.credentialId,
+      ...result,
+      ...args,
+      statusListId,
     }
 
     const updStatusListId = result?.statusListId ?? statusListId
     const updateResult = await (
-      await this.getStatusListEntryRepo()
+      await this.getStatusListEntryRepo(statusList.type)
     ).upsert(
       { ...(result ?? { statusListId: updStatusListId, statusListIndex: args.statusListIndex }), ...updatedEntry },
       { conflictPaths: ['statusList', 'statusListIndex'] },
     )
-    console.log(updateResult)
+    debug(updateResult)
     return (await this.getStatusListEntryByIndex({
       ...args,
       statusListId: updStatusListId,
       errorOnNotFound: true,
-    })) as IStatusListEntryEntity
+    }))!
   }
 
   async getStatusListEntryByIndex({
@@ -88,7 +100,7 @@ export class StatusListStore implements IStatusListStore {
     statusListIndex,
     entryCorrelationId,
     errorOnNotFound,
-  }: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | undefined> {
+  }: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | BitstringStatusListEntryEntity | undefined> {
     if (!statusListId && !statusListCorrelationId) {
       throw Error(`Cannot get statusList entry without either a statusList id or statusListCorrelationId`)
     }
@@ -97,8 +109,12 @@ export class StatusListStore implements IStatusListStore {
       throw Error(`Cannot get statusList entry without either a statusListIndex or entryCorrelationId`)
     }
 
+    const statusList = statusListId
+      ? await this.getStatusList({ id: statusListId })
+      : await this.getStatusList({ correlationId: statusListCorrelationId })
+
     const result = await (
-      await this.getStatusListEntryRepo()
+      await this.getStatusListEntryRepo(statusList.type)
     ).findOne({
       where: {
         ...(statusListId && { statusListId }),
@@ -118,7 +134,9 @@ export class StatusListStore implements IStatusListStore {
     return result ?? undefined
   }
 
-  async getStatusListEntryByCredentialId(args: IGetStatusListEntryByCredentialIdArgs): Promise<StatusListEntryEntity | undefined> {
+  async getStatusListEntryByCredentialId(
+    args: IGetStatusListEntryByCredentialIdArgs,
+  ): Promise<StatusListEntryEntity | BitstringStatusListEntryEntity | undefined> {
     const credentialId = args.credentialId
     if (!credentialId) {
       throw Error('Can only get a credential by credentialId when a credentialId is supplied')
@@ -132,8 +150,8 @@ export class StatusListStore implements IStatusListStore {
       ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
       credentialId,
     }
-    console.log(`Entries: ${JSON.stringify(await (await this.getStatusListEntryRepo()).find(), null, 2)}`)
-    const result = await (await this.getStatusListEntryRepo()).findOne({ where })
+    debug(`Entries: ${JSON.stringify(await (await this.getStatusListEntryRepo(statusList.type)).find(), null, 2)}`)
+    const result = await (await this.getStatusListEntryRepo(statusList.type)).findOne({ where })
 
     if (!result && args.errorOnNotFound) {
       throw Error(`Could not find status list credential id ${credentialId} for status list id ${statusList.id}`)
@@ -149,8 +167,12 @@ export class StatusListStore implements IStatusListStore {
       error = true
     }
     if (!error) {
+      const statusList = await this.getStatusList({
+        id: args.statusListId,
+        correlationId: args.statusListCorrelationId,
+      })
       const result = await (
-        await this.getStatusListEntryRepo()
+        await this.getStatusListEntryRepo(statusList.type)
       ).delete({
         ...(args.statusListId && { statusList: args.statusListId }),
         ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
@@ -169,10 +191,11 @@ export class StatusListStore implements IStatusListStore {
       error = true
     }
     if (error) {
-      console.log(`Could not delete statusList ${args.statusListId} entry by index ${args.statusListIndex}`)
+      console.error(`Could not delete statusList ${args.statusListId} entry by index ${args.statusListIndex}`)
     } else {
+      const statusList = await this.getStatusList({ id: args.statusListId })
       const result = await (
-        await this.getStatusListEntryRepo()
+        await this.getStatusListEntryRepo(statusList.type)
       ).delete({
         ...(args.statusListId && { statusList: args.statusListId }),
         ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
@@ -183,12 +206,14 @@ export class StatusListStore implements IStatusListStore {
     return !error
   }
 
-  async getStatusListEntries(args: IGetStatusListEntriesArgs): Promise<StatusListEntryEntity[]> {
-    return (await this.getStatusListEntryRepo()).find({ where: { ...args?.filter, statusList: args.statusListId } })
-  }
-
-  async getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity> {
-    return statusListFrom(await this.getStatusListEntity(args))
+  async getStatusListEntries(args: IGetStatusListEntriesArgs): Promise<Array<IStatusListEntryEntity | IBitstringStatusListEntryEntity>> {
+    const statusList = await this.getStatusList({ id: args.statusListId })
+    const results = await (
+      await this.getStatusListEntryRepo(statusList.type)
+    ).find({
+      where: { ...args?.filter, statusList: args.statusListId },
+    })
+    return results as Array<IStatusListEntryEntity | IBitstringStatusListEntryEntity>
   }
 
   private async getStatusListEntity(args: IGetStatusListArgs): Promise<StatusListEntity> {
@@ -208,7 +233,12 @@ export class StatusListStore implements IStatusListStore {
     return result
   }
 
-  async getStatusLists(args: IGetStatusListsArgs): Promise<Array<IStatusListEntity>> {
+  async getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity | IBitstringStatusListEntity> {
+    const entity = await this.getStatusListEntity(args)
+    return statusListFrom(entity) as IStatusListEntity | IBitstringStatusListEntity
+  }
+
+  async getStatusLists(args: IGetStatusListsArgs): Promise<Array<IStatusListEntity | IBitstringStatusListEntity>> {
     const result = await (
       await this.getStatusListRepo()
     ).find({
@@ -219,7 +249,7 @@ export class StatusListStore implements IStatusListStore {
       return []
     }
 
-    return result.map((entity) => statusListFrom(entity))
+    return result.map((entity) => statusListFrom(entity) as IStatusListEntity | IBitstringStatusListEntity)
   }
 
   async addStatusList(args: IAddStatusListArgs): Promise<IStatusListEntity> {
@@ -240,7 +270,7 @@ export class StatusListStore implements IStatusListStore {
     return statusListFrom(createdResult)
   }
 
-  async updateStatusList(args: IUpdateStatusListIndexArgs): Promise<IStatusListEntity> {
+  async updateStatusList(args: IUpdateStatusListIndexArgs): Promise<IStatusListEntity | IBitstringStatusListEntity> {
     const result = await this.getStatusList(args)
     debug('Updating status list', result)
     const entity = statusListEntityFrom(args)
@@ -251,7 +281,7 @@ export class StatusListStore implements IStatusListStore {
   async removeStatusList(args: IRemoveStatusListArgs): Promise<boolean> {
     const result = await this.getStatusListEntity(args)
 
-    await (await this.getStatusListEntryRepo()).delete({ statusListId: result.id })
+    await (await this.getStatusListEntryRepo(result.type)).delete({ statusListId: result.id })
     const deletedEntity = await (await this.getStatusListRepo()).remove(result)
 
     return Boolean(deletedEntity)
@@ -268,12 +298,20 @@ export class StatusListStore implements IStatusListStore {
         return dataSource.getRepository(StatusList2021Entity)
       case StatusListType.OAuthStatusList:
         return dataSource.getRepository(OAuthStatusListEntity)
+      case StatusListType.BitstringStatusList:
+        return dataSource.getRepository(BitstringStatusListEntity)
       default:
         return dataSource.getRepository(StatusListEntity)
     }
   }
 
-  async getStatusListEntryRepo(): Promise<Repository<StatusListEntryEntity>> {
-    return (await this.getDS()).getRepository(StatusListEntryEntity)
+  async getStatusListEntryRepo(type?: StatusListType): Promise<Repository<StatusListEntryEntity | BitstringStatusListEntryEntity>> {
+    const dataSource = await this.getDS()
+    switch (type) {
+      case StatusListType.BitstringStatusList:
+        return dataSource.getRepository(BitstringStatusListEntryEntity)
+      default:
+        return dataSource.getRepository(StatusListEntryEntity)
+    }
   }
 }

package/src/types/index.ts

@@ -1,14 +1,2 @@
-export * from './issuanceBranding/issuanceBranding'
-export * from './issuanceBranding/IAbstractIssuanceBrandingStore'
-export * from './contact/contact'
-export * from './contact/IAbstractContactStore'
-export * from './presentationDefinition/presentationDefinition'
-export * from './presentationDefinition/IAbstractPDStore'
-export * from './validation/validation'
 export * from './statusList/statusList'
 export * from './statusList/IAbstractStatusListStore'
-export * from './eventLogger/IAbstractEventLoggerStore'
-export * from './eventLogger/eventLogger'
-export * from './machineState/IAbstractMachineStateStore'
-export * from './digitalCredential'
-export * from './digitalCredential/IAbstractDigitalCredentialStore'

package/src/types/statusList/IAbstractStatusListStore.ts

@@ -1,7 +1,23 @@
+import {
+  CredentialProofFormat,
+  IIssuer,
+  StatusListCredential,
+  StatusListCredentialIdMode,
+  StatusListDriverType,
+  StatusListIndexingDirection,
+  StatusListType,
+  StatusPurpose2021,
+} from '@sphereon/ssi-types'
 import { FindOptionsWhere } from 'typeorm'
-import { IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntity, IStatusListEntryEntity } from './statusList'
+import {
+  BitstringStatusPurpose,
+  IBitstringStatusListEntryEntity,
+  IOAuthStatusListEntity,
+  IStatusList2021Entity,
+  IStatusListEntryEntity,
+} from './statusList'
 
-export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[]
+export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[] // TODO export our own FindOptionsWhere
 export type FindStatusListEntryArgs = FindOptionsWhere<IStatusListEntryEntity>[] | FindOptionsWhere<IStatusListEntryEntity>
 
 export interface IStatusListEntryAvailableArgs {
@@ -30,7 +46,7 @@ export interface IGetStatusListEntriesArgs {
   filter?: FindStatusListEntryArgs
 }
 
-export type IAddStatusListEntryArgs = IStatusListEntryEntity
+export type IAddStatusListEntryArgs = IStatusListEntryEntity | IBitstringStatusListEntryEntity
 
 export interface IGetStatusListArgs {
   id?: string
@@ -43,6 +59,40 @@ export interface IGetStatusListsArgs {
   filter?: FindStatusListArgs
 }
 
-export type IAddStatusListArgs = IStatusListEntity
+interface IBaseStatusListArgs {
+  id: string
+  correlationId: string
+  driverType: StatusListDriverType
+  credentialIdMode: StatusListCredentialIdMode
+  length: number
+  issuer: string | IIssuer
+  type: StatusListType
+  proofFormat: CredentialProofFormat
+  statusListCredential?: StatusListCredential
+  bitsPerStatus?: number
+}
+
+export type IStatusList2021Args = IBaseStatusListArgs & {
+  type: StatusListType.StatusList2021
+  indexingDirection: StatusListIndexingDirection
+  statusPurpose: StatusPurpose2021
+}
+
+export type IOAuthStatusListArgs = IBaseStatusListArgs & {
+  type: StatusListType.OAuthStatusList
+  bitsPerStatus: number
+  expiresAt?: Date
+}
+
+export type IBitstringStatusListArgs = IBaseStatusListArgs & {
+  type: StatusListType.BitstringStatusList
+  statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[]
+  bitsPerStatus?: number
+  validFrom?: Date
+  validUntil?: Date
+  ttl?: number
+}
+
+export type IAddStatusListArgs = IStatusList2021Args | IOAuthStatusListArgs | IBitstringStatusListArgs
 
-export type IUpdateStatusListIndexArgs = IStatusListEntity
+export type IUpdateStatusListIndexArgs = IAddStatusListArgs

package/src/types/statusList/statusList.ts

@@ -1,13 +1,14 @@
 import {
+  type CredentialProofFormat,
+  type ICredentialStatus,
   IIssuer,
+  RequireOneOf,
   StatusListCredential,
   StatusListCredentialIdMode,
   StatusListDriverType,
   StatusListIndexingDirection,
   StatusListType,
   StatusPurpose2021,
-  type CredentialProofFormat,
-  RequireOneOf,
 } from '@sphereon/ssi-types'
 import { StatusListEntity } from '../../entities/statusList/StatusListEntities'
 
@@ -21,6 +22,7 @@ export interface IStatusListEntity {
   type: StatusListType
   proofFormat: CredentialProofFormat
   statusListCredential?: StatusListCredential
+  bitsPerStatus?: number
 }
 
 export interface IStatusList2021Entity extends IStatusListEntity {
@@ -33,6 +35,14 @@ export interface IOAuthStatusListEntity extends IStatusListEntity {
   expiresAt?: Date
 }
 
+export interface IBitstringStatusListEntity extends IStatusListEntity {
+  statusPurpose: BitstringStatusPurpose | Array<BitstringStatusPurpose>
+  bitsPerStatus?: number
+  validFrom?: Date
+  validUntil?: Date
+  ttl?: number
+}
+
 export type IStatusListEntryEntity = RequireOneOf<
   {
     statusList: StatusListEntity
@@ -45,3 +55,41 @@ export type IStatusListEntryEntity = RequireOneOf<
   },
   'statusList' | 'statusListId'
 >
+
+export type BitstringStatusPurpose = 'revocation' | 'suspension' | 'refresh' | 'message' | string // From vc-bitstring-status-lists without pulling in the whole dep for just this one type
+
+export type BitstringStatusMessage = {
+  status: string
+  message?: string
+  [x: string]: any
+}
+
+export interface BitstringStatusListEntryCredentialStatus extends ICredentialStatus {
+  type: 'BitstringStatusListEntry'
+  statusPurpose: BitstringStatusPurpose | Array<BitstringStatusPurpose>
+  statusListIndex: string
+  statusListCredential: string
+  bitsPerStatus?: number
+  statusMessage?: Array<BitstringStatusMessage>
+  statusReference?: string | Array<string>
+}
+
+export type BitstringStatusListArgs = {
+  statusPurpose: BitstringStatusPurpose
+  bitsPerStatus: number
+  ttl?: number
+  validFrom?: Date
+  validUntil?: Date
+}
+
+export interface IBitstringStatusListEntryEntity {
+  statusListId: string
+  statusListIndex: number
+  credentialId?: string
+  credentialHash?: string
+  entryCorrelationId?: string
+  statusPurpose: string
+  bitsPerStatus?: number
+  statusMessage?: Array<BitstringStatusMessage>
+  statusReference?: string | Array<string>
+}

package/src/utils/ValidatorUtils.ts

@@ -1,5 +1,5 @@
+import { type ValidationConstraint } from '@sphereon/ssi-sdk.data-store-types'
 import { ValidationError } from 'class-validator'
-import { type ValidationConstraint } from '../types'
 
 export const getConstraint = (validation: ValidationError): ValidationConstraint | undefined => {
   if (validation.children && validation.children.length > 0) {

package/src/utils/contact/MappingUtils.ts

@@ -1,5 +1,4 @@
 import type {
-  MetadataTypes,
   Connection,
   ConnectionConfig,
   Contact,
@@ -8,6 +7,7 @@ import type {
   ElectronicAddress,
   Identity,
   MetadataItem,
+  MetadataTypes,
   NaturalPerson,
   NonPersistedConnection,
   NonPersistedConnectionConfig,
@@ -30,23 +30,23 @@ import type {
   PartyRelationship,
   PartyType,
   PhysicalAddress,
-} from '../../types'
-import { PartyEntity } from '../../entities/contact/PartyEntity'
-import { IdentityEntity } from '../../entities/contact/IdentityEntity'
-import { ElectronicAddressEntity } from '../../entities/contact/ElectronicAddressEntity'
-import { PartyRelationshipEntity } from '../../entities/contact/PartyRelationshipEntity'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { BaseConfigEntity } from '../../entities/contact/BaseConfigEntity'
 import { BaseContactEntity } from '../../entities/contact/BaseContactEntity'
-import { NaturalPersonEntity } from '../../entities/contact/NaturalPersonEntity'
-import { OrganizationEntity } from '../../entities/contact/OrganizationEntity'
 import { ConnectionEntity } from '../../entities/contact/ConnectionEntity'
-import { BaseConfigEntity } from '../../entities/contact/BaseConfigEntity'
+import { ContactMetadataItemEntity } from '../../entities/contact/ContactMetadataItemEntity'
 import { CorrelationIdentifierEntity } from '../../entities/contact/CorrelationIdentifierEntity'
 import { DidAuthConfigEntity } from '../../entities/contact/DidAuthConfigEntity'
+import { ElectronicAddressEntity } from '../../entities/contact/ElectronicAddressEntity'
+import { IdentityEntity } from '../../entities/contact/IdentityEntity'
 import { IdentityMetadataItemEntity } from '../../entities/contact/IdentityMetadataItemEntity'
+import { NaturalPersonEntity } from '../../entities/contact/NaturalPersonEntity'
 import { OpenIdConfigEntity } from '../../entities/contact/OpenIdConfigEntity'
+import { OrganizationEntity } from '../../entities/contact/OrganizationEntity'
+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 { ContactMetadataItemEntity } from '../../entities/contact/ContactMetadataItemEntity'
 import { replaceNullWithUndefined } from '../FormattingUtils'
 
 export const partyEntityFrom = (party: NonPersistedParty): PartyEntity => {

package/src/utils/digitalCredential/MappingUtils.ts

@@ -1,3 +1,6 @@
+import { defaultHasher } from '@sphereon/ssi-sdk.core'
+import type { AddCredentialArgs, DigitalCredential, NonPersistedDigitalCredential } from '@sphereon/ssi-sdk.data-store-types'
+import { CredentialDocumentFormat, DocumentType, RegulationType } from '@sphereon/ssi-sdk.data-store-types'
 import {
   CredentialMapper,
   DocumentFormat,
@@ -10,10 +13,7 @@ import {
 } from '@sphereon/ssi-types'
 import { computeEntryHash } from '@veramo/utils'
 import { DigitalCredentialEntity } from '../../entities/digitalCredential/DigitalCredentialEntity'
-import type { AddCredentialArgs, DigitalCredential, NonPersistedDigitalCredential } from '../../types'
-import { CredentialDocumentFormat, DocumentType, RegulationType } from '../../types'
 import { replaceNullWithUndefined } from '../FormattingUtils'
-import { defaultHasher } from '@sphereon/ssi-sdk.core'
 
 function determineDocumentType(raw: string): DocumentType {
   const rawDocument = parseRawDocument(raw)
@@ -51,24 +51,6 @@ export function parseRawDocument(raw: string): OriginalVerifiableCredential | Or
   }
 }
 
-export function ensureRawDocument(input: string | object): string {
-  if (typeof input === 'string') {
-    if (isHex(input) || ObjectUtils.isBase64(input)) {
-      // mso_mdoc
-      return input
-    } else if (CredentialMapper.isJwtEncoded(input) || CredentialMapper.isSdJwtEncoded(input)) {
-      return input
-    }
-    throw Error('Unknown input to be mapped as rawDocument')
-  }
-
-  try {
-    return JSON.stringify(input)
-  } catch (e) {
-    throw new Error(`Can't stringify to a raw credential: ${input}`)
-  }
-}
-
 function determineCredentialDocumentFormat(documentFormat: DocumentFormat): CredentialDocumentFormat {
   switch (documentFormat) {
     case DocumentFormat.JSONLD:

package/src/utils/eventLogger/MappingUtils.ts

@@ -1,8 +1,8 @@
 import type { ActivityLoggingEvent, AuditLoggingEvent } from '@sphereon/ssi-sdk.core'
+import type { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '@sphereon/ssi-sdk.data-store-types'
 import { LoggingEventType } from '@sphereon/ssi-types'
-import { replaceNullWithUndefined } from '../FormattingUtils'
 import { AuditEventEntity } from '../../entities/eventLogger/AuditEventEntity'
-import type { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../../types'
+import { replaceNullWithUndefined } from '../FormattingUtils'
 
 export const auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
   const result: AuditLoggingEvent = {

package/src/utils/issuanceBranding/MappingUtils.ts

@@ -1,15 +1,3 @@
-import { replaceNullWithUndefined } from '../FormattingUtils'
-import { isEmptyString } from '../../entities/validators'
-import { CredentialBrandingEntity } from '../../entities/issuanceBranding/CredentialBrandingEntity'
-import { BaseLocaleBrandingEntity } from '../../entities/issuanceBranding/BaseLocaleBrandingEntity'
-import { IssuerBrandingEntity } from '../../entities/issuanceBranding/IssuerBrandingEntity'
-import { ImageAttributesEntity } from '../../entities/issuanceBranding/ImageAttributesEntity'
-import { BackgroundAttributesEntity } from '../../entities/issuanceBranding/BackgroundAttributesEntity'
-import { TextAttributesEntity } from '../../entities/issuanceBranding/TextAttributesEntity'
-import { IssuerLocaleBrandingEntity } from '../../entities/issuanceBranding/IssuerLocaleBrandingEntity'
-import { CredentialLocaleBrandingEntity } from '../../entities/issuanceBranding/CredentialLocaleBrandingEntity'
-import { ImageDimensionsEntity } from '../../entities/issuanceBranding/ImageDimensionsEntity'
-import { CredentialClaimsEntity } from '../../entities/issuanceBranding/CredentialClaimsEntity'
 import type {
   IBasicBackgroundAttributes,
   IBasicCredentialBranding,
@@ -23,7 +11,19 @@ import type {
   ICredentialBranding,
   IIssuerBranding,
   ILocaleBranding,
-} from '../../types'
+} from '@sphereon/ssi-sdk.data-store-types'
+import { BackgroundAttributesEntity } from '../../entities/issuanceBranding/BackgroundAttributesEntity'
+import { BaseLocaleBrandingEntity } from '../../entities/issuanceBranding/BaseLocaleBrandingEntity'
+import { CredentialBrandingEntity } from '../../entities/issuanceBranding/CredentialBrandingEntity'
+import { CredentialClaimsEntity } from '../../entities/issuanceBranding/CredentialClaimsEntity'
+import { CredentialLocaleBrandingEntity } from '../../entities/issuanceBranding/CredentialLocaleBrandingEntity'
+import { ImageAttributesEntity } from '../../entities/issuanceBranding/ImageAttributesEntity'
+import { ImageDimensionsEntity } from '../../entities/issuanceBranding/ImageDimensionsEntity'
+import { IssuerBrandingEntity } from '../../entities/issuanceBranding/IssuerBrandingEntity'
+import { IssuerLocaleBrandingEntity } from '../../entities/issuanceBranding/IssuerLocaleBrandingEntity'
+import { TextAttributesEntity } from '../../entities/issuanceBranding/TextAttributesEntity'
+import { isEmptyString } from '../../entities/validators'
+import { replaceNullWithUndefined } from '../FormattingUtils'
 
 export const credentialBrandingFrom = (credentialBranding: CredentialBrandingEntity): ICredentialBranding => {
   const result: ICredentialBranding = {

package/src/utils/presentationDefinition/MappingUtils.ts

@@ -1,58 +1,67 @@
-import { PresentationDefinitionItemEntity } from '../../entities/presentationDefinition/PresentationDefinitionItemEntity'
 import type { IPresentationDefinition } from '@sphereon/pex'
-import type { NonPersistedPresentationDefinitionItem, PartialPresentationDefinitionItem, PresentationDefinitionItem } from '../../types'
+import type { DcqlQueryItem, NonPersistedDcqlQueryItem, PartialDcqlQueryItem } from '@sphereon/ssi-sdk.data-store-types'
 import * as blakepkg from 'blakejs'
+import { DcqlQuery } from 'dcql'
+import { DcqlQueryItemEntity } from '../../entities/presentationDefinition/DcqlQueryItemEntity'
 import { replaceNullWithUndefined } from '../FormattingUtils'
-import type { DcqlQueryREST } from '@sphereon/ssi-types'
 
-export const presentationDefinitionItemFrom = (entity: PresentationDefinitionItemEntity): PresentationDefinitionItem => {
-  const result: PresentationDefinitionItem = {
+export const dcqlQueryItemFrom = (entity: DcqlQueryItemEntity): DcqlQueryItem => {
+  const result: DcqlQueryItem = {
     id: entity.id,
     tenantId: entity.tenantId,
-    definitionId: entity.definitionId,
+    queryId: entity.queryId,
     version: entity.version,
     name: entity.name,
     purpose: entity.purpose,
-    definitionPayload: JSON.parse(entity.definitionPayload) as IPresentationDefinition,
-    dcqlPayload: JSON.parse(entity.dcqlPayload) as DcqlQueryREST,
+    query: DcqlQuery.parse(JSON.parse(entity.query)),
     createdAt: entity.createdAt,
     lastUpdatedAt: entity.lastUpdatedAt,
   }
 
+  if (result.query) {
+    DcqlQuery.validate(result.query)
+  }
   return replaceNullWithUndefined(result)
 }
 
-export const presentationDefinitionEntityItemFrom = (item: NonPersistedPresentationDefinitionItem): PresentationDefinitionItemEntity => {
-  const entity = new PresentationDefinitionItemEntity()
+export const dcqlQueryEntityItemFrom = (item: NonPersistedDcqlQueryItem): DcqlQueryItemEntity => {
+  const entity = new DcqlQueryItemEntity()
 
   entity.tenantId = item.tenantId
-  entity.definitionId = item.definitionId!
+  entity.queryId = item.queryId!
   entity.version = item.version
   entity.name = item.name
   entity.purpose = item.purpose
-  entity.definitionPayload = JSON.stringify(item.definitionPayload!)
-  entity.dcqlPayload = JSON.stringify(item.dcqlPayload!)
+  if (item.query) {
+    const dcqlQuery = DcqlQuery.parse(item.query)
+    DcqlQuery.validate(dcqlQuery)
+    entity.query = JSON.stringify(item.query)
+  }
   return entity
 }
 
-function hashPayload(payload: IPresentationDefinition): string {
+function hashPayload(payload: IPresentationDefinition | DcqlQuery): string {
   return blakepkg.blake2bHex(JSON.stringify(payload))
 }
 
-export function isPresentationDefinitionEqual(base: PartialPresentationDefinitionItem, compare: PartialPresentationDefinitionItem): boolean {
+export function isPresentationDefinitionEqual(base: PartialDcqlQueryItem, compare: PartialDcqlQueryItem): boolean {
   if (
-    base.definitionId !== compare.definitionId ||
-    base.tenantId != compare.tenantId ||
+    base.queryId !== compare.queryId ||
+    base.tenantId !== compare.tenantId ||
     base.version !== compare.version ||
-    base.name != compare.name ||
-    base.purpose != compare.purpose
+    base.name !== compare.name ||
+    base.purpose !== compare.purpose
   ) {
     return false
   }
 
-  if (base.definitionPayload && compare.definitionPayload) {
-    return hashPayload(base.definitionPayload) === hashPayload(compare.definitionPayload)
+  if (base.query && compare.query) {
+    if (hashPayload(base.query) !== hashPayload(compare.query)) {
+      return false
+    }
+  } else if (base.query || compare.query) {
+    return false
   }
 
-  return false
+  return true
 }