Make decrypt function generic

Previous incorrect types surfaced problem with defined DecryptFn declaration

Author: ondrej-langr

packages/auth/src/connection/Connection.ts

@@ -1,6 +1,6 @@
 /* eslint-disable object-shorthand */
 import { EventEmitter } from '@herbcaudill/eventemitter42'
-import type { DecryptFnParams } from '@localfirst/crdx'
+import type { DecryptFn, DecryptFnParams, Graph } from '@localfirst/crdx'
 import {
   generateMessage,
   headsAreEqual,
@@ -33,7 +33,13 @@ import { redactDevice } from '../device/index.js'
 import * as invitations from '../invitation/index.js'
 import { pack, unpack } from 'msgpackr'
 import { getTeamState } from '../team/getTeamState.js'
-import { Team, decryptTeamGraph, type TeamAction, type TeamContext } from '../team/index.js'
+import {
+  Team,
+  TeamGraph,
+  decryptTeamGraph,
+  type TeamAction,
+  type TeamContext,
+} from '../team/index.js'
 import * as select from '../team/selectors/index.js'
 import { arraysAreEqual } from '../util/arraysAreEqual.js'
 import { KeyType } from '../util/index.js'
@@ -308,7 +314,7 @@ export class Connection extends EventEmitter<ConnectionEvents> {
           const deviceKeys = device.keys
 
           // handle errors here
-          const decrypt = ({ encryptedGraph, keys }: DecryptFnParams<TeamAction, TeamContext>) =>
+          const decrypt: DecryptFn<TeamAction, TeamContext> = ({ encryptedGraph, keys }) =>
             decryptTeamGraph({ encryptedGraph, teamKeys: keys, deviceKeys })
 
           const [newChain, syncState] = receiveMessage(

packages/crdx/src/graph/decrypt.ts

@@ -43,13 +43,10 @@ export const decryptLink = <A extends Action, C>(
 /**
  * Decrypts a graph using a one or more keys.
  */
-export const decryptGraph: DecryptFn = <A extends Action, C>({
+export const decryptGraph = (<A extends Action, C>({
   encryptedGraph,
   keys,
-}: {
-  encryptedGraph: MaybePartlyDecryptedGraph<A, C>
-  keys: KeysetWithSecrets | KeysetWithSecrets[] | Keyring
-}): Graph<A, C> => {
+}: DecryptFnParams<A, C>): Graph<A, C> => {
   const { encryptedLinks, root, childMap = {} } = encryptedGraph
 
   const links = encryptedGraph.links ?? {}
@@ -83,14 +80,14 @@ export const decryptGraph: DecryptFn = <A extends Action, C>({
     ...encryptedGraph,
     links: decryptedLinks,
   }
-}
+}) satisfies DecryptFn<any, any>
 
 export type DecryptFnParams<A extends Action, C> = {
   encryptedGraph: MaybePartlyDecryptedGraph<A, C>
   keys: KeysetWithSecrets | KeysetWithSecrets[] | Keyring
 }
 
-export type DecryptFn = <A extends Action, C>({
+export type DecryptFn<A extends Action, C> = ({
   encryptedGraph,
   keys,
 }: DecryptFnParams<A, C>) => Graph<A, C>

packages/crdx/src/sync/receiveMessage.ts

@@ -25,7 +25,7 @@ export const receiveMessage = <A extends Action, C>(
 
   keys: KeysetWithSecrets | Keyring,
 
-  decrypt: DecryptFn = decryptGraph
+  decrypt: DecryptFn<A, C> = decryptGraph
 ): [Graph<A, C>, SyncState] => {
   // if a keyset was provided, wrap it in a keyring
   const keyring = createKeyring(keys)