Libraries converted from TSLint to ESLint and linting fixed

Author: sjimenez77

.eslintrc.json

@@ -0,0 +1,47 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json",
+          "e2e/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/ng-cli-compat",
+        "plugin:@angular-eslint/ng-cli-compat--formatting-add-on",
+        "plugin:@angular-eslint/template/process-inline-templates"
+      ],
+      "rules": {
+        "@typescript-eslint/explicit-member-accessibility": [
+          "off",
+          {
+            "accessibility": "explicit"
+          }
+        ],
+        "arrow-parens": [
+          "off",
+          "always"
+        ],
+        "import/order": "off"
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}

README.asciidoc

@@ -17,7 +17,7 @@ toc::[]
 
 = devon4ng library
 
-This project was generated with https://github.com/angular/angular-cli[Angular CLI] version 7.3.6 and upgraded to Angular 8.0.1. It contains the devon4ng libraries. 
+This project was generated with https://github.com/angular/angular-cli[Angular CLI] version 7.3.6 and upgraded to Angular 11.2.1. It contains the devon4ng libraries. 
 
 == Library catalogue
 
@@ -28,7 +28,10 @@ This repository includes the following devon4ng libraries.
 
 == Project Requirements
 
-In order to use these libraries your project must use at least **Angular 7** in order to ensure the library will work as expected. 
+In order to use these libraries your project must use at least **Angular 7** in order to ensure the library will work as expected. To install **the correct vesion for your Angular project** please refer to the versions in the correspondent npm package page:
+
+  - link:https://www.npmjs.com/package/@devon4ng/cache?activeTab=versions[@devon4ng/cache versions]
+  - link:https://www.npmjs.com/package/@devon4ng/authorization?activeTab=versions[@devon4ng/authorization versions]
 
 == How to contribute
 

angular.json

@@ -14,13 +14,13 @@
           "options": {
             "tsConfig": "projects/devon4ng/cache/tsconfig.lib.json",
             "project": "projects/devon4ng/cache/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
             "production": {
               "tsConfig": "projects/devon4ng/cache/tsconfig.lib.prod.json"
             }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -30,14 +30,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "projects/devon4ng/cache/tsconfig.lib.json",
-              "projects/devon4ng/cache/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/devon4ng/cache/**/*.ts",
+              "projects/devon4ng/cache/**/*.html"
             ]
           }
         }
@@ -54,13 +51,13 @@
           "options": {
             "tsConfig": "projects/devon4ng/authorization/tsconfig.lib.json",
             "project": "projects/devon4ng/authorization/ng-package.json"
-          }
-        ,          "configurations": {
+          },
+          "configurations": {
             "production": {
               "tsConfig": "projects/devon4ng/authorization/tsconfig.lib.prod.json"
             }
           }
-},
+        },
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
@@ -70,19 +67,16 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "projects/devon4ng/authorization/tsconfig.lib.json",
-              "projects/devon4ng/authorization/tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "projects/devon4ng/authorization/**/*.ts",
+              "projects/devon4ng/authorization/**/*.html"
             ]
           }
         }
       }
     }
   },
   "defaultProject": "@devon4ng/cache"
-}
+}

package.json

@@ -11,7 +11,8 @@
     "start": "ng serve",
     "build": "ng build",
     "test": "ng test",
-    "lint": "ng lint",
+    "lint:cache": "npx ng lint @devon4ng/cache",
+    "lint:authorization": "npx ng lint @devon4ng/authorization",
     "e2e": "ng e2e"
   },
   "private": true,
@@ -32,14 +33,24 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "~0.1102.1",
+    "@angular-eslint/builder": "1.2.0",
+    "@angular-eslint/eslint-plugin": "1.2.0",
+    "@angular-eslint/eslint-plugin-template": "1.2.0",
+    "@angular-eslint/schematics": "1.2.0",
+    "@angular-eslint/template-parser": "1.2.0",
     "@angular/cli": "~11.2.1",
     "@angular/compiler-cli": "~11.2.1",
     "@angular/language-service": "~11.2.1",
     "@types/jasmine": "~3.6.0",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "^12.11.1",
     "@types/object-hash": "^1.3.4",
-    "codelyzer": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "4.3.0",
+    "@typescript-eslint/parser": "4.3.0",
+    "eslint": "^7.6.0",
+    "eslint-plugin-import": "2.22.1",
+    "eslint-plugin-jsdoc": "30.7.6",
+    "eslint-plugin-prefer-arrow": "1.2.2",
     "jasmine-core": "~3.6.0",
     "jasmine-spec-reporter": "~5.0.0",
     "karma": "~6.1.1",
@@ -50,7 +61,6 @@
     "ng-packagr": "^11.2.2",
     "protractor": "~7.0.0",
     "ts-node": "~7.0.0",
-    "tslint": "~6.1.0",
     "typescript": "~4.0.7"
   }
-}
+}

projects/devon4ng/authorization/.eslintrc.json

@@ -0,0 +1,46 @@
+{
+  "extends": "../../../.eslintrc.json",
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts"],
+      "parserOptions": {
+        "project": [
+          "projects/devon4ng/authorization/tsconfig.lib.json",
+          "projects/devon4ng/authorization/tsconfig.spec.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "rules": {
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "type": "element",
+            "prefix": "daon",
+            "style": "kebab-case"
+          }
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "type": "attribute",
+            "prefix": "daon",
+            "style": "camelCase"
+          }
+        ],
+        "@typescript-eslint/explicit-member-accessibility": [
+          "off",
+          {
+            "accessibility": "explicit"
+          }
+        ],
+        "arrow-parens": ["off", "always"],
+        "import/order": "off"
+      }
+    },
+    {
+      "files": ["*.html"],
+      "rules": {}
+    }
+  ]
+}

projects/devon4ng/authorization/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devon4ng/authorization",
-  "version": "11.0.0",
+  "version": "11.0.1",
   "description": "Adds rights-based authorization to your Angular app's routes",
   "author": {
     "name": "devonfw team"
@@ -26,4 +26,4 @@
     "@angular/router": "^11.2.0",
     "rxjs": "^6.6.0"
   }
-}
+}

projects/devon4ng/authorization/src/lib/devonfw-authorization.module.spec.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable no-shadow */
 import { Component } from '@angular/core';
 import { fakeAsync, TestBed, TestModuleMetadata, tick } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
@@ -181,13 +183,13 @@ describe('DevonfwAuthorizationModule', () => {
   });
 });
 
-function whenNavigateTo(commands: any[]) {
+const whenNavigateTo = (commands: any[]) => {
   const appComponentFixture = TestBed.createComponent(MyTestAppComponent);
   const router: Router = TestBed.inject(Router);
   const location: Location = TestBed.inject(Location);
 
   return {
-    thenExpectLocationPathToEqual(path: string) {
+    thenExpectLocationPathToEqual: (path: string) => {
       appComponentFixture.ngZone.run(() => {
         // when
         router.navigate(commands);
@@ -200,10 +202,10 @@ function whenNavigateTo(commands: any[]) {
       });
     },
   };
-}
+};
 
-function configureTestingModule<R>(config?: AuthorizationModuleConfig) {
-  function configureTestingModuleProvidingMock(authorizationServiceMock?: IsAuthorized<R>) {
+const configureTestingModule = <R>(config?: AuthorizationModuleConfig) => {
+  const configureTestingModuleProvidingMock = (authorizationServiceMock?: IsAuthorized<R>) => {
     const testingModuleDefinition: TestModuleMetadata = {
       declarations: [MyTestAppComponent, MyTestPageComponent],
       imports: [RouterTestingModule.withRoutes(routes), DevonfwAuthorizationModule.forRoot(config)],
@@ -221,61 +223,49 @@ function configureTestingModule<R>(config?: AuthorizationModuleConfig) {
     TestBed.configureTestingModule(testingModuleDefinition);
     const router: Router = TestBed.inject(Router);
     addAuthorizationGuards(router);
-  }
+  };
 
   return {
-    withDummyAuthorization() {
+    withDummyAuthorization: () => {
       configureTestingModuleProvidingMock();
     },
 
-    withFailingAuthorization() {
+    withFailingAuthorization: () => {
       configureTestingModuleProvidingMock(createAuthorizationServiceMock<R>().whichFails());
     },
 
-    forUserHavingRightsOf(userRights: R[]) {
+    forUserHavingRightsOf: (userRights: R[]) => {
       configureTestingModuleProvidingMock(createAuthorizationServiceMock<R>().forUserHavingRightsOf(userRights));
     },
 
-    forUnauthorizedUsers() {
+    forUnauthorizedUsers: () => {
       configureTestingModuleProvidingMock(createAuthorizationServiceMock<R>().forUnauthorizedUsers());
     },
   };
-}
+};
 
-export function createAuthorizationServiceMock<R>() {
-  return {
-    forUserHavingRightsOf(userRights: R[]): IsAuthorized<R> {
-      return {
-        isAuthorizedForRightsOf(requiredRights: R[]): Observable<boolean> {
-          let isAuthorized = true;
+export const createAuthorizationServiceMock = <R>() => ({
+  forUserHavingRightsOf: (userRights: R[]): IsAuthorized<R> => ({
+    isAuthorizedForRightsOf: (requiredRights: R[]): Observable<boolean> => {
+      let isAuthorized = true;
 
-          if (requiredRights && requiredRights.length > 0) {
-            isAuthorized = requiredRights.reduce(
-              (requiredAuthorizationFulfilled, requiredRight) =>
-                requiredAuthorizationFulfilled ? (userRights ? userRights.includes(requiredRight) : false) : false,
-              true
-            );
-          }
+      if (requiredRights && requiredRights.length > 0) {
+        isAuthorized = requiredRights.reduce(
+          (requiredAuthorizationFulfilled, requiredRight) =>
+            requiredAuthorizationFulfilled ? (userRights ? userRights.includes(requiredRight) : false) : false,
+          true
+        );
+      }
 
-          return of(isAuthorized);
-        },
-      };
+      return of(isAuthorized);
     },
+  }),
 
-    forUnauthorizedUsers(): IsAuthorized<R> {
-      return {
-        isAuthorizedForRightsOf(): Observable<boolean> {
-          return of(false);
-        },
-      };
-    },
+  forUnauthorizedUsers: (): IsAuthorized<R> => ({
+    isAuthorizedForRightsOf: (): Observable<boolean> => of(false),
+  }),
 
-    whichFails(): IsAuthorized<R> {
-      return {
-        isAuthorizedForRightsOf(): Observable<boolean> {
-          return throwError(new Error());
-        },
-      };
-    },
-  };
-}
+  whichFails: (): IsAuthorized<R> => ({
+    isAuthorizedForRightsOf: (): Observable<boolean> => throwError(new Error()),
+  }),
+});

projects/devon4ng/authorization/src/lib/guard/authorization.guard.spec.ts

@@ -9,9 +9,8 @@ describe('AuthorizationGuard', () => {
     const guard = new AuthorizationGuard(routerMock, authorizationServiceMock, {});
 
     const routeWithoutConfig: any = {};
-    const state: any = {};
     // when
-    const canActivate = guard.canActivate(routeWithoutConfig, state);
+    const canActivate = guard.canActivate(routeWithoutConfig);
     // then
     expect(canActivate).toBeFalsy();
   });