refactor: always use infered CryptoKey

Author: panva

src/lib/crypto_key.ts

@@ -1,3 +1,5 @@
+import type { CryptoKey } from '../types.d.ts'
+
 function unusable(name: string | number, prop = 'algorithm.name') {
   return new TypeError(`CryptoKey does not support this operation, its ${prop} must be ${name}`)
 }

src/runtime/aeskw.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import { checkEncCryptoKey } from '../lib/crypto_key.js'
 
 function checkKeySize(key: CryptoKey, alg: string) {

src/runtime/check_key_length.ts

@@ -1,3 +1,5 @@
+import type { CryptoKey } from '../types.d.ts'
+
 export default (alg: string, key: CryptoKey) => {
   if (alg.startsWith('RS') || alg.startsWith('PS')) {
     const { modulusLength } = key.algorithm as RsaKeyAlgorithm

src/runtime/decrypt.ts

@@ -1,5 +1,6 @@
 import { concat, uint64be } from '../lib/buffer_utils.js'
 
+import type { CryptoKey } from '../types.d.ts'
 import type { DecryptFunction } from './interfaces.d.ts'
 import checkIvLength from '../lib/check_iv_length.js'
 import checkCekLength from './check_cek_length.js'

src/runtime/ecdhes.ts

@@ -1,6 +1,6 @@
+import type { CryptoKey } from '../types.d.ts'
 import { encoder, concat, uint32be, lengthAndInput, concatKdf } from '../lib/buffer_utils.js'
 import { checkEncCryptoKey } from '../lib/crypto_key.js'
-import type { CryptoKey } from '../types.d.ts'
 
 export async function deriveKey(
   publicKey: CryptoKey,

src/runtime/encrypt.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import { concat, uint64be } from '../lib/buffer_utils.js'
 import type { EncryptFunction } from './interfaces.d.ts'
 import checkIvLength from '../lib/check_iv_length.js'

src/runtime/generate.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import { JOSENotSupported } from '../util/errors.js'
 import random from './random.js'
 import type { GenerateKeyPairOptions } from '../key/generate_key_pair.js'

src/runtime/get_sign_verify_key.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import { checkSigCryptoKey } from '../lib/crypto_key.js'
 import invalidKeyInput from '../lib/invalid_key_input.js'
 

src/runtime/is_key_like.ts

@@ -1,4 +1,4 @@
-import type { KeyObject } from '../types.d.ts'
+import type { CryptoKey, KeyObject } from '../types.d.ts'
 
 export function assertCryptoKey(key: unknown): asserts key is CryptoKey {
   if (!isCryptoKey(key)) {

src/runtime/jwk_to_key.ts

@@ -1,5 +1,5 @@
 import { JOSENotSupported } from '../util/errors.js'
-import type { JWK } from '../types.d.ts'
+import type { CryptoKey, JWK } from '../types.d.ts'
 
 function subtleMapping(jwk: JWK): {
   algorithm: RsaHashedImportParams | EcKeyAlgorithm | Algorithm

src/runtime/pbes2kw.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import random from './random.js'
 import { p2s as concatSalt } from '../lib/buffer_utils.js'
 import { encode as base64url } from './base64url.js'

src/runtime/rsaes.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import subtleAlgorithm from './subtle_rsaes.js'
 import { checkEncCryptoKey } from '../lib/crypto_key.js'
 import checkKeyLength from './check_key_length.js'

src/runtime/sign.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import subtleAlgorithm from './subtle_dsa.js'
 
 import checkKeyLength from './check_key_length.js'

src/runtime/verify.ts

@@ -1,3 +1,4 @@
+import type { CryptoKey } from '../types.d.ts'
 import subtleAlgorithm from './subtle_dsa.js'
 
 import checkKeyLength from './check_key_length.js'