сделал EventSender дженериком, переименовал ивенты (#32)(#43)

frontend/mvc/controller/Controller.ts

@@ -1,5 +1,6 @@
-import IModel from '../model/IModel';
-import IView from '../view/IView';
+import { IModel } from '../model/IModel';
+import { IView } from '../view/IView';
+
 
 class Controller {
   model: IModel;
@@ -15,32 +16,32 @@ class Controller {
     this.setRunning(false);
   }
   setSubscription():void {
-    this.model.matrixChanged.attach((sender, { isResized, matrix }) => {
-      if (isResized) { this.view.initTable(matrix); }
+    this.model.matrixChanged.attach((sender, { resized , matrix }) => {
+      if (resized) { this.view.initTable(matrix); }
       else { this.view.changeTable(matrix); }
     });
     this.view.tableCellChanged.attach((sender, { row, cell }) => {
       this.model.toggleCell(row, cell);
     });
-    this.view.startEvent.attach(() => {
+    this.view.started.attach(() => {
       this.setRunning(true);
       this.anim();
     });
-    this.view.pauseEvent.attach(() => {
+    this.view.paused.attach(() => {
       this.setRunning(false);
     });
-    this.view.clearEvent.attach(() => {
+    this.view.cleared.attach(() => {
       this.model.clearMatrix();
       this.setRunning(false);
     });
-    this.view.speedChanged.attach((sender, { value }) => {
+    this.view.speedChanged.attach((sender, value) => {
       this.fps = value;
     });
-    this.view.widthChanged.attach((sender, { value }) => {
+    this.view.widthChanged.attach((sender, value) => {
       this.setRunning(false);
       this.model.setWidthMatrix(value);
     });
-    this.view.heightChanged.attach((sender, { value }) => {
+    this.view.heightChanged.attach((sender, value) => {
       this.setRunning(false);
       this.model.setHeightMatrix(value);
     });

frontend/mvc/model/IModel.ts

@@ -1,8 +1,13 @@
 import IEventSender from '../utils/IEventSender';
 
+type matrixChangedMessage = {
+  matrix: boolean[][];
+  resized?: boolean;
+};
+
 interface IModel {
   matrix: boolean[][];
-  matrixChanged: IEventSender;
+  matrixChanged: IEventSender<matrixChangedMessage>;
   setWidthMatrix(newValue: number): void;
   setHeightMatrix(newValue: number): void;
   clearMatrix(): void;
@@ -11,4 +16,4 @@ interface IModel {
   toggleCell(row: number, column: number): void;
 }
 
-export default IModel;
+export { IModel, matrixChangedMessage };

frontend/mvc/model/Model.ts

@@ -1,19 +1,19 @@
-import Event from '../utils/EventSender';
-import IModel from './IModel';
+import EventSender from '../utils/EventSender';
+import { IModel, matrixChangedMessage } from './IModel';
 import '../../scripts/arrayFrom-polyfill';
 
 class Model implements IModel{
   matrix: boolean[][];
   rows: number;
   columns: number;
   stateHistory: boolean[][][];
-  matrixChanged: Event;
+  matrixChanged: EventSender<matrixChangedMessage>;
   constructor(rows: number = 10, columns: number = 10) {
     this.initMatrix(rows, columns);
     this.rows = rows;
     this.columns = columns;
     this.stateHistory = [];
-    this.matrixChanged = new Event(this);
+    this.matrixChanged = new EventSender<matrixChangedMessage>(this);
   }
   initMatrix(rows: number, columns: number): void {
     this.matrix = Array.from(Array(rows), () => Array.from(Array(columns), () => false));
@@ -30,7 +30,7 @@ class Model implements IModel{
     });
     this.columns = newWidth;
     this.stateHistory = [];
-    this.matrixChanged.notify({ matrix: this.matrix, isResized: true });
+    this.matrixChanged.notify({ matrix: this.matrix, resized: true });
   }
   setHeightMatrix(newHeight: number): void {
     this.matrix = Array.from(Array(newHeight), (row, i) => {
@@ -39,7 +39,7 @@ class Model implements IModel{
     });
     this.rows = newHeight;
     this.stateHistory = [];
-    this.matrixChanged.notify({ matrix: this.matrix, isResized: true });
+    this.matrixChanged.notify({ matrix: this.matrix, resized: true });
   }
   clearMatrix(): void {
     this.initMatrix(this.rows, this.columns);

frontend/mvc/utils/EventSender.ts

@@ -1,16 +1,16 @@
 import IEventSender from './IEventSender';
 
-class EventSender implements IEventSender {
+class EventSender<T> implements IEventSender<T> {
   sender: object;
-  listeners: Array<(a, b) => void>;
+  listeners: Array<(a: object, b: T) => void>;
   constructor(sender: object) {
     this.sender = sender;
     this.listeners = [];
   }
-  attach(listener: (a, b) => void): void {
+  attach(listener: (a: object, b: T) => void): void {
     this.listeners.push(listener);
   }
-  notify(args: object): void {
+  notify(args: T): void {
     this.listeners.forEach((listener) => {
       listener(this.sender, args);
     });

frontend/mvc/utils/IEventSender.ts

@@ -1,5 +1,5 @@
-interface IEventSender {
-  attach(listener: (a, b) => void): void;
-  notify(args: object): void;
+interface IEventSender<T> {
+  attach(listener: (a: object, b: T) => void): void;
+  notify(args: T): void;
 }
 export default IEventSender;

frontend/mvc/view/IView.ts

@@ -1,16 +1,22 @@
 import IEventSender from '../utils/IEventSender';
 
+type tableCellAddress = {
+  row: number;
+  cell:number;
+};
+
+
 interface IView {
-  tableCellChanged: IEventSender;
-  startEvent: IEventSender;
-  pauseEvent: IEventSender;
-  clearEvent: IEventSender;
-  widthChanged: IEventSender;
-  heightChanged: IEventSender;
-  speedChanged: IEventSender;
+  tableCellChanged: IEventSender<tableCellAddress>;
+  started: IEventSender<null>;
+  paused: IEventSender<null>;
+  cleared: IEventSender<null>;
+  widthChanged: IEventSender<number>;
+  heightChanged: IEventSender<number>;
+  speedChanged: IEventSender<number>;
   setStatus(running: boolean): void;
   initTable(matrix: boolean[][]): void;
   changeTable(matrix: boolean[][]): void;
 }
 
-export default IView;
+export { IView, tableCellAddress };

frontend/mvc/view/View.ts

@@ -1,5 +1,5 @@
 import EventSender from '../utils/EventSender';
-import IView from './IView';
+import { IView, tableCellAddress } from './IView';
 
 const CLASS_CEIL = 'game__ceil';
 const CLASS_CEIL_LIVE = 'game__ceil_live';
@@ -15,13 +15,13 @@ class View implements IView{
   $sliderHeight: JQuery;
   $status: JQuery;
 
-  tableCellChanged: EventSender;
-  startEvent: EventSender;
-  pauseEvent: EventSender;
-  clearEvent: EventSender;
-  widthChanged: EventSender;
-  heightChanged: EventSender;
-  speedChanged: EventSender;
+  tableCellChanged: EventSender<tableCellAddress>;
+  started: EventSender<null>;
+  paused: EventSender<null>;
+  cleared: EventSender<null>;
+  widthChanged: EventSender<number>;
+  heightChanged: EventSender<number>;
+  speedChanged: EventSender<number>;
   constructor() {
     this.initDOMElements();
     this.initEvents();
@@ -39,13 +39,13 @@ class View implements IView{
     this.$status = this.$controls.find('.js-game__status');
   }
   initEvents(): void {
-    this.tableCellChanged = new EventSender(this);
-    this.startEvent = new EventSender(this);
-    this.pauseEvent = new EventSender(this);
-    this.clearEvent = new EventSender(this);
-    this.widthChanged = new EventSender(this);
-    this.heightChanged = new EventSender(this);
-    this.speedChanged = new EventSender(this);
+    this.tableCellChanged = new EventSender<tableCellAddress>(this);
+    this.started = new EventSender<null>(this);
+    this.paused = new EventSender<null>(this);
+    this.cleared = new EventSender<null>(this);
+    this.widthChanged = new EventSender<number>(this);
+    this.heightChanged = new EventSender<number>(this);
+    this.speedChanged = new EventSender<number>(this);
   }
   initHandlers(): void {
     this.$table.on('click.view', 'td', ({ target }) => {
@@ -54,25 +54,25 @@ class View implements IView{
       this.tableCellChanged.notify({ row, cell });
     });
     this.$buttonStart.on('click.view', () => {
-      this.startEvent.notify({});
+      this.started.notify(null);
     });
     this.$buttonPause.on('click.view', () => {
-      this.pauseEvent.notify({});
+      this.paused.notify(null);
     });
     this.$buttonClear.on('click.view', () => {
-      this.clearEvent.notify({});
+      this.cleared.notify(null);
     });
     this.$sliderSpeed.on('change.view', ({ target }) => {
       const value: number = Number($(target).val());
-      this.speedChanged.notify({ value });
+      this.speedChanged.notify(value);
     });
     this.$sliderWidth.on('change.view', ({ target }) => {
       const value: number = Number($(target).val());
-      this.widthChanged.notify({ value });
+      this.widthChanged.notify(value);
     });
     this.$sliderHeight.on('change.view', ({ target }) => {
       const value: number = Number($(target).val());
-      this.heightChanged.notify({ value });
+      this.heightChanged.notify(value);
     });
   }
   setButtons(running: boolean): void {