@sd-jwt/core 0.3.2-next.108 → 0.3.2-next.110

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import * as _sd_jwt_types from '@sd-jwt/types';
-import { Base64urlString, Signer, Verifier, kbHeader, kbPayload, KbVerifier, JwtPayload, SDJWTCompact, Hasher, DisclosureFrame, HasherAndAlg, SaltGenerator, SDJWTConfig, KBOptions } from '@sd-jwt/types';
+import { Base64urlString, Signer, Verifier, kbHeader, kbPayload, KbVerifier, JwtPayload, SDJWTCompact, Hasher, PresentationFrame, DisclosureFrame, HasherAndAlg, SaltGenerator, SDJWTConfig, KBOptions } from '@sd-jwt/types';
 import { Disclosure } from '@sd-jwt/utils';
 
 type JwtData<Header extends Record<string, unknown>, Payload extends Record<string, unknown>> = {
@@ -55,7 +55,7 @@ declare class SDJwt<Header extends Record<string, unknown> = Record<string, unkn
         kbJwt?: KBJwt<KBHeader, KBPayload>;
     }>;
     static fromEncode<Header extends Record<string, unknown> = Record<string, unknown>, Payload extends Record<string, unknown> = Record<string, unknown>, KBHeader extends kbHeader = kbHeader, KBPayload extends kbPayload = kbPayload>(encodedSdJwt: SDJWTCompact, hasher: Hasher): Promise<SDJwt<Header, Payload>>;
-    present(keys: string[], hasher: Hasher): Promise<SDJWTCompact>;
+    present<T extends Record<string, unknown>>(presentFrame: PresentationFrame<T> | undefined, hasher: Hasher): Promise<SDJWTCompact>;
     encodeSDJwt(): SDJWTCompact;
     keys(hasher: Hasher): Promise<string[]>;
     presentableKeys(hasher: Hasher): Promise<string[]>;
@@ -87,7 +87,7 @@ declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
      * @returns
      */
     protected validateReservedFields<T extends ExtendedPayload>(disclosureFrame: DisclosureFrame<T>): void;
-    present(encodedSDJwt: string, presentationKeys?: string[], options?: {
+    present<T extends Record<string, unknown>>(encodedSDJwt: string, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
     verify(encodedSDJwt: string, requiredClaimKeys?: string[], requireKeyBindings?: boolean): Promise<{

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _sd_jwt_types from '@sd-jwt/types';
-import { Base64urlString, Signer, Verifier, kbHeader, kbPayload, KbVerifier, JwtPayload, SDJWTCompact, Hasher, DisclosureFrame, HasherAndAlg, SaltGenerator, SDJWTConfig, KBOptions } from '@sd-jwt/types';
+import { Base64urlString, Signer, Verifier, kbHeader, kbPayload, KbVerifier, JwtPayload, SDJWTCompact, Hasher, PresentationFrame, DisclosureFrame, HasherAndAlg, SaltGenerator, SDJWTConfig, KBOptions } from '@sd-jwt/types';
 import { Disclosure } from '@sd-jwt/utils';
 
 type JwtData<Header extends Record<string, unknown>, Payload extends Record<string, unknown>> = {
@@ -55,7 +55,7 @@ declare class SDJwt<Header extends Record<string, unknown> = Record<string, unkn
         kbJwt?: KBJwt<KBHeader, KBPayload>;
     }>;
     static fromEncode<Header extends Record<string, unknown> = Record<string, unknown>, Payload extends Record<string, unknown> = Record<string, unknown>, KBHeader extends kbHeader = kbHeader, KBPayload extends kbPayload = kbPayload>(encodedSdJwt: SDJWTCompact, hasher: Hasher): Promise<SDJwt<Header, Payload>>;
-    present(keys: string[], hasher: Hasher): Promise<SDJWTCompact>;
+    present<T extends Record<string, unknown>>(presentFrame: PresentationFrame<T> | undefined, hasher: Hasher): Promise<SDJWTCompact>;
     encodeSDJwt(): SDJWTCompact;
     keys(hasher: Hasher): Promise<string[]>;
     presentableKeys(hasher: Hasher): Promise<string[]>;
@@ -87,7 +87,7 @@ declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
      * @returns
      */
     protected validateReservedFields<T extends ExtendedPayload>(disclosureFrame: DisclosureFrame<T>): void;
-    present(encodedSDJwt: string, presentationKeys?: string[], options?: {
+    present<T extends Record<string, unknown>>(encodedSDJwt: string, presentationFrame?: PresentationFrame<T>, options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
     verify(encodedSDJwt: string, requiredClaimKeys?: string[], requireKeyBindings?: boolean): Promise<{

package/dist/index.js

@@ -195,6 +195,7 @@ var createDecoy = (hash, saltGenerator) => __async(void 0, null, function* () {
 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;
@@ -239,7 +240,7 @@ var SDJwt = class _SDJwt {
       });
     });
   }
-  present(keys, hasher) {
+  present(presentFrame, hasher) {
     return __async(this, null, function* () {
       var _a;
       if (!((_a = this.jwt) == null ? void 0 : _a.payload) || !this.disclosures) {
@@ -253,14 +254,8 @@ var SDJwt = class _SDJwt {
         this.disclosures,
         hasher
       );
-      const presentableKeys = Object.keys(disclosureKeymap);
-      const missingKeys = keys.filter((k) => !presentableKeys.includes(k));
-      if (missingKeys.length > 0) {
-        throw new import_utils4.SDJWTException(
-          `Invalid sd-jwt: invalid present keys: ${missingKeys.join(", ")}`
-        );
-      }
-      const disclosures = keys.map((k) => hashmap[disclosureKeymap[k]]);
+      const keys = presentFrame ? (0, import_present.transformPresentationFrame)(presentFrame) : yield this.presentableKeys(hasher);
+      const disclosures = keys.map((k) => hashmap[disclosureKeymap[k]]).filter((d) => d !== void 0);
       const presentSDJwt = new _SDJwt({
         jwt: this.jwt,
         disclosures,
@@ -510,19 +505,18 @@ var _SDJwtInstance = class _SDJwtInstance {
   validateReservedFields(disclosureFrame) {
     return;
   }
-  present(encodedSDJwt, presentationKeys, options) {
+  present(encodedSDJwt, presentationFrame, options) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a;
       if (!this.userConfig.hasher) {
         throw new import_utils5.SDJWTException("Hasher not found");
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      const sortedpresentationKeys = (_a = presentationKeys == null ? void 0 : presentationKeys.sort()) != null ? _a : yield sdjwt.presentableKeys(hasher);
-      if (!((_b = sdjwt.jwt) == null ? void 0 : _b.payload))
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
         throw new import_utils5.SDJWTException("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
-        sortedpresentationKeys,
+        presentationFrame,
         hasher
       );
       if (!(options == null ? void 0 : options.kb)) {
@@ -534,7 +528,7 @@ var _SDJwtInstance = class _SDJwtInstance {
         hasher
       );
       sdjwt.kbJwt = yield this.createKBJwt(options.kb, sdHashStr);
-      return sdjwt.present(sortedpresentationKeys, hasher);
+      return sdjwt.present(presentationFrame, hasher);
     });
   }
   // This function is for verifying the SD JWT

package/dist/index.mjs

@@ -175,6 +175,7 @@ import {
   SD_SEPARATOR
 } from "@sd-jwt/types";
 import { createHashMapping, getSDAlgAndPayload, unpack } from "@sd-jwt/decode";
+import { transformPresentationFrame } from "@sd-jwt/present";
 var SDJwt = class _SDJwt {
   constructor(data) {
     this.jwt = data == null ? void 0 : data.jwt;
@@ -219,7 +220,7 @@ var SDJwt = class _SDJwt {
       });
     });
   }
-  present(keys, hasher) {
+  present(presentFrame, hasher) {
     return __async(this, null, function* () {
       var _a;
       if (!((_a = this.jwt) == null ? void 0 : _a.payload) || !this.disclosures) {
@@ -233,14 +234,8 @@ var SDJwt = class _SDJwt {
         this.disclosures,
         hasher
       );
-      const presentableKeys = Object.keys(disclosureKeymap);
-      const missingKeys = keys.filter((k) => !presentableKeys.includes(k));
-      if (missingKeys.length > 0) {
-        throw new SDJWTException3(
-          `Invalid sd-jwt: invalid present keys: ${missingKeys.join(", ")}`
-        );
-      }
-      const disclosures = keys.map((k) => hashmap[disclosureKeymap[k]]);
+      const keys = presentFrame ? transformPresentationFrame(presentFrame) : yield this.presentableKeys(hasher);
+      const disclosures = keys.map((k) => hashmap[disclosureKeymap[k]]).filter((d) => d !== void 0);
       const presentSDJwt = new _SDJwt({
         jwt: this.jwt,
         disclosures,
@@ -396,7 +391,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
 
 // src/index.ts
 import {
-  KB_JWT_TYP as KB_JWT_TYP3
+  KB_JWT_TYP as KB_JWT_TYP2
 } from "@sd-jwt/types";
 import { getSDAlgAndPayload as getSDAlgAndPayload2 } from "@sd-jwt/decode";
 var _SDJwtInstance = class _SDJwtInstance {
@@ -417,7 +412,7 @@ var _SDJwtInstance = class _SDJwtInstance {
       const { payload } = options;
       const kbJwt = new KBJwt({
         header: {
-          typ: KB_JWT_TYP3,
+          typ: KB_JWT_TYP2,
           alg: this.userConfig.kbSignAlg
         },
         payload: __spreadProps(__spreadValues({}, payload), { sd_hash: sdHash })
@@ -492,19 +487,18 @@ var _SDJwtInstance = class _SDJwtInstance {
   validateReservedFields(disclosureFrame) {
     return;
   }
-  present(encodedSDJwt, presentationKeys, options) {
+  present(encodedSDJwt, presentationFrame, options) {
     return __async(this, null, function* () {
-      var _a, _b;
+      var _a;
       if (!this.userConfig.hasher) {
         throw new SDJWTException4("Hasher not found");
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      const sortedpresentationKeys = (_a = presentationKeys == null ? void 0 : presentationKeys.sort()) != null ? _a : yield sdjwt.presentableKeys(hasher);
-      if (!((_b = sdjwt.jwt) == null ? void 0 : _b.payload))
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
         throw new SDJWTException4("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
-        sortedpresentationKeys,
+        presentationFrame,
         hasher
       );
       if (!(options == null ? void 0 : options.kb)) {
@@ -516,7 +510,7 @@ var _SDJwtInstance = class _SDJwtInstance {
         hasher
       );
       sdjwt.kbJwt = yield this.createKBJwt(options.kb, sdHashStr);
-      return sdjwt.present(sortedpresentationKeys, hasher);
+      return sdjwt.present(presentationFrame, hasher);
     });
   }
   // This function is for verifying the SD JWT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/core",
-  "version": "0.3.2-next.108+34b24c0",
+  "version": "0.3.2-next.110+10aa828",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,12 +38,13 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.3.2-next.108+34b24c0"
+    "@sd-jwt/crypto-nodejs": "0.3.2-next.110+10aa828"
   },
   "dependencies": {
-    "@sd-jwt/decode": "0.3.2-next.108+34b24c0",
-    "@sd-jwt/types": "0.3.2-next.108+34b24c0",
-    "@sd-jwt/utils": "0.3.2-next.108+34b24c0"
+    "@sd-jwt/decode": "0.3.2-next.110+10aa828",
+    "@sd-jwt/present": "0.3.2-next.110+10aa828",
+    "@sd-jwt/types": "0.3.2-next.110+10aa828",
+    "@sd-jwt/utils": "0.3.2-next.110+10aa828"
   },
   "publishConfig": {
     "access": "public"
@@ -61,5 +62,5 @@
       "esm"
     ]
   },
-  "gitHead": "34b24c079dc2c63286b2f2e8d5202c54a9163ee5"
+  "gitHead": "10aa828afa2b75787459bfde444a8e4d318825f9"
 }

package/src/index.ts

@@ -7,6 +7,7 @@ import {
   Hasher,
   KBOptions,
   KB_JWT_TYP,
+  PresentationFrame,
   SDJWTCompact,
   SDJWTConfig,
 } from '@sd-jwt/types';
@@ -139,9 +140,9 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
     return;
   }
 
-  public async present(
+  public async present<T extends Record<string, unknown>>(
     encodedSDJwt: string,
-    presentationKeys?: string[],
+    presentationFrame?: PresentationFrame<T>,
     options?: {
       kb?: KBOptions;
     },
@@ -153,12 +154,9 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
 
     const sdjwt = await SDJwt.fromEncode(encodedSDJwt, hasher);
 
-    const sortedpresentationKeys =
-      presentationKeys?.sort() ?? (await sdjwt.presentableKeys(hasher));
-
     if (!sdjwt.jwt?.payload) throw new SDJWTException('Payload not found');
     const presentSdJwtWithoutKb = await sdjwt.present(
-      sortedpresentationKeys,
+      presentationFrame,
       hasher,
     );
 
@@ -173,7 +171,7 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
     );
 
     sdjwt.kbJwt = await this.createKBJwt(options.kb, sdHashStr);
-    return sdjwt.present(sortedpresentationKeys, hasher);
+    return sdjwt.present(presentationFrame, hasher);
   }
 
   // This function is for verifying the SD JWT

package/src/sdjwt.ts

@@ -6,19 +6,18 @@ import {
   DisclosureFrame,
   Hasher,
   HasherAndAlg,
-  KBOptions,
-  KB_JWT_TYP,
+  PresentationFrame,
   SDJWTCompact,
   SD_DECOY,
   SD_DIGEST,
   SD_LIST_KEY,
   SD_SEPARATOR,
   SaltGenerator,
-  Signer,
   kbHeader,
   kbPayload,
 } from '@sd-jwt/types';
 import { createHashMapping, getSDAlgAndPayload, unpack } from '@sd-jwt/decode';
+import { transformPresentationFrame } from '@sd-jwt/present';
 
 export type SDJwtData<
   Header extends Record<string, unknown>,
@@ -117,7 +116,10 @@ export class SDJwt<
     });
   }
 
-  public async present(keys: string[], hasher: Hasher): Promise<SDJWTCompact> {
+  public async present<T extends Record<string, unknown>>(
+    presentFrame: PresentationFrame<T> | undefined,
+    hasher: Hasher,
+  ): Promise<SDJWTCompact> {
     if (!this.jwt?.payload || !this.disclosures) {
       throw new SDJWTException('Invalid sd-jwt: jwt or disclosures is missing');
     }
@@ -130,15 +132,12 @@ export class SDJwt<
       hasher,
     );
 
-    const presentableKeys = Object.keys(disclosureKeymap);
-    const missingKeys = keys.filter((k) => !presentableKeys.includes(k));
-    if (missingKeys.length > 0) {
-      throw new SDJWTException(
-        `Invalid sd-jwt: invalid present keys: ${missingKeys.join(', ')}`,
-      );
-    }
-
-    const disclosures = keys.map((k) => hashmap[disclosureKeymap[k]]);
+    const keys = presentFrame
+      ? transformPresentationFrame(presentFrame)
+      : await this.presentableKeys(hasher);
+    const disclosures = keys
+      .map((k) => hashmap[disclosureKeymap[k]])
+      .filter((d) => d !== undefined);
     const presentSDJwt = new SDJwt({
       jwt: this.jwt,
       disclosures,

package/src/test/index.spec.ts

@@ -53,15 +53,19 @@ describe('index', () => {
 
     expect(credential).toBeDefined();
 
-    const presentation = await sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '1',
-          iat: 1,
-          nonce: '342',
+    const presentation = await sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '1',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
 
     expect(presentation).toBeDefined();
   });
@@ -163,15 +167,19 @@ describe('index', () => {
       },
     );
 
-    const presentation = await sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '',
-          iat: 1,
-          nonce: '342',
+    const presentation = await sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
 
     try {
       await sdjwt.verify(presentation);
@@ -235,15 +243,19 @@ describe('index', () => {
       },
     );
 
-    const presentation = await sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '1',
-          iat: 1,
-          nonce: '342',
+    const presentation = await sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '1',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
 
     const results = await sdjwt.verify(presentation, ['foo'], true);
     expect(results).toBeDefined();
@@ -341,15 +353,19 @@ describe('index', () => {
       },
     );
 
-    const presentation = await sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '1',
-          iat: 1,
-          nonce: '342',
+    const presentation = await sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '1',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
     try {
       const results = await sdjwt.verify(presentation, ['foo'], true);
     } catch (e) {
@@ -381,15 +397,19 @@ describe('index', () => {
       },
     );
     try {
-      const presentation = await sdjwt.present(credential, ['foo'], {
-        kb: {
-          payload: {
-            aud: '1',
-            iat: 1,
-            nonce: '342',
+      const presentation = await sdjwt.present(
+        credential,
+        { foo: true },
+        {
+          kb: {
+            payload: {
+              aud: '1',
+              iat: 1,
+              nonce: '342',
+            },
           },
         },
-      });
+      );
     } catch (e) {
       expect(e).toBeDefined();
     }
@@ -419,15 +439,19 @@ describe('index', () => {
       },
     );
 
-    const presentation = await sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '1',
-          iat: 1,
-          nonce: '342',
+    const presentation = await sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '1',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
     try {
       const results = await sdjwt.verify(presentation, ['foo'], true);
     } catch (e) {
@@ -458,15 +482,19 @@ describe('index', () => {
       },
     );
 
-    const presentation = sdjwt.present(credential, ['foo'], {
-      kb: {
-        payload: {
-          aud: '1',
-          iat: 1,
-          nonce: '342',
+    const presentation = sdjwt.present(
+      credential,
+      { foo: true },
+      {
+        kb: {
+          payload: {
+            aud: '1',
+            iat: 1,
+            nonce: '342',
+          },
         },
       },
-    });
+    );
     expect(presentation).rejects.toThrow(
       'Key Binding sign algorithm not specified',
     );
@@ -496,7 +524,7 @@ describe('index', () => {
     expect(sdjwt.presentableKeys('')).rejects.toThrow('Hasher not found');
     expect(sdjwt.getClaims('')).rejects.toThrow('Hasher not found');
     expect(() => sdjwt.decode('')).toThrowError('Hasher not found');
-    expect(sdjwt.present(credential, ['foo'])).rejects.toThrow(
+    expect(sdjwt.present(credential, { foo: true })).rejects.toThrow(
       'Hasher not found',
     );
   });

package/test/app-e2e.spec.ts

@@ -1,6 +1,11 @@
 import Crypto from 'node:crypto';
 import { SDJwtInstance, SdJwtPayload } from '../src';
-import { DisclosureFrame, Signer, Verifier } from '@sd-jwt/types';
+import {
+  DisclosureFrame,
+  PresentationFrame,
+  Signer,
+  Verifier,
+} from '@sd-jwt/types';
 import fs from 'fs';
 import path from 'path';
 import { describe, expect, test } from 'vitest';
@@ -105,7 +110,10 @@ describe('App', () => {
       'id',
     ]);
 
-    const presentationFrame = ['firstname', 'id'];
+    const presentationFrame = {
+      firstname: true,
+      id: true,
+    };
     const presentedSDJwt = await sdjwt.present(encodedSdjwt, presentationFrame);
     expect(presentedSDJwt).toBeDefined();
 
@@ -215,7 +223,7 @@ async function JSONtest(filename: string) {
 
   const presentedSDJwt = await sdjwt.present(
     encodedSdjwt,
-    test.presentationKeys,
+    test.presentationFrames,
   );
 
   expect(presentedSDJwt).toBeDefined();
@@ -236,7 +244,7 @@ async function JSONtest(filename: string) {
 type TestJson = {
   claims: SdJwtPayload;
   disclosureFrame: DisclosureFrame<SdJwtPayload>;
-  presentationKeys: string[];
+  presentationFrames: PresentationFrame<SdJwtPayload>;
   presenatedClaims: object;
   requiredClaimKeys: string[];
 };

package/test/array_data_types.json

@@ -7,14 +7,16 @@
       "_sd": [0, 1, 2, 3, 4, 5]
     }
   },
-  "presentationKeys": [
-    "data_types.0",
-    "data_types.1",
-    "data_types.2",
-    "data_types.3",
-    "data_types.4",
-    "data_types.5"
-  ],
+  "presentationFrames": {
+    "data_types": {
+      "0": true,
+      "1": true,
+      "2": true,
+      "3": true,
+      "4": true,
+      "5": true
+    }
+  },
   "presenatedClaims": {
     "data_types": [null, 42, 3.14, "foo", ["Test"], { "foo": "bar" }]
   },

package/test/array_full_sd.json

@@ -11,7 +11,7 @@
       "_sd": ["13", "18", "21"]
     }
   },
-  "presentationKeys": ["is_over.18"],
+  "presentationFrames": { "is_over": { "18": true } },
   "presenatedClaims": {
     "is_over": {
       "18": false

package/test/array_in_sd.json

@@ -5,7 +5,7 @@
   "disclosureFrame": {
     "_sd": ["sd_array"]
   },
-  "presentationKeys": ["sd_array"],
+  "presentationFrames": { "sd_array": true },
   "presenatedClaims": {
     "sd_array": ["32", "23"]
   },

package/test/array_nested_in_plain.json

@@ -12,7 +12,16 @@
       }
     }
   },
-  "presentationKeys": ["nested_array.0.0", "nested_array.1.1"],
+  "presentationFrames": {
+    "nested_array": {
+      "0": {
+        "0": true
+      },
+      "1": {
+        "1": true
+      }
+    }
+  },
   "presenatedClaims": {
     "nested_array": [["foo"], ["qux"]]
   },

package/test/array_none_disclosed.json

@@ -11,7 +11,7 @@
       "_sd": ["13", "18", "21"]
     }
   },
-  "presentationKeys": [],
+  "presentationFrames": {},
   "presenatedClaims": {},
   "requiredClaimKeys": []
 }

package/test/array_of_nulls.json

@@ -7,7 +7,7 @@
       "_sd": [1, 2]
     }
   },
-  "presentationKeys": [],
+  "presentationFrames": {},
   "presenatedClaims": {
     "null_values": [null, null]
   },

package/test/array_of_objects.json

@@ -28,7 +28,14 @@
       "_sd": ["foo"]
     }
   },
-  "presentationKeys": ["addresses.1", "array_with_one_sd_object.foo"],
+  "presentationFrames": {
+    "addresses": {
+      "1": true
+    },
+    "array_with_one_sd_object": {
+      "foo": true
+    }
+  },
   "presenatedClaims": {
     "addresses": [
       {

package/test/array_of_scalars.json

@@ -7,7 +7,11 @@
       "_sd": [0, 1]
     }
   },
-  "presentationKeys": ["nationalities.1"],
+  "presentationFrames": {
+    "nationalities": {
+      "1": true
+    }
+  },
   "presenatedClaims": {
     "nationalities": ["CA", "DE"]
   },

package/test/array_recursive_sd.json

@@ -26,7 +26,7 @@
       "_sd": [0, 1]
     }
   },
-  "presentationKeys": [],
+  "presentationFrames": {},
   "presenatedClaims": {
     "array_with_recursive_sd": ["boring", []],
     "test2": []

package/test/array_recursive_sd_some_disclosed.json

@@ -25,12 +25,20 @@
       "_sd": [0, 1]
     }
   },
-  "presentationKeys": [
-    "array_with_recursive_sd.1.baz",
-    "array_with_recursive_sd.2.1",
-    "test2.0",
-    "test2.1"
-  ],
+  "presentationFrames": {
+    "array_with_recursive_sd": {
+      "1": {
+        "baz": true
+      },
+      "2": {
+        "1": true
+      }
+    },
+    "test2": {
+      "0": true,
+      "1": true
+    }
+  },
   "presenatedClaims": {
     "array_with_recursive_sd": [
       "boring",

package/test/complex.json

@@ -31,7 +31,7 @@
       "_sd": ["hi"]
     }
   },
-  "presentationKeys": ["firstname", "id"],
+  "presentationFrames": { "firstname": true, "id": true },
   "presenatedClaims": {
     "lastname": "Doe",
     "ssn": "123-45-6789",

package/test/header_mod.json

@@ -24,7 +24,11 @@
       "birthdate"
     ]
   },
-  "presentationKeys": ["given_name", "family_name", "address"],
+  "presentationFrames": {
+    "given_name": true,
+    "family_name": true,
+    "address": true
+  },
   "presenatedClaims": {
     "given_name": "John",
     "family_name": "Deo",

package/test/json_serialization.json

@@ -24,7 +24,11 @@
       "birthdate"
     ]
   },
-  "presentationKeys": ["given_name", "family_name", "address"],
+  "presentationFrames": {
+    "given_name": true,
+    "family_name": true,
+    "address": true
+  },
   "presenatedClaims": {
     "given_name": "John",
     "family_name": "Deo",

package/test/key_binding.json

@@ -24,7 +24,11 @@
       "birthdate"
     ]
   },
-  "presentationKeys": ["given_name", "family_name", "address"],
+  "presentationFrames": {
+    "given_name": true,
+    "family_name": true,
+    "address": true
+  },
   "presenatedClaims": {
     "given_name": "John",
     "family_name": "Deo",

package/test/no_sd.json

@@ -13,7 +13,7 @@
     "test2": ["foo", "bar"]
   },
   "disclosureFrame": {},
-  "presentationKeys": [],
+  "presentationFrames": {},
   "presenatedClaims": {
     "recursive": [
       "boring",

package/test/object_data_types.json

@@ -25,15 +25,17 @@
       ]
     }
   },
-  "presentationKeys": [
-    "value_Data_types.test_null",
-    "value_Data_types.test_int",
-    "value_Data_types.test_float",
-    "value_Data_types.test_str",
-    "value_Data_types.test_bool",
-    "value_Data_types.test_arr",
-    "value_Data_types.test_object"
-  ],
+  "presentationFrames": {
+    "value_Data_types": {
+      "test_null": true,
+      "test_int": true,
+      "test_float": true,
+      "test_str": true,
+      "test_bool": true,
+      "test_arr": true,
+      "test_object": true
+    }
+  },
   "presenatedClaims": {
     "value_Data_types": {
       "test_null": null,

package/test/recursions.json

@@ -50,23 +50,42 @@
       }
     }
   },
-  "presentationKeys": [
-    "foo.1",
-    "bar.green",
-    "qux.0",
-    "qux.0.0",
-    "qux.0.1",
-    "baz.0",
-    "baz.0.0",
-    "baz.0.1",
-    "baz.1",
-    "baz.1.0",
-    "baz.1.1",
-    "animals.snake",
-    "animals.snake.age",
-    "animals.bird",
-    "animals.bird.age"
-  ],
+  "presentationFrames": {
+    "foo": {
+      "1": true
+    },
+    "bar": {
+      "green": true
+    },
+    "qux": {
+      "0": {
+        "0": true,
+        "1": true
+      },
+      "1": {
+        "0": true,
+        "1": true
+      }
+    },
+    "baz": {
+      "0": {
+        "0": true,
+        "1": true
+      },
+      "1": {
+        "0": true,
+        "1": true
+      }
+    },
+    "animals": {
+      "snake": {
+        "age": true
+      },
+      "bird": {
+        "age": true
+      }
+    }
+  },
   "presenatedClaims": {
     "foo": ["two"],
     "bar": {