@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.17.bitstring.sl.9 → 0.34.1-next.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
+  "version": "0.34.1-next.29+2593a430",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -28,15 +28,15 @@
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-sdk-ext.did-utils": "0.29.0",
-    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.0",
-    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.9+a052acba",
+    "@sphereon/ssi-sdk-ext.did-utils": "0.29.1-next.3",
+    "@sphereon/ssi-sdk-ext.identifier-resolution": "0.29.1-next.3",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-next.29+2593a430",
+    "@sphereon/ssi-sdk.core": "0.34.1-next.29+2593a430",
+    "@sphereon/ssi-types": "0.34.1-next.29+2593a430",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
-    "class-validator": "^0.14.1",
+    "class-validator": "0.14.1",
     "dcql": "0.2.19",
     "debug": "^4.3.5",
     "typeorm": "0.3.20"
@@ -65,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "a052acbaa88acf4be22236ca3afaadd5b2821fe1"
+  "gitHead": "2593a430ac4faca47b620a3e12b297899518f2af"
 }

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

@@ -277,6 +277,7 @@ describe('Status list store tests', () => {
       credentialIdMode: StatusListCredentialIdMode.ISSUANCE,
       type: StatusListType.BitstringStatusList,
       proofFormat: 'lds',
+      bitsPerStatus: 1,
       statusPurpose: 'suspension',
       ttl: 3600000,
       issuer: 'did:example:789',

package/src/entities/statusList/BitstringStatusListEntryEntity.ts

@@ -1,31 +1,9 @@
-import { Validate } from 'class-validator'
-import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'
-import { IsNonEmptyStringConstraint } from '../validators'
-import { BitstringStatusListEntity } from './StatusListEntities'
-import { BitstringStatus } from '../../types/statusList/bitstringTypes'
-
-@Entity('BitstringStatusListEntry')
-export class BitstringStatusListEntryEntity extends BaseEntity {
-  @PrimaryColumn({ name: 'statusListId', type: 'varchar', nullable: false, unique: false })
-  @Validate(IsNonEmptyStringConstraint, { message: 'Status list id is required' })
-  statusListId!: string
-
-  @PrimaryColumn({ name: 'statusListIndex', type: 'integer', nullable: false, unique: false })
-  statusListIndex!: number
-
-  @ManyToOne(() => BitstringStatusListEntity, (statusList) => statusList.statusListEntries)
-  @JoinColumn({ name: 'statusListId' })
-  statusList!: BitstringStatusListEntity
-
-  @Column({ name: 'credentialId', type: 'text', nullable: true })
-  credentialId?: string
-
-  @Column({ name: 'credentialHash', length: 128, type: 'varchar', nullable: true, unique: false })
-  credentialHash?: string
-
-  @Column({ name: 'correlationId', length: 255, type: 'varchar', nullable: true, unique: false })
-  entryCorrelationId?: string
+import { ChildEntity, Column } from 'typeorm'
+import { StatusListEntryEntity } from './StatusList2021EntryEntity'
+import { BitstringStatusMessage } from '../../types'
 
+@ChildEntity('bitstring')
+export class BitstringStatusListEntryEntity extends StatusListEntryEntity {
   @Column({ type: 'varchar', name: 'statusPurpose', nullable: false })
   statusPurpose!: string
 
@@ -37,13 +15,13 @@ export class BitstringStatusListEntryEntity extends BaseEntity {
     name: 'statusMessage',
     nullable: true,
     transformer: {
-      from(value: string): Array<BitstringStatus> | undefined {
+      from(value: string): Array<BitstringStatusMessage> | undefined {
         if (!value) {
           return undefined
         }
         return JSON.parse(value)
       },
-      to(value: Array<BitstringStatus> | undefined): string | undefined {
+      to(value: Array<BitstringStatusMessage> | undefined): string | undefined {
         if (!value) {
           return undefined
         }
@@ -51,7 +29,7 @@ export class BitstringStatusListEntryEntity extends BaseEntity {
       },
     },
   })
-  statusMessage?: Array<BitstringStatus>
+  statusMessage?: Array<BitstringStatusMessage>
 
   @Column({
     type: 'text',

package/src/entities/statusList/StatusList2021EntryEntity.ts

@@ -1,11 +1,12 @@
 import { Validate } from 'class-validator'
-import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm'
+import { BaseEntity, Column, Entity, JoinColumn, ManyToOne, PrimaryColumn, TableInheritance } from 'typeorm'
 import { IsNonEmptyStringConstraint } from '../validators'
 import { StatusList2021Entity, StatusListEntity } from './StatusListEntities'
 
 @Entity('StatusListEntry')
 // @Unique('uq_credential_statuslist', ['statusList', 'credentialId']) // disabled because one prop can be null
 // @Unique('uq_credentialHash_statuslistId', ['statusList', 'credentialHash']) // disabled because one prop can be null
+@TableInheritance({ column: { type: 'varchar', name: 'type' } })
 export class StatusListEntryEntity extends BaseEntity {
   @PrimaryColumn({ name: 'statusListId', type: 'varchar', nullable: false, unique: false })
   @Validate(IsNonEmptyStringConstraint, { message: 'Status list id is required' })

package/src/entities/statusList/StatusListEntities.ts

@@ -29,6 +29,13 @@ export abstract class StatusListEntity extends BaseEntity {
   @Column({ name: 'length', type: 'integer', nullable: false, unique: false })
   length!: number
 
+  @Column('simple-enum', {
+    name: 'type',
+    enum: StatusListType,
+    nullable: false,
+  })
+  type!: StatusListType
+
   @Column({
     name: 'issuer',
     type: 'text',

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

@@ -16,36 +16,35 @@ export class CreateBitstringStatusListPG1741895823000 implements MigrationInterf
       `ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList'))`,
     )
 
-    // Create BitstringStatusListEntry table
-    await queryRunner.query(`
-      CREATE TABLE "BitstringStatusListEntry" (
-        "statusListId" character varying NOT NULL,
-        "statusListIndex" integer NOT NULL,
-        "credentialId" text,
-        "credentialHash" character varying(128),
-        "correlationId" character varying(255),
-        "statusPurpose" character varying NOT NULL,
-        "bitsPerStatus" integer DEFAULT 1,
-        "statusMessage" text,
-        "statusReference" text,
-        CONSTRAINT "PK_BitstringStatusListEntry" PRIMARY KEY ("statusListId", "statusListIndex")
-      )
-    `)
-
-    await queryRunner.query(`
-      ALTER TABLE "BitstringStatusListEntry" 
-      ADD CONSTRAINT "FK_BitstringStatusListEntry_statusListId" 
-      FOREIGN KEY ("statusListId") REFERENCES "StatusList"("id") ON DELETE NO ACTION ON UPDATE NO ACTION
-    `)
+    // Add inheritance discriminator column to StatusListEntry table
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "type" character varying NOT NULL DEFAULT 'StatusListEntryEntity'`)
+
+    // Add BitstringStatusListEntry specific columns to StatusListEntry table
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusPurpose" character varying`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "bitsPerStatus" integer DEFAULT 1`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusMessage" text`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" ADD COLUMN "statusReference" text`)
+
+    // Add constraint for entry type
+    await queryRunner.query(
+      `ALTER TABLE "StatusListEntry" ADD CONSTRAINT "CHK_StatusListEntry_type" CHECK ("type" IN ('StatusListEntryEntity', 'bitstring'))`,
+    )
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`ALTER TABLE "BitstringStatusListEntry" DROP CONSTRAINT "FK_BitstringStatusListEntry_statusListId"`)
-    await queryRunner.query(`DROP TABLE "BitstringStatusListEntry"`)
-
+    // Remove entry type constraint and columns
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP CONSTRAINT "CHK_StatusListEntry_type"`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusReference"`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusMessage"`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "bitsPerStatus"`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "statusPurpose"`)
+    await queryRunner.query(`ALTER TABLE "StatusListEntry" DROP COLUMN "type"`)
+
+    // Revert StatusList type constraint
     await queryRunner.query(`ALTER TABLE "StatusList" DROP CONSTRAINT "CHK_StatusList_type"`)
     await queryRunner.query(`ALTER TABLE "StatusList" ADD CONSTRAINT "CHK_StatusList_type" CHECK ("type" IN ('StatusList2021', 'OAuthStatusList'))`)
 
+    // Remove BitstringStatusList columns from StatusList table
     await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validUntil"`)
     await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "validFrom"`)
     await queryRunner.query(`ALTER TABLE "StatusList" DROP COLUMN "ttl"`)

package/src/migrations/sqlite/1741895823001-CreateBitstringStatusList.ts

@@ -14,7 +14,7 @@ export class CreateBitstringStatusListSqlite1741895823001 implements MigrationIn
         "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList', 'BitstringStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
         "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
         "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
         "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
         "statusPurpose" varchar,
         "statusListCredential" text,
@@ -43,26 +43,69 @@ export class CreateBitstringStatusListSqlite1741895823001 implements MigrationIn
     await queryRunner.query(`DROP TABLE "StatusList"`)
     await queryRunner.query(`ALTER TABLE "temporary_StatusList" RENAME TO "StatusList"`)
 
-    // Create BitstringStatusListEntry table
+    // Update StatusListEntry table with inheritance and bitstring columns
     await queryRunner.query(`
-      CREATE TABLE "BitstringStatusListEntry" (
+      CREATE TABLE "temporary_StatusListEntry" (
         "statusListId" varchar NOT NULL,
         "statusListIndex" integer NOT NULL,
         "credentialId" text,
         "credentialHash" varchar(128),
         "correlationId" varchar(255),
-        "statusPurpose" varchar NOT NULL,
+        "value" varchar(50),
+        "type" varchar CHECK( "type" IN ('StatusListEntryEntity', 'bitstring') ) NOT NULL DEFAULT ('StatusListEntryEntity'),
+        "statusPurpose" varchar,
         "bitsPerStatus" integer DEFAULT (1),
         "statusMessage" text,
         "statusReference" text,
         PRIMARY KEY ("statusListId", "statusListIndex")
       )
     `)
+
+    await queryRunner.query(`
+      INSERT INTO "temporary_StatusListEntry"(
+        "statusListId", "statusListIndex", "credentialId", "credentialHash", 
+        "correlationId", "value", "type"
+      )
+      SELECT 
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value", 'StatusListEntryEntity'
+      FROM "StatusListEntry"
+    `)
+
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`)
+    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`)
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.query(`DROP TABLE "BitstringStatusListEntry"`)
+    // Revert StatusListEntry table changes
+    await queryRunner.query(`
+      CREATE TABLE "temporary_StatusListEntry" (
+        "statusListId" varchar NOT NULL,
+        "statusListIndex" integer NOT NULL,
+        "credentialId" text,
+        "credentialHash" varchar(128),
+        "correlationId" varchar(255),
+        "value" varchar(50),
+        PRIMARY KEY ("statusListId", "statusListIndex")
+      )
+    `)
+
+    await queryRunner.query(`
+      INSERT INTO "temporary_StatusListEntry"(
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value"
+      )
+      SELECT 
+        "statusListId", "statusListIndex", "credentialId", "credentialHash",
+        "correlationId", "value"
+      FROM "StatusListEntry"
+      WHERE "type" = 'StatusListEntryEntity'
+    `)
+
+    await queryRunner.query(`DROP TABLE "StatusListEntry"`)
+    await queryRunner.query(`ALTER TABLE "temporary_StatusListEntry" RENAME TO "StatusListEntry"`)
 
+    // Revert StatusList table changes
     await queryRunner.query(`
       CREATE TABLE "temporary_StatusList" (
         "id" varchar PRIMARY KEY NOT NULL,
@@ -72,7 +115,7 @@ export class CreateBitstringStatusListSqlite1741895823001 implements MigrationIn
         "type" varchar CHECK( "type" IN ('StatusList2021', 'OAuthStatusList') ) NOT NULL DEFAULT ('StatusList2021'),
         "driverType" varchar CHECK( "driverType" IN ('agent_typeorm','agent_kv_store','github','agent_filesystem') ) NOT NULL DEFAULT ('agent_typeorm'),
         "credentialIdMode" varchar CHECK( "credentialIdMode" IN ('ISSUANCE','PERSISTENCE','NEVER') ) NOT NULL DEFAULT ('ISSUANCE'),
-        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt') ) NOT NULL DEFAULT ('lds'),
+        "proofFormat" varchar CHECK( "proofFormat" IN ('lds','jwt', 'vc+jwt') ) NOT NULL DEFAULT ('lds'),
         "indexingDirection" varchar CHECK( "indexingDirection" IN ('rightToLeft') ),
         "statusPurpose" varchar,
         "statusListCredential" text,

package/src/statusList/IStatusListStore.ts

@@ -2,6 +2,8 @@ import { StatusListEntryEntity } from '../entities/statusList/StatusList2021Entr
 import type {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
+  IBitstringStatusListEntity,
+  IBitstringStatusListEntryEntity,
   IGetStatusListArgs,
   IGetStatusListEntriesArgs,
   IGetStatusListEntryByCredentialIdArgs,
@@ -12,33 +14,34 @@ import type {
   IUpdateStatusListIndexArgs,
 } from '../types'
 import { IStatusListEntity, IStatusListEntryEntity } from '../types'
+import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
 
 export interface IStatusListStore {
-  getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity>
+  getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity | IBitstringStatusListEntity>
 
-  getStatusLists(args: IGetStatusListsArgs): Promise<Array<IStatusListEntity>>
+  getStatusLists(args: IGetStatusListsArgs): Promise<Array<IStatusListEntity | IBitstringStatusListEntity>>
 
   removeStatusList(args: IRemoveStatusListArgs): Promise<boolean>
 
-  addStatusList(args: IAddStatusListArgs): Promise<IStatusListEntity>
+  addStatusList(args: IAddStatusListArgs): Promise<IStatusListEntity | IBitstringStatusListEntity>
 
-  updateStatusList(args: IUpdateStatusListIndexArgs): Promise<IStatusListEntity>
+  updateStatusList(args: IUpdateStatusListIndexArgs): Promise<IStatusListEntity | IBitstringStatusListEntity>
 
   availableStatusListEntries(args: IStatusListEntryAvailableArgs): Promise<number[]>
 
-  addStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity>
+  addStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity | IBitstringStatusListEntryEntity>
 
-  updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity>
+  updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity | IBitstringStatusListEntryEntity>
 
-  getStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | undefined>
+  getStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<StatusListEntryEntity | BitstringStatusListEntryEntity | undefined>
 
-  getStatusListEntryByCredentialId(args: IGetStatusListEntryByCredentialIdArgs): Promise<StatusListEntryEntity | undefined>
+  getStatusListEntryByCredentialId(
+    args: IGetStatusListEntryByCredentialIdArgs,
+  ): Promise<StatusListEntryEntity | BitstringStatusListEntryEntity | undefined>
 
   removeStatusListEntryByIndex(args: IGetStatusListEntryByIndexArgs): Promise<boolean>
 
   removeStatusListEntryByCredentialId(args: IGetStatusListEntryByCredentialIdArgs): Promise<boolean>
 
-  getStatusListEntries(args: IGetStatusListEntriesArgs): Promise<IStatusListEntryEntity[]>
-
-  getStatusList(args: IGetStatusListArgs): Promise<IStatusListEntity>
+  getStatusListEntries(args: IGetStatusListEntriesArgs): Promise<Array<IStatusListEntryEntity | IBitstringStatusListEntryEntity>>
 }

package/src/statusList/StatusListStore.ts

@@ -3,9 +3,12 @@ import Debug from 'debug'
 import { DataSource, In, type Repository } from 'typeorm'
 import { BitstringStatusListEntity, OAuthStatusListEntity, StatusList2021Entity, StatusListEntity } from '../entities/statusList/StatusListEntities'
 import { StatusListEntryEntity } from '../entities/statusList/StatusList2021EntryEntity'
-import type {
+import { BitstringStatusListEntryEntity } from '../entities/statusList/BitstringStatusListEntryEntity'
+import {
   IAddStatusListArgs,
   IAddStatusListEntryArgs,
+  IBitstringStatusListEntity,
+  IBitstringStatusListEntryEntity,
   IGetStatusListArgs,
   IGetStatusListEntriesArgs,
   IGetStatusListEntryByCredentialIdArgs,
@@ -41,7 +44,7 @@ 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: {
@@ -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)
@@ -275,7 +305,13 @@ export class StatusListStore implements IStatusListStore {
     }
   }
 
-  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

@@ -6,7 +6,6 @@ export * from './presentationDefinition/presentationDefinition'
 export * from './presentationDefinition/IAbstractPDStore'
 export * from './validation/validation'
 export * from './statusList/statusList'
-export * from './statusList/bitstringTypes'
 export * from './statusList/IAbstractStatusListStore'
 export * from './eventLogger/IAbstractEventLoggerStore'
 export * from './eventLogger/eventLogger'

package/src/types/statusList/IAbstractStatusListStore.ts

@@ -1,5 +1,21 @@
 import { FindOptionsWhere } from 'typeorm'
-import { IOAuthStatusListEntity, IStatusList2021Entity, IStatusListEntity, IStatusListEntryEntity } from './statusList'
+import {
+  BitstringStatusPurpose,
+  IBitstringStatusListEntryEntity,
+  IOAuthStatusListEntity,
+  IStatusList2021Entity,
+  IStatusListEntryEntity,
+} from './statusList'
+import {
+  CredentialProofFormat,
+  IIssuer,
+  StatusListCredential,
+  StatusListCredentialIdMode,
+  StatusListDriverType,
+  StatusListIndexingDirection,
+  StatusListType,
+  StatusPurpose2021,
+} from '@sphereon/ssi-types'
 
 export type FindStatusListArgs = FindOptionsWhere<IStatusList2021Entity | IOAuthStatusListEntity>[]
 export type FindStatusListEntryArgs = FindOptionsWhere<IStatusListEntryEntity>[] | FindOptionsWhere<IStatusListEntryEntity>
@@ -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