Introduce injection token for channels to allow injecting all of them at once

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/common/channel/channel-injection-token.ts

@@ -3,7 +3,13 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 
+import { getInjectionToken } from "@ogre-tools/injectable";
+
 export interface Channel<TInstance> {
   id: string;
   _template?: TInstance;
 }
+
+export const channelInjectionToken = getInjectionToken<Channel<any>>({
+  id: "channel",
+});

src/common/channel/channel-listener-injection-token.ts

@@ -3,14 +3,14 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { Channel } from "./channel";
+import type { Channel } from "./channel-injection-token";
 
-export interface ChannelListener<TChannel extends Channel<unknown>> {
+export interface ChannelListener<TChannel extends Channel<any>> {
   channel: TChannel;
   handler: (value: TChannel["_template"]) => void;
 }
 
-export const channelListenerInjectionToken = getInjectionToken<ChannelListener<Channel<unknown>>>(
+export const channelListenerInjectionToken = getInjectionToken<ChannelListener<Channel<any>>>(
   {
     id: "channel-listener",
   },

src/common/channel/channel.test.ts

@@ -11,7 +11,7 @@ import { sendToAgnosticChannelInjectionToken } from "./send-to-agnostic-channel-
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { channelListenerInjectionToken } from "./channel-listener-injection-token";
 import createLensWindowInjectable from "../../main/start-main-application/lens-window/application-window/create-lens-window.injectable";
-import type { Channel } from "./channel";
+import type { Channel } from "./channel-injection-token";
 
 type TestChannel = Channel<string>;
 

src/common/channel/enlist-channel-listener-injection-token.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { Channel } from "./channel";
+import type { Channel } from "./channel-injection-token";
 
 export type EnlistChannelListener = <TChannel extends Channel<unknown>>(
   channel: TChannel,

src/common/channel/send-to-agnostic-channel-injection-token.ts

@@ -3,7 +3,7 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectionToken } from "@ogre-tools/injectable";
-import type { Channel } from "./channel";
+import type { Channel } from "./channel-injection-token";
 
 export type SendToAgnosticChannel = <TChannel extends Channel<unknown>>(
   channel: TChannel,

src/common/sync-box/sync-box-channel-listener.injectable.ts

@@ -3,20 +3,19 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { SyncBoxChannel } from "./sync-box-channel.injectable";
 import syncBoxChannelInjectable from "./sync-box-channel.injectable";
-import type { ChannelListener } from "../channel/channel-listener-injection-token";
 import { channelListenerInjectionToken } from "../channel/channel-listener-injection-token";
 import syncBoxStateInjectable from "./sync-box-state.injectable";
 
 const syncBoxChannelListenerInjectable = getInjectable({
   id: "sync-box-channel-listener",
 
-  instantiate: (di): ChannelListener<SyncBoxChannel> => {
+  instantiate: (di) => {
     const getSyncBoxState = (id: string) => di.inject(syncBoxStateInjectable, id);
+    const channel = di.inject(syncBoxChannelInjectable);
 
     return {
-      channel: di.inject(syncBoxChannelInjectable),
+      channel,
 
       handler: ({ id, value }) => {
         const target = getSyncBoxState(id);

src/common/sync-box/sync-box-channel.injectable.ts

@@ -3,7 +3,8 @@
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
 import { getInjectable } from "@ogre-tools/injectable";
-import type { Channel } from "../channel/channel";
+import type { Channel } from "../channel/channel-injection-token";
+import { channelInjectionToken } from "../channel/channel-injection-token";
 
 export type SyncBoxChannel = Channel<{ id: string; value: unknown }>;
 
@@ -13,6 +14,8 @@ const syncBoxChannelInjectable = getInjectable({
   instantiate: (): SyncBoxChannel => ({
     id: "sync-box-channel",
   }),
+
+  injectionToken: channelInjectionToken,
 });
 
 export default syncBoxChannelInjectable;