@sd-jwt/core 0.15.2-next.8 → 0.16.0

package/dist/index.js

@@ -69,11 +69,183 @@ __export(index_exports, {
   pack: () => pack
 });
 module.exports = __toCommonJS(index_exports);
+var import_decode5 = require("@sd-jwt/decode");
+var import_types5 = require("@sd-jwt/types");
 var import_utils7 = require("@sd-jwt/utils");
 
-// src/jwt.ts
-var import_utils = require("@sd-jwt/utils");
+// src/flattenJSON.ts
 var import_decode = require("@sd-jwt/decode");
+var import_types = require("@sd-jwt/types");
+var import_utils = require("@sd-jwt/utils");
+var FlattenJSON = class _FlattenJSON {
+  constructor(data) {
+    this.disclosures = data.disclosures;
+    this.kb_jwt = data.kb_jwt;
+    this.payload = data.jwtData.payload;
+    this.signature = data.jwtData.signature;
+    this.protected = data.jwtData.protected;
+  }
+  static fromEncode(encodedSdJwt) {
+    const { jwt, disclosures, kbJwt } = (0, import_decode.splitSdJwt)(encodedSdJwt);
+    const { 0: protectedHeader, 1: payload, 2: signature } = jwt.split(".");
+    if (!protectedHeader || !payload || !signature) {
+      throw new import_utils.SDJWTException("Invalid JWT");
+    }
+    return new _FlattenJSON({
+      jwtData: {
+        protected: protectedHeader,
+        payload,
+        signature
+      },
+      disclosures,
+      kb_jwt: kbJwt
+    });
+  }
+  static fromSerialized(json) {
+    return new _FlattenJSON({
+      jwtData: {
+        protected: json.protected,
+        payload: json.payload,
+        signature: json.signature
+      },
+      disclosures: json.header.disclosures,
+      kb_jwt: json.header.kb_jwt
+    });
+  }
+  toJson() {
+    return {
+      payload: this.payload,
+      signature: this.signature,
+      protected: this.protected,
+      header: {
+        disclosures: this.disclosures,
+        kb_jwt: this.kb_jwt
+      }
+    };
+  }
+  toEncoded() {
+    var _a;
+    const data = [];
+    const jwt = `${this.protected}.${this.payload}.${this.signature}`;
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(import_types.SD_SEPARATOR);
+      data.push(disclosures);
+    }
+    const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
+    data.push(kb_jwt);
+    return data.join(import_types.SD_SEPARATOR);
+  }
+};
+
+// src/generalJSON.ts
+var import_decode2 = require("@sd-jwt/decode");
+var import_types2 = require("@sd-jwt/types");
+var import_utils2 = require("@sd-jwt/utils");
+var GeneralJSON = class _GeneralJSON {
+  constructor(data) {
+    this.payload = data.payload;
+    this.disclosures = data.disclosures;
+    this.kb_jwt = data.kb_jwt;
+    this.signatures = data.signatures;
+  }
+  static fromEncode(encodedSdJwt) {
+    const { jwt, disclosures, kbJwt } = (0, import_decode2.splitSdJwt)(encodedSdJwt);
+    const { 0: protectedHeader, 1: payload, 2: signature } = jwt.split(".");
+    if (!protectedHeader || !payload || !signature) {
+      throw new import_utils2.SDJWTException("Invalid JWT");
+    }
+    return new _GeneralJSON({
+      payload,
+      disclosures,
+      kb_jwt: kbJwt,
+      signatures: [
+        {
+          protected: protectedHeader,
+          signature
+        }
+      ]
+    });
+  }
+  static fromSerialized(json) {
+    var _a, _b, _c;
+    if (!json.signatures[0]) {
+      throw new import_utils2.SDJWTException("Invalid JSON");
+    }
+    const disclosures = (_b = (_a = json.signatures[0].header) == null ? void 0 : _a.disclosures) != null ? _b : [];
+    const kb_jwt = (_c = json.signatures[0].header) == null ? void 0 : _c.kb_jwt;
+    return new _GeneralJSON({
+      payload: json.payload,
+      disclosures,
+      kb_jwt,
+      signatures: json.signatures.map((s) => {
+        var _a2;
+        return {
+          protected: s.protected,
+          signature: s.signature,
+          kid: (_a2 = s.header) == null ? void 0 : _a2.kid
+        };
+      })
+    });
+  }
+  toJson() {
+    return {
+      payload: this.payload,
+      signatures: this.signatures.map((s, i) => {
+        if (i !== 0) {
+          return {
+            header: {
+              kid: s.kid
+            },
+            protected: s.protected,
+            signature: s.signature
+          };
+        }
+        return {
+          header: {
+            disclosures: this.disclosures,
+            kid: s.kid,
+            kb_jwt: this.kb_jwt
+          },
+          protected: s.protected,
+          signature: s.signature
+        };
+      })
+    };
+  }
+  toEncoded(index) {
+    var _a;
+    if (index < 0 || index >= this.signatures.length) {
+      throw new import_utils2.SDJWTException("Index out of bounds");
+    }
+    const data = [];
+    const { protected: protectedHeader, signature } = this.signatures[index];
+    const jwt = `${protectedHeader}.${this.payload}.${signature}`;
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(import_types2.SD_SEPARATOR);
+      data.push(disclosures);
+    }
+    const kb = (_a = this.kb_jwt) != null ? _a : "";
+    data.push(kb);
+    return data.join(import_types2.SD_SEPARATOR);
+  }
+  addSignature(protectedHeader, signer, kid) {
+    return __async(this, null, function* () {
+      const header = (0, import_utils2.base64urlEncode)(JSON.stringify(protectedHeader));
+      const signature = yield signer(`${header}.${this.payload}`);
+      this.signatures.push({
+        protected: header,
+        signature,
+        kid
+      });
+    });
+  }
+};
+
+// src/jwt.ts
+var import_decode3 = require("@sd-jwt/decode");
+var import_utils3 = require("@sd-jwt/utils");
 var Jwt = class _Jwt {
   constructor(data) {
     this.header = data == null ? void 0 : data.header;
@@ -82,7 +254,7 @@ var Jwt = class _Jwt {
     this.encoded = data == null ? void 0 : data.encoded;
   }
   static decodeJWT(jwt) {
-    return (0, import_decode.decodeJwt)(jwt);
+    return (0, import_decode3.decodeJwt)(jwt);
   }
   static fromEncode(encodedJwt) {
     const { header, payload, signature } = _Jwt.decodeJWT(
@@ -108,18 +280,18 @@ var Jwt = class _Jwt {
   }
   getUnsignedToken() {
     if (!this.header || !this.payload) {
-      throw new import_utils.SDJWTException("Serialize Error: Invalid JWT");
+      throw new import_utils3.SDJWTException("Serialize Error: Invalid JWT");
     }
     if (this.encoded) {
       const parts = this.encoded.split(".");
       if (parts.length !== 3) {
-        throw new import_utils.SDJWTException(`Invalid JWT format: ${this.encoded}`);
+        throw new import_utils3.SDJWTException(`Invalid JWT format: ${this.encoded}`);
       }
       const unsignedToken = parts.slice(0, 2).join(".");
       return unsignedToken;
     }
-    const header = (0, import_utils.base64urlEncode)(JSON.stringify(this.header));
-    const payload = (0, import_utils.base64urlEncode)(JSON.stringify(this.payload));
+    const header = (0, import_utils3.base64urlEncode)(JSON.stringify(this.header));
+    const payload = (0, import_utils3.base64urlEncode)(JSON.stringify(this.payload));
     return `${header}.${payload}`;
   }
   sign(signer) {
@@ -134,10 +306,10 @@ var Jwt = class _Jwt {
       return this.encoded;
     }
     if (!this.header || !this.payload || !this.signature) {
-      throw new import_utils.SDJWTException("Serialize Error: Invalid JWT");
+      throw new import_utils3.SDJWTException("Serialize Error: Invalid JWT");
     }
-    const header = (0, import_utils.base64urlEncode)(JSON.stringify(this.header));
-    const payload = (0, import_utils.base64urlEncode)(JSON.stringify(this.payload));
+    const header = (0, import_utils3.base64urlEncode)(JSON.stringify(this.header));
+    const payload = (0, import_utils3.base64urlEncode)(JSON.stringify(this.payload));
     const signature = this.signature;
     const compact = `${header}.${payload}.${signature}`;
     this.encoded = compact;
@@ -156,21 +328,21 @@ var Jwt = class _Jwt {
       const skew = (options == null ? void 0 : options.skewSeconds) ? options.skewSeconds : 0;
       const currentDate = (_a = options == null ? void 0 : options.currentDate) != null ? _a : Math.floor(Date.now() / 1e3);
       if (((_b = this.payload) == null ? void 0 : _b.iat) && this.payload.iat - skew > currentDate) {
-        throw new import_utils.SDJWTException("Verify Error: JWT is not yet valid");
+        throw new import_utils3.SDJWTException("Verify Error: JWT is not yet valid");
       }
       if (((_c = this.payload) == null ? void 0 : _c.nbf) && this.payload.nbf - skew > currentDate) {
-        throw new import_utils.SDJWTException("Verify Error: JWT is not yet valid");
+        throw new import_utils3.SDJWTException("Verify Error: JWT is not yet valid");
       }
       if (((_d = this.payload) == null ? void 0 : _d.exp) && this.payload.exp + skew < currentDate) {
-        throw new import_utils.SDJWTException("Verify Error: JWT is expired");
+        throw new import_utils3.SDJWTException("Verify Error: JWT is expired");
       }
       if (!this.signature) {
-        throw new import_utils.SDJWTException("Verify Error: no signature in JWT");
+        throw new import_utils3.SDJWTException("Verify Error: no signature in JWT");
       }
       const data = this.getUnsignedToken();
       const verified = yield verifier(data, this.signature);
       if (!verified) {
-        throw new import_utils.SDJWTException("Verify Error: Invalid JWT Signature");
+        throw new import_utils3.SDJWTException("Verify Error: Invalid JWT Signature");
       }
       return { payload: this.payload, header: this.header };
     });
@@ -178,8 +350,8 @@ var Jwt = class _Jwt {
 };
 
 // src/kbjwt.ts
-var import_utils2 = require("@sd-jwt/utils");
-var import_types = require("@sd-jwt/types");
+var import_types3 = require("@sd-jwt/types");
+var import_utils4 = require("@sd-jwt/utils");
 var KBJwt = class _KBJwt extends Jwt {
   // Checking the validity of the key binding jwt
   // the type unknown is not good, but we don't know at this point how to get the public key of the signer, this is defined in the kbVerifier
@@ -187,11 +359,11 @@ var KBJwt = class _KBJwt extends Jwt {
     return __async(this, null, function* () {
       var _a;
       if (!this.header || !this.payload || !this.signature) {
-        throw new import_utils2.SDJWTException("Verify Error: Invalid JWT");
+        throw new import_utils4.SDJWTException("Verify Error: Invalid JWT");
       }
-      if (!this.header.alg || this.header.alg === "none" || !this.header.typ || this.header.typ !== import_types.KB_JWT_TYP || !this.payload.iat || !this.payload.aud || !this.payload.nonce || // this is for backward compatibility with version 06
+      if (!this.header.alg || this.header.alg === "none" || !this.header.typ || this.header.typ !== import_types3.KB_JWT_TYP || !this.payload.iat || !this.payload.aud || !this.payload.nonce || // this is for backward compatibility with version 06
       !(this.payload.sd_hash || ((_a = this.payload) == null ? void 0 : _a._sd_hash))) {
-        throw new import_utils2.SDJWTException("Invalid Key Binding Jwt");
+        throw new import_utils4.SDJWTException("Invalid Key Binding Jwt");
       }
       const data = this.getUnsignedToken();
       const verified = yield values.verifier(
@@ -200,10 +372,10 @@ var KBJwt = class _KBJwt extends Jwt {
         values.payload
       );
       if (!verified) {
-        throw new import_utils2.SDJWTException("Verify Error: Invalid JWT Signature");
+        throw new import_utils4.SDJWTException("Verify Error: Invalid JWT Signature");
       }
       if (this.payload.nonce !== values.nonce) {
-        throw new import_utils2.SDJWTException("Verify Error: Invalid Nonce");
+        throw new import_utils4.SDJWTException("Verify Error: Invalid Nonce");
       }
       return { payload: this.payload, header: this.header };
     });
@@ -223,20 +395,22 @@ var KBJwt = class _KBJwt extends Jwt {
   }
 };
 
+// src/sdjwt.ts
+var import_decode4 = require("@sd-jwt/decode");
+var import_present = require("@sd-jwt/present");
+var import_types4 = require("@sd-jwt/types");
+var import_utils6 = require("@sd-jwt/utils");
+
 // src/decoy.ts
-var import_utils3 = require("@sd-jwt/utils");
-var createDecoy = (hash, saltGenerator) => __async(void 0, null, function* () {
+var import_utils5 = require("@sd-jwt/utils");
+var createDecoy = (hash, saltGenerator) => __async(null, null, function* () {
   const { hasher, alg } = hash;
   const salt = yield saltGenerator(16);
   const decoy = yield hasher(salt, alg);
-  return (0, import_utils3.uint8ArrayToBase64Url)(decoy);
+  return (0, import_utils5.uint8ArrayToBase64Url)(decoy);
 });
 
 // src/sdjwt.ts
-var import_utils4 = require("@sd-jwt/utils");
-var import_types2 = require("@sd-jwt/types");
-var import_decode2 = require("@sd-jwt/decode");
-var import_present = require("@sd-jwt/present");
 var SDJwt = class _SDJwt {
   constructor(data) {
     this.jwt = data == null ? void 0 : data.jwt;
@@ -245,7 +419,7 @@ var SDJwt = class _SDJwt {
   }
   static decodeSDJwt(sdjwt, hasher) {
     return __async(this, null, function* () {
-      const [encodedJwt, ...encodedDisclosures] = sdjwt.split(import_types2.SD_SEPARATOR);
+      const [encodedJwt, ...encodedDisclosures] = sdjwt.split(import_types4.SD_SEPARATOR);
       const jwt = Jwt.fromEncode(encodedJwt);
       if (!jwt.payload) {
         throw new Error("Payload is undefined on the JWT. Invalid state reached");
@@ -258,10 +432,10 @@ var SDJwt = class _SDJwt {
       }
       const encodedKeyBindingJwt = encodedDisclosures.pop();
       const kbJwt = encodedKeyBindingJwt ? KBJwt.fromKBEncode(encodedKeyBindingJwt) : void 0;
-      const { _sd_alg } = (0, import_decode2.getSDAlgAndPayload)(jwt.payload);
+      const { _sd_alg } = (0, import_decode4.getSDAlgAndPayload)(jwt.payload);
       const disclosures = yield Promise.all(
         encodedDisclosures.map(
-          (ed) => import_utils4.Disclosure.fromEncode(ed, { alg: _sd_alg, hasher })
+          (ed) => import_utils6.Disclosure.fromEncode(ed, { alg: _sd_alg, hasher })
         )
       );
       return {
@@ -273,7 +447,7 @@ var SDJwt = class _SDJwt {
   }
   static extractJwt(encodedSdJwt) {
     return __async(this, null, function* () {
-      const [encodedJwt, ..._encodedDisclosures] = encodedSdJwt.split(import_types2.SD_SEPARATOR);
+      const [encodedJwt, ..._encodedDisclosures] = encodedSdJwt.split(import_types4.SD_SEPARATOR);
       return Jwt.fromEncode(encodedJwt);
     });
   }
@@ -302,12 +476,12 @@ var SDJwt = class _SDJwt {
     return __async(this, null, function* () {
       var _a;
       if (!((_a = this.jwt) == null ? void 0 : _a.payload) || !this.disclosures) {
-        throw new import_utils4.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
+        throw new import_utils6.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
       }
-      const { _sd_alg: alg } = (0, import_decode2.getSDAlgAndPayload)(this.jwt.payload);
+      const { _sd_alg: alg } = (0, import_decode4.getSDAlgAndPayload)(this.jwt.payload);
       const hash = { alg, hasher };
-      const hashmap = yield (0, import_decode2.createHashMapping)(this.disclosures, hash);
-      const { disclosureKeymap } = yield (0, import_decode2.unpack)(
+      const hashmap = yield (0, import_decode4.createHashMapping)(this.disclosures, hash);
+      const { disclosureKeymap } = yield (0, import_decode4.unpack)(
         this.jwt.payload,
         this.disclosures,
         hasher
@@ -320,16 +494,16 @@ var SDJwt = class _SDJwt {
   encodeSDJwt() {
     const data = [];
     if (!this.jwt) {
-      throw new import_utils4.SDJWTException("Invalid sd-jwt: jwt is missing");
+      throw new import_utils6.SDJWTException("Invalid sd-jwt: jwt is missing");
     }
     const encodedJwt = this.jwt.encodeJwt();
     data.push(encodedJwt);
     if (this.disclosures && this.disclosures.length > 0) {
-      const encodeddisclosures = this.disclosures.map((dc) => dc.encode()).join(import_types2.SD_SEPARATOR);
+      const encodeddisclosures = this.disclosures.map((dc) => dc.encode()).join(import_types4.SD_SEPARATOR);
       data.push(encodeddisclosures);
     }
     data.push(this.kbJwt ? this.kbJwt.encodeJwt() : "");
-    return data.join(import_types2.SD_SEPARATOR);
+    return data.join(import_types4.SD_SEPARATOR);
   }
   keys(hasher) {
     return __async(this, null, function* () {
@@ -340,9 +514,9 @@ var SDJwt = class _SDJwt {
     return __async(this, null, function* () {
       var _a, _b;
       if (!((_a = this.jwt) == null ? void 0 : _a.payload) || !this.disclosures) {
-        throw new import_utils4.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
+        throw new import_utils6.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
       }
-      const { disclosureKeymap } = yield (0, import_decode2.unpack)(
+      const { disclosureKeymap } = yield (0, import_decode4.unpack)(
         (_b = this.jwt) == null ? void 0 : _b.payload,
         this.disclosures,
         hasher
@@ -354,9 +528,9 @@ var SDJwt = class _SDJwt {
     return __async(this, null, function* () {
       var _a;
       if (!((_a = this.jwt) == null ? void 0 : _a.payload) || !this.disclosures) {
-        throw new import_utils4.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
+        throw new import_utils6.SDJWTException("Invalid sd-jwt: jwt or disclosures is missing");
       }
-      const { unpackedObj } = yield (0, import_decode2.unpack)(
+      const { unpackedObj } = yield (0, import_decode4.unpack)(
         this.jwt.payload,
         this.disclosures,
         hasher
@@ -377,7 +551,7 @@ var listKeys = (obj, prefix = "") => {
   }
   return keys;
 };
-var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, null, function* () {
+var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(null, null, function* () {
   var _a, _b;
   if (!disclosureFrame) {
     return {
@@ -385,15 +559,15 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
       disclosures: []
     };
   }
-  const sd = (_a = disclosureFrame[import_types2.SD_DIGEST]) != null ? _a : [];
-  const decoyCount = (_b = disclosureFrame[import_types2.SD_DECOY]) != null ? _b : 0;
+  const sd = (_a = disclosureFrame[import_types4.SD_DIGEST]) != null ? _a : [];
+  const decoyCount = (_b = disclosureFrame[import_types4.SD_DECOY]) != null ? _b : 0;
   if (Array.isArray(claims)) {
     const packedClaims2 = [];
     const disclosures2 = [];
     const recursivePackedClaims2 = {};
     for (const key in disclosureFrame) {
-      if (key !== import_types2.SD_DIGEST) {
-        const idx = Number.parseInt(key);
+      if (key !== import_types4.SD_DIGEST) {
+        const idx = Number.parseInt(key, 10);
         const packed = yield pack(
           claims[idx],
           disclosureFrame[idx],
@@ -408,9 +582,9 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
       const claim = recursivePackedClaims2[i] ? recursivePackedClaims2[i] : claims[i];
       if (sd.includes(i)) {
         const salt = yield saltGenerator(16);
-        const disclosure = new import_utils4.Disclosure([salt, claim]);
+        const disclosure = new import_utils6.Disclosure([salt, claim]);
         const digest = yield disclosure.digest(hash);
-        packedClaims2.push({ [import_types2.SD_LIST_KEY]: digest });
+        packedClaims2.push({ [import_types4.SD_LIST_KEY]: digest });
         disclosures2.push(disclosure);
       } else {
         packedClaims2.push(claim);
@@ -418,7 +592,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
     }
     for (let j = 0; j < decoyCount; j++) {
       const decoyDigest = yield createDecoy(hash, saltGenerator);
-      packedClaims2.push({ [import_types2.SD_LIST_KEY]: decoyDigest });
+      packedClaims2.push({ [import_types4.SD_LIST_KEY]: decoyDigest });
     }
     return { packedClaims: packedClaims2, disclosures: disclosures2 };
   }
@@ -426,9 +600,9 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
   const disclosures = [];
   const recursivePackedClaims = {};
   for (const key in disclosureFrame) {
-    if (key !== import_types2.SD_DIGEST) {
+    if (key !== import_types4.SD_DIGEST) {
       const packed = yield pack(
-        // @ts-ignore
+        // @ts-expect-error
         claims[key],
         disclosureFrame[key],
         hash,
@@ -443,7 +617,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
     const claim = recursivePackedClaims[key] ? recursivePackedClaims[key] : claims[key];
     if (sd.includes(key)) {
       const salt = yield saltGenerator(16);
-      const disclosure = new import_utils4.Disclosure([salt, key, claim]);
+      const disclosure = new import_utils6.Disclosure([salt, key, claim]);
       const digest = yield disclosure.digest(hash);
       _sd.push(digest);
       disclosures.push(disclosure);
@@ -456,185 +630,11 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
     _sd.push(decoyDigest);
   }
   if (_sd.length > 0) {
-    packedClaims[import_types2.SD_DIGEST] = _sd.sort();
+    packedClaims[import_types4.SD_DIGEST] = _sd.sort();
   }
   return { packedClaims, disclosures };
 });
 
-// src/index.ts
-var import_types5 = require("@sd-jwt/types");
-var import_decode5 = require("@sd-jwt/decode");
-
-// src/flattenJSON.ts
-var import_utils5 = require("@sd-jwt/utils");
-var import_decode3 = require("@sd-jwt/decode");
-var import_types3 = require("@sd-jwt/types");
-var FlattenJSON = class _FlattenJSON {
-  constructor(data) {
-    this.disclosures = data.disclosures;
-    this.kb_jwt = data.kb_jwt;
-    this.payload = data.jwtData.payload;
-    this.signature = data.jwtData.signature;
-    this.protected = data.jwtData.protected;
-  }
-  static fromEncode(encodedSdJwt) {
-    const { jwt, disclosures, kbJwt } = (0, import_decode3.splitSdJwt)(encodedSdJwt);
-    const { 0: protectedHeader, 1: payload, 2: signature } = jwt.split(".");
-    if (!protectedHeader || !payload || !signature) {
-      throw new import_utils5.SDJWTException("Invalid JWT");
-    }
-    return new _FlattenJSON({
-      jwtData: {
-        protected: protectedHeader,
-        payload,
-        signature
-      },
-      disclosures,
-      kb_jwt: kbJwt
-    });
-  }
-  static fromSerialized(json) {
-    return new _FlattenJSON({
-      jwtData: {
-        protected: json.protected,
-        payload: json.payload,
-        signature: json.signature
-      },
-      disclosures: json.header.disclosures,
-      kb_jwt: json.header.kb_jwt
-    });
-  }
-  toJson() {
-    return {
-      payload: this.payload,
-      signature: this.signature,
-      protected: this.protected,
-      header: {
-        disclosures: this.disclosures,
-        kb_jwt: this.kb_jwt
-      }
-    };
-  }
-  toEncoded() {
-    var _a;
-    const data = [];
-    const jwt = `${this.protected}.${this.payload}.${this.signature}`;
-    data.push(jwt);
-    if (this.disclosures && this.disclosures.length > 0) {
-      const disclosures = this.disclosures.join(import_types3.SD_SEPARATOR);
-      data.push(disclosures);
-    }
-    const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
-    data.push(kb_jwt);
-    return data.join(import_types3.SD_SEPARATOR);
-  }
-};
-
-// src/generalJSON.ts
-var import_utils6 = require("@sd-jwt/utils");
-var import_decode4 = require("@sd-jwt/decode");
-var import_types4 = require("@sd-jwt/types");
-var GeneralJSON = class _GeneralJSON {
-  constructor(data) {
-    this.payload = data.payload;
-    this.disclosures = data.disclosures;
-    this.kb_jwt = data.kb_jwt;
-    this.signatures = data.signatures;
-  }
-  static fromEncode(encodedSdJwt) {
-    const { jwt, disclosures, kbJwt } = (0, import_decode4.splitSdJwt)(encodedSdJwt);
-    const { 0: protectedHeader, 1: payload, 2: signature } = jwt.split(".");
-    if (!protectedHeader || !payload || !signature) {
-      throw new import_utils6.SDJWTException("Invalid JWT");
-    }
-    return new _GeneralJSON({
-      payload,
-      disclosures,
-      kb_jwt: kbJwt,
-      signatures: [
-        {
-          protected: protectedHeader,
-          signature
-        }
-      ]
-    });
-  }
-  static fromSerialized(json) {
-    var _a, _b, _c;
-    if (!json.signatures[0]) {
-      throw new import_utils6.SDJWTException("Invalid JSON");
-    }
-    const disclosures = (_b = (_a = json.signatures[0].header) == null ? void 0 : _a.disclosures) != null ? _b : [];
-    const kb_jwt = (_c = json.signatures[0].header) == null ? void 0 : _c.kb_jwt;
-    return new _GeneralJSON({
-      payload: json.payload,
-      disclosures,
-      kb_jwt,
-      signatures: json.signatures.map((s) => {
-        var _a2;
-        return {
-          protected: s.protected,
-          signature: s.signature,
-          kid: (_a2 = s.header) == null ? void 0 : _a2.kid
-        };
-      })
-    });
-  }
-  toJson() {
-    return {
-      payload: this.payload,
-      signatures: this.signatures.map((s, i) => {
-        if (i !== 0) {
-          return {
-            header: {
-              kid: s.kid
-            },
-            protected: s.protected,
-            signature: s.signature
-          };
-        }
-        return {
-          header: {
-            disclosures: this.disclosures,
-            kid: s.kid,
-            kb_jwt: this.kb_jwt
-          },
-          protected: s.protected,
-          signature: s.signature
-        };
-      })
-    };
-  }
-  toEncoded(index) {
-    var _a;
-    if (index < 0 || index >= this.signatures.length) {
-      throw new import_utils6.SDJWTException("Index out of bounds");
-    }
-    const data = [];
-    const { protected: protectedHeader, signature } = this.signatures[index];
-    const jwt = `${protectedHeader}.${this.payload}.${signature}`;
-    data.push(jwt);
-    if (this.disclosures && this.disclosures.length > 0) {
-      const disclosures = this.disclosures.join(import_types4.SD_SEPARATOR);
-      data.push(disclosures);
-    }
-    const kb = (_a = this.kb_jwt) != null ? _a : "";
-    data.push(kb);
-    return data.join(import_types4.SD_SEPARATOR);
-  }
-  addSignature(protectedHeader, signer, kid) {
-    return __async(this, null, function* () {
-      const header = (0, import_utils6.base64urlEncode)(JSON.stringify(protectedHeader));
-      const signature = yield signer(`${header}.${this.payload}`);
-      this.signatures.push({
-        protected: header,
-        signature,
-        kid
-      });
-    });
-  }
-};
-
 // src/index.ts
 var _SDJwtInstance = class _SDJwtInstance {
   constructor(userConfig) {
@@ -731,7 +731,7 @@ var _SDJwtInstance = class _SDJwtInstance {
    * @param disclosureFrame
    * @returns
    */
-  validateReservedFields(disclosureFrame) {
+  validateReservedFields(_disclosureFrame) {
     return;
   }
   present(encodedSDJwt, presentationFrame, options) {
@@ -986,7 +986,7 @@ var SDJwtGeneralJSONInstance = class {
    * @param disclosureFrame
    * @returns
    */
-  validateReservedFields(disclosureFrame) {
+  validateReservedFields(_disclosureFrame) {
     return;
   }
   present(generalJSON, presentationFrame, options) {