Merge pull request #30 from skedwards88/use-transpose-grid

Use transposeGrid function

package.json

@@ -21,7 +21,7 @@
   "license": "",
   "dependencies": {
     "@skedwards88/word_lists": "latest",
-    "@skedwards88/word_logic": "2.0.4",
+    "@skedwards88/word_logic": "2.0.7",
     "lodash.clonedeep": "^4.5.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

src/logic/centerGrid.js

@@ -1,5 +1,6 @@
 import cloneDeep from "lodash.clonedeep";
 import { getMaxShifts } from "./getMaxShifts";
+import { transposeGrid } from "@skedwards88/word_logic";
 
 export function centerGrid(grid) {
   let shiftedGrid = cloneDeep(grid);
@@ -29,9 +30,7 @@ export function centerGrid(grid) {
   ];
 
   // transpose
-  shiftedGrid = shiftedGrid.map((_, index) =>
-    shiftedGrid.map((row) => row[index])
-  );
+  shiftedGrid = transposeGrid(shiftedGrid);
 
   // trim the empty rows, then pad with empty rows to center
   const cutLeftRight = shiftedGrid.slice(
@@ -45,9 +44,7 @@ export function centerGrid(grid) {
   ];
 
   // un transpose
-  shiftedGrid = shiftedGrid.map((_, index) =>
-    shiftedGrid.map((row) => row[index])
-  );
+  shiftedGrid = transposeGrid(shiftedGrid);
 
   return shiftedGrid;
 }

src/logic/generateGrid.js

@@ -1,5 +1,5 @@
 import getPatternsForRow from "./getRegexForRow.js";
-import { shuffleArray } from "@skedwards88/word_logic";
+import { shuffleArray, transposeGrid } from "@skedwards88/word_logic";
 import {
   commonWordsLen4,
   commonWordsLen5,
@@ -77,7 +77,7 @@ export function generateGrid({ gridSize, minLetters, pseudoRandomGenerator }) {
     //
     while (letterCount < minLetters && count < 20) {
       // transpose the grid to start searching in the opposite orientation
-      grid = grid.map((_, index) => grid.map((row) => row[index]));
+      grid = transposeGrid(grid);
       orientationIsRows = !orientationIsRows;
 
       // to keep the puzzle spread out and to be more likely to find a match,

src/logic/getMaxShifts.js

@@ -1,5 +1,7 @@
+import { transposeGrid } from "@skedwards88/word_logic";
+
 export function getMaxShifts(grid) {
-  const transposedGrid = grid.map((_, index) => grid.map((row) => row[index]));
+  const transposedGrid = transposeGrid(grid);
 
   let maxShiftUp = 0;
   for (let index = 0; index < grid.length; index++) {

src/logic/getWordsFromGrid.js

@@ -1,3 +1,5 @@
+import { transposeGrid } from "@skedwards88/word_logic";
+
 function getHorizontalWordsFromGrid(grid) {
   let words = [];
 
@@ -23,21 +25,7 @@ function getHorizontalWordsFromGrid(grid) {
 }
 
 export function getWordsFromGrid(grid) {
-  // The simple method of grid transposition used in this function
-  // relies on an equal number of rows and columns,
-  // so throw errors if that isn't the case
-  if (grid.length != grid[0]?.length) {
-    throw new Error(
-      `The number of columns and number of rows in the grid must be equal.`
-    );
-  }
-
-  const numColumnsPerRow = grid.map((row) => row.length);
-  if (Math.min(...numColumnsPerRow) != Math.max(...numColumnsPerRow)) {
-    throw new Error(`All of the rows in the grid must have the same length.`);
-  }
-
-  const transposedGrid = grid.map((_, index) => grid.map((row) => row[index]));
+  const transposedGrid = transposeGrid(grid);
 
   return [
     ...getHorizontalWordsFromGrid(grid),