@sphereon/ssi-types 0.34.1-next.91 → 0.36.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sphereon/ssi-types",
   "description": "SSI Common Types",
-  "version": "0.34.1-next.91+3c949810",
+  "version": "0.36.0",
   "source": "./src/index.ts",
   "type": "module",
   "main": "./dist/index.cjs",
@@ -26,6 +26,7 @@
     "@sd-jwt/decode": "^0.15.0",
     "@sd-jwt/types": "^0.15.0",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
+    "dcql": "1.0.1",
     "debug": "^4.3.5",
     "events": "^3.3.0",
     "jwt-decode": "^4.0.0",
@@ -58,5 +59,5 @@
     "Verifiable Credentials",
     "DIDs"
   ],
-  "gitHead": "3c9498100ca07dfc2ba7979e7347fb9b19c47d18"
+  "gitHead": "f713d3a83948ef69aaa7d435700b16d5655ac863"
 }

package/src/index.ts

@@ -3,9 +3,8 @@ import { Loggers } from './logging'
 const logger = Loggers.DEFAULT.get('sphereon:ssi')
 logger.debug(`Sphereon logger initialized`)
 
-export type * from './types'
+export * from './types'
 export * from './logging'
 export * from './events'
 export * from './utils'
 export * from './mapper'
-

package/src/mapper/credential-mapper.ts

@@ -57,7 +57,7 @@ export class CredentialMapper {
    * Decodes a compact SD-JWT vc to it's decoded variant. This method can be used when the hasher implementation used is Async, and therefore not suitable for usage
    * with the other decode methods.
    */
-  static decodeSdJwtVcAsync(compactSdJwtVc: string, hasher: Hasher) {
+  static decodeSdJwtVcAsync(compactSdJwtVc: string, hasher: Hasher): Promise<SdJwtDecodedVerifiableCredential> {
     return decodeSdJwtVcAsyncFunc(compactSdJwtVc, hasher ?? sha256)
   }
 
@@ -73,7 +73,7 @@ export class CredentialMapper {
    */
   static decodeVerifiablePresentation(
     presentation: OriginalVerifiablePresentation,
-    hasher?: HasherSync
+    hasher?: HasherSync,
   ): JwtDecodedVerifiablePresentation | IVerifiablePresentation | SdJwtDecodedVerifiableCredential | MdocOid4vpMdocVpToken | MdocDeviceResponse {
     if (CredentialMapper.isJwtEncoded(presentation)) {
       const payload = jwtDecode(presentation as string) as JwtDecodedVerifiablePresentation
@@ -111,11 +111,12 @@ export class CredentialMapper {
    * an async hasher implementation, use the decodeSdJwtVcAsync method instead and you can provide the decoded payload to methods
    * instead of the compact SD-JWT.
    *
+   * @param credential
    * @param hasher Hasher implementation to use for SD-JWT decoding
    */
   static decodeVerifiableCredential(
     credential: OriginalVerifiableCredential,
-    hasher?: HasherSync
+    hasher?: HasherSync,
   ): JwtDecodedVerifiableCredential | IVerifiableCredential | SdJwtDecodedVerifiableCredential {
     if (CredentialMapper.isJwtEncoded(credential)) {
       const payload = jwtDecode(credential as string) as JwtDecodedVerifiableCredential
@@ -149,11 +150,12 @@ export class CredentialMapper {
    * an async hasher implementation, use the decodeSdJwtVcAsync method instead and you can provide the decoded payload to methods
    * instead of the compact SD-JWT.
    *
-   * @param hasher Hasher implementation to use for SD-JWT decoding
+   * @param originalPresentation
+   * @param opts
    */
   static toWrappedVerifiablePresentation(
     originalPresentation: OriginalVerifiablePresentation,
-    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync }
+    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync },
   ): WrappedVerifiablePresentation {
     // MSO_MDOC
     if (CredentialMapper.isMsoMdocDecodedPresentation(originalPresentation) || CredentialMapper.isMsoMdocOid4VPEncoded(originalPresentation)) {
@@ -168,7 +170,7 @@ export class CredentialMapper {
       }
 
       const mdocCredentials = deviceResponse.documents?.map(
-        (doc) => CredentialMapper.toWrappedVerifiableCredential(doc, opts) as WrappedMdocCredential
+        (doc) => CredentialMapper.toWrappedVerifiableCredential(doc, opts) as WrappedMdocCredential,
       )
       if (!mdocCredentials || mdocCredentials.length === 0) {
         throw new Error('could not extract any mdoc credentials from mdoc device response')
@@ -208,7 +210,7 @@ export class CredentialMapper {
       typeof originalPresentation !== 'string' && CredentialMapper.hasJWTProofType(originalPresentation) ? proof?.jwt : originalPresentation
     if (!original) {
       throw Error(
-        'Could not determine original presentation, probably it was a converted JWT presentation, that is now missing the JWT value in the proof'
+        'Could not determine original presentation, probably it was a converted JWT presentation, that is now missing the JWT value in the proof',
       )
     }
     const decoded = CredentialMapper.decodeVerifiablePresentation(original) as IVerifiablePresentation | JwtDecodedVerifiablePresentation
@@ -236,7 +238,7 @@ export class CredentialMapper {
       ? []
       : (CredentialMapper.toWrappedVerifiableCredentials(
           vp.verifiableCredential ?? [] /*.map(value => value.original)*/,
-          opts
+          opts,
         ) as WrappedW3CVerifiableCredential[])
 
     const presentation = {
@@ -264,7 +266,7 @@ export class CredentialMapper {
    */
   static toWrappedVerifiableCredentials(
     verifiableCredentials: OriginalVerifiableCredential[],
-    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync }
+    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync },
   ): WrappedVerifiableCredential[] {
     return verifiableCredentials.map((vc) => CredentialMapper.toWrappedVerifiableCredential(vc, opts))
   }
@@ -280,7 +282,7 @@ export class CredentialMapper {
    */
   static toWrappedVerifiableCredential(
     verifiableCredential: OriginalVerifiableCredential,
-    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync }
+    opts?: { maxTimeSkewInMS?: number; hasher?: HasherSync },
   ): WrappedVerifiableCredential {
     // MSO_MDOC
     if (CredentialMapper.isMsoMdocDecodedCredential(verifiableCredential) || CredentialMapper.isMsoMdocOid4VPEncoded(verifiableCredential)) {
@@ -320,10 +322,10 @@ export class CredentialMapper {
 
     // If the VC is not an encoded/decoded SD-JWT, we assume it will be a W3C VC
     const proof = CredentialMapper.getFirstProof(verifiableCredential)
-    const original = CredentialMapper.hasJWTProofType(verifiableCredential) && proof ? proof.jwt ?? verifiableCredential : verifiableCredential
+    const original = CredentialMapper.hasJWTProofType(verifiableCredential) && proof ? (proof.jwt ?? verifiableCredential) : verifiableCredential
     if (!original) {
       throw Error(
-        'Could not determine original credential, probably it was a converted JWT credential, that is now missing the JWT value in the proof'
+        'Could not determine original credential, probably it was a converted JWT credential, that is now missing the JWT value in the proof',
       )
     }
     const decoded = CredentialMapper.decodeVerifiableCredential(original) as JwtDecodedVerifiableCredential | IVerifiableCredential
@@ -439,7 +441,7 @@ export class CredentialMapper {
   }
 
   public static isW3cPresentation(
-    presentation: UniformVerifiablePresentation | IPresentation | SdJwtDecodedVerifiableCredential | DeviceResponseCbor
+    presentation: UniformVerifiablePresentation | IPresentation | SdJwtDecodedVerifiableCredential | DeviceResponseCbor,
   ): presentation is IPresentation {
     return (
       typeof presentation === 'object' &&
@@ -449,7 +451,7 @@ export class CredentialMapper {
   }
 
   public static isSdJwtDecodedCredentialPayload(
-    credential: ICredential | SdJwtDecodedVerifiableCredentialPayload
+    credential: ICredential | SdJwtDecodedVerifiableCredentialPayload,
   ): credential is SdJwtDecodedVerifiableCredentialPayload {
     return typeof credential === 'object' && 'vct' in credential
   }
@@ -481,7 +483,7 @@ export class CredentialMapper {
   }
 
   public static isSdJwtDecodedCredential(
-    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation
+    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation,
   ): original is SdJwtDecodedVerifiableCredential {
     return (
       typeof original === 'object' &&
@@ -490,7 +492,7 @@ export class CredentialMapper {
   }
 
   public static isSdJwtVcdm2DecodedCredential(
-    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation
+    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation,
   ): original is SdJwtDecodedVerifiableCredential {
     if (typeof original !== 'object') {
       return false
@@ -500,7 +502,7 @@ export class CredentialMapper {
   }
 
   public static isMsoMdocDecodedCredential(
-    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation
+    original: OriginalVerifiableCredential | OriginalVerifiablePresentation | ICredential | IPresentation,
   ): original is MdocDocument {
     return typeof original === 'object' && 'issuerSigned' in original && (<MdocDocument>original).issuerSigned !== undefined
   }
@@ -535,7 +537,7 @@ export class CredentialMapper {
   static jwtEncodedPresentationToUniformPresentation(
     jwt: string,
     makeCredentialsUniform: boolean = true,
-    opts?: { maxTimeSkewInMS?: number }
+    opts?: { maxTimeSkewInMS?: number },
   ): IPresentation {
     return CredentialMapper.jwtDecodedPresentationToUniformPresentation(jwtDecode(jwt), makeCredentialsUniform, opts)
   }
@@ -543,7 +545,7 @@ export class CredentialMapper {
   static jwtDecodedPresentationToUniformPresentation(
     decoded: JwtDecodedVerifiablePresentation,
     makeCredentialsUniform: boolean = true,
-    opts?: { maxTimeSkewInMS?: number }
+    opts?: { maxTimeSkewInMS?: number },
   ): IVerifiablePresentation {
     const { iss, aud, jti, vp, ...rest } = decoded
 
@@ -590,7 +592,7 @@ export class CredentialMapper {
     opts?: {
       maxTimeSkewInMS?: number
       hasher?: HasherSync
-    }
+    },
   ): IVerifiableCredential {
     if (CredentialMapper.isMsoMdocDecodedCredential(verifiableCredential)) {
       return mdocDecodedCredentialToUniformCredential(verifiableCredential)
@@ -604,7 +606,7 @@ export class CredentialMapper {
         : verifiableCredential
     if (!original) {
       throw Error(
-        'Could not determine original credential from passed in credential. Probably because a JWT proof type was present, but now is not available anymore'
+        'Could not determine original credential from passed in credential. Probably because a JWT proof type was present, but now is not available anymore',
       )
     }
     const decoded = CredentialMapper.decodeVerifiableCredential(original, opts?.hasher ?? sha256)
@@ -627,7 +629,7 @@ export class CredentialMapper {
 
   static toUniformPresentation(
     presentation: OriginalVerifiablePresentation,
-    opts?: { maxTimeSkewInMS?: number; addContextIfMissing?: boolean; hasher?: HasherSync }
+    opts?: { maxTimeSkewInMS?: number; addContextIfMissing?: boolean; hasher?: HasherSync },
   ): IVerifiablePresentation {
     if (CredentialMapper.isSdJwtDecodedCredential(presentation)) {
       throw new Error('Converting SD-JWT VC to uniform VP is not supported.')
@@ -639,7 +641,7 @@ export class CredentialMapper {
     const original = typeof presentation !== 'string' && CredentialMapper.hasJWTProofType(presentation) ? proof?.jwt : presentation
     if (!original) {
       throw Error(
-        'Could not determine original presentation, probably it was a converted JWT presentation, that is now missing the JWT value in the proof'
+        'Could not determine original presentation, probably it was a converted JWT presentation, that is now missing the JWT value in the proof',
       )
     }
     const decoded = CredentialMapper.decodeVerifiablePresentation(original, opts?.hasher ?? sha256)
@@ -656,7 +658,7 @@ export class CredentialMapper {
     }
 
     uniformPresentation.verifiableCredential = uniformPresentation.verifiableCredential?.map((vc) =>
-      CredentialMapper.toUniformCredential(vc, opts)
+      CredentialMapper.toUniformCredential(vc, opts),
     ) as IVerifiableCredential[] // We cast it because we IPresentation needs a VC. The internal Credential doesn't have the required Proof anymore (that is intended)
     return uniformPresentation
   }
@@ -665,14 +667,14 @@ export class CredentialMapper {
     jwt: string,
     opts?: {
       maxTimeSkewInMS?: number
-    }
+    },
   ): IVerifiableCredential {
     return CredentialMapper.jwtDecodedCredentialToUniformCredential(jwtDecode(jwt), opts)
   }
 
   static jwtDecodedCredentialToUniformCredential(
     decoded: JwtDecodedVerifiableCredential,
-    opts?: { maxTimeSkewInMS?: number }
+    opts?: { maxTimeSkewInMS?: number },
   ): IVerifiableCredential {
     const { exp, nbf, iss, vc, sub, jti, ...rest } = decoded
     const credential: IVerifiableCredential = {
@@ -840,7 +842,7 @@ export class CredentialMapper {
   }
 
   static toCompactJWT(
-    jwtDocument: W3CVerifiableCredential | JwtDecodedVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiablePresentation | string
+    jwtDocument: W3CVerifiableCredential | JwtDecodedVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiablePresentation | string,
   ): string {
     if (!jwtDocument || CredentialMapper.detectDocumentType(jwtDocument) !== DocumentFormat.JWT) {
       throw Error('Cannot convert non JWT credential to JWT')
@@ -870,7 +872,7 @@ export class CredentialMapper {
       | JwtDecodedVerifiablePresentation
       | SdJwtDecodedVerifiableCredential
       | MdocDeviceResponse
-      | MdocDocument
+      | MdocDocument,
   ): DocumentFormat {
     if (this.isMsoMdocOid4VPEncoded(document as any) || this.isMsoMdocDecodedCredential(document as any)) {
       return DocumentFormat.MSO_MDOC
@@ -898,7 +900,7 @@ export class CredentialMapper {
   }
 
   private static hasJWTProofType(
-    document: W3CVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiableCredential | JwtDecodedVerifiablePresentation
+    document: W3CVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiableCredential | JwtDecodedVerifiablePresentation,
   ): boolean {
     if (typeof document === 'string') {
       return false
@@ -907,7 +909,7 @@ export class CredentialMapper {
   }
 
   private static getFirstProof(
-    document: W3CVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiableCredential | JwtDecodedVerifiablePresentation
+    document: W3CVerifiableCredential | W3CVerifiablePresentation | JwtDecodedVerifiableCredential | JwtDecodedVerifiablePresentation,
   ): IProof | undefined {
     if (!document || typeof document === 'string') {
       return undefined
@@ -957,7 +959,7 @@ export enum OriginalType {
 
 export const JWT_PROOF_TYPE_2020 = 'JwtProof2020'
 
-export const enum DocumentFormat {
+export enum DocumentFormat {
   // W3C
   JWT,
   JSONLD,

package/src/types/datastore.ts

@@ -0,0 +1,6 @@
+export enum CredentialRole {
+  ISSUER = 'ISSUER',
+  VERIFIER = 'VERIFIER',
+  HOLDER = 'HOLDER',
+  FEDERATION_TRUST_ANCHOR = 'FEDERATION_TRUST_ANCHOR',
+}

package/src/types/index.ts

@@ -10,5 +10,5 @@ export type * from './cose'
 export type * from './mso_mdoc'
 export type * from './metadata-types'
 export type * from './status-list'
-export type * from './dcql'
 export type * from './vcdm2-sdjwt'
+export * from './datastore'

package/src/types/sd-jwt-vc.ts

@@ -200,8 +200,6 @@ export interface WrappedSdJwtVerifiablePresentation {
   vcs: [WrappedSdJwtVerifiableCredential]
 }
 
-
-
 export type SdJwtVcType = 'dc+sd-jwt' | 'vc+sd-jwt'
 export type SdJwtVpType = 'dc+sd-jwt' | 'vp+sd-jwt'
-export type SdJwtType = SdJwtVcType | SdJwtVpType
+export type SdJwtType = SdJwtVcType | SdJwtVpType

package/src/types/vc.ts

@@ -64,3 +64,43 @@ export type OriginalVerifiablePresentation =
   | MdocOid4vpMdocVpToken
   | MdocDeviceResponse
 export type Original = OriginalVerifiablePresentation | OriginalVerifiableCredential
+
+export type JwtObject = {
+  alg_values: Array<string>
+}
+
+export type LdpObject = {
+  proof_type_values: Array<string>
+}
+
+export type DiObject = {
+  proof_type_values: Array<string>
+  cryptosuite: Array<string>
+}
+
+export type SdJwtObject = {
+  ['sd-jwt_alg_values']?: Array<string>
+  ['kb-jwt_alg_values']?: Array<string>
+}
+
+export type MsoMdocObject = {
+  ['issuerauth_alg_values']?: Array<number>
+  ['deviceauth_alg_values']?: Array<number>
+}
+
+export type Format = {
+  jwt?: JwtObject
+  jwt_vc?: JwtObject
+  jwt_vc_json?: JwtObject
+  jwt_vp?: JwtObject
+  jwt_vp_json?: JwtObject
+  ldp?: LdpObject
+  ldp_vc?: LdpObject
+  ldp_vp?: LdpObject
+  di?: DiObject
+  di_vc?: DiObject
+  di_vp?: DiObject
+  ['vc+sd-jwt']?: SdJwtObject
+  ['dc+sd-jwt']?: SdJwtObject
+  mso_mdoc?: MsoMdocObject
+}

package/src/types/vcdm2-sdjwt/index.ts

@@ -1,2 +1,2 @@
-export type * from './sd-jwt-vc-config';
-export type * from './sd-jwt-vc-payload';
+export type * from './sd-jwt-vc-config'
+export type * from './sd-jwt-vc-payload'

package/src/types/vcdm2-sdjwt/sd-jwt-vc-config.ts

@@ -1,22 +1,22 @@
 import type { SDJWTConfig, Verifier } from '@sd-jwt/types'
 
 export type StatusListFetcher = (uri: string) => Promise<string>
-export type StatusValidator = (status: number) => Promise<void>;
+export type StatusValidator = (status: number) => Promise<void>
 
 /**
  * Configuration for SD-JWT-VC
  */
 export type SDJWTVCDM2Config = SDJWTConfig & {
   // A function that fetches the status list from the uri. If not provided, the library will assume that the response is a compact JWT.
-  statusListFetcher?: StatusListFetcher;
+  statusListFetcher?: StatusListFetcher
   // validte the status and decide if the status is valid or not. If not provided, the code will continue if it is 0, otherwise it will throw an error.
-  statusValidator?: StatusValidator;
+  statusValidator?: StatusValidator
   // a function that fetches the type metadata format from the uri. If not provided, the library will assume that the response is a TypeMetadataFormat. Caching has to be implemented in this function. If the integrity value is passed, it to be validated according to https://www.w3.org/TR/SRI/
   // vctFetcher?: VcTFetcher;
   // a function that verifies the status of the JWT. If not provided, the library will assume that the status is valid if it is 0.
-  statusVerifier?: Verifier;
+  statusVerifier?: Verifier
   // if set to true, it will load the metadata format based on the vct value. If not provided, it will default to false.
-  loadTypeMetadataFormat?: boolean;
+  loadTypeMetadataFormat?: boolean
   // timeout value in milliseconds when to abort the fetch request. If not provided, it will default to 10000.
-  timeout?: number;
-};
+  timeout?: number
+}

package/src/types/w3c-vc.ts

@@ -16,7 +16,7 @@ export interface IVcdmBaseCredential {
   // If iss is present, the value MUST be used to set the issuer property of the new credential JSON object or the holderDID property of the new presentation JSON object.
   issuer: IIssuerId | IIssuer
   // If sub is present, the value MUST be used to set the value of the id property of credentialSubject of the new credential JSON object.
-  credentialSubject: SingleOrArray<(ICredentialSubject & AdditionalClaims)>
+  credentialSubject: SingleOrArray<ICredentialSubject & AdditionalClaims>
   // If jti is present, the value MUST be used to set the value of the id property of the new JSON object.
   id?: string
   credentialStatus?: SingleOrArray<ICredentialStatus>
@@ -35,8 +35,7 @@ export interface IVcdm2Credential extends IVcdmBaseCredential {
   [x: string]: any
 }
 
-export interface ICredential  extends IVcdmBaseCredential{
-
+export interface ICredential extends IVcdmBaseCredential {
   // If nbf is present, the UNIX timestamp MUST be converted to an [XMLSCHEMA11-2] date-time, and MUST be used to set the value of the issuanceDate property of the new JSON object.
   issuanceDate: string
   // If exp is present, the UNIX timestamp MUST be converted to an [XMLSCHEMA11-2] date-time, and MUST be used to set the value of the expirationDate property of credentialSubject of the new JSON object.

package/src/utils/mdoc.ts

@@ -41,7 +41,7 @@ export function getMdocDecodedPayload(mdoc: MdocDocument): MdocDecodedPayload {
         ...acc,
         [item.key]: item.value.value,
       }),
-      {}
+      {},
     )
   }
 
@@ -56,7 +56,7 @@ export function getMdocDecodedPayload(mdoc: MdocDocument): MdocDecodedPayload {
 export function decodeMdocIssuerSigned(oid4vpIssuerSigned: MdocOid4vpIssuerSigned): MdocDocument {
   // Issuer signed according to 18013-7 in base64url
   const issuerSigned: MdocIssuerSigned = com.sphereon.mdoc.data.device.IssuerSignedCbor.Static.cborDecode(
-    com.sphereon.kmp.decodeFrom(oid4vpIssuerSigned, com.sphereon.kmp.Encoding.BASE64URL)
+    com.sphereon.kmp.decodeFrom(oid4vpIssuerSigned, com.sphereon.kmp.Encoding.BASE64URL),
   )
   // Create an mdoc from it. // Validations need to be performed by the caller after this!
   const holderMdoc: MdocDocument = issuerSigned.toDocument()
@@ -74,7 +74,7 @@ export function encodeMdocIssuerSigned(issuerSigned: MdocIssuerSigned, encoding:
  */
 export function decodeMdocDeviceResponse(vpToken: MdocOid4vpMdocVpToken): MdocDeviceResponse {
   const deviceResponse = com.sphereon.mdoc.data.device.DeviceResponseCbor.Static.cborDecode(
-    com.sphereon.kmp.decodeFrom(vpToken, com.sphereon.kmp.Encoding.BASE64URL)
+    com.sphereon.kmp.decodeFrom(vpToken, com.sphereon.kmp.Encoding.BASE64URL),
   )
   return deviceResponse
 }
@@ -83,7 +83,7 @@ export function decodeMdocDeviceResponse(vpToken: MdocOid4vpMdocVpToken): MdocDe
 export const mdocDecodedCredentialToUniformCredential = (
   decoded: MdocDocument,
   // @ts-ignore
-  opts?: { maxTimeSkewInMS?: number }
+  opts?: { maxTimeSkewInMS?: number },
 ): IVerifiableCredential => {
   const document = decoded.toJson()
   const json = document.toJsonDTO<DocumentJson>()

package/src/utils/sd-jwt.ts

@@ -104,7 +104,9 @@ export const sdJwtDecodedCredentialToUniformCredential = (
 ): IVerifiableCredential => {
   const { decodedPayload } = decoded
   const { exp, nbf, iss, iat, vct, cnf, status, jti, validUntil, validFrom } = decodedPayload
-  let credentialSubject: | SingleOrArray<ICredentialSubject & AdditionalClaims> | undefined = decodedPayload.credentialSubject as | SingleOrArray<ICredentialSubject & AdditionalClaims> | undefined
+  let credentialSubject: SingleOrArray<ICredentialSubject & AdditionalClaims> | undefined = decodedPayload.credentialSubject as
+    | SingleOrArray<ICredentialSubject & AdditionalClaims>
+    | undefined
 
   let issuer = iss ?? decodedPayload.issuer
   if (typeof issuer === 'object' && 'id' in issuer && typeof issuer.id === 'string') {
@@ -136,17 +138,20 @@ export const sdJwtDecodedCredentialToUniformCredential = (
   // Filter out the fields we don't want in credentialSubject
   const excludedFields = new Set(['vct', 'cnf', 'iss', 'iat', 'exp', 'nbf', 'jti', 'sub'])
   if (!credentialSubject) {
-    credentialSubject = Object.entries(decodedPayload).reduce((acc, [key, value]) => {
-      if (
-        !excludedFields.has(key) &&
-        value !== undefined &&
-        value !== '' &&
-        !(typeof value === 'object' && value !== null && Object.keys(value).length === 0)
-      ) {
-        acc[key] = value
-      }
-      return acc
-    }, {} as Record<string, any>)
+    credentialSubject = Object.entries(decodedPayload).reduce(
+      (acc, [key, value]) => {
+        if (
+          !excludedFields.has(key) &&
+          value !== undefined &&
+          value !== '' &&
+          !(typeof value === 'object' && value !== null && Object.keys(value).length === 0)
+        ) {
+          acc[key] = value
+        }
+        return acc
+      },
+      {} as Record<string, any>,
+    )
   }
   const sdJwtVc = decodedPayload.vct && !decodedPayload.type
   const credential: Omit<IVerifiableCredential, 'issuer' | 'issuanceDate'> = {

package/src/utils/vc.ts

@@ -24,7 +24,7 @@ export enum StatusListType {
 
 function isVcdmCredential(
   credential: CredentialPayload | IVerifiableCredential | ICredential | VerifiableCredential | unknown,
-  vcdmType: string
+  vcdmType: string,
 ): boolean {
   if (!credential || typeof credential !== 'object') {
     return false

package/src/types/dcql.ts

@@ -1,39 +0,0 @@
-// FIXME Temporary minimal DCQL schema for PD manager, the DcqlQuery used by Animo does not serialize properly (over REST / Veramo)
-
-export interface DcqlQueryREST {
-  credentials: DcqlCredentialQuery[]
-}
-
-export interface DcqlCredentialQuery {
-  id: string
-  format: string
-  alg?: string[]
-  claims: DcqlClaim[]
-  meta?: Record<string, any>
-}
-
-export interface DcqlClaim {
-  namespace: string
-  claim_name: string
-  filter?: DcqlFilter
-}
-
-export interface DcqlFilter {
-  type: 'string' | 'number' | 'boolean'
-  pattern?: string
-  minimum?: number
-  maximum?: number
-}
-
-export interface DcqlPresentationResult {
-  canBeSatisfied: boolean
-  credential_matches: Record<string, DcqlCredentialMatch>
-  invalid_matches?: Record<string, DcqlCredentialMatch>
-}
-
-export interface DcqlCredentialMatch {
-  success: boolean
-  input_credential_index: number
-  claim_set_index?: number
-  output: any
-}