chore: update dependencies, improve type definitions and minor code cleanup

nklomp · nklomp · commit f04433609d85 · 2026-01-30T00:40:57.000+01:00
diff --git a/lerna.json b/lerna.json
@@ -1,10 +1,6 @@
 {
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "version": "0.20.0",
   "npmClient": "pnpm",
-  "workspaces": [
-    "packages/*"
-  ]
-}
+  "workspaces": ["packages/*"]
+}
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
     "pnpm": ">=10"
   },
   "resolutions": {
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "dcql": "1.0.1",
     "node-fetch": "2.6.12",
     "typescript": "5.8.3"
diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json
@@ -30,7 +30,7 @@
     "@sphereon/oid4vci-client": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/oid4vci-issuer": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "jose": "^4.10.0"
   },
   "devDependencies": {
@@ -46,12 +46,7 @@
   "engines": {
     "node": ">=20.6"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts
@@ -548,7 +548,6 @@ export class OpenID4VCIClient {
       if (!this.shouldRetryWithFreshNonce(e)) {
         return Promise.reject(e instanceof Error ? e : Error(String(e)))
       }
-
       // one retry with fresh nonce + rebuilt proof
       ;(this._state as OpenID4VCIClientStateV1_0_15).cachedCNonce = undefined
 
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -29,7 +29,7 @@
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "cross-fetch": "^4.1.0",
     "debug": "^4.4.0"
   },
@@ -55,12 +55,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/common/lib/hasher.ts b/packages/common/lib/hasher.ts
@@ -1,5 +1,5 @@
 import { HasherSync, shaHasher } from '@sphereon/ssi-types'
 
-export const defaultHasher: HasherSync = (data: string | ArrayBuffer, algorithm: string) => {
+export const defaultHasher: HasherSync = (data: string | ArrayBuffer | SharedArrayBuffer, algorithm: string) => {
   return shaHasher(data, algorithm)
 }
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -22,7 +22,7 @@
     "test": "vitest run --config ../../vitest.config.mts --coverage"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "jwt-decode": "^4.0.0",
     "uint8arrays": "^3.1.1",
     "uuid": "^9.0.0"
@@ -34,12 +34,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/did-auth-siop-adapter/package.json b/packages/did-auth-siop-adapter/package.json
@@ -36,9 +36,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "dist/**/*"
-  ],
+  "files": ["dist/**/*"],
   "keywords": [
     "Sphereon",
     "SSI",
diff --git a/packages/issuer-rest/package.json b/packages/issuer-rest/package.json
@@ -26,7 +26,7 @@
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/oid4vci-issuer": "workspace:^",
     "@sphereon/ssi-express-support": "0.34.1-next.3",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "body-parser": "^1.20.2",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
@@ -66,12 +66,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/issuer/package.json b/packages/issuer/package.json
@@ -24,7 +24,7 @@
     "@sphereon/oid4vc-common": "workspace:^",
     "@sphereon/oid4vci-common": "workspace:^",
     "@sphereon/ssi-express-support": "0.34.1-next.3",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "short-uuid": "^4.2.2",
     "uuid": "^9.0.0"
   },
@@ -49,12 +49,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/jarm/package.json b/packages/jarm/package.json
@@ -30,12 +30,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/oid4vci-common/package.json b/packages/oid4vci-common/package.json
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@sphereon/oid4vc-common": "workspace:^",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "cross-fetch": "^4.1.0",
     "debug": "^4.4.0",
     "jwt-decode": "^4.0.0",
@@ -37,12 +37,7 @@
   "engines": {
     "node": ">=20"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "Verifiable Credentials",
diff --git a/packages/siop-oid4vp/lib/authorization-response/Payload.ts b/packages/siop-oid4vp/lib/authorization-response/Payload.ts
@@ -1,4 +1,3 @@
-import { DcqlPresentation } from 'dcql'
 import { AuthorizationRequest } from '../authorization-request'
 import { IDToken } from '../id-token'
 import { RequestObject } from '../request-object'
@@ -99,8 +98,7 @@ export const createResponsePayload = async (
   }
 
   if (responseOpts.dcqlResponse?.dcqlPresentation) {
-    const canonicalPresentation = toCanonicalDcqlPresentation(responseOpts.dcqlResponse.dcqlPresentation)
-    responsePayload.vp_token = DcqlPresentation.encode(canonicalPresentation)
+    responsePayload.vp_token = toCanonicalDcqlPresentation(responseOpts.dcqlResponse.dcqlPresentation)
   }
 
   if (idTokenPayload) {
diff --git a/packages/siop-oid4vp/lib/types/SIOP.types.ts b/packages/siop-oid4vp/lib/types/SIOP.types.ts
@@ -173,7 +173,7 @@ export type DcqlPresentationEntry = string | Record<string, Json>
 export type DcqlVpToken = Record<string, NonEmptyArray<DcqlPresentationEntry>>
 export type DcqlVpTokenInput = Record<string, DcqlPresentationEntry | DcqlPresentationEntry[] | Record<string, DcqlPresentationEntry>>
 
-export type EncodedDcqlPresentationVpToken = string
+export type EncodedDcqlPresentationVpToken = string | DcqlVpToken
 
 export interface AuthorizationResponsePayload {
   access_token?: string
diff --git a/packages/siop-oid4vp/package.json b/packages/siop-oid4vp/package.json
@@ -30,15 +30,15 @@
     "@sphereon/jarm": "workspace:^",
     "@sphereon/oid4vc-common": "workspace:^",
     "@sphereon/pex": "5.0.0-unstable.28",
-    "@sphereon/ssi-types": "0.34.1-feature.SSISDK.78.280",
+    "@sphereon/ssi-types": "0.36.1-next.156",
     "cross-fetch": "^4.0.0",
     "dcql": "1.0.1",
     "debug": "^4.4.0",
     "events": "^3.3.0",
     "jwt-decode": "^4.0.0",
     "language-tags": "^1.0.9",
     "multiformats": "^12.1.3",
-    "qs": "^6.11.2",
+    "qs": "6.14.1",
     "uint8arrays": "^3.1.1",
     "zod": "^4.1.5"
   },
@@ -94,12 +94,7 @@
   "engines": {
     "node": ">=20.6"
   },
-  "files": [
-    "src",
-    "dist",
-    "README.md",
-    "LICENSE.md"
-  ],
+  "files": ["src", "dist", "README.md", "LICENSE.md"],
   "keywords": [
     "Sphereon",
     "SSI",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -548,7 +548,6 @@ export class OpenID4VCIClient {`
`548`	`548`	`if (!this.shouldRetryWithFreshNonce(e)) {`
`549`	`549`	`return Promise.reject(e instanceof Error ? e : Error(String(e)))`
`550`	`550`	`}`
`551`		`-`
`552`	`551`	`// one retry with fresh nonce + rebuilt proof`
`553`	`552`	`;(this._state as OpenID4VCIClientStateV1_0_15).cachedCNonce = undefined`
`554`	`553`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import { HasherSync, shaHasher } from '@sphereon/ssi-types'`
`2`	`2`
`3`		`-export const defaultHasher: HasherSync = (data: string \| ArrayBuffer, algorithm: string) => {`
	`3`	`+export const defaultHasher: HasherSync = (data: string \| ArrayBuffer \| SharedArrayBuffer, algorithm: string) => {`
`4`	`4`	`return shaHasher(data, algorithm)`
`5`	`5`	`}`