cleanup

Author: mbrinkl

src/App.jsx

@@ -38,7 +38,7 @@ export const App = () => {
       if (worker) {
         worker.postMessage(setupData);
       } else {
-        const { data, discovered, error } = generatePuzzleBoard(
+        const { cells, knownCells, error } = generatePuzzleBoard(
           setupData.seed,
           setupData.pieces,
           setupData.size,
@@ -49,15 +49,6 @@ export const App = () => {
         if (error) {
           console.error(error);
         } else {
-          let cells = data;
-          let knownCells = Array(setupData.size * setupData.size).fill(false);
-
-          for (let i in discovered) {
-            if (discovered[i]) {
-              knownCells[i] = true;
-            }
-          }
-
           setGame({ ...Game({ ...setupData, cells, knownCells }) });
         }
       }

src/Game.js

@@ -367,11 +367,19 @@ export function generatePuzzleBoard(seed, pieces, size, count, difficulty) {
     }
   }
 
+  let knownCells;
   if (c === maxIt) {
     error = "Failed to generate puzzle";
+  } else {
+    knownCells = Array(size * size).fill(false);
+    for (let i in discovered) {
+      if (discovered[i]) {
+        knownCells[i] = true;
+      }
+    }
   }
 
-  return { data, discovered, error };
+  return { cells: data, knownCells, error };
 }
 
 function generateClassicBoard(G, id) {

src/PuzzleGenWorker.js

@@ -3,7 +3,7 @@ import { generatePuzzleBoard } from "./Game";
 onmessage = (e) => {
   const { seed, pieces, size, count, difficulty } = e.data;
 
-  const { data, discovered, error } = generatePuzzleBoard(
+  const { cells, knownCells, error } = generatePuzzleBoard(
     seed,
     pieces,
     size,
@@ -14,15 +14,6 @@ onmessage = (e) => {
   if (error) {
     postMessage(error);
   } else {
-    let cells = data;
-    let knownCells = Array(size * size).fill(false);
-
-    for (let i in discovered) {
-      if (discovered[i]) {
-        knownCells[i] = true;
-      }
-    }
-
     postMessage({ cells, knownCells });
   }
 };