@sphereon/ssi-types 0.34.1-next.6 → 0.34.1-next.85

package/dist/index.cjs

@@ -100,26 +100,26 @@ module.exports = __toCommonJS(index_exports);
 // src/logging/index.ts
 var import_debug = __toESM(require("debug"), 1);
 var import_events = require("events");
-var LogLevel = /* @__PURE__ */ function(LogLevel2) {
+var LogLevel = /* @__PURE__ */ (function(LogLevel2) {
   LogLevel2[LogLevel2["TRACE"] = 0] = "TRACE";
   LogLevel2[LogLevel2["DEBUG"] = 1] = "DEBUG";
   LogLevel2[LogLevel2["INFO"] = 2] = "INFO";
   LogLevel2[LogLevel2["WARNING"] = 3] = "WARNING";
   LogLevel2[LogLevel2["ERROR"] = 4] = "ERROR";
   return LogLevel2;
-}({});
-var LoggingEventType = /* @__PURE__ */ function(LoggingEventType2) {
+})({});
+var LoggingEventType = /* @__PURE__ */ (function(LoggingEventType2) {
   LoggingEventType2["AUDIT"] = "audit";
   LoggingEventType2["ACTIVITY"] = "activity";
   LoggingEventType2["GENERAL"] = "general";
   return LoggingEventType2;
-}({});
-var LogMethod = /* @__PURE__ */ function(LogMethod2) {
+})({});
+var LogMethod = /* @__PURE__ */ (function(LogMethod2) {
   LogMethod2[LogMethod2["DEBUG_PKG"] = 0] = "DEBUG_PKG";
   LogMethod2[LogMethod2["CONSOLE"] = 1] = "CONSOLE";
   LogMethod2[LogMethod2["EVENT"] = 2] = "EVENT";
   return LogMethod2;
-}({});
+})({});
 function logOptions(opts) {
   return {
     namespace: opts?.namespace ?? "sphereon",
@@ -296,7 +296,7 @@ var SimpleRecordLogger = class extends SimpleLogger {
 
 // src/events/index.ts
 var import_events2 = require("events");
-var System = /* @__PURE__ */ function(System2) {
+var System = /* @__PURE__ */ (function(System2) {
   System2["GENERAL"] = "general";
   System2["KMS"] = "kms";
   System2["IDENTITY"] = "identity";
@@ -309,8 +309,8 @@ var System = /* @__PURE__ */ function(System2) {
   System2["PROFILE"] = "profile";
   System2["CONTACT"] = "contact";
   return System2;
-}({});
-var SubSystem = /* @__PURE__ */ function(SubSystem2) {
+})({});
+var SubSystem = /* @__PURE__ */ (function(SubSystem2) {
   SubSystem2["KEY"] = "key";
   SubSystem2["DID_PROVIDER"] = "did_provider";
   SubSystem2["DID_RESOLVER"] = "did_resolver";
@@ -325,16 +325,16 @@ var SubSystem = /* @__PURE__ */ function(SubSystem2) {
   SubSystem2["PROFILE"] = "profile";
   SubSystem2["API"] = "api";
   return SubSystem2;
-}({});
-var ActionType = /* @__PURE__ */ function(ActionType2) {
+})({});
+var ActionType = /* @__PURE__ */ (function(ActionType2) {
   ActionType2["CREATE"] = "create";
   ActionType2["READ"] = "read";
   ActionType2["UPDATE"] = "update";
   ActionType2["DELETE"] = "delete";
   ActionType2["EXECUTE"] = "execute";
   return ActionType2;
-}({});
-var DefaultActionSubType = /* @__PURE__ */ function(DefaultActionSubType2) {
+})({});
+var DefaultActionSubType = /* @__PURE__ */ (function(DefaultActionSubType2) {
   DefaultActionSubType2["KEY_GENERATION"] = "Key generation";
   DefaultActionSubType2["KEY_IMPORT"] = "Key import";
   DefaultActionSubType2["KEY_PERSISTENCE"] = "Key persistence";
@@ -349,14 +349,14 @@ var DefaultActionSubType = /* @__PURE__ */ function(DefaultActionSubType2) {
   DefaultActionSubType2["VC_ISSUE_DECLINE"] = "VC issue decline";
   DefaultActionSubType2["VC_SHARE_DECLINE"] = "VC share decline";
   return DefaultActionSubType2;
-}({});
-var InitiatorType = /* @__PURE__ */ function(InitiatorType2) {
+})({});
+var InitiatorType = /* @__PURE__ */ (function(InitiatorType2) {
   InitiatorType2["USER"] = "user";
   InitiatorType2["SYSTEM"] = "system";
   InitiatorType2["EXTERNAL"] = "external";
   return InitiatorType2;
-}({});
-var SystemCorrelationIdType = /* @__PURE__ */ function(SystemCorrelationIdType2) {
+})({});
+var SystemCorrelationIdType = /* @__PURE__ */ (function(SystemCorrelationIdType2) {
   SystemCorrelationIdType2["DID"] = "did";
   SystemCorrelationIdType2["URL"] = "url";
   SystemCorrelationIdType2["EMAIL"] = "email";
@@ -364,7 +364,7 @@ var SystemCorrelationIdType = /* @__PURE__ */ function(SystemCorrelationIdType2)
   SystemCorrelationIdType2["PHONE"] = "phone";
   SystemCorrelationIdType2["USER"] = "user";
   return SystemCorrelationIdType2;
-}({});
+})({});
 var EventManager = class _EventManager {
   static {
     __name(this, "EventManager");
@@ -527,11 +527,12 @@ function isWrappedW3CVerifiablePresentation(vp) {
   return vp.format === "jwt_vp" || vp.format === "ldp_vp";
 }
 __name(isWrappedW3CVerifiablePresentation, "isWrappedW3CVerifiablePresentation");
-var StatusListType = /* @__PURE__ */ function(StatusListType2) {
+var StatusListType = /* @__PURE__ */ (function(StatusListType2) {
   StatusListType2["StatusList2021"] = "StatusList2021";
   StatusListType2["OAuthStatusList"] = "OAuthStatusList";
+  StatusListType2["BitstringStatusList"] = "BitstringStatusList";
   return StatusListType2;
-}({});
+})({});
 function isVcdmCredential(credential, vcdmType) {
   if (!credential || typeof credential !== "object") {
     return false;
@@ -568,7 +569,7 @@ var VCDM_CREDENTIAL_CONTEXT_VERSIONS = [
 ];
 
 // src/utils/did.ts
-var IProofPurpose = /* @__PURE__ */ function(IProofPurpose2) {
+var IProofPurpose = /* @__PURE__ */ (function(IProofPurpose2) {
   IProofPurpose2["verificationMethod"] = "verificationMethod";
   IProofPurpose2["assertionMethod"] = "assertionMethod";
   IProofPurpose2["authentication"] = "authentication";
@@ -577,8 +578,8 @@ var IProofPurpose = /* @__PURE__ */ function(IProofPurpose2) {
   IProofPurpose2["capabilityInvocation"] = "capabilityInvocation";
   IProofPurpose2["capabilityDelegation"] = "capabilityDelegation";
   return IProofPurpose2;
-}({});
-var IProofType = /* @__PURE__ */ function(IProofType2) {
+})({});
+var IProofType = /* @__PURE__ */ (function(IProofType2) {
   IProofType2["Ed25519Signature2018"] = "Ed25519Signature2018";
   IProofType2["Ed25519Signature2020"] = "Ed25519Signature2020";
   IProofType2["EcdsaSecp256k1Signature2019"] = "EcdsaSecp256k1Signature2019";
@@ -593,7 +594,7 @@ var IProofType = /* @__PURE__ */ function(IProofType2) {
   IProofType2["SdJwtProof2024"] = "SdJwtProof2024";
   IProofType2["MdocProof2024"] = "MsoMdocProof2024";
   return IProofType2;
-}({});
+})({});
 var parseDid = /* @__PURE__ */ __name((did) => {
   const parsedDid = parse(did);
   if (parsedDid === null) {
@@ -639,7 +640,8 @@ var parse = /* @__PURE__ */ __name((didUrl) => {
 }, "parse");
 
 // src/utils/mdoc.ts
-var mdoc = __toESM(require("@sphereon/kmp-mdoc-core"), 1);
+var import_kmp_mdoc_core = __toESM(require("@sphereon/kmp-mdoc-core"), 1);
+var { com } = import_kmp_mdoc_core.default;
 function isWrappedMdocCredential(vc) {
   return vc.format === "mso_mdoc";
 }
@@ -648,12 +650,12 @@ function isWrappedMdocPresentation(vp) {
   return vp.format === "mso_mdoc";
 }
 __name(isWrappedMdocPresentation, "isWrappedMdocPresentation");
-function getMdocDecodedPayload(mdoc2) {
-  const mdocJson = mdoc2.toJson();
+function getMdocDecodedPayload(mdoc) {
+  const mdocJson = mdoc.toJson();
   if (!mdocJson.issuerSigned.nameSpaces) {
     throw Error(`Cannot access Issuer Signed items from the Mdoc`);
   }
-  const issuerSignedJson = mdoc2.issuerSigned.toJsonDTO();
+  const issuerSignedJson = mdoc.issuerSigned.toJsonDTO();
   const namespaces = issuerSignedJson.nameSpaces;
   const decodedPayload = {};
   for (const [namespace, items] of Object.entries(namespaces)) {
@@ -666,17 +668,17 @@ function getMdocDecodedPayload(mdoc2) {
 }
 __name(getMdocDecodedPayload, "getMdocDecodedPayload");
 function decodeMdocIssuerSigned(oid4vpIssuerSigned) {
-  const issuerSigned = mdoc.com.sphereon.mdoc.data.device.IssuerSignedCbor.Static.cborDecode(mdoc.com.sphereon.kmp.decodeFrom(oid4vpIssuerSigned, mdoc.com.sphereon.kmp.Encoding.BASE64URL));
+  const issuerSigned = com.sphereon.mdoc.data.device.IssuerSignedCbor.Static.cborDecode(com.sphereon.kmp.decodeFrom(oid4vpIssuerSigned, com.sphereon.kmp.Encoding.BASE64URL));
   const holderMdoc = issuerSigned.toDocument();
   return holderMdoc;
 }
 __name(decodeMdocIssuerSigned, "decodeMdocIssuerSigned");
 function encodeMdocIssuerSigned(issuerSigned, encoding = "base64url") {
-  return mdoc.com.sphereon.kmp.encodeTo(issuerSigned.cborEncode(), mdoc.com.sphereon.kmp.Encoding.BASE64URL);
+  return com.sphereon.kmp.encodeTo(issuerSigned.cborEncode(), com.sphereon.kmp.Encoding.BASE64URL);
 }
 __name(encodeMdocIssuerSigned, "encodeMdocIssuerSigned");
 function decodeMdocDeviceResponse(vpToken) {
-  const deviceResponse = mdoc.com.sphereon.mdoc.data.device.DeviceResponseCbor.Static.cborDecode(mdoc.com.sphereon.kmp.decodeFrom(vpToken, mdoc.com.sphereon.kmp.Encoding.BASE64URL));
+  const deviceResponse = com.sphereon.mdoc.data.device.DeviceResponseCbor.Static.cborDecode(com.sphereon.kmp.decodeFrom(vpToken, com.sphereon.kmp.Encoding.BASE64URL));
   return deviceResponse;
 }
 __name(decodeMdocDeviceResponse, "decodeMdocDeviceResponse");
@@ -729,7 +731,7 @@ var mdocDecodedCredentialToUniformCredential = /* @__PURE__ */ __name((decoded,
       created: issuanceDate,
       proofPurpose: IProofPurpose.authentication,
       verificationMethod: json.issuerSigned.issuerAuth.payload,
-      mso_mdoc: mdoc.com.sphereon.kmp.encodeTo(decoded.cborEncode(), mdoc.com.sphereon.kmp.Encoding.BASE64URL)
+      mso_mdoc: com.sphereon.kmp.encodeTo(decoded.cborEncode(), com.sphereon.kmp.Encoding.BASE64URL)
     }
   };
   return credential;
@@ -742,8 +744,10 @@ function decodeSdJwtVc(compactSdJwtVc, hasher) {
   const signedPayload = jwt.payload;
   const decodedPayload = (0, import_decode.getClaimsSync)(signedPayload, disclosures, hasher);
   const compactKeyBindingJwt = kbJwt ? compactSdJwtVc.split("~").pop() : void 0;
+  const type = decodedPayload.vct ? "dc+sd-jwt" : "vc+sd-jwt";
   return {
     compactSdJwtVc,
+    type,
     decodedPayload,
     disclosures: disclosures.map((d) => {
       const decoded = d.key ? [
@@ -777,8 +781,10 @@ async function decodeSdJwtVcAsync(compactSdJwtVc, hasher) {
   const signedPayload = jwt.payload;
   const decodedPayload = await (0, import_decode.getClaims)(signedPayload, disclosures, hasher);
   const compactKeyBindingJwt = kbJwt ? compactSdJwtVc.split("~").pop() : void 0;
+  const type = decodedPayload.vct ? "dc+sd-jwt" : "vc+sd-jwt";
   return {
     compactSdJwtVc,
+    type,
     decodedPayload,
     disclosures: disclosures.map((d) => {
       const decoded = d.key ? [
@@ -809,13 +815,19 @@ async function decodeSdJwtVcAsync(compactSdJwtVc, hasher) {
 __name(decodeSdJwtVcAsync, "decodeSdJwtVcAsync");
 var sdJwtDecodedCredentialToUniformCredential = /* @__PURE__ */ __name((decoded, opts) => {
   const { decodedPayload } = decoded;
-  const { exp, nbf, iss, iat, vct, cnf, status, sub, jti } = decodedPayload;
+  const { exp, nbf, iss, iat, vct, cnf, status, jti, validUntil, validFrom } = decodedPayload;
+  let credentialSubject = decodedPayload.credentialSubject;
+  let issuer = iss ?? decodedPayload.issuer;
+  if (typeof issuer === "object" && "id" in issuer && typeof issuer.id === "string") {
+    issuer = issuer.id;
+  }
+  const subId = decodedPayload.sub ?? (typeof credentialSubject == "object" && "id" in credentialSubject ? credentialSubject.id : void 0);
   const maxSkewInMS = opts?.maxTimeSkewInMS ?? 1500;
-  const expirationDate = jwtDateToISOString({
+  const expirationDate = validUntil ?? jwtDateToISOString({
     jwtClaim: exp,
     claimName: "exp"
   });
-  let issuanceDateStr = jwtDateToISOString({
+  let issuanceDateStr = validFrom ?? jwtDateToISOString({
     jwtClaim: iat,
     claimName: "iat"
   });
@@ -826,7 +838,7 @@ var sdJwtDecodedCredentialToUniformCredential = /* @__PURE__ */ __name((decoded,
       claimName: "nbf"
     });
     if (issuanceDateStr && nbfDateAsStr && issuanceDateStr !== nbfDateAsStr) {
-      const diff = Math.abs(new Date(nbfDateAsStr).getTime() - new Date(iss).getTime());
+      const diff = Math.abs(new Date(nbfDateAsStr).getTime() - new Date(issuanceDateStr).getTime());
       if (!maxSkewInMS || diff > maxSkewInMS) {
         throw Error(`Inconsistent issuance dates between JWT claim (${nbfDateAsStr}) and VC value (${iss})`);
       }
@@ -847,24 +859,39 @@ var sdJwtDecodedCredentialToUniformCredential = /* @__PURE__ */ __name((decoded,
     "jti",
     "sub"
   ]);
-  const credentialSubject = Object.entries(decodedPayload).reduce((acc, [key, value]) => {
-    if (!excludedFields.has(key) && value !== void 0 && value !== "" && !(typeof value === "object" && value !== null && Object.keys(value).length === 0)) {
-      acc[key] = value;
-    }
-    return acc;
-  }, {});
+  if (!credentialSubject) {
+    credentialSubject = Object.entries(decodedPayload).reduce((acc, [key, value]) => {
+      if (!excludedFields.has(key) && value !== void 0 && value !== "" && !(typeof value === "object" && value !== null && Object.keys(value).length === 0)) {
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+  }
+  const sdJwtVc = decodedPayload.vct && !decodedPayload.type;
   const credential = {
-    type: [
-      vct
-    ],
-    "@context": [],
+    ...{
+      type: sdJwtVc ? [
+        vct
+      ] : decodedPayload.type
+    },
+    ...{
+      "@context": sdJwtVc ? [] : decodedPayload["@context"]
+    },
     credentialSubject: {
       ...credentialSubject,
-      id: credentialSubject.id ?? sub ?? jti
+      id: subId ?? jti
     },
-    issuanceDate,
-    expirationDate,
-    issuer: iss,
+    ...issuanceDate && (sdJwtVc ? {
+      issuanceDate
+    } : {
+      validFrom: issuanceDateStr
+    }),
+    ...expirationDate && (sdJwtVc ? {
+      expirationDate
+    } : {
+      validUntil: expirationDate
+    }),
+    issuer,
     ...cnf && {
       cnf
     },
@@ -892,14 +919,14 @@ var jwtDateToISOString = /* @__PURE__ */ __name(({ jwtClaim, claimName, isRequir
 }, "jwtDateToISOString");
 
 // src/utils/jose.ts
-var JwkKeyType = /* @__PURE__ */ function(JwkKeyType2) {
+var JwkKeyType = /* @__PURE__ */ (function(JwkKeyType2) {
   JwkKeyType2["EC"] = "EC";
   JwkKeyType2["RSA"] = "RSA";
   JwkKeyType2["oct"] = "oct";
   JwkKeyType2["OKP"] = "OKP";
   return JwkKeyType2;
-}({});
-var JoseSignatureAlgorithm = /* @__PURE__ */ function(JoseSignatureAlgorithm2) {
+})({});
+var JoseSignatureAlgorithm = /* @__PURE__ */ (function(JoseSignatureAlgorithm2) {
   JoseSignatureAlgorithm2["RS256"] = "RS256";
   JoseSignatureAlgorithm2["RS384"] = "RS384";
   JoseSignatureAlgorithm2["RS512"] = "RS512";
@@ -916,8 +943,8 @@ var JoseSignatureAlgorithm = /* @__PURE__ */ function(JoseSignatureAlgorithm2) {
   JoseSignatureAlgorithm2["PS512"] = "PS512";
   JoseSignatureAlgorithm2["none"] = "none";
   return JoseSignatureAlgorithm2;
-}({});
-var JoseKeyOperation = /* @__PURE__ */ function(JoseKeyOperation2) {
+})({});
+var JoseKeyOperation = /* @__PURE__ */ (function(JoseKeyOperation2) {
   JoseKeyOperation2["SIGN"] = "sign";
   JoseKeyOperation2["VERIFY"] = "verify";
   JoseKeyOperation2["ENCRYPT"] = "encrypt";
@@ -927,8 +954,8 @@ var JoseKeyOperation = /* @__PURE__ */ function(JoseKeyOperation2) {
   JoseKeyOperation2["DERIVE_KEY"] = "deriveKey";
   JoseKeyOperation2["DERIVE_BITS"] = "deriveBits";
   return JoseKeyOperation2;
-}({});
-var JoseCurve = /* @__PURE__ */ function(JoseCurve2) {
+})({});
+var JoseCurve = /* @__PURE__ */ (function(JoseCurve2) {
   JoseCurve2["P_256"] = "P-256";
   JoseCurve2["P_384"] = "P-384";
   JoseCurve2["P_521"] = "P-521";
@@ -939,18 +966,18 @@ var JoseCurve = /* @__PURE__ */ function(JoseCurve2) {
   JoseCurve2["Ed448"] = "Ed448";
   JoseCurve2["secp256k1"] = "secp256k1";
   return JoseCurve2;
-}({});
+})({});
 
 // src/utils/cose.ts
-var ICoseKeyType = /* @__PURE__ */ function(ICoseKeyType2) {
+var ICoseKeyType = /* @__PURE__ */ (function(ICoseKeyType2) {
   ICoseKeyType2[ICoseKeyType2["OKP"] = 1] = "OKP";
   ICoseKeyType2[ICoseKeyType2["EC2"] = 2] = "EC2";
   ICoseKeyType2[ICoseKeyType2["RSA"] = 3] = "RSA";
   ICoseKeyType2[ICoseKeyType2["Symmetric"] = 4] = "Symmetric";
   ICoseKeyType2[ICoseKeyType2["Reserved"] = 0] = "Reserved";
   return ICoseKeyType2;
-}({});
-var ICoseSignatureAlgorithm = /* @__PURE__ */ function(ICoseSignatureAlgorithm2) {
+})({});
+var ICoseSignatureAlgorithm = /* @__PURE__ */ (function(ICoseSignatureAlgorithm2) {
   ICoseSignatureAlgorithm2[ICoseSignatureAlgorithm2["ES256"] = -7] = "ES256";
   ICoseSignatureAlgorithm2[ICoseSignatureAlgorithm2["ES256K"] = -47] = "ES256K";
   ICoseSignatureAlgorithm2[ICoseSignatureAlgorithm2["ES384"] = -35] = "ES384";
@@ -964,8 +991,8 @@ var ICoseSignatureAlgorithm = /* @__PURE__ */ function(ICoseSignatureAlgorithm2)
   ICoseSignatureAlgorithm2[ICoseSignatureAlgorithm2["PS384"] = -38] = "PS384";
   ICoseSignatureAlgorithm2[ICoseSignatureAlgorithm2["PS512"] = -39] = "PS512";
   return ICoseSignatureAlgorithm2;
-}({});
-var ICoseKeyOperation = /* @__PURE__ */ function(ICoseKeyOperation2) {
+})({});
+var ICoseKeyOperation = /* @__PURE__ */ (function(ICoseKeyOperation2) {
   ICoseKeyOperation2[ICoseKeyOperation2["SIGN"] = 1] = "SIGN";
   ICoseKeyOperation2[ICoseKeyOperation2["VERIFY"] = 2] = "VERIFY";
   ICoseKeyOperation2[ICoseKeyOperation2["ENCRYPT"] = 3] = "ENCRYPT";
@@ -977,8 +1004,8 @@ var ICoseKeyOperation = /* @__PURE__ */ function(ICoseKeyOperation2) {
   ICoseKeyOperation2[ICoseKeyOperation2["MAC_CREATE"] = 9] = "MAC_CREATE";
   ICoseKeyOperation2[ICoseKeyOperation2["MAC_VERIFY"] = 10] = "MAC_VERIFY";
   return ICoseKeyOperation2;
-}({});
-var ICoseCurve = /* @__PURE__ */ function(ICoseCurve2) {
+})({});
+var ICoseCurve = /* @__PURE__ */ (function(ICoseCurve2) {
   ICoseCurve2[ICoseCurve2["P_256"] = 1] = "P_256";
   ICoseCurve2[ICoseCurve2["P_384"] = 2] = "P_384";
   ICoseCurve2[ICoseCurve2["P_521"] = 3] = "P_521";
@@ -988,18 +1015,18 @@ var ICoseCurve = /* @__PURE__ */ function(ICoseCurve2) {
   ICoseCurve2[ICoseCurve2["Ed448"] = 7] = "Ed448";
   ICoseCurve2[ICoseCurve2["secp256k1"] = -1] = "secp256k1";
   return ICoseCurve2;
-}({});
+})({});
 
 // src/mapper/credential-constraints.ts
-var StatusListCredentialIdMode = /* @__PURE__ */ function(StatusListCredentialIdMode2) {
+var StatusListCredentialIdMode = /* @__PURE__ */ (function(StatusListCredentialIdMode2) {
   StatusListCredentialIdMode2["ISSUANCE"] = "ISSUANCE";
   StatusListCredentialIdMode2["NEVER"] = "NEVER";
   return StatusListCredentialIdMode2;
-}({});
-var StatusListDriverType = /* @__PURE__ */ function(StatusListDriverType2) {
+})({});
+var StatusListDriverType = /* @__PURE__ */ (function(StatusListDriverType2) {
   StatusListDriverType2["AGENT_TYPEORM"] = "agent_typeorm";
   return StatusListDriverType2;
-}({});
+})({});
 
 // src/mapper/credential-mapper.ts
 var import_jwt_decode = require("jwt-decode");
@@ -1135,7 +1162,7 @@ var CredentialMapper = class _CredentialMapper {
       }
       return {
         type: _CredentialMapper.isSdJwtDecodedCredential(originalPresentation) ? "sd-jwt-vc-decoded" : "sd-jwt-vc-encoded",
-        format: "vc+sd-jwt",
+        format: "dc+sd-jwt",
         original: originalPresentation,
         presentation: decodedPresentation,
         decoded: decodedPresentation.decodedPayload,
@@ -1205,18 +1232,18 @@ var CredentialMapper = class _CredentialMapper {
   */
   static toWrappedVerifiableCredential(verifiableCredential, opts) {
     if (_CredentialMapper.isMsoMdocDecodedCredential(verifiableCredential) || _CredentialMapper.isMsoMdocOid4VPEncoded(verifiableCredential)) {
-      let mdoc2;
+      let mdoc;
       if (_CredentialMapper.isMsoMdocOid4VPEncoded(verifiableCredential)) {
-        mdoc2 = decodeMdocIssuerSigned(verifiableCredential);
+        mdoc = decodeMdocIssuerSigned(verifiableCredential);
       } else {
-        mdoc2 = verifiableCredential;
+        mdoc = verifiableCredential;
       }
       return {
         type: _CredentialMapper.isMsoMdocDecodedCredential(verifiableCredential) ? "mso_mdoc-decoded" : "mso_mdoc-encoded",
         format: "mso_mdoc",
         original: verifiableCredential,
-        credential: mdoc2,
-        decoded: getMdocDecodedPayload(mdoc2)
+        credential: mdoc,
+        decoded: getMdocDecodedPayload(mdoc)
       };
     }
     if (_CredentialMapper.isSdJwtDecodedCredential(verifiableCredential) || _CredentialMapper.isSdJwtEncoded(verifiableCredential)) {
@@ -1229,7 +1256,7 @@ var CredentialMapper = class _CredentialMapper {
       }
       return {
         type: _CredentialMapper.isSdJwtDecodedCredential(verifiableCredential) ? "sd-jwt-vc-decoded" : "sd-jwt-vc-encoded",
-        format: "vc+sd-jwt",
+        format: "dc+sd-jwt",
         original: verifiableCredential,
         credential: decodedCredential,
         decoded: decodedCredential.decodedPayload
@@ -1351,6 +1378,13 @@ var CredentialMapper = class _CredentialMapper {
   static isSdJwtDecodedCredential(original) {
     return typeof original === "object" && (original.compactSdJwtVc !== void 0 || original.kbJwt !== void 0);
   }
+  static isSdJwtVcdm2DecodedCredential(original) {
+    if (typeof original !== "object") {
+      return false;
+    }
+    const decoded = original;
+    return decoded.compactSdJwtVc !== void 0 && !decoded.decodedPayload.vct && !decoded.decodedPayload["@context"];
+  }
   static isMsoMdocDecodedCredential(original) {
     return typeof original === "object" && "issuerSigned" in original && original.issuerSigned !== void 0;
   }
@@ -1674,14 +1708,14 @@ var CredentialMapper = class _CredentialMapper {
   }
 };
 function isWrappedSdJwtVerifiableCredential(vc) {
-  return vc.format === "vc+sd-jwt";
+  return vc.format === "dc+sd-jwt";
 }
 __name(isWrappedSdJwtVerifiableCredential, "isWrappedSdJwtVerifiableCredential");
 function isWrappedSdJwtVerifiablePresentation(vp) {
-  return vp.format === "vc+sd-jwt";
+  return vp.format === "dc+sd-jwt";
 }
 __name(isWrappedSdJwtVerifiablePresentation, "isWrappedSdJwtVerifiablePresentation");
-var OriginalType = /* @__PURE__ */ function(OriginalType2) {
+var OriginalType = /* @__PURE__ */ (function(OriginalType2) {
   OriginalType2["JSONLD"] = "json-ld";
   OriginalType2["JWT_ENCODED"] = "jwt-encoded";
   OriginalType2["JWT_DECODED"] = "jwt-decoded";
@@ -1690,16 +1724,16 @@ var OriginalType = /* @__PURE__ */ function(OriginalType2) {
   OriginalType2["MSO_MDOC_ENCODED"] = "mso_mdoc-encoded";
   OriginalType2["MSO_MDOC_DECODED"] = "mso_mdoc-decoded";
   return OriginalType2;
-}({});
+})({});
 var JWT_PROOF_TYPE_2020 = "JwtProof2020";
-var DocumentFormat = /* @__PURE__ */ function(DocumentFormat2) {
+var DocumentFormat = /* @__PURE__ */ (function(DocumentFormat2) {
   DocumentFormat2[DocumentFormat2["JWT"] = 0] = "JWT";
   DocumentFormat2[DocumentFormat2["JSONLD"] = 1] = "JSONLD";
   DocumentFormat2[DocumentFormat2["SD_JWT_VC"] = 2] = "SD_JWT_VC";
   DocumentFormat2[DocumentFormat2["EIP712"] = 3] = "EIP712";
   DocumentFormat2[DocumentFormat2["MSO_MDOC"] = 4] = "MSO_MDOC";
   return DocumentFormat2;
-}({});
+})({});
 
 // src/mapper/jsonld-language-values.ts
 var isLanguageValueObject = /* @__PURE__ */ __name((claim) => {