Export tokens instead of injectables

Signed-off-by: Sami Tiilikainen <97873007+samitiilikainen@users.noreply.github.com>

packages/logging/index.ts

@@ -1,7 +1,9 @@
-export { logErrorInjectable } from "./src/log-error.injectable";
-export { loggerInjectable } from "./src/logger.injectable";
-export type { Logger } from "./src/logger";
-export { winstonLoggerInjectable } from "./src/winston-logger.injectable";
-export { prefixedLoggerInjectable } from "./src/prefixed-logger.injectable";
-export { loggerTransportInjectionToken } from "./src/transports";
 export { loggingFeature } from "./src/feature";
+
+export type { Logger } from "./src/logger";
+
+export { logErrorInjectionToken } from "./src/log-error.injectable";
+export { loggerInjectionToken } from "./src/logger.injectable";
+export { winstonLoggerInjectionToken } from "./src/winston-logger.injectable";
+export { prefixedLoggerInjectionToken } from "./src/prefixed-logger.injectable";
+export { loggerTransportInjectionToken } from "./src/transports";

packages/logging/src/log-error.injectable.ts

@@ -2,11 +2,18 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 import { loggerInjectable } from "./logger.injectable";
 
+type LogError = (message: string, ...args: any) => void;
+
+export const logErrorInjectionToken = getInjectionToken<LogError>({
+  id: "logger",
+});
+
 export const logErrorInjectable = getInjectable({
   id: "log-error",
   instantiate: (di) => di.inject(loggerInjectable).error,
+  injectionToken: logErrorInjectionToken,
   decorable: false,
 });

packages/logging/src/logger.injectable.ts

@@ -2,10 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 import type { Logger } from "./logger";
 import { winstonLoggerInjectable } from "./winston-logger.injectable";
 
+export const loggerInjectionToken = getInjectionToken<Logger>({
+  id: "logger",
+});
+
 export const loggerInjectable = getInjectable({
   id: "logger",
   instantiate: (di): Logger => {
@@ -19,6 +23,6 @@ export const loggerInjectable = getInjectable({
       silly: (message, ...data) => baseLogger.silly(message, ...data),
     };
   },
-
+  injectionToken: loggerInjectionToken,
   decorable: false,
 });

packages/logging/src/prefixed-logger.injectable.ts

@@ -2,10 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken, lifecycleEnum } from "@ogre-tools/injectable";
 import type { Logger } from "./logger";
 import { loggerInjectable } from "./logger.injectable";
 
+export const prefixedLoggerInjectionToken = getInjectionToken<Logger, string>({
+  id: "prefixed-logger",
+});
+
 export const prefixedLoggerInjectable = getInjectable({
   id: "prefixed-logger",
   instantiate: (di, prefix): Logger => {
@@ -32,4 +36,5 @@ export const prefixedLoggerInjectable = getInjectable({
   lifecycle: lifecycleEnum.keyedSingleton({
     getInstanceKey: (di, prefix: string) => prefix,
   }),
+  injectionToken: prefixedLoggerInjectionToken,
 });

packages/logging/src/winston-logger.injectable.ts

@@ -2,10 +2,15 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getInjectable } from "@ogre-tools/injectable";
+import { getInjectable, getInjectionToken } from "@ogre-tools/injectable";
 import { createLogger, format } from "winston";
+import type { Logger as WinstonLogger } from "winston";
 import { loggerTransportInjectionToken } from "./transports";
 
+export const winstonLoggerInjectionToken = getInjectionToken<WinstonLogger>({
+  id: "winston-logger",
+});
+
 export const winstonLoggerInjectable = getInjectable({
   id: "winston-logger",
   instantiate: (di) =>