Refactoring openCell action

README.md

@@ -191,3 +191,7 @@
 ### Test refactoring
 
 [Pull request](https://github.com/nickovchinnikov/minesweeper/pull/31/files)
+
+### Set flag action
+
+[Pull request](https://github.com/nickovchinnikov/minesweeper/pull/32/files)

src/helpers/CellsManipulator.test.ts

@@ -3,7 +3,6 @@ import {
   incrementNeibours,
   getNeigboursItems,
   checkItemInField,
-  openCell,
 } from './CellsManipulator';
 
 const { empty: e, hidden: h, bomb: b } = CellState;
@@ -221,113 +220,3 @@ describe('Check Increment Neibours', () => {
     });
   });
 });
-
-describe('Open cell action', () => {
-  describe('Simple cases with loose', () => {
-    it('Open cell with the bomb', () => {
-      expect(() =>
-        openCell(
-          [1, 1],
-          [
-            [h, h],
-            [h, h],
-          ],
-          [
-            [1, 1],
-            [1, b],
-          ]
-        )
-      ).toThrow('Game Over');
-    });
-  });
-  describe('Open cell with number', () => {
-    it('Open cell with state == 1', () => {
-      const playerField = openCell(
-        [1, 1],
-        [
-          [h, h, h],
-          [h, h, h],
-          [h, h, h],
-        ],
-        [
-          [1, 1, 0],
-          [9, 1, 0],
-          [1, 1, 0],
-        ]
-      );
-      expect(playerField).toStrictEqual([
-        [h, h, h],
-        [h, 1, h],
-        [h, h, h],
-      ]);
-    });
-    it('Open cell with state == 3', () => {
-      const playerField = openCell(
-        [1, 1],
-        [
-          [h, h, h],
-          [h, h, h],
-          [h, h, h],
-        ],
-        [
-          [9, 2, 0],
-          [9, 3, 0],
-          [9, 2, 0],
-        ]
-      );
-      expect(playerField).toStrictEqual([
-        [h, h, h],
-        [h, 3, h],
-        [h, h, h],
-      ]);
-    });
-  });
-  describe('Open empty cell', () => {
-    it('Open empty cell, simple 3*3 case', () => {
-      const playerField = openCell(
-        [1, 2],
-        [
-          [h, h, h],
-          [h, h, h],
-          [h, h, h],
-        ],
-        [
-          [1, 1, 0],
-          [9, 1, 0],
-          [1, 1, 0],
-        ]
-      );
-      expect(playerField).toStrictEqual([
-        [h, 1, 0],
-        [h, 1, 0],
-        [h, 1, 0],
-      ]);
-    });
-    it('Open empty cell 5*5 case', () => {
-      const playerField = openCell(
-        [2, 2],
-        [
-          [h, h, h, h, h],
-          [h, h, h, h, h],
-          [h, h, h, h, h],
-          [h, h, h, h, h],
-          [h, h, h, h, h],
-        ],
-        [
-          [9, 9, 1, 1, 2],
-          [9, 3, 1, 0, 0],
-          [1, 1, 0, 1, 1],
-          [1, 0, 0, 1, 9],
-          [2, 1, 0, 1, 0],
-        ]
-      );
-      expect(playerField).toStrictEqual([
-        [h, h, 1, 1, 2],
-        [h, 3, 1, 0, 0],
-        [1, 1, 0, 1, 1],
-        [1, 0, 0, 1, h],
-        [2, 1, 0, 1, h],
-      ]);
-    });
-  });
-});

src/helpers/CellsManipulator.ts

@@ -1,4 +1,4 @@
-import { Cell, CellState, Coords, Field } from './Field';
+import { Cell, Coords, Field } from './Field';
 
 /**
  * Get neighbour cells indexes
@@ -48,46 +48,3 @@ export const incrementNeibours = (coords: Coords, field: Field): Field => {
 
   return field;
 };
-
-/**
- * Open cell in the player field using game field info
- * @param {Coords} coords
- * @param {Field} playerField
- * @param {Field} gameField
- * @returns {Field}
- */
-export const openCell = (
-  coords: Coords,
-  playerField: Field,
-  gameField: Field
-): Field => {
-  const { empty, hidden, bomb } = CellState;
-
-  const [y, x] = coords;
-  const gameCell = gameField[y][x];
-
-  if (gameCell === bomb) {
-    throw new Error('Game Over');
-  }
-
-  if (gameCell === empty) {
-    playerField[y][x] = gameCell;
-
-    const items = getNeigboursItems(coords);
-
-    for (const [y, x] of Object.values(items)) {
-      if (checkItemInField([y, x], gameField)) {
-        const playerCell = playerField[y][x];
-        const gameCell = gameField[y][x];
-
-        if (playerCell === hidden && gameCell !== bomb) {
-          playerField = openCell([y, x], playerField, gameField);
-        }
-      }
-    }
-  }
-
-  playerField[y][x] = gameCell;
-
-  return playerField;
-};

src/helpers/openCell.test.ts

@@ -0,0 +1,114 @@
+import { CellState } from './Field';
+import { openCell } from './openCell';
+
+const { empty: e, hidden: h, bomb: b } = CellState;
+
+describe('Open cell action', () => {
+  describe('Simple cases with loose', () => {
+    it('Open cell with the bomb', () => {
+      expect(() =>
+        openCell(
+          [1, 1],
+          [
+            [h, h],
+            [h, h],
+          ],
+          [
+            [1, 1],
+            [1, b],
+          ]
+        )
+      ).toThrow('Game Over');
+    });
+  });
+  describe('Open cell with number', () => {
+    it('Open cell with state == 1', () => {
+      const playerField = openCell(
+        [1, 1],
+        [
+          [h, h, h],
+          [h, h, h],
+          [h, h, h],
+        ],
+        [
+          [1, 1, 0],
+          [9, 1, 0],
+          [1, 1, 0],
+        ]
+      );
+      expect(playerField).toStrictEqual([
+        [h, h, h],
+        [h, 1, h],
+        [h, h, h],
+      ]);
+    });
+    it('Open cell with state == 3', () => {
+      const playerField = openCell(
+        [1, 1],
+        [
+          [h, h, h],
+          [h, h, h],
+          [h, h, h],
+        ],
+        [
+          [9, 2, 0],
+          [9, 3, 0],
+          [9, 2, 0],
+        ]
+      );
+      expect(playerField).toStrictEqual([
+        [h, h, h],
+        [h, 3, h],
+        [h, h, h],
+      ]);
+    });
+  });
+  describe('Open empty cell', () => {
+    it('Open empty cell, simple 3*3 case', () => {
+      const playerField = openCell(
+        [1, 2],
+        [
+          [h, h, h],
+          [h, h, h],
+          [h, h, h],
+        ],
+        [
+          [1, 1, 0],
+          [9, 1, 0],
+          [1, 1, 0],
+        ]
+      );
+      expect(playerField).toStrictEqual([
+        [h, 1, 0],
+        [h, 1, 0],
+        [h, 1, 0],
+      ]);
+    });
+    it('Open empty cell 5*5 case', () => {
+      const playerField = openCell(
+        [2, 2],
+        [
+          [h, h, h, h, h],
+          [h, h, h, h, h],
+          [h, h, h, h, h],
+          [h, h, h, h, h],
+          [h, h, h, h, h],
+        ],
+        [
+          [9, 9, 1, 1, 2],
+          [9, 3, 1, 0, 0],
+          [1, 1, 0, 1, 1],
+          [1, 0, 0, 1, 9],
+          [2, 1, 0, 1, 0],
+        ]
+      );
+      expect(playerField).toStrictEqual([
+        [h, h, 1, 1, 2],
+        [h, 3, 1, 0, 0],
+        [1, 1, 0, 1, 1],
+        [1, 0, 0, 1, h],
+        [2, 1, 0, 1, h],
+      ]);
+    });
+  });
+});

src/helpers/openCell.ts

@@ -0,0 +1,45 @@
+import { CellState, Coords, Field } from './Field';
+import { checkItemInField, getNeigboursItems } from './CellsManipulator';
+
+/**
+ * Open cell in the player field using game field info
+ * @param {Coords} coords
+ * @param {Field} playerField
+ * @param {Field} gameField
+ * @returns {Field}
+ */
+export const openCell = (
+  coords: Coords,
+  playerField: Field,
+  gameField: Field
+): Field => {
+  const { empty, hidden, bomb } = CellState;
+
+  const [y, x] = coords;
+  const gameCell = gameField[y][x];
+
+  if (gameCell === bomb) {
+    throw new Error('Game Over');
+  }
+
+  if (gameCell === empty) {
+    playerField[y][x] = gameCell;
+
+    const items = getNeigboursItems(coords);
+
+    for (const [y, x] of Object.values(items)) {
+      if (checkItemInField([y, x], gameField)) {
+        const playerCell = playerField[y][x];
+        const gameCell = gameField[y][x];
+
+        if (playerCell === hidden && gameCell !== bomb) {
+          playerField = openCell([y, x], playerField, gameField);
+        }
+      }
+    }
+  }
+
+  playerField[y][x] = gameCell;
+
+  return playerField;
+};