refactoring (#229)

Author: splincode

.eslintrc.js

@@ -0,0 +1,3 @@
+module.exports = {
+    extends: '@angular-ru/eslint-config'
+};

.eslintrc.json

@@ -1,9 +1,7 @@
-sudo: required
-dist: trusty
-
 language: node_js
+sudo: false
 node_js:
-    - '12'
+  - '12.0.0'
 
 cache:
     directories:
@@ -20,5 +18,5 @@ script:
     - yarn test:types
 
 after_success:
-    - test $TRAVIS_BRANCH = "master" && yarn coverage
-    - test $TRAVIS_BRANCH = "master" && yarn deploy
+    - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && yarn coverage
+    - test $TRAVIS_PULL_REQUEST == "false" && test $TRAVIS_BRANCH == "master" && yarn deploy

.travis.yml

@@ -2,13 +2,13 @@
 
 ```ts
 import { NgxsDataPluginModule } from '@ngxs-labs/data';
-import { NGXS_DATA_STORAGE_CONTAINER, NGXS_DATA_STORAGE_EXTENSION } from '@ngxs-labs/data/storage';
+import { NGXS_DATA_STORAGE_PLUGIN } from '@ngxs-labs/data/storage';
 
 @NgModule({
     // ..
     imports: [
         NgxsModule.forRoot([TodoState]),
-        NgxsDataPluginModule.forRoot([NGXS_DATA_STORAGE_EXTENSION, NGXS_DATA_STORAGE_CONTAINER])
+        NgxsDataPluginModule.forRoot([NGXS_DATA_STORAGE_PLUGIN])
     ]
 })
 export class AppModule {}

docs/pages/persistence-state.md

@@ -1,6 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
+import { CountModule } from './examples/count/count.module';
+import { TodoModule } from './examples/todo/todo.module';
+
 @NgModule({
     imports: [
         RouterModule.forRoot(
@@ -12,11 +15,17 @@ import { RouterModule } from '@angular/router';
                 },
                 {
                     path: 'count',
-                    loadChildren: () => import('./examples/count/count.module').then((m) => m.CountModule)
+                    loadChildren: (): Promise<CountModule> =>
+                        import('./examples/count/count.module').then(
+                            (m: { CountModule: CountModule }): CountModule => m.CountModule
+                        )
                 },
                 {
                     path: 'todo',
-                    loadChildren: () => import('./examples/todo/todo.module').then((m) => m.TodoModule)
+                    loadChildren: (): Promise<TodoModule> =>
+                        import('./examples/todo/todo.module').then(
+                            (m: { TodoModule: TodoModule }): TodoModule => m.TodoModule
+                        )
                 }
             ],
             { useHash: true }

integration/app/app-routing.module.ts

@@ -8,11 +8,12 @@ import { Observable } from 'rxjs';
     changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class AppComponent implements OnInit {
-    public snapshot: Observable<unknown> = this.store.select((state) => state);
+    public snapshot: Observable<unknown> = this.store.select((state: unknown): unknown => state);
 
     constructor(private readonly store: Store) {}
 
     public ngOnInit(): void {
+        // eslint-disable-next-line no-console
         console.log('[isDevMode]', isDevMode());
     }
 }

integration/app/app.component.ts

@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
 import { Persistence, StateRepository } from '@ngxs-labs/data/decorators';
+import { PersistenceProvider } from '@ngxs-labs/data/typings';
 import { State } from '@ngxs/store';
 
 import { CountModel } from './count.model';
 
-const options = [{ path: 'count.countSub.val', existingEngine: sessionStorage }];
+const options: PersistenceProvider[] = [{ path: 'count.countSub.val', existingEngine: sessionStorage }];
 
 @Persistence(options)
 @StateRepository()

integration/app/examples/count/count-sub.state.ts

@@ -7,7 +7,7 @@ import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import { CountSubState } from './count-sub.state';
-import { ParentCountModel } from './count.model';
+import { CountModel, ParentCountModel } from './count.model';
 
 const COUNT_TOKEN: StateToken<ParentCountModel> = new StateToken<ParentCountModel>('count');
 
@@ -19,28 +19,41 @@ const COUNT_TOKEN: StateToken<ParentCountModel> = new StateToken<ParentCountMode
 })
 @Injectable()
 export class CountState extends NgxsDataRepository<ParentCountModel> {
-    public readonly values$: Observable<ParentCountModel> = this.state$.pipe(map((state) => state.countSub!));
+    public readonly values$: Observable<ParentCountModel> = this.state$.pipe(
+        map((state: Immutable<ParentCountModel>): CountModel => state.countSub!)
+    );
 
     @action()
     public increment(): void {
-        this.ctx.setState((state: Immutable<ParentCountModel>) => ({ ...state, val: state.val + 1 }));
+        this.ctx.setState(
+            (state: Immutable<ParentCountModel>): Immutable<ParentCountModel> => ({ ...state, val: state.val + 1 })
+        );
     }
 
     @action()
     public countSubIncrement(): void {
-        this.ctx.setState((state) => ({
-            ...state,
-            countSub: { val: state.countSub!.val + 1 }
-        }));
+        this.ctx.setState(
+            (state: Immutable<ParentCountModel>): Immutable<ParentCountModel> => ({
+                ...state,
+                countSub: { val: state.countSub!.val + 1 }
+            })
+        );
     }
 
     @action()
     public decrement(): void {
-        this.setState((state) => ({ ...state, val: state.val - 1 }));
+        this.setState(
+            (state: Immutable<ParentCountModel>): Immutable<ParentCountModel> => ({ ...state, val: state.val - 1 })
+        );
     }
 
     @action({ async: true, debounce: 300 })
     public setValueFromInput(val: string | number): void {
-        this.ctx.setState((state) => ({ ...state, val: parseFloat(val as string) || 0 }));
+        this.ctx.setState(
+            (state: Immutable<ParentCountModel>): Immutable<ParentCountModel> => ({
+                ...state,
+                val: parseFloat(val as string) || 0
+            })
+        );
     }
 }

integration/app/examples/count/count.state.ts

@@ -15,12 +15,15 @@ export class TodoState extends NgxsDataRepository<string[]> {
     @action()
     public addTodo(todo: string): void {
         if (todo) {
-            this.ctx.setState((state: Immutable<string[]>) => state.concat(todo));
+            this.ctx.setState((state: Immutable<string[]>): Immutable<string[]> => state.concat(todo));
         }
     }
 
     @action()
     public removeTodo(idx: number): void {
-        this.ctx.setState((state: Immutable<string[]>) => state.filter((_: string, index: number) => index !== idx));
+        this.ctx.setState(
+            (state: Immutable<string[]>): Immutable<string[]> =>
+                state.filter((_: string, index: number): boolean => index !== idx)
+        );
     }
 }

integration/app/examples/todo/todo.state.ts

@@ -1,3 +1,3 @@
-export const environment = {
+export const environment: { production: boolean } = {
     production: true
 };

integration/environments/environment.prod.ts

@@ -2,7 +2,7 @@
 // `ng build ---prod` replaces `environment.ts` with `environment.prod.ts`.
 // The list of file replacements can be found in `angular.json`.
 
-export const environment = {
+export const environment: { production: boolean } = {
     production: false
 };
 

integration/environments/environment.ts

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

integration/main.ts

@@ -12,7 +12,7 @@ module.exports = {
     preset: 'jest-preset-angular',
     rootDir: path.resolve('.'),
     testMatch: ['<rootDir>/**/*.spec.ts'],
-    collectCoverageFrom: ['<rootDir>/src/**/*.ts'],
+    collectCoverageFrom: ['<rootDir>/lib/**/*.ts'],
     setupFilesAfterEnv: ['<rootDir>/setupJest.ts'],
     coverageReporters: ['json', 'lcovonly', 'lcov', 'text', 'html'],
     coveragePathIgnorePatterns: ['/node_modules/'],

jest.config.js

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import { $args, actionNameCreator, NgxsDataFactory, NgxsDataInjector } from '@ngxs-labs/data/internals';
 import { NGXS_DATA_EXCEPTIONS, REPOSITORY_ACTION_OPTIONS } from '@ngxs-labs/data/tokens';
 import {
@@ -34,7 +35,7 @@ export function action(options: RepositoryActionOptions = REPOSITORY_ACTION_OPTI
         descriptor.value = function() {
             const instance: DataRepository<Any> = (this as Any) as DataRepository<Any>;
 
-            let result: Any | Observable<Any> = undefined;
+            let result: Any | Observable<Any>;
             const args: IArguments = arguments;
             const repository: NgxsRepositoryMeta = NgxsDataFactory.getRepositoryByInstance(instance);
             const operations: PlainObjectOf<NgxsDataOperation> | null = (repository && repository.operations) || null;
@@ -119,7 +120,9 @@ export function action(options: RepositoryActionOptions = REPOSITORY_ACTION_OPTI
 
                 return source.pipe(
                     debounceTime(debounce),
-                    finalize(() => scheduleTask && scheduleTask.complete())
+                    finalize((): void => {
+                        scheduleTask && scheduleTask.complete();
+                    })
                 );
             } else {
                 const dispatcher: Observable<Any> = NgxsDataInjector.store!.dispatch(event);