From e8cc105bc6381f5be5d15feb23be90ac56db08c7 Mon Sep 17 00:00:00 2001 From: "e.zbarskaya" Date: Tue, 4 Jun 2019 12:50:51 +0300 Subject: [PATCH 1/4] feat: add injector service --- README.md | 12 +++++----- helpers/test.component.ts | 4 ++-- projects/logger/package.json | 2 +- .../src/lib/decorators/debug.decorator.ts | 5 ++-- .../src/lib/decorators/error.decorator.ts | 5 ++-- .../src/lib/decorators/groups/group.common.ts | 6 ++--- .../src/lib/decorators/info.decorator.ts | 5 ++-- .../src/lib/decorators/log.decorator.ts | 7 +++--- .../src/lib/decorators/logger.decorator.ts | 4 ++-- .../src/lib/decorators/timer.decorator.ts | 11 ++++++--- .../src/lib/decorators/trace.decorator.ts | 5 ++-- .../src/lib/decorators/warn.decorator.ts | 5 ++-- projects/logger/src/lib/logger.injector.ts | 18 +++++++++++++++ projects/logger/src/lib/logger.module.ts | 23 ++++++------------- projects/logger/src/lib/logger.options.ts | 4 ---- projects/logger/src/public-api.ts | 3 ++- projects/logger/tsconfig.lib.json | 8 +++---- src/app/app.component.ts | 4 ++-- tsconfig.json | 2 +- 19 files changed, 75 insertions(+), 58 deletions(-) create mode 100644 projects/logger/src/lib/logger.injector.ts diff --git a/README.md b/README.md index d705f52..62b453a 100644 --- a/README.md +++ b/README.md @@ -462,7 +462,7 @@ export class AppComponent implements OnInit { ### Example: decorators ```typescript -import { LoggerService, Logger, DebugLog, TraceLog, InfoLog, WarnLog, ErrorLog, Log, LogFn } from '@angular-ru/logger'; +import { LoggerService, Logger, DebugLog, TraceLog, InfoLog, WarnLog, ErrorLog, LoggerLog, LogFn } from '@angular-ru/logger'; export class AppComponent { @Logger() public logger: LoggerService; @@ -471,7 +471,7 @@ export class AppComponent { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @Log() public log: LogFn; + @LoggerLog() public log: LogFn; private readonly traceIsWork: string = 'trace is worked'; private readonly debugIsWork: string = 'debug is worked'; @@ -518,10 +518,10 @@ export class AppComponent { ### Example: decorator group with function title ```typescript -import { Log, LogFn, Group } from '@angular-ru/logger'; +import { LoggerLog, LogFn, Group } from '@angular-ru/logger'; export class AppComponent { - @Log() public log: LogFn; + @LoggerLog() public log: LogFn; @Group((name: string) => `Test group with ${name}`) public method(name: string): string { @@ -540,9 +540,9 @@ export class AppComponent { ### Example: timer decorator ```typescript -import { Log, LogFn, TimerLog, LoggerLevel, LoggerService, Logger } from '@angular-ru/logger'; +import { LoggerLog, LogFn, TimerLog, LoggerLevel, LoggerService, Logger } from '@angular-ru/logger'; export class AppComponent { - @Log() public log: LogFn; + @LoggerLog() public log: LogFn; @Logger() public logger: LoggerService; @TimerLog('Test timer') diff --git a/helpers/test.component.ts b/helpers/test.component.ts index 77f082a..5410884 100644 --- a/helpers/test.component.ts +++ b/helpers/test.component.ts @@ -6,7 +6,7 @@ import { TraceLog } from '../projects/logger/src/lib/decorators/trace.decorator' import { InfoLog } from '../projects/logger/src/lib/decorators/info.decorator'; import { ErrorLog } from '../projects/logger/src/lib/decorators/error.decorator'; import { WarnLog } from '../projects/logger/src/lib/decorators/warn.decorator'; -import { Log } from '../projects/logger/src/lib/decorators/log.decorator'; +import { LoggerLog } from '../projects/logger/src/lib/decorators/log.decorator'; import { Group } from '../projects/logger/src/lib/decorators/groups/group.decorator'; import { GroupCollapsed } from '../projects/logger/src/lib/decorators/groups/group-collapsed.decorator'; import { LoggerLevel } from '../projects/logger/src/lib/logger.config'; @@ -22,7 +22,7 @@ export class MyTestComponent implements OnInit { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @Log() public log: LogFn; + @LoggerLog() public log: LogFn; public count: number = 0; public hook: string; diff --git a/projects/logger/package.json b/projects/logger/package.json index 43b65e3..ce146ee 100644 --- a/projects/logger/package.json +++ b/projects/logger/package.json @@ -1,6 +1,6 @@ { "name": "@angular-ru/logger", - "version": "1.3.0", + "version": "1.4.0", "license": "MIT", "homepage": "https://github.com/Angular-RU/angular-logger", "repository": "https://github.com/Angular-RU/angular-logger", diff --git a/projects/logger/src/lib/decorators/debug.decorator.ts b/projects/logger/src/lib/decorators/debug.decorator.ts index f203a57..e2c86d9 100644 --- a/projects/logger/src/lib/decorators/debug.decorator.ts +++ b/projects/logger/src/lib/decorators/debug.decorator.ts @@ -1,14 +1,15 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function DebugLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().debug; + return LoggerInjector.getInjector().get(LoggerService).debug; } }); }; diff --git a/projects/logger/src/lib/decorators/error.decorator.ts b/projects/logger/src/lib/decorators/error.decorator.ts index 28d47ac..ff0f835 100644 --- a/projects/logger/src/lib/decorators/error.decorator.ts +++ b/projects/logger/src/lib/decorators/error.decorator.ts @@ -1,13 +1,14 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function ErrorLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().error; + return LoggerInjector.getInjector().get(LoggerService).error; } }); }; diff --git a/projects/logger/src/lib/decorators/groups/group.common.ts b/projects/logger/src/lib/decorators/groups/group.common.ts index 9e2c0cc..86c9d2b 100644 --- a/projects/logger/src/lib/decorators/groups/group.common.ts +++ b/projects/logger/src/lib/decorators/groups/group.common.ts @@ -3,7 +3,7 @@ import { LoggerService } from '../../logger.service'; import { GroupLevel, LoggerLevel } from '../../logger.config'; import { Any, Callback, Fn, GroupMethod } from '../../logger.interfaces'; import { GroupFactory } from '../../services/group-factory.service'; -import { LoggerModule } from '../../logger.module'; +import { LoggerInjector } from '../../logger.injector'; export function groupDecoratorFactory( level: LoggerLevel, @@ -14,8 +14,8 @@ export function groupDecoratorFactory( target: Type ): unknown { let result: unknown; - const logger: LoggerService = LoggerModule.logger(); - const groupFactory: GroupFactory = LoggerModule.groupFactory(); + const logger: LoggerService = LoggerInjector.getInjector().get(LoggerService); + const groupFactory: GroupFactory = LoggerInjector.getInjector().get(GroupFactory); const groupMethod: GroupMethod = groupFactory[groupType].bind(groupFactory); const label: string = typeof title === 'string' ? title : title(...args); diff --git a/projects/logger/src/lib/decorators/info.decorator.ts b/projects/logger/src/lib/decorators/info.decorator.ts index 67ae043..f8df1ab 100644 --- a/projects/logger/src/lib/decorators/info.decorator.ts +++ b/projects/logger/src/lib/decorators/info.decorator.ts @@ -1,14 +1,15 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function InfoLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().info; + return LoggerInjector.getInjector().get(LoggerService).info; } }); }; diff --git a/projects/logger/src/lib/decorators/log.decorator.ts b/projects/logger/src/lib/decorators/log.decorator.ts index 6361337..349aa10 100644 --- a/projects/logger/src/lib/decorators/log.decorator.ts +++ b/projects/logger/src/lib/decorators/log.decorator.ts @@ -1,14 +1,15 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; -export function Log(): PropertyDecorator { +export function LoggerLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().log; + return LoggerInjector.getInjector().get(LoggerService).log; } }); }; diff --git a/projects/logger/src/lib/decorators/logger.decorator.ts b/projects/logger/src/lib/decorators/logger.decorator.ts index 30e5c47..4c51715 100644 --- a/projects/logger/src/lib/decorators/logger.decorator.ts +++ b/projects/logger/src/lib/decorators/logger.decorator.ts @@ -1,14 +1,14 @@ import { Type } from '@angular/core'; import { LoggerService } from '../logger.service'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; export function Logger(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LoggerService { - return LoggerModule.logger(); + return LoggerInjector.getInjector().get(LoggerService); } }); }; diff --git a/projects/logger/src/lib/decorators/timer.decorator.ts b/projects/logger/src/lib/decorators/timer.decorator.ts index 58a7529..61932d4 100644 --- a/projects/logger/src/lib/decorators/timer.decorator.ts +++ b/projects/logger/src/lib/decorators/timer.decorator.ts @@ -2,7 +2,8 @@ import { Type } from '@angular/core'; import { LoggerLevel } from '../logger.config'; import { Any, DecoratorMethod, Fn, TimerInfo, TimerLevels } from '../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function TimerLog( title: string, @@ -13,9 +14,13 @@ export function TimerLog( let result: PropertyDescriptor; const method: Fn = descriptor.value; descriptor.value = function(...args: Any[]): PropertyDescriptor { - const info: TimerInfo | null = LoggerModule.logger().startTime(title, level); + const info: TimerInfo | null = LoggerInjector.getInjector() + .get(LoggerService) + .startTime(title, level); result = method.apply(this, args); - LoggerModule.logger().endTime(info, level, isMillisecond); + LoggerInjector.getInjector() + .get(LoggerService) + .endTime(info, level, isMillisecond); return result; }; return descriptor; diff --git a/projects/logger/src/lib/decorators/trace.decorator.ts b/projects/logger/src/lib/decorators/trace.decorator.ts index f748b5b..e4d048c 100644 --- a/projects/logger/src/lib/decorators/trace.decorator.ts +++ b/projects/logger/src/lib/decorators/trace.decorator.ts @@ -1,14 +1,15 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function TraceLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().trace; + return LoggerInjector.getInjector().get(LoggerService).trace; } }); }; diff --git a/projects/logger/src/lib/decorators/warn.decorator.ts b/projects/logger/src/lib/decorators/warn.decorator.ts index d497f0b..f85fe0e 100644 --- a/projects/logger/src/lib/decorators/warn.decorator.ts +++ b/projects/logger/src/lib/decorators/warn.decorator.ts @@ -1,14 +1,15 @@ import { Type } from '@angular/core'; import { LogFn } from './../logger.interfaces'; -import { LoggerModule } from '../logger.module'; +import { LoggerInjector } from '../logger.injector'; +import { LoggerService } from '../logger.service'; export function WarnLog(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, get(): LogFn { - return LoggerModule.logger().warn; + return LoggerInjector.getInjector().get(LoggerService).warn; } }); }; diff --git a/projects/logger/src/lib/logger.injector.ts b/projects/logger/src/lib/logger.injector.ts new file mode 100644 index 0000000..6b21afe --- /dev/null +++ b/projects/logger/src/lib/logger.injector.ts @@ -0,0 +1,18 @@ +import { Injectable, Injector } from '@angular/core'; + +@Injectable() +export class LoggerInjector { + private static injector: Injector | null = null; + + constructor(injector: Injector) { + LoggerInjector.injector = injector; + } + + public static getInjector(): never | Injector { + if (!LoggerInjector.injector) { + throw new Error(`You've forgotten to import \`LoggerModule\``); + } + + return LoggerInjector.injector; + } +} diff --git a/projects/logger/src/lib/logger.module.ts b/projects/logger/src/lib/logger.module.ts index c152b78..4ecafe8 100644 --- a/projects/logger/src/lib/logger.module.ts +++ b/projects/logger/src/lib/logger.module.ts @@ -1,4 +1,4 @@ -import { InjectionToken, Injector, ModuleWithProviders, NgModule } from '@angular/core'; +import { InjectionToken, ModuleWithProviders, NgModule, Self } from '@angular/core'; import { LoggerService } from './logger.service'; import { LoggerFactory } from './services/factory.service'; @@ -10,6 +10,7 @@ import { JsonFactory } from './services/json-factory.service'; import { ClipboardFactory } from './services/clipboard-factory.service'; import { TimerFactory } from './services/timer-factory.service'; import { LoggerOptionsImpl } from './logger.options'; +import { LoggerInjector } from './logger.injector'; @NgModule({ providers: [ @@ -20,24 +21,14 @@ import { LoggerOptionsImpl } from './logger.options'; CssFactory, JsonFactory, ClipboardFactory, - TimerFactory + TimerFactory, + LoggerInjector ] }) export class LoggerModule { - public static injector: Injector = undefined; private static readonly ROOT_OPTIONS: InjectionToken = new InjectionToken('ROOT_OPTIONS'); - constructor(injector: Injector) { - LoggerModule.injector = injector; - } - - public static logger(): LoggerService { - return LoggerModule.injector.get(LoggerService); - } - - public static groupFactory(): GroupFactory { - return LoggerModule.injector.get(GroupFactory); - } + constructor(@Self() public loggerInjector: LoggerInjector) {} public static forRoot(config: Partial = {}): ModuleWithProviders { return { @@ -56,7 +47,7 @@ export class LoggerModule { }; } - private static loggerConfigFactory(config: Partial): unknown { - return new LoggerOptionsImpl().options(config); + private static loggerConfigFactory(config: Partial): LoggerOptionsImpl { + return Object.assign(new LoggerOptionsImpl(), config); } } diff --git a/projects/logger/src/lib/logger.options.ts b/projects/logger/src/lib/logger.options.ts index 2512afa..3f302d0 100644 --- a/projects/logger/src/lib/logger.options.ts +++ b/projects/logger/src/lib/logger.options.ts @@ -24,8 +24,4 @@ export class LoggerOptionsImpl implements LoggerOptions { [LoggerLevel.WARN]: LABELS.WARN, [LoggerLevel.ERROR]: LABELS.ERROR }; - - public options(config: Partial): LoggerOptions { - return Object.assign(new LoggerOptionsImpl(), config); - } } diff --git a/projects/logger/src/public-api.ts b/projects/logger/src/public-api.ts index 12b2a0c..8f63732 100644 --- a/projects/logger/src/public-api.ts +++ b/projects/logger/src/public-api.ts @@ -9,8 +9,9 @@ export * from './lib/logger.interfaces'; export * from './lib/decorators/logger.decorator'; export * from './lib/decorators/trace.decorator'; export * from './lib/decorators/debug.decorator'; -export * from './lib/decorators/info.decorator'; export * from './lib/decorators/error.decorator'; +export * from './lib/decorators/log.decorator'; +export * from './lib/decorators/info.decorator'; export * from './lib/decorators/warn.decorator'; export * from './lib/decorators/groups/group.decorator'; export * from './lib/decorators/timer.decorator'; diff --git a/projects/logger/tsconfig.lib.json b/projects/logger/tsconfig.lib.json index 656264a..7e62d1f 100644 --- a/projects/logger/tsconfig.lib.json +++ b/projects/logger/tsconfig.lib.json @@ -17,12 +17,12 @@ "lib": ["dom", "es2018"] }, "angularCompilerOptions": { - "annotateForClosureCompiler": true, - "skipTemplateCodegen": true, - "strictMetadataEmit": true, "fullTemplateTypeCheck": true, + "annotateForClosureCompiler": true, "strictInjectionParameters": true, - "enableResourceInlining": true + "skipTemplateCodegen": true, + "preserveWhitespaces": true, + "skipMetadataEmit": true }, "exclude": ["**/*.spec.ts"] } diff --git a/src/app/app.component.ts b/src/app/app.component.ts index f0e2b42..a48e75b 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,13 +8,13 @@ import { LogFn, Logger, LoggerLevel, + LoggerLog, LoggerService, TimerLog, TraceLog, WarnLog } from '@angular-ru/logger'; import * as devtools from 'devtools-detect'; -import { Log } from '../../projects/logger/src/lib/decorators/log.decorator'; @Component({ selector: 'app-root', @@ -29,7 +29,7 @@ export class AppComponent implements OnInit { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @Log() public log: LogFn; + @LoggerLog() public log: LogFn; public isLoaded: boolean; public devToolsIsOpen: boolean = devtools.isOpen; diff --git a/tsconfig.json b/tsconfig.json index dc3bc3b..cb51624 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,7 +18,7 @@ "typeRoots": ["node_modules/@types"], "lib": ["es2018", "dom"], "paths": { - "@angular-ru/logger": ["./projects/logger/src/public-api"] + "@angular-ru/logger": ["./dist/logger"] } } } From 243b6d29aed845bf9f20dde07967c1a4ebd9f791 Mon Sep 17 00:00:00 2001 From: "e.zbarskaya" Date: Tue, 4 Jun 2019 12:58:05 +0300 Subject: [PATCH 2/4] refactor: change log decorator --- projects/logger/src/lib/decorators/log.decorator.ts | 2 +- src/app/app.component.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/logger/src/lib/decorators/log.decorator.ts b/projects/logger/src/lib/decorators/log.decorator.ts index 349aa10..300d722 100644 --- a/projects/logger/src/lib/decorators/log.decorator.ts +++ b/projects/logger/src/lib/decorators/log.decorator.ts @@ -4,7 +4,7 @@ import { LogFn } from './../logger.interfaces'; import { LoggerInjector } from '../logger.injector'; import { LoggerService } from '../logger.service'; -export function LoggerLog(): PropertyDecorator { +export function Log(): PropertyDecorator { return (target: Type, propertyName: string): void => { Object.defineProperty(target, propertyName, { configurable: false, diff --git a/src/app/app.component.ts b/src/app/app.component.ts index a48e75b..70594b5 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,7 +8,7 @@ import { LogFn, Logger, LoggerLevel, - LoggerLog, + Log, LoggerService, TimerLog, TraceLog, @@ -29,7 +29,7 @@ export class AppComponent implements OnInit { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @LoggerLog() public log: LogFn; + @Log() public log: LogFn; public isLoaded: boolean; public devToolsIsOpen: boolean = devtools.isOpen; From 1fe64559a1c5011bc5fa7bcfd78321c16d129f35 Mon Sep 17 00:00:00 2001 From: "e.zbarskaya" Date: Tue, 4 Jun 2019 12:58:28 +0300 Subject: [PATCH 3/4] test: change path --- projects/logger/tests/decorators.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/logger/tests/decorators.spec.ts b/projects/logger/tests/decorators.spec.ts index 8ad35c7..e115b92 100644 --- a/projects/logger/tests/decorators.spec.ts +++ b/projects/logger/tests/decorators.spec.ts @@ -4,7 +4,7 @@ import { LoggerService } from '../src/lib/logger.service'; import { MyTestComponent } from '../../../helpers/test.component'; import { LoggerLevel } from '../src/lib/logger.config'; import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { Fn } from '@angular-ru/logger'; +import { Fn } from '../src/lib/logger.interfaces'; describe('[TEST]: Decorator API', () => { let logger: LoggerService; From 0cb16bd142070880b1b227c4935a7533f9dda9fa Mon Sep 17 00:00:00 2001 From: "e.zbarskaya" Date: Tue, 4 Jun 2019 12:59:27 +0300 Subject: [PATCH 4/4] test: small fix --- README.md | 12 ++++++------ helpers/test.component.ts | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 62b453a..d705f52 100644 --- a/README.md +++ b/README.md @@ -462,7 +462,7 @@ export class AppComponent implements OnInit { ### Example: decorators ```typescript -import { LoggerService, Logger, DebugLog, TraceLog, InfoLog, WarnLog, ErrorLog, LoggerLog, LogFn } from '@angular-ru/logger'; +import { LoggerService, Logger, DebugLog, TraceLog, InfoLog, WarnLog, ErrorLog, Log, LogFn } from '@angular-ru/logger'; export class AppComponent { @Logger() public logger: LoggerService; @@ -471,7 +471,7 @@ export class AppComponent { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @LoggerLog() public log: LogFn; + @Log() public log: LogFn; private readonly traceIsWork: string = 'trace is worked'; private readonly debugIsWork: string = 'debug is worked'; @@ -518,10 +518,10 @@ export class AppComponent { ### Example: decorator group with function title ```typescript -import { LoggerLog, LogFn, Group } from '@angular-ru/logger'; +import { Log, LogFn, Group } from '@angular-ru/logger'; export class AppComponent { - @LoggerLog() public log: LogFn; + @Log() public log: LogFn; @Group((name: string) => `Test group with ${name}`) public method(name: string): string { @@ -540,9 +540,9 @@ export class AppComponent { ### Example: timer decorator ```typescript -import { LoggerLog, LogFn, TimerLog, LoggerLevel, LoggerService, Logger } from '@angular-ru/logger'; +import { Log, LogFn, TimerLog, LoggerLevel, LoggerService, Logger } from '@angular-ru/logger'; export class AppComponent { - @LoggerLog() public log: LogFn; + @Log() public log: LogFn; @Logger() public logger: LoggerService; @TimerLog('Test timer') diff --git a/helpers/test.component.ts b/helpers/test.component.ts index 5410884..77f082a 100644 --- a/helpers/test.component.ts +++ b/helpers/test.component.ts @@ -6,7 +6,7 @@ import { TraceLog } from '../projects/logger/src/lib/decorators/trace.decorator' import { InfoLog } from '../projects/logger/src/lib/decorators/info.decorator'; import { ErrorLog } from '../projects/logger/src/lib/decorators/error.decorator'; import { WarnLog } from '../projects/logger/src/lib/decorators/warn.decorator'; -import { LoggerLog } from '../projects/logger/src/lib/decorators/log.decorator'; +import { Log } from '../projects/logger/src/lib/decorators/log.decorator'; import { Group } from '../projects/logger/src/lib/decorators/groups/group.decorator'; import { GroupCollapsed } from '../projects/logger/src/lib/decorators/groups/group-collapsed.decorator'; import { LoggerLevel } from '../projects/logger/src/lib/logger.config'; @@ -22,7 +22,7 @@ export class MyTestComponent implements OnInit { @InfoLog() public info: LogFn; @ErrorLog() public error: LogFn; @WarnLog() public warn: LogFn; - @LoggerLog() public log: LogFn; + @Log() public log: LogFn; public count: number = 0; public hook: string;