@sd-jwt/decode 0.1.2-alpha.6 → 0.1.2-alpha.8

package/build/disclosures/calculateDigest.d.ts

@@ -1,5 +1,5 @@
 import type { AsyncHasher, Hasher } from '@sd-jwt/types';
-import type { Disclosure, DisclosureWithDigest } from '@sd-jwt/types';
+import type { Disclosure } from '@sd-jwt/types';
 import { HasherAlgorithm } from '@sd-jwt/utils';
-export type CalculateDigestReturnType<HasherImplementation extends Hasher | AsyncHasher> = ReturnType<HasherImplementation> extends Promise<any> ? Promise<DisclosureWithDigest> : DisclosureWithDigest;
+export type CalculateDigestReturnType<HasherImplementation extends Hasher | AsyncHasher> = ReturnType<HasherImplementation> extends Promise<any> ? Promise<string> : string;
 export declare const disclosureCalculateDigest: <HI extends Hasher | AsyncHasher>(disclosure: Disclosure, algorithm: HasherAlgorithm, hasher: HI) => CalculateDigestReturnType<HI>;

package/build/sdJwtVc/decode.d.ts

@@ -1,18 +1,12 @@
-import type { AsyncHasher, Hasher } from '@sd-jwt/types';
-export declare const decodeSdJwtVc: <HI extends Hasher | AsyncHasher>(compact: string, hasher: HI) => {
+import type { AsyncHasher, DisclosureWithDigest, Hasher } from '@sd-jwt/types';
+interface DecodeSdJwtVcResult {
     compactSdJwtVc: string;
     signedPayload: Record<string, unknown>;
     header: Record<string, unknown>;
     signature: Uint8Array;
-    keyBinding: {
-        header: Record<string, unknown>;
-        payload: Record<string, unknown>;
-        signature: Uint8Array;
-    } | undefined;
-    disclosures: {
-        digest: import("../disclosures/calculateDigest").CalculateDigestReturnType<HI>;
-        decoded: import("@sd-jwt/types").Disclosure;
-        encoded: import("@sd-jwt/types").DisclosureArray;
-    }[];
+    keyBinding?: Record<string, unknown>;
+    disclosures: Array<DisclosureWithDigest>;
     decodedPayload: Record<string, unknown>;
-};
+}
+export declare const decodeSdJwtVc: <HI extends Hasher | AsyncHasher>(compact: string, hasher: HI) => HI extends AsyncHasher ? Promise<DecodeSdJwtVcResult> : DecodeSdJwtVcResult;
+export {};

package/build/sdJwtVc/decode.js

@@ -2,28 +2,36 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeSdJwtVc = void 0;
 const utils_1 = require("@sd-jwt/utils");
-const fromCompact_1 = require("./fromCompact");
 const utils_2 = require("@sd-jwt/utils");
+const fromCompact_1 = require("./fromCompact");
+const utils_3 = require("@sd-jwt/utils");
 const calculateDigest_1 = require("../disclosures/calculateDigest");
-const toArray_1 = require("../disclosures/toArray");
 const decodeSdJwtVc = (compact, hasher) => {
     var _a, _b;
     const { header, payload, signature, keyBinding, disclosures } = (0, fromCompact_1.sdJwtVcFromCompact)(compact);
-    const hasherAlgorithm = (_a = (0, utils_2.getValueByKeyAnyLevel)(payload, '_sd_alg')) !== null && _a !== void 0 ? _a : utils_1.HasherAlgorithm.Sha256;
-    const disclosureWithDigests = (_b = disclosures === null || disclosures === void 0 ? void 0 : disclosures.map((d) => ({
-        digest: (0, calculateDigest_1.disclosureCalculateDigest)(d, hasherAlgorithm, hasher),
-        decoded: d,
-        encoded: (0, toArray_1.disclosureToArray)(d)
-    }))) !== null && _b !== void 0 ? _b : [];
-    return {
+    const hasherAlgorithm = (_a = (0, utils_3.getValueByKeyAnyLevel)(payload, '_sd_alg')) !== null && _a !== void 0 ? _a : utils_2.HasherAlgorithm.Sha256;
+    const disclosuresWithDigestsResult = ((_b = disclosures === null || disclosures === void 0 ? void 0 : disclosures.map((disclosure) => {
+        const digestResult = (0, calculateDigest_1.disclosureCalculateDigest)(disclosure, hasherAlgorithm, hasher);
+        return (0, utils_1.isPromise)(digestResult)
+            ? digestResult.then((digest) => (Object.assign(Object.assign({}, disclosure), { digest })))
+            : Object.assign(Object.assign({}, disclosure), { digest: digestResult });
+    })) !== null && _b !== void 0 ? _b : []);
+    const basePayload = {
         compactSdJwtVc: compact,
         signedPayload: payload,
         header,
         signature,
-        keyBinding,
-        disclosures: disclosureWithDigests,
-        decodedPayload: (0, utils_2.swapClaims)(payload, disclosureWithDigests.map((d) => (Object.assign(Object.assign({}, d.decoded), { digest: d.digest }))))
+        keyBinding
     };
+    if (isAsyncCalculateDigestReturnType(disclosuresWithDigestsResult)) {
+        return Promise.all(disclosuresWithDigestsResult).then((disclosureWithDigests) => (Object.assign(Object.assign({}, basePayload), { disclosures: disclosureWithDigests, decodedPayload: (0, utils_3.swapClaims)(basePayload.signedPayload, disclosureWithDigests) })));
+    }
+    else {
+        return Object.assign(Object.assign({}, basePayload), { disclosures: disclosuresWithDigestsResult, decodedPayload: (0, utils_3.swapClaims)(basePayload.signedPayload, disclosuresWithDigestsResult) });
+    }
 };
 exports.decodeSdJwtVc = decodeSdJwtVc;
+function isAsyncCalculateDigestReturnType(disclosureWithDigests) {
+    return (0, utils_1.isPromise)(disclosureWithDigests[0]);
+}
 //# sourceMappingURL=decode.js.map

package/build/sdJwtVc/decode.js.map

@@ -1 +1 @@
-{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../src/sdJwtVc/decode.ts"],"names":[],"mappings":";;;AAEA,yCAA+C;AAC/C,+CAAkD;AAClD,yCAAiE;AACjE,oEAA0E;AAC1E,oDAA0D;AAEnD,MAAM,aAAa,GAAG,CACzB,OAAe,EACf,MAAU,EACZ,EAAE;;IACA,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACzD,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAA;IAE/B,MAAM,eAAe,GACjB,MAAA,IAAA,6BAAqB,EAAkB,OAAO,EAAE,SAAS,CAAC,mCAC1D,uBAAe,CAAC,MAAM,CAAA;IAE1B,MAAM,qBAAqB,GACvB,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACrB,MAAM,EAAE,IAAA,2CAAyB,EAAC,CAAC,EAAE,eAAe,EAAE,MAAM,CAAC;QAC7D,OAAO,EAAE,CAAC;QACV,OAAO,EAAE,IAAA,2BAAiB,EAAC,CAAC,CAAC;KAChC,CAAC,CAAC,mCAAI,EAAE,CAAA;IAEb,OAAO;QACH,cAAc,EAAE,OAAO;QACvB,aAAa,EAAE,OAAO;QACtB,MAAM;QACN,SAAS;QACT,UAAU;QACV,WAAW,EAAE,qBAAqB;QAClC,cAAc,EAAE,IAAA,kBAAU,EACtB,OAAO,EACP,qBAAqB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iCAC1B,CAAC,CAAC,OAAO,KACZ,MAAM,EAAE,CAAC,CAAC,MAAM,IAClB,CAA2C,CAChD;KACJ,CAAA;AACL,CAAC,CAAA;AAjCY,QAAA,aAAa,iBAiCzB"}
+{"version":3,"file":"decode.js","sourceRoot":"","sources":["../../src/sdJwtVc/decode.ts"],"names":[],"mappings":";;;AACA,yCAAyC;AACzC,yCAA+C;AAC/C,+CAAkD;AAClD,yCAAiE;AACjE,oEAA0E;AAYnE,MAAM,aAAa,GAAG,CACzB,OAAe,EACf,MAAU,EAGY,EAAE;;IACxB,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,GACzD,IAAA,gCAAkB,EAAC,OAAO,CAAC,CAAA;IAE/B,MAAM,eAAe,GACjB,MAAA,IAAA,6BAAqB,EAAkB,OAAO,EAAE,SAAS,CAAC,mCAC1D,uBAAe,CAAC,MAAM,CAAA;IAE1B,MAAM,4BAA4B,GAAG,CAAC,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClE,MAAM,YAAY,GAAG,IAAA,2CAAyB,EAC1C,UAAU,EACV,eAAe,EACf,MAAM,CACT,CAAA;QAED,OAAO,IAAA,iBAAS,EAAC,YAAY,CAAC;YAC1B,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,iCAAM,UAAU,KAAE,MAAM,IAAG,CAAC;YAC5D,CAAC,iCAAM,UAAU,KAAE,MAAM,EAAE,YAAY,GAAE,CAAA;IACjD,CAAC,CAAC,mCAAI,EAAE,CAEkC,CAAA;IAE1C,MAAM,WAAW,GAAG;QAChB,cAAc,EAAE,OAAO;QACvB,aAAa,EAAE,OAAO;QACtB,MAAM;QACN,SAAS;QACT,UAAU;KACJ,CAAA;IAEV,IAAI,gCAAgC,CAAC,4BAA4B,CAAC,EAAE,CAAC;QACjE,OAAO,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC,IAAI,CACjD,CAAC,qBAAqB,EAAE,EAAE,CAAC,iCACpB,WAAW,KACd,WAAW,EAAE,qBAAqB,EAClC,cAAc,EAAE,IAAA,kBAAU,EACtB,WAAW,CAAC,aAAa,EACzB,qBAAqB,CACxB,IACH,CAGmB,CAAA;IAC7B,CAAC;SAAM,CAAC;QACJ,OAAO,gCACA,WAAW,KACd,WAAW,EAAE,4BAA4B,EACzC,cAAc,EAAE,IAAA,kBAAU,EACtB,WAAW,CAAC,aAAa,EACzB,4BAA4B,CAC/B,GAGoB,CAAA;IAC7B,CAAC;AACL,CAAC,CAAA;AA5DY,QAAA,aAAa,iBA4DzB;AAED,SAAS,gCAAgC,CACrC,qBAEC;IAED,OAAO,IAAA,iBAAS,EAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAA;AAC9C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sd-jwt/decode",
-    "version": "0.1.2-alpha.6",
+    "version": "0.1.2-alpha.8",
     "description": "Decode implementation of sd-jwt Draft 06 and sd-jwt-vc Draft 01",
     "license": "(MIT OR Apache-2.0)",
     "author": "Berend Sliedrecht <sliedrecht@berend.io>",
@@ -37,13 +37,13 @@
         "test": "node --require ts-node/register --test ./tests/*.test.ts"
     },
     "dependencies": {
-        "@sd-jwt/types": "0.1.2-alpha.6",
-        "@sd-jwt/utils": "0.1.2-alpha.6"
+        "@sd-jwt/types": "0.1.2-alpha.8",
+        "@sd-jwt/utils": "0.1.2-alpha.8"
     },
     "devDependencies": {
         "@types/node": "*",
         "ts-node": "*",
         "typescript": "*"
     },
-    "gitHead": "b2c26012342e9dfba2220300cb5acbcde1e05ea8"
+    "gitHead": "e030a05d603046d98044eba671a2182263b8aced"
 }