revert: Revert "fix(types): headers and payloads may only be JSON val…

…ues and primitives"

This reverts commit 24f306e.

Closes #534

docs/modules/types.md

@@ -10,10 +10,6 @@ Support from the community to continue maintaining and improving this module is
 
 ### Type Aliases
 
-- [JsonArray](../types/types.JsonArray.md)
-- [JsonObject](../types/types.JsonObject.md)
-- [JsonPrimitive](../types/types.JsonPrimitive.md)
-- [JsonValue](../types/types.JsonValue.md)
 - [KeyLike](../types/types.KeyLike.md)
 
 ### Interfaces

src/jwe/flattened/encrypt.ts

@@ -3,7 +3,6 @@ import encrypt from '../../runtime/encrypt.js'
 import { deflate } from '../../runtime/zlib.js'
 
 import type {
-  JsonValue,
   KeyLike,
   FlattenedJWE,
   JWEHeaderParameters,
@@ -226,7 +225,7 @@ export class FlattenedEncrypt {
 
     let cek: KeyLike | Uint8Array
     {
-      let parameters: { [parameter: string]: JsonValue | undefined } | undefined
+      let parameters: { [propName: string]: unknown } | undefined
       ;({ cek, encryptedKey, parameters } = await encryptKeyManagement(
         alg,
         enc,

src/lib/jwt_claims_set.ts

@@ -1,5 +1,4 @@
 import type {
-  JsonValue,
   JWTPayload,
   JWTClaimVerificationOptions,
   JWEHeaderParameters,
@@ -41,7 +40,7 @@ export default (
     throw new JWTClaimValidationFailed('unexpected "typ" JWT header value', 'typ', 'check_failed')
   }
 
-  let payload!: { [propName: string]: JsonValue | undefined }
+  let payload!: { [propName: string]: unknown }
   try {
     payload = JSON.parse(decoder.decode(encodedPayload))
   } catch {

src/lib/validate_crit.ts

@@ -1,10 +1,9 @@
-import type { JsonValue } from '../types.d'
 import { JOSENotSupported, JWEInvalid, JWSInvalid } from '../util/errors.js'
 
 interface CritCheckHeader {
   b64?: boolean
   crit?: string[]
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 function validateCrit(

src/runtime/interfaces.d.ts

@@ -1,4 +1,4 @@
-import type { JWK, KeyLike, JsonValue } from '../types.d'
+import type { JWK, KeyLike } from '../types.d'
 import type { PEMImportOptions } from '../key/import.js'
 
 type AsyncOrSync<T> = Promise<T> | T
@@ -57,9 +57,7 @@ export interface DecryptFunction {
   ): AsyncOrSync<Uint8Array>
 }
 export interface FetchFunction {
-  (url: URL, timeout: number, options?: any): Promise<{
-    [parameter: string]: JsonValue | undefined
-  }>
+  (url: URL, timeout: number, options?: any): Promise<{ [propName: string]: unknown }>
 }
 export interface DigestFunction {
   (digest: 'sha256' | 'sha384' | 'sha512', data: Uint8Array): AsyncOrSync<Uint8Array>

src/runtime/node/key_to_jwk.ts

@@ -36,7 +36,7 @@ const keyToJWK: JWKExportFunction = (key: unknown): JWK => {
     ) {
       throw new JOSENotSupported('Unsupported key asymmetricKeyType')
     }
-    return <JWK>keyObject.export({ format: 'jwk' })
+    return keyObject.export({ format: 'jwk' })
   }
 
   switch (keyObject.type) {
@@ -112,7 +112,7 @@ const keyToJWK: JWKExportFunction = (key: unknown): JWK => {
           if (der.length < 100) {
             offset += correction
           }
-          return <JWK>{
+          return {
             ...keyToJWK(createPublicKey(keyObject)),
             d: base64url(der.subarray(offset, offset + len / 2)),
           }
@@ -130,7 +130,7 @@ const keyToJWK: JWKExportFunction = (key: unknown): JWK => {
           }
 
           const der = keyObject.export({ type: 'pkcs8', format: 'der' })
-          return <JWK>{
+          return {
             ...keyToJWK(createPublicKey(keyObject)),
             d: base64url(der.subarray(-32)),
           }
@@ -148,7 +148,7 @@ const keyToJWK: JWKExportFunction = (key: unknown): JWK => {
           }
 
           const der = keyObject.export({ type: 'pkcs8', format: 'der' })
-          return <JWK>{
+          return {
             ...keyToJWK(createPublicKey(keyObject)),
             d: base64url(der.subarray(crv === 'Ed448' ? -57 : -56)),
           }

src/types.d.ts

@@ -91,11 +91,6 @@
  */
 export type KeyLike = { type: string }
 
-type JsonObject = { [Key in string]?: JsonValue }
-type JsonArray = JsonValue[]
-type JsonPrimitive = string | number | boolean | null
-type JsonValue = JsonPrimitive | JsonObject | JsonArray
-
 /**
  * JSON Web Key ({@link https://www.rfc-editor.org/rfc/rfc7517 JWK}). "RSA", "EC", "OKP", and "oct"
  * key types are supported.
@@ -139,7 +134,7 @@ export interface JWK {
   /** JWK "x5u" (X.509 URL) Parameter. */
   x5u?: string
 
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /**
@@ -263,7 +258,7 @@ export interface JWSHeaderParameters extends JoseHeaderParameters {
   crit?: string[]
 
   /** Any other JWS Header member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /** Recognized JWE Key Management-related Header Parameters. */
@@ -371,7 +366,7 @@ export interface JWEHeaderParameters extends JoseHeaderParameters {
   zip?: string
 
   /** Any other JWE Header member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /** Shared Interface with a "crit" property for all sign, verify, encrypt and decrypt operations. */
@@ -545,7 +540,7 @@ export interface JWTPayload {
   iat?: number
 
   /** Any other JWT Claim Set member. */
-  [propName: string]: JsonValue | undefined
+  [propName: string]: unknown
 }
 
 /**

test/types/index.test-d.ts

@@ -1,5 +1,5 @@
 import type { KeyObject } from 'crypto'
-import { expectError, expectType } from 'tsd'
+import { expectType } from 'tsd'
 
 import * as lib from '../../dist/types'
 
@@ -208,47 +208,3 @@ expectType<KeyObject>(await lib.createRemoteJWKSet<KeyObject>(new URL(''))())
 expectType<lib.KeyLike>(await lib.EmbeddedJWK())
 expectType<CryptoKey>(await lib.EmbeddedJWK())
 expectType<KeyObject>(await lib.EmbeddedJWK())
-
-{
-  const result = await lib.jwtVerify('', new Uint8Array())
-  switch (typeof result.payload.unknown) {
-    case 'bigint':
-    case 'function':
-    case 'symbol':
-      expectType<never>(result.payload.unknown)
-  }
-
-  switch (typeof result.protectedHeader.unknown) {
-    case 'bigint':
-    case 'function':
-    case 'symbol':
-      expectType<never>(result.protectedHeader.unknown)
-  }
-}
-
-{
-  const result = await lib.decodeJwt('')
-  switch (typeof result.unknown) {
-    case 'bigint':
-    case 'function':
-    case 'symbol':
-      expectType<never>(result.unknown)
-  }
-}
-
-{
-  const result = await lib.decodeProtectedHeader('')
-  switch (typeof result.unknown) {
-    case 'bigint':
-    case 'function':
-    case 'symbol':
-      expectType<never>(result.unknown)
-  }
-}
-
-expectError(new lib.SignJWT({ foo() {} }))
-expectError(new lib.SignJWT({}).setProtectedHeader({ foo() {} }))
-expectError(new lib.SignJWT({ foo: Symbol() }))
-expectError(new lib.SignJWT({}).setProtectedHeader({ foo: Symbol() }))
-expectError(new lib.SignJWT({ foo: 0n }))
-expectError(new lib.SignJWT({}).setProtectedHeader({ foo: 0n }))