chore: integrate main

Signed-off-by: Timo Glastra <[email protected]>

Author: TimoGlastra

package.json

@@ -23,7 +23,7 @@
     "style:check": "biome check --unsafe",
     "style:fix": "biome check --write --unsafe",
     "build": "tsup src/index.ts --format cjs,esm --dts --clean --sourcemap",
-    "test": "jest --verbose"
+    "test": "vitest"
   },
   "dependencies": {
     "compare-versions": "^6.1.1"

src/__tests__/__snapshots__/diagnostic.tests.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`diagnostic info should return the version 1`] = `
+exports[`diagnostic info > should return the version 1`] = `
 {
   "attributes": [
     {

src/mdoc/model/device-request.test.ts renamed to src/__tests__/device-request.test.ts

@@ -1,7 +1,6 @@
-import assert from 'node:assert'
-import { describe, it } from 'node:test'
-import { hexToUint8Array, uint8ArrayToHex } from '../../u-hex'
-import { DeviceRequest } from './device-request'
+import { hexToUint8Array, uint8ArrayToHex } from '../u-hex'
+import { DeviceRequest } from '../mdoc/model/device-request'
+import { describe, expect, it } from 'vitest'
 
 export const cbor =
   'a26776657273696f6e63312e306b646f63526571756573747381a26c6974656d7352657175657374d8185893a267646f6354797065756f72672e69736f2e31383031332e352e312e6d444c6a6e616d65537061636573a1716f72672e69736f2e31383031332e352e31a66b66616d696c795f6e616d65f56f646f63756d656e745f6e756d626572f57264726976696e675f70726976696c65676573f56a69737375655f64617465f56b6578706972795f64617465f568706f727472616974f46a726561646572417574688443a10126a118215901b7308201b330820158a00302010202147552715f6add323d4934a1ba175dc945755d8b50300a06082a8648ce3d04030230163114301206035504030c0b72656164657220726f6f74301e170d3230313030313030303030305a170d3233313233313030303030305a3011310f300d06035504030c067265616465723059301306072a8648ce3d020106082a8648ce3d03010703420004f8912ee0f912b6be683ba2fa0121b2630e601b2b628dff3b44f6394eaa9abdbcc2149d29d6ff1a3e091135177e5c3d9c57f3bf839761eed02c64dd82ae1d3bbfa38188308185301c0603551d1f041530133011a00fa00d820b6578616d706c652e636f6d301d0603551d0e04160414f2dfc4acafc5f30b464fada20bfcd533af5e07f5301f0603551d23041830168014cfb7a881baea5f32b6fb91cc29590c50dfac416e300e0603551d0f0101ff04040302078030150603551d250101ff040b3009060728818c5d050106300a06082a8648ce3d0403020349003046022100fb9ea3b686fd7ea2f0234858ff8328b4efef6a1ef71ec4aae4e307206f9214930221009b94f0d739dfa84cca29efed529dd4838acfd8b6bee212dc6320c46feb839a35f658401f3400069063c189138bdcd2f631427c589424113fc9ec26cebcacacfcdb9695d28e99953becabc4e30ab4efacc839a81f9159933d192527ee91b449bb7f80bf'
@@ -13,6 +12,6 @@ void describe('device-request', () => {
     const encoded = deviceRequest.encode()
     const hexres = uint8ArrayToHex(encoded)
     const deviceRequest2 = DeviceRequest.parse(hexToUint8Array(hexres))
-    assert.deepEqual(deviceRequest, deviceRequest2)
+    expect(deviceRequest).toStrictEqual(deviceRequest2)
   })
 })

src/__tests__/example/__snapshots__/example4.tests.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`example 4: device response with device attributes should get the right diagnostic info 1`] = `
+exports[`example 4: device response with device attributes > should get the right diagnostic info 1`] = `
 {
   "attributes": [
     {

src/__tests__/issuing/config.ts

@@ -110,7 +110,7 @@ export const deviceRequest = DeviceRequest.from('1.0', [
       docType: 'org.iso.18013.5.1.mDL',
       nameSpaces: {
         'org.iso.18013.5.1': {
-          family_name: true,
+          family_name: false,
           given_name: true,
           birth_date: true,
           issue_date: true,

src/__tests__/issuing/device-response.tests.ts

@@ -292,6 +292,7 @@ describe('issuing a device response', () => {
     const eReaderKeyBytes: Buffer = randomFillSync(Buffer.alloc(32))
     const readerEngagementBytes = randomFillSync(Buffer.alloc(32))
     const deviceEngagementBytes = randomFillSync(Buffer.alloc(32))
+    let encodedDeviceResponse: Uint8Array
 
     const getSessionTranscriptBytes = (rdrEngtBytes: Buffer, devEngtBytes: Buffer, eRdrKeyBytes: Buffer) =>
       cborEncode(
@@ -386,6 +387,26 @@ describe('issuing a device response', () => {
       expect(validityInfo.expectedUpdate).toBeUndefined()
     })
 
+    it('should contain all requested claims', () => {
+      const namespaces = parsedDocument.allIssuerSignedNamespaces
+      expect(namespaces).toStrictEqual({
+        'org.iso.18013.5.1': {
+          family_name: 'Jones',
+          birth_date: '2007-03-25',
+          document_number: '01-856-5050',
+          given_name: 'Ava',
+          driving_privileges: [expect.any(Map)],
+          expiry_date: '2028-09-30',
+          issue_date: '2023-09-01',
+          issuing_authority: 'NY DMV',
+          issuing_country: 'US',
+          issuing_jurisdiction: 'New York',
+          portrait: 'bstr',
+          un_distinguishing_sign: 'tbd-us.ny.dmv',
+        },
+      })
+    })
+
     it('should contain the device namespaces', () => {
       expect(parsedDocument.getDeviceNameSpace('com.foobar-device')).toEqual({
         test: 1234,

src/__tests__/parser/__snapshots__/device-response.tests.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`parse DeviceResponse Example 1 parse should decoded protected headers 1`] = `
+exports[`parse DeviceResponse Example 1 > parse > should decoded protected headers 1`] = `
 Map {
   1 => -7,
   4 => {
@@ -548,7 +548,7 @@ Map {
 }
 `;
 
-exports[`parse DeviceResponse Example 1 parse should match the snapshot 1`] = `
+exports[`parse DeviceResponse Example 1 > parse > should match the snapshot 1`] = `
 MDoc {
   "documentErrors": [],
   "documents": [

src/__tests__/parser/__snapshots__/device-response2.tests.ts.snap

@@ -1,12 +1,12 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`parse DeviceResponse Example 2 parse should decoded protected headers 1`] = `
+exports[`parse DeviceResponse Example 2 > parse > should decoded protected headers 1`] = `
 Map {
   1 => -7,
 }
 `;
 
-exports[`parse DeviceResponse Example 2 parse should match the snapshot 1`] = `
+exports[`parse DeviceResponse Example 2 > parse > should match the snapshot 1`] = `
 MDoc {
   "documentErrors": [],
   "documents": [

src/__tests__/parser/__snapshots__/issuer-signed.tests.ts.snap

@@ -1,6 +1,6 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`parse an issuer signed mdoc should match the snapshot 1`] = `
+exports[`parse an issuer signed mdoc > should match the snapshot 1`] = `
 MDoc {
   "documentErrors": [],
   "documents": [

src/mdoc/model/pex-limit-disclosure.ts

@@ -13,15 +13,13 @@ export const limitDisclosureToDeviceRequestNameSpaces = (
 
   for (const [nameSpace, nameSpaceFields] of Object.entries(deviceRequestNameSpaces)) {
     const nsAttrs = mdoc.issuerSigned.nameSpaces[nameSpace] ?? []
-    const digests = Object.entries(nameSpaceFields)
-      .filter(([_, disclose]) => disclose)
-      .map(([elementIdentifier, _]) => {
-        const digest = prepareDigest(elementIdentifier, nsAttrs)
-        if (!digest) {
-          throw new Error(`No matching field found for '${elementIdentifier}'`)
-        }
-        return digest
-      })
+    const digests = Object.entries(nameSpaceFields).map(([elementIdentifier, _]) => {
+      const digest = prepareDigest(elementIdentifier, nsAttrs)
+      if (!digest) {
+        throw new Error(`No matching field found for '${elementIdentifier}'`)
+      }
+      return digest
+    })
 
     nameSpaces[nameSpace] = digests
   }

vite.config.js

@@ -1,5 +1,6 @@
 export default {
   test: {
     watch: false,
+    include: ['**/*.{test,tests}.ts']
   },
 }