Develop

helpers/console-fake.ts

@@ -18,6 +18,7 @@ export enum TestLoggerGroupType {
 }
 
 export class ConsoleFake implements Console {
+    // tslint:disable-next-line:no-any
     public Console: any;
     private _stack: ObjectKeyMap[] = [];
 
@@ -40,7 +41,7 @@ export class ConsoleFake implements Console {
         }
     }
 
-    public table(data: any): void {
+    public table(data: unknown): void {
         this._stack.push({ [TestLoggerLineType.TABLE]: [data] });
     }
 
@@ -100,7 +101,7 @@ export class ConsoleFake implements Console {
         const stackList: string[] = this.stackList(this.stack(0));
         const stackOptionsList: ObjectKeyMap = [];
 
-        stackList.forEach((line: any) => {
+        stackList.forEach((line: string) => {
             stackOptionsList.push({
                 label: String(line[0]).replace('%c', ''),
                 styles: this.parseCssString(line[usageNext ? 2 : 1])

helpers/test.component.ts

@@ -10,7 +10,7 @@ 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';
-import { LogFn, TimerInfo } from '../projects/logger/src/lib/logger.interfaces';
+import { Fn, LogFn, TimerInfo } from '../projects/logger/src/lib/logger.interfaces';
 import { TimerLog } from '../projects/logger/src/lib/decorators/timer.decorator';
 
 // noinspection AngularMissingOrInvalidDeclarationInModule
@@ -76,11 +76,11 @@ export class MyTestComponent implements OnInit {
     }
 
     @TimerLog('longQueryBySecond', LoggerLevel.INFO, false)
-    public longQueryBySecond(seconds: number, done: any): void {
+    public longQueryBySecond(seconds: number, done: Fn): void {
         this.extracted(seconds, done);
     }
 
-    public longQueryBySecondMs(seconds: number, done: any): void {
+    public longQueryBySecondMs(seconds: number, done: Fn): void {
         const info: TimerInfo = this.logger.startTime('longQueryBySecondMs');
         this.extracted(seconds, done);
         this.logger.endTime(info);
@@ -91,7 +91,7 @@ export class MyTestComponent implements OnInit {
         throw new Error('error');
     }
 
-    private extracted(seconds: number, done: any): void {
+    private extracted(seconds: number, done: Fn): void {
         const e: number = new Date().getTime() + seconds * 1000;
         while (new Date().getTime() <= e) {
             this.doneHeavy = true;

projects/logger/src/lib/decorators/debug.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LogFn } from './../logger.interfaces';
 import { LoggerModule } from './../logger.module';
-import { Type } from '@angular/core';
 
 export function DebugLog(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.debug;
+                return LoggerModule.logger().debug;
             }
         });
     };

projects/logger/src/lib/decorators/error.decorator.ts

@@ -7,7 +7,7 @@ export function ErrorLog(): PropertyDecorator {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.error;
+                return LoggerModule.logger().error;
             }
         });
     };

projects/logger/src/lib/decorators/groups/group-collapsed.decorator.ts

@@ -1,7 +1,8 @@
+import { Type } from '@angular/core';
+
 import { GroupLevel, LoggerLevel } from '../../logger.config';
 import { groupDecoratorFactory } from './group.common';
 import { Any, Callback, DecoratorMethod } from '../../logger.interfaces';
-import { Type } from '@angular/core';
 
 export function GroupCollapsed(
     title: string | Callback<string>,

projects/logger/src/lib/decorators/groups/group.common.ts

@@ -1,10 +1,10 @@
+import { Type } from '@angular/core';
+
 import { LoggerModule } from '../../logger.module';
 import { LoggerService } from '../../logger.service';
 import { LoggerLevel, GroupLevel } from '../../logger.config';
 import { Any, Callback, Fn, GroupMethod } from '../../logger.interfaces';
-
 import { GroupFactory } from '../../services/group-factory.service';
-import { Type } from '@angular/core';
 
 export function groupDecoratorFactory(
     level: LoggerLevel,
@@ -15,8 +15,8 @@ export function groupDecoratorFactory(
     target: Type<unknown>
 ): unknown {
     let result: unknown;
-    const logger: LoggerService = LoggerModule.logger;
-    const groupFactory: GroupFactory = LoggerModule.groupFactory;
+    const logger: LoggerService = LoggerModule.logger();
+    const groupFactory: GroupFactory = LoggerModule.groupFactory();
     const groupMethod: GroupMethod = groupFactory[groupType].bind(groupFactory);
     const label: string = typeof title === 'string' ? title : title(...args);
 

projects/logger/src/lib/decorators/groups/group.decorator.ts

@@ -1,7 +1,8 @@
+import { Type } from '@angular/core';
+
 import { GroupLevel, LoggerLevel } from '../../logger.config';
 import { groupDecoratorFactory } from './group.common';
 import { Any, Callback, DecoratorMethod } from '../../logger.interfaces';
-import { Type } from '@angular/core';
 
 export function Group(title: string | Callback<string>, level: LoggerLevel = LoggerLevel.INFO): DecoratorMethod {
     return (_target: Type<unknown>, _key: string, descriptor: PropertyDescriptor): PropertyDescriptor => {

projects/logger/src/lib/decorators/info.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LogFn } from './../logger.interfaces';
 import { LoggerModule } from './../logger.module';
-import { Type } from '@angular/core';
 
 export function InfoLog(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.info;
+                return LoggerModule.logger().info;
             }
         });
     };

projects/logger/src/lib/decorators/log.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LogFn } from './../logger.interfaces';
 import { LoggerModule } from './../logger.module';
-import { Type } from '@angular/core';
 
 export function Log(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.log;
+                return LoggerModule.logger().log;
             }
         });
     };

projects/logger/src/lib/decorators/logger.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LoggerModule } from '../logger.module';
 import { LoggerService } from '../logger.service';
-import { Type } from '@angular/core';
 
 export function Logger(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LoggerService {
-                return LoggerModule.logger;
+                return LoggerModule.logger();
             }
         });
     };

projects/logger/src/lib/decorators/timer.decorator.ts

@@ -1,7 +1,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 { Type } from '@angular/core';
 
 export function TimerLog(
     title: string,
@@ -12,9 +13,9 @@ 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 = LoggerModule.logger().startTime(title, level);
             result = method.apply(this, args);
-            LoggerModule.logger.endTime(info, level, isMillisecond);
+            LoggerModule.logger().endTime(info, level, isMillisecond);
             return result;
         };
         return descriptor;

projects/logger/src/lib/decorators/trace.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LogFn } from './../logger.interfaces';
 import { LoggerModule } from './../logger.module';
-import { Type } from '@angular/core';
 
 export function TraceLog(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.trace;
+                return LoggerModule.logger().trace;
             }
         });
     };

projects/logger/src/lib/decorators/warn.decorator.ts

@@ -1,13 +1,14 @@
+import { Type } from '@angular/core';
+
 import { LogFn } from './../logger.interfaces';
 import { LoggerModule } from './../logger.module';
-import { Type } from '@angular/core';
 
 export function WarnLog(): PropertyDecorator {
     return (target: Type<unknown>, propertyName: string): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
-                return LoggerModule.logger.warn;
+                return LoggerModule.logger().warn;
             }
         });
     };

projects/logger/src/lib/logger.interfaces.ts

@@ -28,6 +28,7 @@ export interface ObjectKeyMap<T = Any> {
     [key: string]: T;
 }
 
+// tslint:disable-next-line:no-any
 export type Any = any; // NOSONAR
 
 export type DecoratorMethod = (target: Any, key: string, descriptor: PropertyDescriptor) => PropertyDescriptor;

projects/logger/src/lib/logger.module.ts

@@ -1,4 +1,5 @@
 import { Injector, ModuleWithProviders, NgModule } from '@angular/core';
+
 import { LoggerService } from './logger.service';
 import { LoggerFactory } from './services/factory.service';
 import { ConsoleService } from './services/console.service';
@@ -31,18 +32,20 @@ import { TimerFactory } from './services/timer-factory.service';
         TimerFactory
     ]
 })
+
+// @dynamic
 export class LoggerModule {
-    private static injector: Injector;
+    private static injector: Injector = undefined;
 
     constructor(injector: Injector) {
         LoggerModule.injector = injector;
     }
 
-    public static get logger(): LoggerService {
+    public static logger(): LoggerService {
         return LoggerModule.injector.get(LoggerService);
     }
 
-    public static get groupFactory(): GroupFactory {
+    public static groupFactory(): GroupFactory {
         return LoggerModule.injector.get(GroupFactory);
     }
 

projects/logger/tests/clipboard.spec.ts

@@ -10,7 +10,7 @@ describe('[TEST]: Check clipboard', () => {
     const fakeConsole: Console & ConsoleFake = new ConsoleFake();
     const textarea: Partial<HTMLTextAreaElement> = {
         textContent: null,
-        style: {} as any,
+        style: {} as CSSStyleDeclaration,
         select: (): void => {}
     };
 
@@ -28,7 +28,7 @@ describe('[TEST]: Check clipboard', () => {
 
     beforeEach(() => {
         buffer = null;
-        (window as any).clipboardData = null;
+        window.clipboardData = null;
         document.queryCommandSupported = null;
         textarea.textContent = null;
         document.execCommand = null;

projects/logger/tests/decorators.spec.ts

@@ -4,6 +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';
 
 describe('[TEST]: Decorator API', () => {
     let logger: LoggerService;
@@ -132,14 +133,14 @@ describe('[TEST]: Decorator API', () => {
         expect(fakeConsole.stack()).toEqual(fakeConsole.createStack());
     });
 
-    it('query by second timer', (done: any) => {
+    it('query by second timer', (done: Fn) => {
         component.longQueryBySecond(3, done);
         expect(fakeConsole.stack()).toEqual(
             fakeConsole.createStack({ info: ['TimerLog: longQueryBySecond', 'took 3s to execute'] })
         );
     });
 
-    it('query by ms timer', (done: any) => {
+    it('query by ms timer', (done: Fn) => {
         component.longQueryBySecondMs(3, done);
         expect(fakeConsole.stack().includes('TimerLog: longQueryBySecondMs')).toEqual(true);
     });

projects/logger/tsconfig.lib.json

@@ -17,12 +17,12 @@
         "lib": ["dom", "es2018"]
     },
     "angularCompilerOptions": {
-        "fullTemplateTypeCheck": false,
         "annotateForClosureCompiler": true,
+        "skipTemplateCodegen": true,
+        "strictMetadataEmit": true,
+        "fullTemplateTypeCheck": true,
         "strictInjectionParameters": true,
-        "skipTemplateCodegen": false,
-        "preserveWhitespaces": true,
-        "skipMetadataEmit": false
+        "enableResourceInlining": true
     },
     "exclude": ["**/*.spec.ts"]
 }

src/app/app.component.ts

@@ -172,7 +172,7 @@ export class AppComponent implements OnInit {
         this.logger.log(...this.logger.prettyJSON(jsonExample));
     }
 
-    public showExample7(): any {
+    public showExample7(): void {
         this.logger.clear();
 
         const example: string = 'test string';
@@ -181,7 +181,7 @@ export class AppComponent implements OnInit {
         this.logger.copy(example);
     }
 
-    public showExample8(): any {
+    public showExample8(): void {
         this.logger.clear();
         this.logger.level = LoggerLevel.INFO;
 

src/environments/environment.prod.ts

@@ -1,3 +1,4 @@
+// tslint:disable-next-line:no-any
 export const environment: any = {
     production: true,
     useConfig: true

src/environments/environment.ts

@@ -1,3 +1,4 @@
+// tslint:disable-next-line:no-any
 export const environment: any = {
     production: false,
     useConfig: true

src/main.ts

@@ -10,4 +10,4 @@ if (environment.production) {
 
 platformBrowserDynamic()
     .bootstrapModule(AppModule)
-    .catch((err: any) => console.error(err));
+    .catch((err: Error) => console.error(err));

tslint.json

@@ -102,6 +102,7 @@
             }
         ],
         "no-arg": true,
+        "no-any": true,
         "no-console": [true, "log", "debug", "info", "time", "timeEnd", "trace"],
         "no-construct": true,
         "no-debugger": true,