@sphereon/ssi-sdk.data-store 0.34.1-feature.SSISDK.17.bitstring.sl.24 → 0.34.1-feature.SSISDK.17.bitstring.sl.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sphereon/ssi-sdk.data-store",
-  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.24+d486d9b6",
+  "version": "0.34.1-feature.SSISDK.17.bitstring.sl.25+6025073e",
   "source": "src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -30,9 +30,9 @@
     "@sphereon/pex": "5.0.0-unstable.28",
     "@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-feature.SSISDK.17.bitstring.sl.24+d486d9b6",
-    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.17.bitstring.sl.24+d486d9b6",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.24+d486d9b6",
+    "@sphereon/ssi-sdk.agent-config": "0.34.1-feature.SSISDK.17.bitstring.sl.25+6025073e",
+    "@sphereon/ssi-sdk.core": "0.34.1-feature.SSISDK.17.bitstring.sl.25+6025073e",
+    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.17.bitstring.sl.25+6025073e",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "blakejs": "^1.2.1",
@@ -65,5 +65,5 @@
     "PostgreSQL",
     "Contact Store"
   ],
-  "gitHead": "d486d9b69ca1a5c0df614642a2d1e158a60edee8"
+  "gitHead": "6025073ed82e7060f6ebfc13ed89f76451c63eb9"
 }

package/src/statusList/StatusListStore.ts

@@ -62,8 +62,7 @@ export class StatusListStore implements IStatusListStore {
     }
 
     const statusList = await this.getStatusList({ id: args.statusListId })
-    const result = await (await this.getStatusListEntryRepo(statusList.type)).save(args)
-    return result as IStatusListEntryEntity | IBitstringStatusListEntryEntity
+    return await (await this.getStatusListEntryRepo(statusList.type)).save(args)
   }
 
   async updateStatusListEntry(args: IAddStatusListEntryArgs): Promise<IStatusListEntryEntity | IBitstringStatusListEntryEntity> {
@@ -87,7 +86,7 @@ export class StatusListStore implements IStatusListStore {
       { ...(result ?? { statusListId: updStatusListId, statusListIndex: args.statusListIndex }), ...updatedEntry },
       { conflictPaths: ['statusList', 'statusListIndex'] },
     )
-    console.log(updateResult)
+    debug(updateResult)
     return (await this.getStatusListEntryByIndex({
       ...args,
       statusListId: updStatusListId,
@@ -151,7 +150,7 @@ export class StatusListStore implements IStatusListStore {
       ...(args.entryCorrelationId && { correlationId: args.entryCorrelationId }),
       credentialId,
     }
-    console.log(`Entries: ${JSON.stringify(await (await this.getStatusListEntryRepo(statusList.type)).find(), null, 2)}`)
+    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) {
@@ -192,7 +191,7 @@ 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 (

package/src/types/statusList/IAbstractStatusListStore.ts

@@ -72,17 +72,27 @@ interface IBaseStatusListArgs {
   bitsPerStatus?: number
 }
 
-// Then extend for specific types when needed
-export type IAddStatusListArgs =
-  | (IBaseStatusListArgs & { type: StatusListType.StatusList2021; indexingDirection: StatusListIndexingDirection; statusPurpose: StatusPurpose2021 })
-  | (IBaseStatusListArgs & { type: StatusListType.OAuthStatusList; bitsPerStatus: number; expiresAt?: Date })
-  | (IBaseStatusListArgs & {
-      type: StatusListType.BitstringStatusList
-      statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[]
-      bitsPerStatus?: number
-      validFrom?: Date
-      validUntil?: Date
-      ttl?: 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 = IAddStatusListArgs

package/src/types/statusList/statusList.ts

@@ -36,7 +36,7 @@ export interface IOAuthStatusListEntity extends IStatusListEntity {
 }
 
 export interface IBitstringStatusListEntity extends IStatusListEntity {
-  statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[]
+  statusPurpose: BitstringStatusPurpose | Array<BitstringStatusPurpose>
   bitsPerStatus?: number
   validFrom?: Date
   validUntil?: Date
@@ -66,12 +66,12 @@ export type BitstringStatusMessage = {
 
 export interface BitstringStatusListEntryCredentialStatus extends ICredentialStatus {
   type: 'BitstringStatusListEntry'
-  statusPurpose: BitstringStatusPurpose | BitstringStatusPurpose[]
+  statusPurpose: BitstringStatusPurpose | Array<BitstringStatusPurpose>
   statusListIndex: string
   statusListCredential: string
   bitsPerStatus?: number
   statusMessage?: Array<BitstringStatusMessage>
-  statusReference?: string | string[]
+  statusReference?: string | Array<string>
 }
 
 export type BitstringStatusListArgs = {
@@ -91,5 +91,5 @@ export interface IBitstringStatusListEntryEntity {
   statusPurpose: string
   bitsPerStatus?: number
   statusMessage?: Array<BitstringStatusMessage>
-  statusReference?: string | string[]
+  statusReference?: string | Array<string>
 }

package/src/utils/statusList/MappingUtils.ts

@@ -9,56 +9,59 @@ import { StatusListType } from '@sphereon/ssi-types'
 import { replaceNullWithUndefined } from '../FormattingUtils'
 
 export const statusListEntityFrom = (args: IStatusListEntity): StatusListEntity => {
-  if (args.type === StatusListType.StatusList2021) {
-    const entity = new StatusList2021Entity()
-    const sl2021 = args as IStatusList2021Entity
-    entity.indexingDirection = sl2021.indexingDirection
-    entity.statusPurpose = sl2021.statusPurpose
-    setBaseFields(entity, args)
-    Object.defineProperty(entity, 'type', {
-      value: StatusListType.StatusList2021,
-      enumerable: true,
-      configurable: true,
-    })
-    return entity
-  }
+  switch (args.type) {
+    case StatusListType.StatusList2021: {
+      const entity = new StatusList2021Entity()
+      const sl2021 = args as IStatusList2021Entity
+      entity.indexingDirection = sl2021.indexingDirection
+      entity.statusPurpose = sl2021.statusPurpose
+      setBaseFields(entity, args)
+      Object.defineProperty(entity, 'type', {
+        value: StatusListType.StatusList2021,
+        enumerable: true,
+        configurable: true,
+      })
+      return entity
+    }
 
-  if (args.type === StatusListType.OAuthStatusList) {
-    const entity = new OAuthStatusListEntity()
-    const oauthSl = args as IOAuthStatusListEntity
-    entity.bitsPerStatus = oauthSl.bitsPerStatus
-    entity.expiresAt = oauthSl.expiresAt
-    setBaseFields(entity, args)
-    Object.defineProperty(entity, 'type', {
-      value: StatusListType.OAuthStatusList,
-      enumerable: true,
-      configurable: true,
-    })
-    return entity
-  }
+    case StatusListType.OAuthStatusList: {
+      const entity = new OAuthStatusListEntity()
+      const oauthSl = args as IOAuthStatusListEntity
+      entity.bitsPerStatus = oauthSl.bitsPerStatus
+      entity.expiresAt = oauthSl.expiresAt
+      setBaseFields(entity, args)
+      Object.defineProperty(entity, 'type', {
+        value: StatusListType.OAuthStatusList,
+        enumerable: true,
+        configurable: true,
+      })
+      return entity
+    }
+
+    case StatusListType.BitstringStatusList: {
+      const entity = new BitstringStatusListEntity()
+      const bitstringsl = args as IBitstringStatusListEntity
+      if (!bitstringsl.bitsPerStatus) {
+        throw Error('bitsPerStatus must be set for BitstringStatusList')
+      }
 
-  if (args.type === StatusListType.BitstringStatusList) {
-    const entity = new BitstringStatusListEntity()
-    const bitstringsl = args as IBitstringStatusListEntity
-    if (!bitstringsl.bitsPerStatus) {
-      throw Error('bitsPerStatus must be set for BitstringStatusList')
+      entity.statusPurpose = bitstringsl.statusPurpose
+      entity.bitsPerStatus = bitstringsl.bitsPerStatus
+      entity.validFrom = bitstringsl.validFrom
+      entity.validUntil = bitstringsl.validUntil
+      entity.ttl = bitstringsl.ttl
+      setBaseFields(entity, args)
+      Object.defineProperty(entity, 'type', {
+        value: StatusListType.BitstringStatusList,
+        enumerable: true,
+        configurable: true,
+      })
+      return entity
     }
 
-    entity.statusPurpose = bitstringsl.statusPurpose
-    entity.bitsPerStatus = bitstringsl.bitsPerStatus
-    entity.validFrom = bitstringsl.validFrom
-    entity.validUntil = bitstringsl.validUntil
-    entity.ttl = bitstringsl.ttl
-    setBaseFields(entity, args)
-    Object.defineProperty(entity, 'type', {
-      value: StatusListType.BitstringStatusList,
-      enumerable: true,
-      configurable: true,
-    })
-    return entity
+    default:
+      throw new Error(`Invalid status list type ${args.type}`)
   }
-
-  throw new Error(`Invalid status list type ${args.type}`)
 }
 
 export const statusListFrom = (entity: StatusListEntity): IStatusListEntity | IBitstringStatusListEntity => {