Consolidate channel abstraction types

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

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

src/common/channel/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-injection-token";
+import type { Channel } from "./channel";
 
 export interface ChannelListener<TChannel extends Channel<unknown>> {
   channel: TChannel;

src/common/channel/channel.test.ts

@@ -11,8 +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-injection-token";
+import type { Channel } from "./channel";
-import { channelInjectionToken } from "./channel-injection-token";
 
 type TestChannel = Channel<string>;
 
@@ -158,8 +157,6 @@ const testChannelInjectable = getInjectable({
       id: channelId,
     };
   },
-
-  injectionToken: channelInjectionToken,
 });
 
 const createTestWindow = (di: DiContainer, id: string) => {

src/common/channel/channel.ts

@@ -2,13 +2,8 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * 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<unknown>>({
-  id: "channel",
-});

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-injection-token";
+import type { Channel } from "./channel";
 
 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-injection-token";
+import type { Channel } from "./channel";
 
 export type SendToAgnosticChannel = <TChannel extends Channel<unknown>>(
   channel: TChannel,

src/common/ipc-channel/channel.ts

@@ -2,6 +2,10 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
+
+/**
+ * @deprecated Switch to using newer version of Channel abstraction
+ */
 export interface Channel<TInstance> {
   name: string;
   _template: TInstance;

src/common/ipc-channel/create-channel/create-channel.ts

@@ -4,6 +4,9 @@
  */
 import type { Channel } from "../channel";
 
+/**
+ * @deprecated Switch to using newer version of Channel abstraction
+ */
 export const createChannel = <Message>(name: string): Channel<Message> => ({
   name,
   _template: null as never,

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

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