From 95605bfd0be6eac035049450860d978bc6f6a25a Mon Sep 17 00:00:00 2001
From: Scott Bedard <scottbedard90@gmail.com>
Date: Sat, 7 Aug 2021 00:08:45 -0500
Subject: [PATCH] extract all stickers if no turn is provided

---
 README.md                            |  2 +-
 src/puzzles/cube/cube.ts             | 15 +++++++++------
 src/puzzles/dodecaminx/dodecaminx.ts | 11 +++++++----
 src/puzzles/puzzle.ts                |  6 +++---
 tests/puzzles/cube.spec.ts           |  7 +++++++
 tests/puzzles/dodecaminx.spec.ts     |  7 +++++++
 6 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index 7eea1e6..55b6ef2 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,7 @@ puzzle.scramble()
 
 #### `stickers`
 
-Get all stickers effected by a turn.
+Get stickers affected by a turn. If no turn notation is provided, all stickers will be returned.
 
 ```js
 const stickers = puzzle.stickers('R')
diff --git a/src/puzzles/cube/cube.ts b/src/puzzles/cube/cube.ts
index adf630e..84000b5 100644
--- a/src/puzzles/cube/cube.ts
+++ b/src/puzzles/cube/cube.ts
@@ -1,6 +1,6 @@
 import { error } from '@/utils/function';
 import { extract, inject, rotate } from '@/utils/matrix';
-import { flattenBy, isUniform, last, sample, times, without } from '@/utils/array';
+import { flattenBy, flattenDeep, isUniform, last, sample, times, without } from '@/utils/array';
 import { floor, max, rand } from '@/utils/number';
 import { keys } from '@/utils/object';
 import { lowercase } from '@/utils/string';
@@ -203,17 +203,20 @@ export class Cube extends Puzzle<CubeOptions, CubeState, CubeSimpleState, CubeTu
   }
 
   /**
-   * Get stickers that are part of a turn.
+   * Get stickers.
    *
-   * @param {string} turn turn to extract stickers from
+   * @param {string} turnNotation turn to extract stickers from
    */
-  stickers(turnNotation: string): CubeSticker[] {
+  stickers(turnNotation?: string): CubeSticker[] {
+    if (!turnNotation) {
+      return flattenDeep(Object.values(this.state));
+    }
+
     const turn = this.parse(turnNotation);
-    const { u, l, f, r, b, d } = this.state;
 
     // return all stickers for whole-puzzle rotations
     if (turn.target === 'x' || turn.target === 'y' || turn.target === 'z') {
-      return [].concat(u, l, f, r, b, d);
+      return flattenDeep(Object.values(this.state));
     }
 
     const stickers: CubeSticker[] = [];
diff --git a/src/puzzles/dodecaminx/dodecaminx.ts b/src/puzzles/dodecaminx/dodecaminx.ts
index 9ae7b77..4eb6219 100644
--- a/src/puzzles/dodecaminx/dodecaminx.ts
+++ b/src/puzzles/dodecaminx/dodecaminx.ts
@@ -244,17 +244,20 @@ export class Dodecaminx extends Puzzle<DodecaminxOptions, DodecaminxState, Dodec
   }
 
   /**
-   * Get stickers that are part of a turn.
+   * Get stickers.
    *
    * @param {string} turnNotation turn to extract stickers from
    */
-  stickers(turnNotation: string): DodecaminxSticker[] {
+  stickers(turnNotation?: string): DodecaminxSticker[] {
+    if (!turnNotation) {
+      return flattenDeep(Object.values(this.state));
+    }
+
     const turn = this.parse(turnNotation);
-    const { b, bl, br, d, dbl, dbr, dl, dr, f, l, r, u } = this.state;
 
     // return all stickers for whole-puzzle rotations
     if (turn.whole) {
-      return flattenDeep([b, bl, br, d, dbl, dbr, dl, dr, f, l, r, u]);
+      return flattenDeep(Object.values(this.state));
     }
 
     const stickers: DodecaminxSticker[] = [];
diff --git a/src/puzzles/puzzle.ts b/src/puzzles/puzzle.ts
index 30c067c..d532bf8 100644
--- a/src/puzzles/puzzle.ts
+++ b/src/puzzles/puzzle.ts
@@ -102,11 +102,11 @@ export abstract class Puzzle<
   }
 
   /**
-   * Get stickers that are part of a turn.
+   * Get stickers.
    *
-   * @param {string} turn turn to extract stickers from
+   * @param {string} turnNotation turn to extract stickers from
    */
-  abstract stickers(turn: string): Sticker[];
+  abstract stickers(turnNotation?: string): Sticker[];
 
   /**
    * Test if the puzzle is solved
diff --git a/tests/puzzles/cube.spec.ts b/tests/puzzles/cube.spec.ts
index da600a8..25462a4 100644
--- a/tests/puzzles/cube.spec.ts
+++ b/tests/puzzles/cube.spec.ts
@@ -89,6 +89,13 @@ describe('Cube', () => {
   });
 
   describe('stickers', () => {
+    it('all stickers', () => {
+      const model = new Cube({ size: 3 });
+      const stickers = model.stickers();
+
+      expect(stickers.length).toBe((3 ** 2) * 6);
+    });
+
     it('X', () => {
       const model = new Cube({ size: 3 });
       const stickers = model.stickers('X');
diff --git a/tests/puzzles/dodecaminx.spec.ts b/tests/puzzles/dodecaminx.spec.ts
index ffd83b3..20ba6c8 100644
--- a/tests/puzzles/dodecaminx.spec.ts
+++ b/tests/puzzles/dodecaminx.spec.ts
@@ -128,6 +128,13 @@ describe('Dodecaminx', () => {
   });
 
   describe('stickers', () => {
+    it('all stickers', () => {
+      const model = new Dodecaminx({ size: 3 });
+      const stickers = model.stickers();
+
+      expect(stickers.length).toBe(11 * 12);
+    });
+
     it('u', () => {
       const model = new Dodecaminx({ size: 3 });
       const stickers = model.stickers('u');