derive bottom-up

stevenwaterman · Jan 31, 2020 · db4b4cc · db4b4cc
1 parent eeb2fb5
commit db4b4cc
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 40 deletions.
diff --git a/src/Cell.svelte b/src/Cell.svelte
@@ -1,9 +1,9 @@
 <script>
-  import { deriveCellStore, deriveSurroundingsStore, width, height } from "./cellsStore";
+  import { cellStores, surroundingStores } from "./cellsStore";
 
   export let index;
-  $: me = deriveCellStore(index);
-  $: surroundings = deriveSurroundingsStore(index, $width, $height);
+  $: me = cellStores[index];
+  $: surroundings = surroundingStores[index];
 
   $: isMine = $me.isMine;
   $: stateKnown = $me.stateKnown;

diff --git a/src/cellsStore.js b/src/cellsStore.js
@@ -27,50 +27,39 @@ function generateCells(cellCount) {
   return shuffle([...clearCells, ...knownCells, ...mineCells]);
 }
 
-function createCellsStore() {
-  const width = 100;
-  const height = 100;
-  const initial = {
-    width,
-    height,
-    cells: generateCells(width * height)
-  };
-  const { subscribe, set, update } = writable(initial);
-  return {
-    subscribe,
-    reveal: idx =>
-      update(state => {
-        state.cells[idx].stateKnown = true;
-        return state;
-      })
-  };
-}
-export const cellsStore = createCellsStore();
-
-export const width = derived(
-  [cellsStore],
-  ([$cellsStore]) => $cellsStore.width
-);
-export const height = derived(
-  [cellsStore],
-  ([$cellsStore]) => $cellsStore.height
-);
+export const width = writable(100);
+export const height = writable(100);
 export const cellCount = derived(
   [width, height],
   ([$width, $height]) => $width * $height
 );
+export const cellStores = generateCells(get(cellCount)).map(createCellStore);
+export const surroundingStores = cellStores.map((_, idx) =>
+  createSurroundingsStore(idx)
+);
 
-export function deriveCellStore(idx) {
-  return derived([cellsStore], ([$cellsStore]) => $cellsStore.cells[idx]);
+export function regenerate() {
+  generateCells(get(cellCount)).forEach((newCell, idx) =>
+    cellStores[idx].set(newCell)
+  );
 }
 
-export function deriveSurroundingsStore(idx, width, height) {
-  const idxs = surroundingIndices(idx, width, height);
-  const store = derived([cellsStore], ([$cellsStore]) =>
-    idxs.map(idx => $cellsStore.cells[idx])
-  );
+function createCellStore(cell) {
+  const { subscribe, set, update } = writable(cell);
+  return {
+    subscribe,
+    set,
+    reveal: () => update(cell => ({ ...cell, stateKnown: true }))
+  };
+}
+
+export function createSurroundingsStore(idx) {
+  const idxs = surroundingIndices(idx, get(width), get(height));
+  const relevantStores = idxs.map(idx => cellStores[idx]);
+  // @ts-ignore
+  const store = derived(relevantStores, values => values);
   return {
     ...store,
-    reveal: () => idxs.forEach(cellsStore.reveal)
-  }
+    reveal: () => relevantStores.forEach(store => store.reveal())
+  };
 }