diff --git a/src/common/channel/enlist-request-channel-listener-injection-token.ts b/src/common/channel/enlist-request-channel-listener-injection-token.ts index ccab218bd2..f87082c466 100644 --- a/src/common/channel/enlist-request-channel-listener-injection-token.ts +++ b/src/common/channel/enlist-request-channel-listener-injection-token.ts @@ -7,7 +7,7 @@ import type { RequestChannel } from "./request-channel-injection-token"; import type { RequestChannelListener } from "./request-channel-listener-injection-token"; export type EnlistRequestChannelListener = < - TChannel extends RequestChannel, + TChannel extends RequestChannel, >(listener: RequestChannelListener) => () => void; export const enlistRequestChannelListenerInjectionToken = diff --git a/src/common/channel/request-channel-injection-token.ts b/src/common/channel/request-channel-injection-token.ts index 4cb290cc63..67044db878 100644 --- a/src/common/channel/request-channel-injection-token.ts +++ b/src/common/channel/request-channel-injection-token.ts @@ -4,8 +4,12 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; +import type { JsonValue } from "type-fest"; -export interface RequestChannel { +export interface RequestChannel< + Request extends JsonValue | void = void, + Response extends JsonValue | void = void, +> { id: string; _requestSignature?: Request; _responseSignature?: Response; diff --git a/src/common/channel/request-from-channel-injection-token.ts b/src/common/channel/request-from-channel-injection-token.ts index c56ee236c6..5f4492543f 100644 --- a/src/common/channel/request-from-channel-injection-token.ts +++ b/src/common/channel/request-from-channel-injection-token.ts @@ -7,7 +7,7 @@ import type { SetRequired } from "type-fest"; import type { RequestChannel } from "./request-channel-injection-token"; export type RequestFromChannel = < - TChannel extends RequestChannel, + TChannel extends RequestChannel, >( channel: TChannel, ...request: TChannel["_requestSignature"] extends void diff --git a/src/common/sync-box/sync-box-initial-value-channel.injectable.ts b/src/common/sync-box/sync-box-initial-value-channel.injectable.ts index 6fe0534323..89374c3565 100644 --- a/src/common/sync-box/sync-box-initial-value-channel.injectable.ts +++ b/src/common/sync-box/sync-box-initial-value-channel.injectable.ts @@ -8,7 +8,7 @@ import { requestChannelInjectionToken } from "../channel/request-channel-injecti export type SyncBoxInitialValueChannel = RequestChannel< void, - { id: string; value: unknown }[] + { id: string; value: any }[] >; const syncBoxInitialValueChannelInjectable = getInjectable({ diff --git a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts index 5897d93f9b..308ebad3e5 100644 --- a/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts +++ b/src/test-utils/channel-fakes/override-requesting-from-window-to-main.ts @@ -11,7 +11,7 @@ import requestFromChannelInjectable from "../../renderer/channel/request-from-ch export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => { const requestChannelListenerFakesForMain = new Map< string, - RequestChannelListener> + RequestChannelListener> >(); mainDi.override( @@ -27,9 +27,9 @@ export const overrideRequestingFromWindowToMain = (mainDi: DiContainer) => { requestChannelListenerFakesForMain.set( listener.channel.id, - // TODO: Figure out typingo + // TODO: Figure out typing listener as unknown as RequestChannelListener< - RequestChannel + RequestChannel >, );