@sphereon/ssi-sdk.data-store 0.34.1-feature.FIDES.1.274 → 0.34.1-feature.IDK.11.48

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 { AuditEventEntity } from '../../entities/eventLogger/AuditEventEntity'
 import { replaceNullWithUndefined } from '../FormattingUtils'
+import { AuditEventEntity } from '../../entities/eventLogger/AuditEventEntity'
+import type { NonPersistedActivityLoggingEvent, NonPersistedAuditLoggingEvent } from '../../types'
 
 export const auditEventFrom = (event: AuditEventEntity): AuditLoggingEvent => {
   const result: AuditLoggingEvent = {

package/src/utils/issuanceBranding/MappingUtils.ts

@@ -1,3 +1,15 @@
+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,
@@ -11,19 +23,7 @@ import type {
   ICredentialBranding,
   IIssuerBranding,
   ILocaleBranding,
-} 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'
+} from '../../types'
 
 export const credentialBrandingFrom = (credentialBranding: CredentialBrandingEntity): ICredentialBranding => {
   const result: ICredentialBranding = {

package/src/utils/presentationDefinition/MappingUtils.ts

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

package/src/utils/statusList/MappingUtils.ts

@@ -1,11 +1,11 @@
 import { IBitstringStatusListEntity, IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntity } from '../../types'
-import { StatusListType } from '@sphereon/ssi-types'
 import {
   BitstringStatusListEntity,
   OAuthStatusListEntity,
   StatusList2021Entity,
   StatusListEntity,
 } from '../../entities/statusList/StatusListEntities'
+import { StatusListType } from '@sphereon/ssi-types'
 import { replaceNullWithUndefined } from '../FormattingUtils'
 
 export const statusListEntityFrom = (args: IStatusListEntity): StatusListEntity => {

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

@@ -1,67 +0,0 @@
-import Debug from 'debug'
-import { DatabaseType, MigrationInterface, QueryRunner } from 'typeorm'
-
-import { CreateDcqlQueryItemPG1726588800000 } from '../postgres/1726588800000-CreateDcqlQueryItem'
-import { CreateDcqlQueryItemSQlite1726617600000 } from '../sqlite/1726617600000-CreateDcqlQueryItem'
-
-const debug: Debug.Debugger = Debug('sphereon:ssi-sdk:migrations')
-
-export class CreateDcqlQueryItem1726617600000 implements MigrationInterface {
-  name = 'CreateDcqlQueryItem1726617600000'
-
-  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: CreateDcqlQueryItemPG1726588800000 = new CreateDcqlQueryItemPG1726588800000()
-        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: CreateDcqlQueryItemSQlite1726617600000 = new CreateDcqlQueryItemSQlite1726617600000()
-        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: CreateDcqlQueryItemPG1726588800000 = new CreateDcqlQueryItemPG1726588800000()
-        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: CreateDcqlQueryItemSQlite1726617600000 = new CreateDcqlQueryItemSQlite1726617600000()
-        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/postgres/1726588800000-CreateDcqlQueryItem.ts

@@ -1,25 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
-
-export class CreateDcqlQueryItemPG1726588800000 implements MigrationInterface {
-  name = 'CreateDcqlQueryItemPG1726588800000'
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`
-      CREATE TABLE "DcqlQueryItem" (
-                                     "id" uuid NOT NULL DEFAULT uuid_generate_v4(),
-                                     "tenant_id" TEXT,
-                                     "query_id" TEXT NOT NULL,
-                                     "name" TEXT,
-                                     "version" TEXT NOT NULL,
-                                     "purpose" TEXT,
-                                     "query" TEXT NOT NULL,
-                                     "created_at" TIMESTAMP NOT NULL DEFAULT now(),
-                                     "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(),
-                                     CONSTRAINT "PK_DcqlQueryItem_id" PRIMARY KEY ("id"))
-    `)
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`)
-  }
-}

package/src/migrations/sqlite/1726617600000-CreateDcqlQueryItem.ts

@@ -1,24 +0,0 @@
-import { MigrationInterface, QueryRunner } from 'typeorm'
-
-export class CreateDcqlQueryItemSQlite1726617600000 implements MigrationInterface {
-  name = 'CreateDcqlQueryItemSQlite1726617600000'
-
-  public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(
-      `CREATE TABLE "DcqlQueryItem" (
-                                      "id" varchar PRIMARY KEY NOT NULL,
-                                      "tenant_id" varchar,
-                                      "query_id" varchar NOT NULL,
-                                      "name" varchar,
-                                      "version" varchar NOT NULL,
-                                      "purpose" varchar,
-                                      "query" varchar NOT NULL,
-                                      "created_at" datetime NOT NULL DEFAULT (datetime('now')),
-                                      "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')))`,
-    )
-  }
-
-  public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "DcqlQueryItem"`)
-  }
-}