Merge pull request trungvose#42 from trungk18/chore/refactor-ts-path

chore: update import path and remove private underscore

Author: trungvose

README.md

@@ -129,8 +129,8 @@ export class Piece {
   shape: Shape;
   next: Shape;
 
-  private _shapes: Shapes;
-  private _lastConfig: Partial<Piece>;
+  private shapes: Shapes;
+  private lastConfig: Partial<Piece>;
 
   constructor(x: number, y: number) {
     this.x = x;
@@ -144,7 +144,7 @@ export class Piece {
       rotation: this.rotation,
       shape: this.shape
     };
-    return this._newPiece();
+    return this.newPiece();
   }
 
   //code removed for brevity
@@ -223,11 +223,11 @@ And the last step, go to [PieceFactory][piecefactory] to add the new PieceF into
 
 ```ts
 export class PieceFactory {
-  private _available: typeof Piece[] = [];
+  private available: typeof Piece[] = [];
 
   constructor() {
     //code removed for brevity
-    this._available.push(PieceF);
+    this.available.push(PieceF);
   }
 }
 ```

e2e/src/app.e2e-spec.ts

@@ -16,8 +16,10 @@ describe('workspace-project App', () => {
   afterEach(async () => {
     // Assert that there are no errors emitted from the browser
     const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-    expect(logs).not.toContain(jasmine.objectContaining({
-      level: logging.Level.SEVERE,
-    } as logging.Entry));
+    expect(logs).not.toContain(
+      jasmine.objectContaining({
+        level: logging.Level.SEVERE
+      } as logging.Entry)
+    );
   });
 });

src/app/app.component.ts

@@ -3,7 +3,7 @@ import { AngularTetrisComponent } from './containers/angular-tetris/angular-tetr
 
 @Component({
   standalone: true,
-  selector: 'app-root',//eslint-disable-line
+  selector: 'app-root', //eslint-disable-line
   imports: [AngularTetrisComponent],
   template: '<angular-tetris></angular-tetris>',
   styleUrls: ['./app.component.scss']

src/app/components/button/button.component.ts

@@ -1,6 +1,6 @@
 import { AsyncPipe, NgClass, NgIf, NgStyle } from '@angular/common';
 import { Component, Input } from '@angular/core';
-import { ArrowButton, ArrowButtonTransform } from '@trungk18/interface/ui-model/arrow-button';
+import { ArrowButton, ArrowButtonTransform } from '@angular-tetris/interface/ui-model/arrow-button';
 import { Observable } from 'rxjs';
 @Component({
   selector: 't-button',

src/app/components/github/github.component.ts

@@ -1,7 +1,7 @@
 import { AsyncPipe, NgIf } from '@angular/common';
 import { Component } from '@angular/core';
-import { GoogleAnalyticsService } from '@trungk18/services/google-analytics.service';
-import { TetrisQuery } from '@trungk18/state/tetris/tetris.query';
+import { GoogleAnalyticsService } from '@angular-tetris/services/google-analytics.service';
+import { TetrisQuery } from '@angular-tetris/state/tetris/tetris.query';
 import { SharedButtonComponent } from '../shared-button/shared-button.component';
 const HASHTAG = 'angular,angulartetris,akita,typescript';
 
@@ -13,11 +13,11 @@ const HASHTAG = 'angular,angulartetris,akita,typescript';
   styleUrls: ['./github.component.scss']
 })
 export class GithubComponent {
-  max$= this._query.max$;
+  max$ = this.query.max$;
   //eslint-disable-next-line max-len
   tweetAngularTetrisUrl = `https://twitter.com/intent/tweet?url=https%3A%2F%2Fgithub.com%2Ftrungk18%2Fangular-tetris&text=Awesome%20Tetris%20game%20built%20with%20Angular%2010%20and%20Akita%2C%20can%20you%20get%20999999%20points%3F&hashtags=${HASHTAG}`;
 
-  constructor(private _query: TetrisQuery, private _googleAnalytics: GoogleAnalyticsService) {}
+  constructor(private query: TetrisQuery, private googleAnalytics: GoogleAnalyticsService) {}
 
   getTweetMaxScoreShareUrl(max: number) {
     const text = encodeURIComponent(
@@ -27,10 +27,10 @@ export class GithubComponent {
   }
 
   sendTwitterShareMaxScoreEvent() {
-    this._googleAnalytics.sendEvent('Share Twitter High Score', 'button');
+    this.googleAnalytics.sendEvent('Share Twitter High Score', 'button');
   }
 
   sendTwitterShareEvent() {
-    this._googleAnalytics.sendEvent('Share Twitter', 'button');
+    this.googleAnalytics.sendEvent('Share Twitter', 'button');
   }
 }

src/app/components/hold/hold.component.ts

@@ -1,7 +1,7 @@
 import { AsyncPipe, NgFor } from '@angular/common';
 import { Component } from '@angular/core';
-import { Tile, TileValue } from '@trungk18/interface/tile/tile';
-import { TetrisService } from '@trungk18/state/tetris/tetris.service';
+import { Tile, TileValue } from '@angular-tetris/interface/tile/tile';
+import { TetrisService } from '@angular-tetris/state/tetris/tetris.service';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { TileComponent } from '../tile/tile.component';
@@ -14,9 +14,9 @@ import { TileComponent } from '../tile/tile.component';
   styleUrls: ['./hold.component.scss']
 })
 export class HoldComponent {
-  hold$: Observable<Tile[][]> = this._tetrisService.hold$.pipe(
+  hold$: Observable<Tile[][]> = this.tetrisService.hold$.pipe(
     map((piece) => piece.next.map((row) => row.map((value) => new Tile(value as TileValue))))
   );
 
-  constructor(private _tetrisService: TetrisService) {}
+  constructor(private tetrisService: TetrisService) {}
 }

src/app/components/keyboard/keyboard.component.ts

@@ -1,9 +1,9 @@
 import { AsyncPipe } from '@angular/common';
 import { Component, EventEmitter, Input, Output } from '@angular/core';
-import { GameState } from '@trungk18/interface/game-state';
-import { ArrowButton } from '@trungk18/interface/ui-model/arrow-button';
-import { KeyboardQuery } from '@trungk18/state/keyboard/keyboard.query';
-import { TetrisQuery } from '@trungk18/state/tetris/tetris.query';
+import { GameState } from '@angular-tetris/interface/game-state';
+import { ArrowButton } from '@angular-tetris/interface/ui-model/arrow-button';
+import { KeyboardQuery } from '@angular-tetris/state/keyboard/keyboard.query';
+import { TetrisQuery } from '@angular-tetris/state/tetris/tetris.query';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { ButtonComponent } from '../button/button.component';
@@ -20,11 +20,11 @@ export class KeyboardComponent {
   @Output() onMouseDown = new EventEmitter<string>();
   @Output() onMouseUp = new EventEmitter<string>();
   ArrowButton = ArrowButton; //eslint-disable-line @typescript-eslint/naming-convention
-  pauseButtonLabel$: Observable<string> = this._query.gameState$.pipe(
+  pauseButtonLabel$: Observable<string> = this.query.gameState$.pipe(
     map((state) => (state === GameState.Paused ? 'Play' : 'Pause'))
   );
 
-  constructor(public keyboardQuery: KeyboardQuery, private _query: TetrisQuery) {}
+  constructor(public keyboardQuery: KeyboardQuery, private query: TetrisQuery) {}
 
   mouseDown(e: Event, key: string) {
     e.preventDefault();

src/app/components/level/level.component.ts

@@ -1,6 +1,6 @@
 import { AsyncPipe, NgIf } from '@angular/common';
 import { Component } from '@angular/core';
-import { TetrisQuery } from '@trungk18/state/tetris/tetris.query';
+import { TetrisQuery } from '@angular-tetris/state/tetris/tetris.query';
 import { NumberComponent } from '../number/number.component';
 
 @Component({
@@ -10,10 +10,10 @@ import { NumberComponent } from '../number/number.component';
   templateUrl: './level.component.html',
   styleUrls: ['./level.component.scss']
 })
-export class LevelComponent  {
-  constructor(private _query: TetrisQuery) {}
+export class LevelComponent {
+  speed$ = this.query.speed$;
+  hasCurrent$ = this.query.hasCurrent$;
+  initSpeed$ = this.query.initSpeed$;
 
-  speed$ = this._query.speed$;
-  hasCurrent$ = this._query.hasCurrent$;
-  initSpeed$ = this._query.initSpeed$;
+  constructor(private query: TetrisQuery) {}
 }

src/app/components/matrix/matrix.component.ts

@@ -1,10 +1,10 @@
 import { AsyncPipe, NgFor } from '@angular/common';
 import { Component, OnInit } from '@angular/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { GameState } from '@trungk18/interface/game-state';
-import { Tile } from '@trungk18/interface/tile/tile';
-import { MatrixUtil } from '@trungk18/interface/utils/matrix';
-import { TetrisQuery } from '@trungk18/state/tetris/tetris.query';
+import { GameState } from '@angular-tetris/interface/game-state';
+import { Tile } from '@angular-tetris/interface/tile/tile';
+import { MatrixUtil } from '@angular-tetris/interface/utils/matrix';
+import { TetrisQuery } from '@angular-tetris/state/tetris/tetris.query';
 import { combineLatest, Observable, of, timer } from 'rxjs';
 import { map, switchMap, takeWhile } from 'rxjs/operators';
 import { TileComponent } from '../tile/tile.component';
@@ -18,14 +18,15 @@ import { TileComponent } from '../tile/tile.component';
 })
 export class MatrixComponent implements OnInit {
   matrix$: Observable<Tile[]>;
-  constructor(private _tetrisQuery: TetrisQuery) {}
+
+  constructor(private tetrisQuery: TetrisQuery) {}
 
   ngOnInit(): void {
     this.matrix$ = this.getMatrix();
   }
 
   getMatrix(): Observable<Tile[]> {
-    return combineLatest([this._tetrisQuery.gameState$, this._tetrisQuery.matrix$]).pipe(
+    return combineLatest([this.tetrisQuery.gameState$, this.tetrisQuery.matrix$]).pipe(
       untilDestroyed(this),
       switchMap(([gameState, matrix]) => {
         if (gameState !== GameState.Over && gameState !== GameState.Loading) {

src/app/components/next/next.component.ts

@@ -1,7 +1,7 @@
 import { AsyncPipe, NgFor } from '@angular/common';
 import { Component } from '@angular/core';
-import { Tile, TileValue } from '@trungk18/interface/tile/tile';
-import { TetrisQuery } from '@trungk18/state/tetris/tetris.query';
+import { Tile, TileValue } from '@angular-tetris/interface/tile/tile';
+import { TetrisQuery } from '@angular-tetris/state/tetris/tetris.query';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { TileComponent } from '../tile/tile.component';
@@ -14,8 +14,9 @@ import { TileComponent } from '../tile/tile.component';
   styleUrls: ['./next.component.scss']
 })
 export class NextComponent {
-  next$: Observable<Tile[][]> = this._tetrisQuery.next$.pipe(
+  next$: Observable<Tile[][]> = this.tetrisQuery.next$.pipe(
     map((piece) => piece.next.map((row) => row.map((value) => new Tile(value as TileValue))))
   );
-  constructor(private _tetrisQuery: TetrisQuery) {}
+
+  constructor(private tetrisQuery: TetrisQuery) {}
 }