fix: replace missing usage of new levels api

ngworker · Jan 28, 2024 · ee12776 · ee12776
1 parent 13a4363
commit ee12776
Show file tree

Hide file tree

Showing 21 changed files with 130 additions and 162 deletions.
diff --git a/packages/docs/lumberjack-docs-app/docs/usage.md b/packages/docs/lumberjack-docs-app/docs/usage.md
@@ -131,7 +131,7 @@ export class MyComponent implements OnInit {
   // (...)
   ngOnInit(): void {
     this.#lumberjack.log({
-      level: LumberjackLevel.Info,
+      level: 'info',
       message: 'Hello, World!',
       scope: 'MyComponent',
       createdAt: this.#time.getUnixEpochTicks(),
@@ -158,7 +158,7 @@ export class MyComponent implements OnInit {
 }
 ```
 
-> Each log level has its associated shorthand version: `LumberjackLevel.Info` is `logInfo`, `LumberjackLevel.Debug` is `logDebug`, etc.
+> Each log level has its associated shorthand version: `'info'` is `logInfo`, `'debug'` is `logDebug`, etc.
 
 ### LumberjackModule and provideLumberjack
 

diff --git a/.../internal/test-util/src/lib/error-throwing-driver/default-error-throwing-driver-config.ts b/.../internal/test-util/src/lib/error-throwing-driver/default-error-throwing-driver-config.ts
@@ -1,10 +1,8 @@
-import { LumberjackLevel } from '@ngworker/lumberjack';
-
 import { ErrorThrowingDriverConfig } from './error-throwing-driver.config';
 import { ErrorThrowingDriver } from './error-throwing.driver';
 
 export const defaultErrorThrowingDriverConfig: ErrorThrowingDriverConfig = {
   logsBeforeThrowing: 0,
-  levels: [LumberjackLevel.Verbose],
+  levels: ['verbose'],
   identifier: ErrorThrowingDriver.driverIdentifier,
 };
diff --git a/...rjack/console-driver/src/lib/configuration/lumberjack-console-driver-config.token.spec.ts b/...rjack/console-driver/src/lib/configuration/lumberjack-console-driver-config.token.spec.ts
@@ -1,15 +1,15 @@
 import { TestBed } from '@angular/core/testing';
 
-import { LumberjackLevel, LumberjackLogDriverConfig, lumberjackLogDriverConfigToken } from '@ngworker/lumberjack';
+import { LumberjackLogDriverConfig, lumberjackLogDriverConfigToken } from '@ngworker/lumberjack';
 
 import { lumberjackConsoleDriverConfigToken } from './lumberjack-console-driver-config.token';
 
 const debugDriverConfig: LumberjackLogDriverConfig = {
-  levels: [LumberjackLevel.Debug],
+  levels: ['debug'],
   identifier: 'TestConsoleDriver',
 };
 const verboseDriverConfig: Partial<LumberjackLogDriverConfig> = {
-  levels: [LumberjackLevel.Verbose],
+  levels: ['verbose'],
 };
 
 describe('consoleDriverConfigToken', () => {

diff --git a/.../lumberjack/console-driver/src/lib/configuration/lumberjack-console-driver.module.spec.ts b/.../lumberjack/console-driver/src/lib/configuration/lumberjack-console-driver.module.spec.ts
@@ -3,7 +3,6 @@ import { TestBed } from '@angular/core/testing';
 import { expectNgModuleToBeGuardedAgainstDirectImport } from '@internal/test-util';
 import {
   lumberjackConfigToken,
-  LumberjackLevel,
   LumberjackLogDriver,
   LumberjackLogDriverConfig,
   lumberjackLogDriverToken,
@@ -49,7 +48,7 @@ describe(LumberjackConsoleDriverModule.name, () => {
 
     it('registers the specified log driver configuration given the specified identifier', () => {
       const expectedConfig: LumberjackLogDriverConfig = {
-        levels: [LumberjackLevel.Error],
+        levels: ['error'],
         identifier: 'TestDriverIdentifier',
       };
 
@@ -61,7 +60,7 @@ describe(LumberjackConsoleDriverModule.name, () => {
 
     it('registers the specified log driver configuration given no identifier', () => {
       const config: LumberjackConsoleDriverConfig = {
-        levels: [LumberjackLevel.Error],
+        levels: ['error'],
       };
       const expectedConfig: LumberjackLogDriverConfig = {
         ...config,
@@ -88,7 +87,7 @@ describe(LumberjackConsoleDriverModule.name, () => {
 
     it('registers the specified log driver configuration when the Lumberjack module is imported after the console driver module', () => {
       const expectedConfig: LumberjackLogDriverConfig = {
-        levels: [LumberjackLevel.Debug],
+        levels: ['debug'],
         identifier: 'TestConsoleDriver',
       };
 

diff --git a/...lumberjack/console-driver/src/lib/configuration/provide-lumberjack-console-driver.spec.ts b/...lumberjack/console-driver/src/lib/configuration/provide-lumberjack-console-driver.spec.ts
@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 
 import {
   lumberjackConfigToken,
-  LumberjackLevel,
   LumberjackLogDriver,
   LumberjackLogDriverConfig,
   lumberjackLogDriverToken,
@@ -43,7 +42,7 @@ describe(provideLumberjackConsoleDriver.name, () => {
 
   it('registers the specified log driver configuration given the specified identifier', () => {
     const expectedConfig: LumberjackLogDriverConfig = {
-      levels: [LumberjackLevel.Error],
+      levels: ['error'],
       identifier: 'TestDriverIdentifier',
     };
 
@@ -55,7 +54,7 @@ describe(provideLumberjackConsoleDriver.name, () => {
 
   it('registers the specified log driver configuration given no identifier', () => {
     const config: LumberjackConsoleDriverConfig = {
-      levels: [LumberjackLevel.Error],
+      levels: ['error'],
     };
     const expectedConfig: LumberjackLogDriverConfig = {
       ...config,
@@ -82,7 +81,7 @@ describe(provideLumberjackConsoleDriver.name, () => {
 
   it('registers the specified log driver configuration when the Lumberjack module is imported after the console driver module', () => {
     const expectedConfig: LumberjackLogDriverConfig = {
-      levels: [LumberjackLevel.Debug],
+      levels: ['debug'],
       identifier: 'TestConsoleDriver',
     };
 

diff --git a/.../ngworker/lumberjack/console-driver/src/lib/log-drivers/lumberjack-console.driver.spec.ts b/.../ngworker/lumberjack/console-driver/src/lib/log-drivers/lumberjack-console.driver.spec.ts
@@ -2,7 +2,6 @@ import { TestBed } from '@angular/core/testing';
 
 import { provideSpyConsole, SpyConsole } from '@internal/console-driver/test-util';
 import {
-  LumberjackLevel,
   LumberjackLogDriver,
   lumberjackLogDriverToken,
   LumberjackLogFactory,
@@ -20,7 +19,7 @@ describe(LumberjackConsoleDriver.name, () => {
       imports: [
         LumberjackModule.forRoot(),
         LumberjackConsoleDriverModule.forRoot({
-          levels: [LumberjackLevel.Verbose],
+          levels: ['verbose'],
           identifier: LumberjackConsoleDriver.driverIdentifier,
         }),
       ],
@@ -38,7 +37,7 @@ describe(LumberjackConsoleDriver.name, () => {
   let spyLogger: SpyConsole;
 
   it("logs the critical level to the console's error channel", () => {
-    const expectedMessage = LumberjackLevel.Critical;
+    const expectedMessage = 'critical';
     const expectedLog = logFactory.createCriticalLog(expectedMessage).build();
 
     driver.logCritical({ formattedLog: expectedMessage, log: expectedLog });
@@ -48,7 +47,7 @@ describe(LumberjackConsoleDriver.name, () => {
   });
 
   it("logs the debug level to the console's debug channel", () => {
-    const expectedMessage = LumberjackLevel.Debug;
+    const expectedMessage = 'debug';
     const expectedLog = logFactory.createDebugLog(expectedMessage).build();
 
     driver.logDebug({ formattedLog: expectedMessage, log: expectedLog });
@@ -58,7 +57,7 @@ describe(LumberjackConsoleDriver.name, () => {
   });
 
   it("logs the error level to the console's error channel", () => {
-    const expectedMessage = LumberjackLevel.Error;
+    const expectedMessage = 'error';
     const expectedLog = logFactory.createErrorLog(expectedMessage).build();
 
     driver.logError({ formattedLog: expectedMessage, log: expectedLog });
@@ -68,7 +67,7 @@ describe(LumberjackConsoleDriver.name, () => {
   });
 
   it("logs the info level to the console's info channel", () => {
-    const expectedMessage = LumberjackLevel.Info;
+    const expectedMessage = 'info';
     const expectedLog = logFactory.createInfoLog(expectedMessage).build();
 
     driver.logInfo({ formattedLog: expectedMessage, log: expectedLog });
@@ -78,7 +77,7 @@ describe(LumberjackConsoleDriver.name, () => {
   });
 
   it("logs the trace level to the console's trace channel", () => {
-    const expectedMessage = LumberjackLevel.Trace;
+    const expectedMessage = 'trace';
     const expectedLog = logFactory.createTraceLog(expectedMessage).build();
 
     driver.logTrace({ formattedLog: expectedMessage, log: expectedLog });
@@ -88,7 +87,7 @@ describe(LumberjackConsoleDriver.name, () => {
   });
 
   it("logs the warning level to the console's warn channel", () => {
-    const expectedMessage = LumberjackLevel.Warning;
+    const expectedMessage = 'warn';
     const expectedLog = logFactory.createWarningLog(expectedMessage).build();
 
     driver.logWarning({ formattedLog: expectedMessage, log: expectedLog });

diff --git a/...worker/lumberjack/http-driver/src/lib/configuration/lumberjack-http-driver.module.spec.ts b/...worker/lumberjack/http-driver/src/lib/configuration/lumberjack-http-driver.module.spec.ts
@@ -2,8 +2,8 @@ import { TestBed } from '@angular/core/testing';
 
 import { expectNgModuleToBeGuardedAgainstDirectImport } from '@internal/test-util';
 import {
+  ConfigLevels,
   LumberjackConfigLevels,
-  LumberjackLevel,
   LumberjackLogDriver,
   lumberjackLogDriverToken,
   LumberjackModule,
@@ -17,7 +17,7 @@ import { LumberjackHttpDriverModule } from './lumberjack-http-driver.module';
 import { LumberjackHttpDriverOptions } from './lumberjack-http-driver.options';
 
 function createHttpOptions(
-  extraOptions: { levels?: LumberjackConfigLevels; identifier?: string } = {}
+  extraOptions: { levels?: LumberjackConfigLevels | ConfigLevels; identifier?: string } = {}
 ): LumberjackHttpDriverOptions {
   return {
     origin: 'TEST_MODULE',
@@ -27,7 +27,10 @@ function createHttpOptions(
   };
 }
 
-function createHttpConfig(levels: LumberjackConfigLevels, identifier?: string): LumberjackHttpDriverConfig {
+function createHttpConfig(
+  levels: LumberjackConfigLevels | ConfigLevels,
+  identifier?: string
+): LumberjackHttpDriverConfig {
   const config = {
     levels,
     origin: 'TEST_MODULE',
@@ -51,7 +54,7 @@ const createHttpDriver = (
     config: LumberjackHttpDriverConfig;
     isLumberjackModuleImportedFirst?: boolean;
   } = {
-    config: createHttpConfig([LumberjackLevel.Verbose], LumberjackHttpDriver.driverIdentifier),
+    config: createHttpConfig(['verbose'], LumberjackHttpDriver.driverIdentifier),
   }
 ) => {
   TestBed.configureTestingModule({
@@ -102,7 +105,7 @@ describe(LumberjackHttpDriverModule.name, () => {
     });
 
     it('registers the specified log driver configuration WITH a specified identifier', () => {
-      const expectedConfig = createHttpConfig([LumberjackLevel.Error], 'TestDriverIdentifier');
+      const expectedConfig = createHttpConfig(['error'], 'TestDriverIdentifier');
 
       const httpDriver = createHttpDriver({ config: expectedConfig });
 
@@ -111,7 +114,7 @@ describe(LumberjackHttpDriverModule.name, () => {
     });
 
     it('registers the specified log driver configuration WITHOUT a specified identifier', () => {
-      const config = createHttpConfig([LumberjackLevel.Error]);
+      const config = createHttpConfig(['error']);
       const expectedConfig = { ...config, identifier: LumberjackHttpDriver.driverIdentifier };
       const httpDriver = createHttpDriver({ config });
 
@@ -120,7 +123,7 @@ describe(LumberjackHttpDriverModule.name, () => {
     });
 
     it('does register the specified log driver configuration when the lumberjack module is imported after the http driver module', () => {
-      const expectedConfig = createHttpConfig([LumberjackLevel.Debug], 'TestDriverIdentifier');
+      const expectedConfig = createHttpConfig(['debug'], 'TestDriverIdentifier');
 
       const httpDriver = createHttpDriver({
         config: expectedConfig,
@@ -147,14 +150,14 @@ describe(LumberjackHttpDriverModule.name, () => {
       const actualConfig = httpDriver.config;
       const expectedConfig: LumberjackHttpDriverInternalConfig = {
         ...options,
-        levels: [LumberjackLevel.Verbose],
+        levels: ['verbose'],
         identifier: 'LumberjackHttpDriver',
       };
       expect(actualConfig).toEqual(expectedConfig);
     });
 
     it('registers the specified options with custom levels', () => {
-      const customLevels: LumberjackConfigLevels = [LumberjackLevel.Critical];
+      const customLevels: ConfigLevels = ['critical'];
       const options = createHttpOptions({ levels: customLevels });
 
       const httpDriver = createHttpDriverWithOptions({ options });
@@ -177,7 +180,7 @@ describe(LumberjackHttpDriverModule.name, () => {
       const actualConfig = httpDriver.config;
       const expectedConfig: LumberjackHttpDriverInternalConfig = {
         ...options,
-        levels: [LumberjackLevel.Verbose],
+        levels: ['verbose'],
         identifier: customIdentifier,
       };
       expect(actualConfig).toEqual(expectedConfig);
@@ -189,7 +192,7 @@ describe(LumberjackHttpDriverModule.name, () => {
       const httpDriver = createHttpDriverWithOptions({ options });
 
       const { levels, identifier } = httpDriver.config;
-      expect(levels).toEqual([LumberjackLevel.Verbose]);
+      expect(levels).toEqual(['verbose']);
       expect(identifier).toEqual(LumberjackHttpDriver.driverIdentifier);
     });
 
@@ -204,7 +207,7 @@ describe(LumberjackHttpDriverModule.name, () => {
       const actualConfig = httpDriver.config;
       const expectedConfig: LumberjackHttpDriverInternalConfig = {
         ...options,
-        levels: [LumberjackLevel.Verbose],
+        levels: ['verbose'],
         identifier: LumberjackHttpDriver.driverIdentifier,
       };
       expect(actualConfig).toEqual(expectedConfig);