From feceb76919073f2a3580b128233f51b6748e1fe3 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Tue, 25 Apr 2023 14:48:40 +0300 Subject: [PATCH] chore: Switch to using non-default exports for being more friendly for IDEs Signed-off-by: Janne Savolainen --- packages/logging/index.ts | 10 +++++----- packages/logging/src/feature.ts | 10 ++++------ .../src/log-error.global-override-for-injectable.ts | 2 +- packages/logging/src/log-error.injectable.ts | 6 ++---- .../src/logger.global-override-for-injectable.ts | 2 +- packages/logging/src/logger.injectable.ts | 6 ++---- packages/logging/src/prefixed-logger.injectable.ts | 6 ++---- .../winston-logger.global-override-for-injectable.ts | 2 +- packages/logging/src/winston-logger.injectable.ts | 4 +--- 9 files changed, 19 insertions(+), 29 deletions(-) diff --git a/packages/logging/index.ts b/packages/logging/index.ts index e5431b0add..639bac58e7 100644 --- a/packages/logging/index.ts +++ b/packages/logging/index.ts @@ -1,7 +1,7 @@ -export { default as logErrorInjectable } from "./src/log-error.injectable"; -export { default as loggerInjectable } from "./src/logger.injectable"; +export { logErrorInjectable } from "./src/log-error.injectable"; +export { loggerInjectable } from "./src/logger.injectable"; export type { Logger } from "./src/logger"; -export { default as winstonLoggerInjectable } from "./src/winston-logger.injectable"; -export { default as prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; +export { winstonLoggerInjectable } from "./src/winston-logger.injectable"; +export { prefixedLoggerInjectable } from "./src/prefixed-logger.injectable"; export { loggerTransportInjectionToken } from "./src/transports"; -export { default as loggingFeature } from "./src/feature"; +export { loggingFeature } from "./src/feature"; diff --git a/packages/logging/src/feature.ts b/packages/logging/src/feature.ts index 4bda5e853b..c44852323b 100644 --- a/packages/logging/src/feature.ts +++ b/packages/logging/src/feature.ts @@ -1,8 +1,8 @@ import { getFeature } from "@k8slens/feature-core"; -import logErrorInjectable from "./log-error.injectable"; -import loggerInjectable from "./logger.injectable"; -import prefixedLoggerInjectable from "./prefixed-logger.injectable"; -import winstonLoggerInjectable from "./winston-logger.injectable"; +import { logErrorInjectable } from "./log-error.injectable"; +import { loggerInjectable } from "./logger.injectable"; +import { prefixedLoggerInjectable } from "./prefixed-logger.injectable"; +import { winstonLoggerInjectable } from "./winston-logger.injectable"; export const loggingFeature = getFeature({ id: "logging", @@ -14,5 +14,3 @@ export const loggingFeature = getFeature({ di.register(winstonLoggerInjectable); }, }); - -export default loggingFeature; diff --git a/packages/logging/src/log-error.global-override-for-injectable.ts b/packages/logging/src/log-error.global-override-for-injectable.ts index 95fa0ac16f..be03be3cd1 100644 --- a/packages/logging/src/log-error.global-override-for-injectable.ts +++ b/packages/logging/src/log-error.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getGlobalOverrideForFunction } from "@k8slens/test-utils"; -import logErrorInjectable from "./log-error.injectable"; +import { logErrorInjectable } from "./log-error.injectable"; // Note: this should remain as it is, and throw if called. Logging error is something // that cannot happen without a unit test explicitly causing it. It cannot be allowed diff --git a/packages/logging/src/log-error.injectable.ts b/packages/logging/src/log-error.injectable.ts index 84a77a679a..d13065b7a8 100644 --- a/packages/logging/src/log-error.injectable.ts +++ b/packages/logging/src/log-error.injectable.ts @@ -3,12 +3,10 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import loggerInjectable from "./logger.injectable"; +import { loggerInjectable } from "./logger.injectable"; -const logErrorInjectable = getInjectable({ +export const logErrorInjectable = getInjectable({ id: "log-error", instantiate: (di) => di.inject(loggerInjectable).error, decorable: false, }); - -export default logErrorInjectable; diff --git a/packages/logging/src/logger.global-override-for-injectable.ts b/packages/logging/src/logger.global-override-for-injectable.ts index e314316d47..1fefa0f45c 100644 --- a/packages/logging/src/logger.global-override-for-injectable.ts +++ b/packages/logging/src/logger.global-override-for-injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import loggerInjectable from "./logger.injectable"; +import { loggerInjectable } from "./logger.injectable"; import { getGlobalOverride } from "@k8slens/test-utils"; export default getGlobalOverride(loggerInjectable, () => ({ diff --git a/packages/logging/src/logger.injectable.ts b/packages/logging/src/logger.injectable.ts index e64978e44b..39828861f7 100644 --- a/packages/logging/src/logger.injectable.ts +++ b/packages/logging/src/logger.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; -import winstonLoggerInjectable from "./winston-logger.injectable"; +import { winstonLoggerInjectable } from "./winston-logger.injectable"; -const loggerInjectable = getInjectable({ +export const loggerInjectable = getInjectable({ id: "logger", instantiate: (di): Logger => { const baseLogger = di.inject(winstonLoggerInjectable); @@ -22,5 +22,3 @@ const loggerInjectable = getInjectable({ decorable: false, }); - -export default loggerInjectable; diff --git a/packages/logging/src/prefixed-logger.injectable.ts b/packages/logging/src/prefixed-logger.injectable.ts index 1e88da00bb..d0fe2e090b 100644 --- a/packages/logging/src/prefixed-logger.injectable.ts +++ b/packages/logging/src/prefixed-logger.injectable.ts @@ -4,9 +4,9 @@ */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import type { Logger } from "./logger"; -import loggerInjectable from "./logger.injectable"; +import { loggerInjectable } from "./logger.injectable"; -const prefixedLoggerInjectable = getInjectable({ +export const prefixedLoggerInjectable = getInjectable({ id: "prefixed-logger", instantiate: (di, prefix): Logger => { const logger = di.inject(loggerInjectable); @@ -33,5 +33,3 @@ const prefixedLoggerInjectable = getInjectable({ getInstanceKey: (di, prefix: string) => prefix, }), }); - -export default prefixedLoggerInjectable; diff --git a/packages/logging/src/winston-logger.global-override-for-injectable.ts b/packages/logging/src/winston-logger.global-override-for-injectable.ts index b4a709fc79..14a889dc89 100644 --- a/packages/logging/src/winston-logger.global-override-for-injectable.ts +++ b/packages/logging/src/winston-logger.global-override-for-injectable.ts @@ -6,7 +6,7 @@ import type winston from "winston"; import { getGlobalOverride } from "@k8slens/test-utils"; import { noop } from "@k8slens/utilities"; -import winstonLoggerInjectable from "./winston-logger.injectable"; +import { winstonLoggerInjectable } from "./winston-logger.injectable"; export default getGlobalOverride( winstonLoggerInjectable, diff --git a/packages/logging/src/winston-logger.injectable.ts b/packages/logging/src/winston-logger.injectable.ts index e57baf03c3..e7fbb764c3 100644 --- a/packages/logging/src/winston-logger.injectable.ts +++ b/packages/logging/src/winston-logger.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { createLogger, format } from "winston"; import { loggerTransportInjectionToken } from "./transports"; -const winstonLoggerInjectable = getInjectable({ +export const winstonLoggerInjectable = getInjectable({ id: "winston-logger", instantiate: (di) => createLogger({ @@ -14,5 +14,3 @@ const winstonLoggerInjectable = getInjectable({ transports: di.injectMany(loggerTransportInjectionToken), }), }); - -export default winstonLoggerInjectable;