Merge pull request #157 from mpalourdio/eslint

mpalourdio · web-flow · commit 233c05df14e5 · 2021-11-04T12:48:51.000+01:00
Eslint
diff --git a/.editorconfig b/.editorconfig
@@ -9,7 +9,7 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
 
-[{package.json,ng-package.json,angular.json,tslint.json,karma.conf.js,tsconfig*.json,test.ts,main.ts,polyfills.ts}]
+[{package.json,ng-package.json,angular.json,.eslintrc.json,karma.conf.js,tsconfig*.json,test.ts,main.ts,polyfills.ts}]
 indent_size = 2
 
 [*.md]
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,83 @@
+{
+  "root": true,
+  "ignorePatterns": [
+    "projects/**/*"
+  ],
+  "overrides": [
+    {
+      "files": [
+        "*.ts"
+      ],
+      "parserOptions": {
+        "project": [
+          "tsconfig.json",
+          "e2e/tsconfig.json"
+        ],
+        "createDefaultProgram": true
+      },
+      "extends": [
+        "plugin:@angular-eslint/recommended",
+        "plugin:@angular-eslint/template/process-inline-templates",
+        "plugin:rxjs/recommended"
+      ],
+      "rules": {
+        "@angular-eslint/component-selector": [
+          "error",
+          {
+            "prefix": "",
+            "style": "kebab-case",
+            "type": "element"
+          }
+        ],
+        "@angular-eslint/directive-selector": [
+          "error",
+          {
+            "prefix": "",
+            "style": "camelCase",
+            "type": "attribute"
+          }
+        ],
+        "comma-dangle": [
+          "error",
+          {
+            "objects": "never",
+            "arrays": "always-multiline",
+            "functions": "never"
+          }
+        ],
+        "rxjs/finnish": [
+          "error",
+          {
+            "functions": true,
+            "methods": true,
+            "names": {
+              "^(canActivate|canActivateChild|canDeactivate|canLoad|intercept|resolve|validate)$": false
+            },
+            "parameters": true,
+            "properties": true,
+            "strict": false,
+            "types": {
+              "^EventEmitter$": false
+            },
+            "variables": true
+          }
+        ],
+        "rxjs/no-implicit-any-catch": [
+          "error",
+          {
+            "allowExplicitAny": true
+          }
+        ]
+      }
+    },
+    {
+      "files": [
+        "*.html"
+      ],
+      "extends": [
+        "plugin:@angular-eslint/template/recommended"
+      ],
+      "rules": {}
+    }
+  ]
+}
diff --git a/README.md b/README.md
@@ -120,7 +120,7 @@ import { Spinkit } from 'ng-http-loader'; // <============
     styleUrls: ['./app.component.css'],
 })
 export class AppComponent {
-    public spinkit = Spinkit; // <============
+    spinkit = Spinkit; // <============
 }
 ```
 The different spinners available are referenced in [this file](src/lib/spinkits.ts).
diff --git a/angular.json b/angular.json
@@ -40,14 +40,11 @@
           }
         },
         "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
+          "builder": "@angular-eslint/builder:lint",
           "options": {
-            "tsConfig": [
-              "./tsconfig.lib.json",
-              "./tsconfig.spec.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
+            "lintFilePatterns": [
+              "src/**/*.ts",
+              "src/**/*.html"
             ]
           }
         }
@@ -56,6 +53,7 @@
   },
   "defaultProject": "ng-http-loader",
   "cli": {
-    "packageManager": "yarn"
+    "packageManager": "yarn",
+    "defaultCollection": "@angular-eslint/schematics"
   }
 }
diff --git a/package.json b/package.json
@@ -48,6 +48,11 @@
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^12.0.0",
+    "@angular-eslint/builder": "12.6.1",
+    "@angular-eslint/eslint-plugin": "12.6.1",
+    "@angular-eslint/eslint-plugin-template": "12.6.1",
+    "@angular-eslint/schematics": "12.6.1",
+    "@angular-eslint/template-parser": "12.6.1",
     "@angular/cli": "^12.0.0",
     "@angular/common": "^12.0.0",
     "@angular/compiler": "^12.0.0",
@@ -57,7 +62,10 @@
     "@angular/platform-browser-dynamic": "^12.0.0",
     "@types/jasmine": "~3.8.0",
     "@types/node": "^12.11.1",
-    "codelyzer": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "4.28.2",
+    "@typescript-eslint/parser": "4.28.2",
+    "eslint": "^7.26.0",
+    "eslint-plugin-rxjs": "^4.0.1",
     "jasmine-core": "~3.8.0",
     "karma": "~6.3.2",
     "karma-chrome-launcher": "~3.1.0",
@@ -68,8 +76,6 @@
     "ng-packagr": "^12.0.0",
     "puppeteer": "^10.0.0",
     "rxjs": "^6.6.0",
-    "rxjs-tslint-rules": "^4.13.0",
-    "tslint": "~6.1.0",
     "typescript": "~4.3.5",
     "zone.js": "~0.11.4"
   }
diff --git a/src/lib/components/abstract.loader.directive.ts b/src/lib/components/abstract.loader.directive.ts
@@ -12,5 +12,5 @@ import { Input, Directive } from '@angular/core';
 @Directive()
 export abstract class AbstractLoaderDirective {
 
-    @Input() public backgroundColor!: string;
+    @Input() backgroundColor!: string;
 }
diff --git a/src/lib/components/ng-http-loader.component.ts b/src/lib/components/ng-http-loader.component.ts
@@ -21,27 +21,27 @@ import { Spinkit } from '../spinkits';
 })
 export class NgHttpLoaderComponent implements OnInit {
 
-    public spinkit = Spinkit;
-    public isVisible$!: Observable<boolean>;
-    private visibleUntil = Date.now();
+    spinkit = Spinkit;
+    isVisible$!: Observable<boolean>;
+    visibleUntil = Date.now();
 
-    @Input() public backdrop = true;
-    @Input() public backgroundColor!: string;
-    @Input() public debounceDelay = 0;
-    @Input() public entryComponent: any = null;
-    @Input() public extraDuration = 0;
-    @Input() public filteredHeaders: string[] = [];
-    @Input() public filteredMethods: string[] = [];
-    @Input() public filteredUrlPatterns: string[] = [];
-    @Input() public minDuration = 0;
-    @Input() public opacity = '.7';
-    @Input() public backdropBackgroundColor = '#f1f1f1';
-    @Input() public spinner: string | null = Spinkit.skWave;
+    @Input() backdrop = true;
+    @Input() backgroundColor!: string;
+    @Input() debounceDelay = 0;
+    @Input() entryComponent: any = null;
+    @Input() extraDuration = 0;
+    @Input() filteredHeaders: string[] = [];
+    @Input() filteredMethods: string[] = [];
+    @Input() filteredUrlPatterns: string[] = [];
+    @Input() minDuration = 0;
+    @Input() opacity = '.7';
+    @Input() backdropBackgroundColor = '#f1f1f1';
+    @Input() spinner: string | null = Spinkit.skWave;
 
     constructor(private pendingRequestsInterceptor: PendingRequestsInterceptor, private spinnerVisibility: SpinnerVisibilityService) {
     }
 
-    public ngOnInit(): void {
+    ngOnInit(): void {
         this.initIsvisibleObservable();
         this.nullifySpinnerIfEntryComponentIsDefined();
         this.initFilters();
diff --git a/src/lib/ng-http-loader.module.ts b/src/lib/ng-http-loader.module.ts
@@ -27,7 +27,7 @@ import { SPINKIT_COMPONENTS } from './spinkits';
     ]
 })
 export class NgHttpLoaderModule {
-    public static forRoot(): ModuleWithProviders<NgHttpLoaderModule> {
+    static forRoot(): ModuleWithProviders<NgHttpLoaderModule> {
         return {
             ngModule: NgHttpLoaderModule,
             providers: [
diff --git a/src/lib/services/pending-requests-interceptor.service.ts b/src/lib/services/pending-requests-interceptor.service.ts
@@ -73,7 +73,7 @@ export class PendingRequestsInterceptor implements HttpInterceptor {
             || this.shouldBypassHeader(req);
     }
 
-    public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
+    intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
         const shouldBypass = this.shouldBypass(req);
 
         if (!shouldBypass) {
diff --git a/src/lib/services/spinner-visibility.service.ts b/src/lib/services/spinner-visibility.service.ts
@@ -25,12 +25,12 @@ export class SpinnerVisibilityService {
         return this._visibility$.asObservable();
     }
 
-    public show(): void {
+    show(): void {
         this.pendingRequestsInterceptor.forceByPass = true;
         this._visibility$.next(true);
     }
 
-    public hide(): void {
+    hide(): void {
         this._visibility$.next(false);
         this.pendingRequestsInterceptor.forceByPass = false;
     }
diff --git a/src/test/services/pending-requests-interceptor.service.spec.ts b/src/test/services/pending-requests-interceptor.service.spec.ts
@@ -84,7 +84,7 @@ describe('PendingRequestsInterceptor', () => {
 
         http.get('/fake').subscribe({
             next: () => expect(true).toBe(false),
-            error: (error: HttpErrorResponse) => expect(error.statusText).toBe(statusTextNotFound)
+            error: (error: any) => expect(error.statusText).toBe(statusTextNotFound)
         });
 
         const testRequest = httpMock.expectOne('/fake');
diff --git a/tslint.json b/tslint.json
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ import { Spinkit } from 'ng-http-loader'; // <============`
`120`	`120`	`styleUrls: ['./app.component.css'],`
`121`	`121`	`})`
`122`	`122`	`export class AppComponent {`
`123`		`- public spinkit = Spinkit; // <============`
	`123`	`+ spinkit = Spinkit; // <============`
`124`	`124`	`}`
`125`	`125`	```
`126`	`126`	`The different spinners available are referenced in [this file](src/lib/spinkits.ts).`
Original file line number	Diff line number	Diff line change
`@@ -40,14 +40,11 @@`
`40`	`40`	`}`
`41`	`41`	`},`
`42`	`42`	`"lint": {`
`43`		`- "builder": "@angular-devkit/build-angular:tslint",`
	`43`	`+ "builder": "@angular-eslint/builder:lint",`
`44`	`44`	`"options": {`
`45`		`- "tsConfig": [`
`46`		`- "./tsconfig.lib.json",`
`47`		`- "./tsconfig.spec.json"`
`48`		`- ],`
`49`		`- "exclude": [`
`50`		`- "/node_modules/"`
	`45`	`+ "lintFilePatterns": [`
	`46`	`+ "src/*/.ts",`
	`47`	`+ "src/*/.html"`
`51`	`48`	`]`
`52`	`49`	`}`
`53`	`50`	`}`
`@@ -56,6 +53,7 @@`
`56`	`53`	`},`
`57`	`54`	`"defaultProject": "ng-http-loader",`
`58`	`55`	`"cli": {`
`59`		`- "packageManager": "yarn"`
	`56`	`+ "packageManager": "yarn",`
	`57`	`+ "defaultCollection": "@angular-eslint/schematics"`
`60`	`58`	`}`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,5 @@ import { Input, Directive } from '@angular/core';`
`12`	`12`	`@Directive()`
`13`	`13`	`export abstract class AbstractLoaderDirective {`
`14`	`14`
`15`		`- @Input() public backgroundColor!: string;`
	`15`	`+ @Input() backgroundColor!: string;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ import { SPINKIT_COMPONENTS } from './spinkits';`
`27`	`27`	`]`
`28`	`28`	`})`
`29`	`29`	`export class NgHttpLoaderModule {`
`30`		`- public static forRoot(): ModuleWithProviders<NgHttpLoaderModule> {`
	`30`	`+ static forRoot(): ModuleWithProviders<NgHttpLoaderModule> {`
`31`	`31`	`return {`
`32`	`32`	`ngModule: NgHttpLoaderModule,`
`33`	`33`	`providers: [`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ export class PendingRequestsInterceptor implements HttpInterceptor {`
`73`	`73`	`\|\| this.shouldBypassHeader(req);`
`74`	`74`	`}`
`75`	`75`
`76`		`- public intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {`
	`76`	`+ intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {`
`77`	`77`	`const shouldBypass = this.shouldBypass(req);`
`78`	`78`
`79`	`79`	`if (!shouldBypass) {`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@ export class SpinnerVisibilityService {`
`25`	`25`	`return this._visibility$.asObservable();`
`26`	`26`	`}`
`27`	`27`
`28`		`- public show(): void {`
	`28`	`+ show(): void {`
`29`	`29`	`this.pendingRequestsInterceptor.forceByPass = true;`
`30`	`30`	`this._visibility$.next(true);`
`31`	`31`	`}`
`32`	`32`
`33`		`- public hide(): void {`
	`33`	`+ hide(): void {`
`34`	`34`	`this._visibility$.next(false);`
`35`	`35`	`this.pendingRequestsInterceptor.forceByPass = false;`
`36`	`36`	`}`