feat: add angular-ru tsconfig.json

splincode · splincode · commit 98cc12c6c64c · 2020-06-17T12:30:00.000+03:00
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ node_js:
 install:
   - npm install
 script:
-  - npm run lint
   - npm test
   - npm run build
 after_success:
diff --git a/helpers/console-fake.ts b/helpers/console-fake.ts
@@ -23,7 +23,7 @@ export class ConsoleFake implements Console {
     private _stack: ObjectKeyMap[] = [];
 
     public log(...args: string[]): void {
-        args.unshift(null, null);
+        args.unshift(null!, null!);
         this._stack.push({ [TestLoggerLineType.LOG]: args });
     }
 
@@ -74,8 +74,8 @@ export class ConsoleFake implements Console {
         history.forEach((line: object, index: number) => {
             for (const arg in line) {
                 if (line.hasOwnProperty(arg)) {
-                    const isArray: boolean = Array.isArray(line[arg]);
-                    history[index] = { [arg]: isArray ? line[arg].slice(withoutLabel) : line[arg] };
+                    const isArray: boolean = Array.isArray((line as any)[arg]);
+                    history[index] = { [arg]: isArray ? (line as any)[arg].slice(withoutLabel) : (line as any)[arg] };
                 }
             }
         });
diff --git a/helpers/test.component.ts b/helpers/test.component.ts
@@ -25,17 +25,17 @@ interface HttpDebugInterface {
 // noinspection AngularMissingOrInvalidDeclarationInModule
 @Component({ selector: 'lib-hello-test', template: '' })
 export class MyTestComponent implements OnInit {
-    @Logger() public logger: LoggerService;
-    @TraceLog() public trace: LogFn;
-    @DebugLog() public debug: LogFn;
-    @InfoLog() public info: LogFn;
-    @ErrorLog() public error: LogFn;
-    @WarnLog() public warn: LogFn;
-    @Log() public log: LogFn;
+    @Logger() public logger!: LoggerService;
+    @TraceLog() public trace!: LogFn;
+    @DebugLog() public debug!: LogFn;
+    @InfoLog() public info!: LogFn;
+    @ErrorLog() public error!: LogFn;
+    @WarnLog() public warn!: LogFn;
+    @Log() public log!: LogFn;
 
     public count: number = 0;
-    public hook: string;
-    public doneHeavy: boolean;
+    public hook: string | null = null;
+    public doneHeavy: boolean = false;
     public name: string = 'MockLoggerComponent';
 
     @Group('Test group')
@@ -101,7 +101,7 @@ export class MyTestComponent implements OnInit {
     }
 
     public longQueryBySecondMs(seconds: number, done: Fn): void {
-        const info: TimerInfo = this.logger.startTime('longQueryBySecondMs');
+        const info: TimerInfo | null = this.logger.startTime('longQueryBySecondMs');
         this.extracted(seconds, done);
         this.logger.endTime(info);
     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
         "start": "ng serve",
         "copy-readme": "ts-node --project tsconfig.tools.json ./tools/copy-readme",
         "build": "ng build logger && npm run copy-readme",
+        "build:app": "ng build",
         "build.meta": "echo 'prebuild'",
         "test": "jest --config ./jest.app.config.js --coverage",
         "lint": "ng lint",
@@ -36,8 +37,9 @@
         "zone.js": "~0.10.3"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^0.901.5",
-        "@angular-devkit/build-ng-packagr": "~0.901.5",
+        "@angular-ru/tsconfig": "^12.19.1",
+        "@angular-devkit/build-angular": "^0.803.27",
+        "@angular-devkit/build-ng-packagr": "~0.803.27",
         "@angular/cli": "~8.3.21",
         "@angular/compiler-cli": "~8.2.14",
         "@angular/language-service": "~8.2.14",
diff --git a/projects/logger/src/lib/decorators/autobind.decorator.ts b/projects/logger/src/lib/decorators/autobind.decorator.ts
@@ -84,7 +84,7 @@ export function autoBind(...args: Any[]): Any {
 }
 
 function createDefaultSetter(key: Any): Fn {
-    return function set(newValue: unknown): unknown {
+    return function set(this: any, newValue: unknown): unknown {
         Object.defineProperty(this, key, {
             configurable: true,
             writable: true,
diff --git a/projects/logger/src/lib/decorators/debug.decorator.ts b/projects/logger/src/lib/decorators/debug.decorator.ts
@@ -1,11 +1,9 @@
-import { Type } from '@angular/core';
-
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function DebugLog(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/decorators/error.decorator.ts b/projects/logger/src/lib/decorators/error.decorator.ts
@@ -1,10 +1,9 @@
-import { Type } from '@angular/core';
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function ErrorLog(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/decorators/groups/group-collapsed.decorator.ts b/projects/logger/src/lib/decorators/groups/group-collapsed.decorator.ts
@@ -1,15 +1,15 @@
 import { Type } from '@angular/core';
 
 import { groupDecoratorFactory } from './group.common';
-import { Any, Callback, DecoratorMethod } from '../../interfaces/logger.internal';
+import { Any, Callback, DecoratorMethod, Fn } from "../../interfaces/logger.internal";
 import { GroupLevel, LoggerLevel } from '../../interfaces/logger.external';
 
 export function GroupCollapsed(title: string | Callback<Any>, level: LoggerLevel = LoggerLevel.INFO): DecoratorMethod {
     return (_target: Type<unknown>, _key: string, descriptor: PropertyDescriptor): PropertyDescriptor => {
         const method: Callback = descriptor.value;
 
         descriptor.value = function(...args: Any[]): unknown {
-            return groupDecoratorFactory(level, GroupLevel.GROUP_COLLAPSED, method, title, args, this);
+            return groupDecoratorFactory(level, GroupLevel.GROUP_COLLAPSED, method as Fn, title, args, this as any);
         };
 
         return descriptor;
diff --git a/projects/logger/src/lib/decorators/groups/group.common.ts b/projects/logger/src/lib/decorators/groups/group.common.ts
@@ -16,7 +16,7 @@ export function groupDecoratorFactory(
     let result: unknown;
     const logger: LoggerService = LoggerInjector.getInjector().get<LoggerService>(LoggerService);
     const groupFactory: GroupFactory = LoggerInjector.getInjector().get<GroupFactory>(GroupFactory);
-    const groupMethod: GroupMethod = groupFactory[groupType].bind(groupFactory);
+    const groupMethod: GroupMethod = groupFactory[groupType].bind(groupFactory) as GroupMethod;
     const label: string = typeof title === 'string' ? title : title(...args);
 
     groupMethod(label, null, logger, level);
diff --git a/projects/logger/src/lib/decorators/groups/group.decorator.ts b/projects/logger/src/lib/decorators/groups/group.decorator.ts
@@ -1,15 +1,15 @@
 import { Type } from '@angular/core';
 
 import { groupDecoratorFactory } from './group.common';
-import { Any, Callback, DecoratorMethod } from '../../interfaces/logger.internal';
+import { Any, Callback, DecoratorMethod, Fn } from "../../interfaces/logger.internal";
 import { GroupLevel, LoggerLevel } from '../../interfaces/logger.external';
 
 export function Group(title: string | Callback<Any>, level: LoggerLevel = LoggerLevel.INFO): DecoratorMethod {
     return (_target: Type<unknown>, _key: string, descriptor: PropertyDescriptor): PropertyDescriptor => {
         const method: Callback = descriptor.value;
 
         descriptor.value = function(...args: Any[]): unknown {
-            return groupDecoratorFactory(level, GroupLevel.GROUP, method, title, args, this);
+            return groupDecoratorFactory(level, GroupLevel.GROUP, method as Fn, title, args, this as any);
         };
 
         return descriptor;
diff --git a/projects/logger/src/lib/decorators/info.decorator.ts b/projects/logger/src/lib/decorators/info.decorator.ts
@@ -1,11 +1,9 @@
-import { Type } from '@angular/core';
-
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function InfoLog(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/decorators/log.decorator.ts b/projects/logger/src/lib/decorators/log.decorator.ts
@@ -1,11 +1,9 @@
-import { Type } from '@angular/core';
-
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function Log(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/decorators/logger.decorator.ts b/projects/logger/src/lib/decorators/logger.decorator.ts
@@ -1,10 +1,8 @@
-import { Type } from '@angular/core';
-
 import { LoggerService } from '../logger.service';
 import { LoggerInjector } from '../logger.injector';
 
 export function Logger(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LoggerService {
diff --git a/projects/logger/src/lib/decorators/timer.decorator.ts b/projects/logger/src/lib/decorators/timer.decorator.ts
@@ -17,10 +17,12 @@ export function TimerLog(
             const info: TimerInfo | null = LoggerInjector.getInjector()
                 .get<LoggerService>(LoggerService)
                 .startTime(title, level);
-            result = method.apply(this, args);
+
+            result = method.apply(this, args) as PropertyDescriptor;
+
             LoggerInjector.getInjector()
                 .get<LoggerService>(LoggerService)
-                .endTime(info, level, isMillisecond);
+                .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
@@ -1,11 +1,9 @@
-import { Type } from '@angular/core';
-
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function TraceLog(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/decorators/warn.decorator.ts b/projects/logger/src/lib/decorators/warn.decorator.ts
@@ -1,11 +1,9 @@
-import { Type } from '@angular/core';
-
 import { LoggerInjector } from '../logger.injector';
 import { LoggerService } from '../logger.service';
 import { LogFn } from '../interfaces/logger.external';
 
 export function WarnLog(): PropertyDecorator {
-    return (target: Type<unknown>, propertyName: string): void => {
+    return (target: unknown, propertyName: string | symbol): void => {
         Object.defineProperty(target, propertyName, {
             configurable: false,
             get(): LogFn {
diff --git a/projects/logger/src/lib/interfaces/logger.external.ts b/projects/logger/src/lib/interfaces/logger.external.ts
@@ -49,7 +49,12 @@ export interface TimerInfo {
 
 export type PipeOperation = GroupMethods | ConsoleOperation;
 export type GroupMethod<T = unknown> = (groupTitle?: string, ...optionalParams: T[]) => unknown;
-export type GroupFactoryMethod = (title: string, pipeline: Pipeline, logger: LoggerService, level: LoggerLevel) => void;
+export type GroupFactoryMethod = (
+    title: string,
+    pipeline: Pipeline | undefined,
+    logger: LoggerService,
+    level: LoggerLevel
+) => void;
 
 export interface LoggerOptions {
     instance: Console;
diff --git a/projects/logger/src/lib/logger.options.ts b/projects/logger/src/lib/logger.options.ts
@@ -8,7 +8,7 @@ export class LoggerOptionsImpl implements LoggerOptions {
     public instance: Console = console;
     public minLevel: LoggerLevel = LoggerLevel.ALL;
     public globalLineStyle: string = '';
-    public cssClassMap: object = {};
+    public cssClassMap: ObjectKeyMap = {};
     public useLevelGroup: boolean = true;
     public labelColors: ObjectKeyMap<string> = {
         [LoggerLevel.TRACE]: COLORS.TRACE,
diff --git a/projects/logger/src/lib/logger.service.ts b/projects/logger/src/lib/logger.service.ts
@@ -28,11 +28,11 @@ export class LoggerService {
     ) {}
 
     public get clear(): LogFn {
-        return this.console.instance.clear.bind(this.console.instance);
+        return this.console.instance.clear.bind(this.console.instance) as LogFn;
     }
 
     public get table(): LogFn {
-        return this.console.instance.table.bind(this.console.instance);
+        return this.console.instance.table.bind(this.console.instance) as LogFn;
     }
 
     public get log(): LogFn {
@@ -44,7 +44,7 @@ export class LoggerService {
     }
 
     public get assert(): LogFn {
-        return this.console.instance.assert.bind(this.console.instance);
+        return this.console.instance.assert.bind(this.console.instance) as LogFn;
     }
 
     public get debug(): LogFn {
@@ -137,7 +137,13 @@ export class LoggerService {
         return this.timerFactory.startTime(title, level);
     }
 
-    public endTime(info: TimerInfo, level: LoggerLevel = LoggerLevel.DEBUG, isMillisecond: boolean = true): void {
-        this.timerFactory.endTime(info, level, isMillisecond, this);
+    public endTime(
+        info: TimerInfo | null,
+        level: LoggerLevel = LoggerLevel.DEBUG,
+        isMillisecond: boolean = true
+    ): void {
+        if (info) {
+            this.timerFactory.endTime(info, level, isMillisecond, this);
+        }
     }
 }
diff --git a/projects/logger/src/lib/services/css-factory.service.ts b/projects/logger/src/lib/services/css-factory.service.ts
@@ -4,7 +4,7 @@ import { LOGGER_OPTIONS, LoggerLevel } from '../interfaces/logger.external';
 
 @Injectable()
 export class CssFactory {
-    private lineStyle: string;
+    private lineStyle: string | null = null;
 
     constructor(@Inject(LOGGER_OPTIONS) private readonly options: LoggerOptionsImpl) {}
 
@@ -36,7 +36,7 @@ export class CssFactory {
         const styles: string[] = [];
 
         classList.forEach((className: string) => {
-            const style: string = this.options.cssClassMap[className];
+            const style: string | undefined = this.options.cssClassMap[className];
             if (style) {
                 styles.push(style);
             }
diff --git a/projects/logger/src/lib/services/factory.service.ts b/projects/logger/src/lib/services/factory.service.ts
@@ -30,7 +30,9 @@ export class LoggerFactory {
         const methodName: string = DEFAULT_METHODS[level];
 
         const operation: Operation =
-            this.console.minLevel <= level ? this.console.instance[methodName].bind(...args) : this.console.noop;
+            this.console.minLevel <= level
+                ? (this.console.instance as any)[methodName].bind(...args)
+                : this.console.noop;
 
         const pipeOperation: PipeOperation = this.options.useLevelGroup
             ? this.defineLevelGroups(level, operation, logger)
diff --git a/projects/logger/src/lib/services/group-factory.service.ts b/projects/logger/src/lib/services/group-factory.service.ts
@@ -8,7 +8,7 @@ import { LoggerOptionsImpl } from '../logger.options';
 
 @Injectable()
 export class GroupFactory {
-    public executePipesGroup: boolean;
+    public executePipesGroup: boolean = false;
     private counterOpenedGroup: number = 0;
 
     constructor(
@@ -30,14 +30,14 @@ export class GroupFactory {
         }
     }
 
-    public group<T = unknown>(title: string, pipeline: Pipeline<T>, logger: LoggerService, level: LoggerLevel): T {
+    public group<T>(title: string, pipeline: Pipeline<T> | undefined, logger: LoggerService, level: LoggerLevel): T {
         const group: GroupMethod = this.console.instance.group.bind(this.console.instance);
         return this.createGroupLogger<T>(group, title, pipeline, logger, level);
     }
 
     public groupCollapsed<T = unknown>(
         title: string,
-        pipeline: Pipeline<T>,
+        pipeline: Pipeline<T> | undefined,
         logger: LoggerService,
         level: LoggerLevel
     ): T {
@@ -48,12 +48,13 @@ export class GroupFactory {
     private createGroupLogger<T = unknown>(
         groupType: GroupMethod,
         title: string,
-        pipeline: Pipeline,
+        pipeline: Pipeline | undefined,
         logger: LoggerService,
         level: LoggerLevel
     ): T {
         const showGroup: boolean = this.console.minLevel <= level;
         let pipeLineResult: T;
+
         if (showGroup) {
             this.executePipesGroup = true;
             this.counterOpenedGroup++;
@@ -74,7 +75,7 @@ export class GroupFactory {
             this.executePipesGroup = false;
         }
 
-        return pipeLineResult;
+        return pipeLineResult!;
     }
 
     private getLabel(level: string, style: string): FormatOutput {
diff --git a/projects/logger/src/lib/services/timer-factory.service.ts b/projects/logger/src/lib/services/timer-factory.service.ts
diff --git a/projects/logger/tests/autobind.spec.ts b/projects/logger/tests/autobind.spec.ts
diff --git a/projects/logger/tests/clipboard.spec.ts b/projects/logger/tests/clipboard.spec.ts
diff --git a/projects/logger/tests/injector.spec.ts b/projects/logger/tests/injector.spec.ts
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
diff --git a/src/polyfills.ts b/src/polyfills.ts
diff --git a/src/test.ts b/src/test.ts
diff --git a/tsconfig.json b/tsconfig.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ export class ConsoleFake implements Console {`
`23`	`23`	`private _stack: ObjectKeyMap[] = [];`
`24`	`24`
`25`	`25`	`public log(...args: string[]): void {`
`26`		`- args.unshift(null, null);`
	`26`	`+ args.unshift(null!, null!);`
`27`	`27`	`this._stack.push({ [TestLoggerLineType.LOG]: args });`
`28`	`28`	`}`
`29`	`29`
`@@ -74,8 +74,8 @@ export class ConsoleFake implements Console {`
`74`	`74`	`history.forEach((line: object, index: number) => {`
`75`	`75`	`for (const arg in line) {`
`76`	`76`	`if (line.hasOwnProperty(arg)) {`
`77`		`- const isArray: boolean = Array.isArray(line[arg]);`
`78`		`- history[index] = { [arg]: isArray ? line[arg].slice(withoutLabel) : line[arg] };`
	`77`	`+ const isArray: boolean = Array.isArray((line as any)[arg]);`
	`78`	`+ history[index] = { [arg]: isArray ? (line as any)[arg].slice(withoutLabel) : (line as any)[arg] };`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`	`});`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ export function autoBind(...args: Any[]): Any {`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`function createDefaultSetter(key: Any): Fn {`
`87`		`- return function set(newValue: unknown): unknown {`
	`87`	`+ return function set(this: any, newValue: unknown): unknown {`
`88`	`88`	`Object.defineProperty(this, key, {`
`89`	`89`	`configurable: true,`
`90`	`90`	`writable: true,`