@sphereon/ssi-sdk.vc-status-list 0.33.1-feature.vcdm2.tsup.49 → 0.33.1-feature.vcdm2.tsup.51

package/src/functions.ts

@@ -1,14 +1,14 @@
-import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import {
   CredentialMapper,
   DocumentFormat,
   type CredentialProofFormat,
-  StatusListCredential,
+  type StatusListCredential,
   StatusListDriverType,
   StatusListType,
-  StatusPurpose2021,
+  type StatusPurpose2021,
 } from '@sphereon/ssi-types'
-import { CredentialStatus, DIDDocument, IAgentContext, ICredentialPlugin, ProofFormat as VeramoProofFormat } from '@veramo/core'
+import type { CredentialStatus, DIDDocument, IAgentContext, ICredentialPlugin, ProofFormat as VeramoProofFormat } from '@veramo/core'
 
 import { checkStatus } from '@sphereon/vc-status-list'
 

package/src/impl/IStatusList.ts

@@ -1,6 +1,6 @@
-import { IAgentContext, ICredentialPlugin } from '@veramo/core'
-import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
-import {
+import type { IAgentContext, ICredentialPlugin } from '@veramo/core'
+import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import type {
   CheckStatusIndexArgs,
   CreateStatusListArgs,
   Status2021,

package/src/impl/OAuthStatusList.ts

@@ -1,6 +1,6 @@
-import { IAgentContext, ICredentialPlugin, IKeyManager } from '@veramo/core'
-import { CompactJWT, CWT, type CredentialProofFormat, StatusListType } from '@sphereon/ssi-types'
-import {
+import type { IAgentContext, ICredentialPlugin, IKeyManager } from '@veramo/core'
+import { type CompactJWT, type CWT, type CredentialProofFormat, StatusListType } from '@sphereon/ssi-types'
+import type {
   CheckStatusIndexArgs,
   CreateStatusListArgs,
   SignedStatusListData,
@@ -11,10 +11,10 @@ import {
   UpdateStatusListIndexArgs,
 } from '../types'
 import { determineProofFormat, getAssertedValue, getAssertedValues } from '../utils'
-import { IStatusList } from './IStatusList'
+import type { IStatusList } from './IStatusList'
 import { StatusList } from '@sd-jwt/jwt-status-list'
-import { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
-import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import type { IJwtService } from '@sphereon/ssi-sdk-ext.jwt-service'
+import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import { createSignedJwt, decodeStatusListJWT } from './encoding/jwt'
 import { createSignedCbor, decodeStatusListCWT } from './encoding/cbor'
 

package/src/impl/StatusList2021.ts

@@ -1,18 +1,26 @@
-import { IAgentContext, ICredentialPlugin, ProofFormat as VeramoProofFormat } from '@veramo/core'
-import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
-import { CredentialMapper, DocumentFormat, IIssuer, type CredentialProofFormat, StatusListCredential, StatusListType } from '@sphereon/ssi-types'
+import type { IAgentContext, ICredentialPlugin, ProofFormat as VeramoProofFormat } from '@veramo/core'
+import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import {
+  CredentialMapper,
+  DocumentFormat,
+  type IIssuer,
+  type CredentialProofFormat,
+  type StatusListCredential,
+  StatusListType,
+} from '@sphereon/ssi-types'
 
 import { StatusList } from '@sphereon/vc-status-list'
-import { IStatusList } from './IStatusList'
-import {
+import type { IStatusList } from './IStatusList'
+import type {
   CheckStatusIndexArgs,
   CreateStatusListArgs,
-  Status2021,
   StatusListResult,
   ToStatusListDetailsArgs,
   UpdateStatusListFromEncodedListArgs,
   UpdateStatusListIndexArgs,
 } from '../types'
+
+import { Status2021 } from '../types'
 import { assertValidProofType, getAssertedProperty, getAssertedValue, getAssertedValues } from '../utils'
 
 export const DEFAULT_LIST_LENGTH = 250000

package/src/impl/StatusListFactory.ts

@@ -1,4 +1,4 @@
-import { IStatusList } from './IStatusList'
+import type { IStatusList } from './IStatusList'
 import { StatusList2021Implementation } from './StatusList2021'
 import { OAuthStatusListImplementation } from './OAuthStatusList'
 import { StatusListType } from '@sphereon/ssi-types'

package/src/impl/encoding/cbor.ts

@@ -1,14 +1,24 @@
+import type { BitsPerStatus } from '@sd-jwt/jwt-status-list'
 import { StatusList } from '@sd-jwt/jwt-status-list'
 import { deflate, inflate } from 'pako'
-import * as cborpkg from '@sphereon/kmp-cbor'
+import { com, kotlin } from '@sphereon/kmp-mdoc-core'
+// import * as cborpkg from '@sphereon/kmp-cbor'
 import base64url from 'base64url'
-import { IRequiredContext, SignedStatusListData } from '../../types'
-import { DecodedStatusListPayload, resolveIdentifier } from './common'
-import { BitsPerStatus } from '@sd-jwt/jwt-status-list'
-
-const cbor = cborpkg.com.sphereon.cbor
-const kmp = cborpkg.com.sphereon.kmp
-const kotlin = cborpkg.kotlin
+import type { IRequiredContext, SignedStatusListData } from '../../types'
+import { type DecodedStatusListPayload, resolveIdentifier } from './common'
+
+export type IKey = com.sphereon.crypto.IKey
+export type CborItem<T> = com.sphereon.cbor.CborItem<T>
+export const CborByteString = com.sphereon.cbor.CborByteString
+export type CborByteStringType = com.sphereon.cbor.CborByteString
+export const CborUInt = com.sphereon.cbor.CborUInt
+export type CborUIntType = com.sphereon.cbor.CborUInt
+export const CborString = com.sphereon.cbor.CborString
+export type CborStringType = com.sphereon.cbor.CborString
+
+// const cbor = cborpkg.com.sphereon.cbor
+// const kmp = cborpkg.com.sphereon.kmp
+// const kotlin = cborpkg.kotlin
 const decompressRawStatusList = (StatusList as any).decodeStatusList.bind(StatusList)
 
 const CWT_CLAIMS = {
@@ -34,23 +44,26 @@ export const createSignedCbor = async (
   const compressedList = deflate(encodeStatusList, { level: 9 })
   const compressedBytes = new Int8Array(compressedList)
 
-  const statusListMap = new cbor.CborMap(
+  const statusListMap = new com.sphereon.cbor.CborMap(
     kotlin.collections.KtMutableMap.fromJsMap(
-      new Map<cborpkg.com.sphereon.cbor.CborString, cborpkg.com.sphereon.cbor.CborItem<any>>([
-        [new cbor.CborString('bits'), new cbor.CborUInt(kmp.LongKMP.fromNumber(statusList.getBitsPerStatus()))],
-        [new cbor.CborString('lst'), new cbor.CborByteString(compressedBytes)],
+      new Map<CborStringType, CborItem<any>>([
+        [
+          new com.sphereon.cbor.CborString('bits'),
+          new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(statusList.getBitsPerStatus())),
+        ],
+        [new com.sphereon.cbor.CborString('lst'), new com.sphereon.cbor.CborByteString(compressedBytes)],
       ]),
     ),
   )
 
-  const protectedHeader = new cbor.CborMap(
+  const protectedHeader = new com.sphereon.cbor.CborMap(
     kotlin.collections.KtMutableMap.fromJsMap(
-      new Map([[new cbor.CborUInt(kmp.LongKMP.fromNumber(16)), new cbor.CborString('statuslist+cwt')]]), // "type"
+      new Map([[new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(16)), new com.sphereon.cbor.CborString('statuslist+cwt')]]), // "type"
     ),
   )
-  const protectedHeaderEncoded = cbor.Cbor.encode(protectedHeader)
+  const protectedHeaderEncoded = com.sphereon.cbor.Cbor.encode(protectedHeader)
   const claimsMap = buildClaimsMap(id, issuerString, statusListMap, expiresAt)
-  const claimsEncoded: Int8Array = cbor.Cbor.encode(claimsMap)
+  const claimsEncoded: Int8Array = com.sphereon.cbor.Cbor.encode(claimsMap)
 
   const signedCWT: string = await context.agent.keyManagerSign({
     keyRef: identifier.kmsKeyRef,
@@ -63,13 +76,13 @@ export const createSignedCbor = async (
   const signatureBytes = base64url.decode(signedCWT)
   const signatureInt8 = new Int8Array(Buffer.from(signatureBytes))
 
-  const cwtArrayElements: Array<cborpkg.com.sphereon.cbor.CborItem<any>> = [
-    new cbor.CborByteString(protectedHeaderEncodedInt8),
-    new cbor.CborByteString(claimsEncodedInt8),
-    new cbor.CborByteString(signatureInt8),
+  const cwtArrayElements: Array<CborItem<any>> = [
+    new CborByteString(protectedHeaderEncodedInt8),
+    new CborByteString(claimsEncodedInt8),
+    new CborByteString(signatureInt8),
   ]
-  const cwtArray = new cbor.CborArray(kotlin.collections.KtMutableList.fromJsArray(cwtArrayElements))
-  const cwtEncoded = cbor.Cbor.encode(cwtArray)
+  const cwtArray = new com.sphereon.cbor.CborArray(kotlin.collections.KtMutableList.fromJsArray(cwtArrayElements))
+  const cwtEncoded = com.sphereon.cbor.Cbor.encode(cwtArray)
   const cwtBuffer = Buffer.from(cwtEncoded)
   return {
     statusListCredential: base64url.encode(cwtBuffer),
@@ -77,43 +90,38 @@ export const createSignedCbor = async (
   }
 }
 
-function buildClaimsMap(
-  id: string,
-  issuerString: string,
-  statusListMap: cborpkg.com.sphereon.cbor.CborMap<cborpkg.com.sphereon.cbor.CborString, cborpkg.com.sphereon.cbor.CborItem<any>>,
-  expiresAt?: Date,
-) {
+function buildClaimsMap(id: string, issuerString: string, statusListMap: com.sphereon.cbor.CborMap<CborStringType, CborItem<any>>, expiresAt?: Date) {
   const ttl = 65535 // FIXME figure out what value should be / come from and what the difference is with exp
-  const claimsEntries: Array<[cborpkg.com.sphereon.cbor.CborUInt, cborpkg.com.sphereon.cbor.CborItem<any>]> = [
-    [new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.SUBJECT)), new cbor.CborString(id)], // "sub"
-    [new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUER)), new cbor.CborString(issuerString)], // "iss"
+  const claimsEntries: Array<[CborUIntType, CborItem<any>]> = [
+    [new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.SUBJECT)), new com.sphereon.cbor.CborString(id)], // "sub"
+    [new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUER)), new com.sphereon.cbor.CborString(issuerString)], // "iss"
     [
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUED_AT)),
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(Math.floor(Date.now() / 1000))), // "iat"
+      new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.ISSUED_AT)),
+      new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(Math.floor(Date.now() / 1000))), // "iat"
     ],
   ]
 
   if (expiresAt) {
     claimsEntries.push([
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.EXPIRATION)),
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(Math.floor(expiresAt.getTime() / 1000))), // "exp"
+      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.EXPIRATION)),
+      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(Math.floor(expiresAt.getTime() / 1000))), // "exp"
     ])
   }
 
   if (ttl) {
     claimsEntries.push([
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.TIME_TO_LIVE)),
-      new cbor.CborUInt(kmp.LongKMP.fromNumber(ttl)), // "time to live"
+      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.TIME_TO_LIVE)),
+      new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(ttl)), // "time to live"
     ])
   }
 
-  claimsEntries.push([new cbor.CborUInt(kmp.LongKMP.fromNumber(CWT_CLAIMS.STATUS_LIST)), statusListMap])
+  claimsEntries.push([new com.sphereon.cbor.CborUInt(com.sphereon.kmp.LongKMP.fromNumber(CWT_CLAIMS.STATUS_LIST)), statusListMap])
 
-  const claimsMap = new cbor.CborMap(kotlin.collections.KtMutableMap.fromJsMap(new Map(claimsEntries)))
+  const claimsMap = new com.sphereon.cbor.CborMap(kotlin.collections.KtMutableMap.fromJsMap(new Map(claimsEntries)))
   return claimsMap
 }
 
-const getCborValueFromMap = <T>(map: Map<cborpkg.com.sphereon.cbor.CborItem<any>, cborpkg.com.sphereon.cbor.CborItem<any>>, key: number): T => {
+const getCborValueFromMap = <T>(map: Map<CborItem<any>, CborItem<any>>, key: number): T => {
   const value = getCborOptionalValueFromMap<T>(map, key)
   if (value === undefined) {
     throw new Error(`Required claim ${key} not found`)
@@ -121,11 +129,8 @@ const getCborValueFromMap = <T>(map: Map<cborpkg.com.sphereon.cbor.CborItem<any>
   return value
 }
 
-const getCborOptionalValueFromMap = <T>(
-  map: Map<cborpkg.com.sphereon.cbor.CborItem<any>, cborpkg.com.sphereon.cbor.CborItem<any>>,
-  key: number,
-): T | undefined | never => {
-  const value = map.get(new cborpkg.com.sphereon.cbor.CborUInt(kmp.LongKMP.fromNumber(key)))
+const getCborOptionalValueFromMap = <T>(map: Map<CborItem<any>, CborItem<any>>, key: number): T | undefined | never => {
+  const value = map.get(new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(key)))
   if (!value) {
     return undefined
   }
@@ -135,28 +140,28 @@ const getCborOptionalValueFromMap = <T>(
 export const decodeStatusListCWT = (cwt: string): DecodedStatusListPayload => {
   const encodedCbor = base64url.toBuffer(cwt)
   const encodedCborArray = new Int8Array(encodedCbor)
-  const decodedCbor = cborpkg.com.sphereon.cbor.Cbor.decode(encodedCborArray)
+  const decodedCbor = com.sphereon.cbor.Cbor.decode(encodedCborArray)
 
-  if (!(decodedCbor instanceof cborpkg.com.sphereon.cbor.CborArray)) {
+  if (!(decodedCbor instanceof com.sphereon.cbor.CborArray)) {
     throw new Error('Invalid CWT format: Expected a CBOR array')
   }
 
   const [, payload] = decodedCbor.value.asJsArrayView()
-  if (!(payload instanceof cborpkg.com.sphereon.cbor.CborByteString)) {
+  if (!(payload instanceof com.sphereon.cbor.CborByteString)) {
     throw new Error('Invalid payload format: Expected a CBOR ByteString')
   }
 
-  const claims = cborpkg.com.sphereon.cbor.Cbor.decode(payload.value)
-  if (!(claims instanceof cborpkg.com.sphereon.cbor.CborMap)) {
+  const claims = com.sphereon.cbor.Cbor.decode(payload.value)
+  if (!(claims instanceof com.sphereon.cbor.CborMap)) {
     throw new Error('Invalid claims format: Expected a CBOR map')
   }
 
   const claimsMap = claims.value.asJsMapView()
 
-  const statusListMap = claimsMap.get(new cborpkg.com.sphereon.cbor.CborUInt(kmp.LongKMP.fromNumber(65533))).value.asJsMapView()
+  const statusListMap = claimsMap.get(new CborUInt(com.sphereon.kmp.LongKMP.fromNumber(65533))).value.asJsMapView()
 
-  const bits = Number(statusListMap.get(new cborpkg.com.sphereon.cbor.CborString('bits')).value) as BitsPerStatus
-  const decoded = new Uint8Array(statusListMap.get(new cborpkg.com.sphereon.cbor.CborString('lst')).value)
+  const bits = Number(statusListMap.get(new CborString('bits')).value) as BitsPerStatus
+  const decoded = new Uint8Array(statusListMap.get(new CborString('lst')).value)
   const uint8Array = inflate(decoded)
   const rawStatusList = decompressRawStatusList(uint8Array, bits)
   const statusList = new StatusList(rawStatusList, bits)

package/src/impl/encoding/common.ts

@@ -1,4 +1,4 @@
-import { IRequiredContext } from '../../types'
+import type { IRequiredContext } from '../../types'
 import { StatusList } from '@sd-jwt/jwt-status-list'
 
 export interface DecodedStatusListPayload {

package/src/impl/encoding/jwt.ts

@@ -1,10 +1,10 @@
-import { CompactJWT, JoseSignatureAlgorithm } from '@sphereon/ssi-types'
-import { createHeaderAndPayload, StatusList, StatusListJWTHeaderParameters, StatusListJWTPayload } from '@sd-jwt/jwt-status-list'
+import { type CompactJWT, JoseSignatureAlgorithm } from '@sphereon/ssi-types'
+import { createHeaderAndPayload, StatusList, type StatusListJWTHeaderParameters, type StatusListJWTPayload } from '@sd-jwt/jwt-status-list'
 import base64url from 'base64url'
-import { JWTPayload } from 'did-jwt'
-import { IRequiredContext, SignedStatusListData } from '../../types'
-import { DecodedStatusListPayload, resolveIdentifier } from './common'
-import { TKeyType } from '@veramo/core'
+import type { JWTPayload } from 'did-jwt'
+import type { IRequiredContext, SignedStatusListData } from '../../types'
+import { type DecodedStatusListPayload, resolveIdentifier } from './common'
+import type { TKeyType } from '@veramo/core'
 import { ensureManagedIdentifierResult } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 
 const STATUS_LIST_JWT_TYP = 'statuslist+jwt'

package/src/types/index.ts

@@ -1,19 +1,19 @@
-import { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
+import type { IIdentifierResolution } from '@sphereon/ssi-sdk-ext.identifier-resolution'
 import {
-  ICredential,
-  ICredentialStatus,
-  IIssuer,
-  IVerifiableCredential,
-  OrPromise,
+  type ICredential,
+  type ICredentialStatus,
+  type IIssuer,
+  type IVerifiableCredential,
+  type OrPromise,
   type CredentialProofFormat,
-  StatusListCredential,
+  type StatusListCredential,
   StatusListCredentialIdMode,
   StatusListDriverType,
-  StatusListIndexingDirection,
+  type StatusListIndexingDirection,
   StatusListType,
-  StatusPurpose2021,
+  type StatusPurpose2021,
 } from '@sphereon/ssi-types'
-import {
+import type {
   CredentialPayload,
   IAgentContext,
   ICredentialIssuer,
@@ -23,9 +23,9 @@ import {
   IPluginMethodMap,
 } from '@veramo/core'
 import { DataSource } from 'typeorm'
-import { BitsPerStatus } from '@sd-jwt/jwt-status-list'
-import { SdJwtVcPayload } from '@sd-jwt/sd-jwt-vc'
-import { StatusListOpts } from '@sphereon/oid4vci-common'
+import type { BitsPerStatus } from '@sd-jwt/jwt-status-list'
+import type { SdJwtVcPayload } from '@sd-jwt/sd-jwt-vc'
+import type { StatusListOpts } from '@sphereon/oid4vci-common'
 
 export enum StatusOAuth {
   Valid = 0,

package/src/utils.ts

@@ -1,10 +1,10 @@
 import {
   CredentialMapper,
-  IIssuer,
+  type IIssuer,
   type CredentialProofFormat,
   StatusListType,
   StatusListType as StatusListTypeW3C,
-  StatusListCredential,
+  type StatusListCredential,
   DocumentFormat,
 } from '@sphereon/ssi-types'
 import { jwtDecode } from 'jwt-decode'