cubing 0.20.2 → 0.21.0-pre12

package/src/cubing/puzzles/stickerings/global-custom-stickering-hack.ts

@@ -0,0 +1,61 @@
+import type { TwistyPlayer } from "../../twisty";
+import {
+  PieceStickering,
+  PuzzleStickering,
+  StickeringManager,
+} from "./appearance";
+
+type Stickerer = (
+  puzzleStickering: PuzzleStickering,
+  m: StickeringManager,
+) => void;
+
+let globalCustomStickerer: Stickerer = () => {};
+
+function setGlobalCustomStickerer(stickerer: Stickerer): void {
+  (async () => {
+    globalCustomStickerer = stickerer;
+
+    const players: TwistyPlayer[] = Array.from(
+      document.body.querySelectorAll("twisty-player"),
+    );
+    console.log(`Setting the custom stickering for ${players.length} players!`);
+    const successPromises = [];
+    for (const player of players) {
+      successPromises.push(
+        (async () => {
+          const stickering =
+            await player.experimentalModel.stickeringProp.get();
+          player.experimentalStickering =
+            stickering === "experimental-global-custom-1"
+              ? "experimental-global-custom-2"
+              : "experimental-global-custom-1";
+        })(),
+      );
+    }
+    await Promise.all(successPromises);
+    console.log("Success!");
+  })();
+}
+
+export function useGlobalCustomStickerer(
+  puzzleStickering: PuzzleStickering,
+  m: StickeringManager,
+): void {
+  globalCustomStickerer(puzzleStickering, m);
+}
+
+if (
+  typeof location !== "undefined" &&
+  new URL(location.href).searchParams.get("global-custom-stickerer") === "true"
+) {
+  (window as any).setGlobalCustomStickerer = setGlobalCustomStickerer;
+  (window as any).PieceStickering = PieceStickering;
+  console.log(
+    "Global custom stickerer enabled! (using: global-custom-stickerer=true)",
+  );
+  console.log(
+    "Look here for inspiration:",
+    "https://github.com/cubing/cubing.js/blob/81b5cab3e27d8defb39dd1e0a10bc9e8ba894d26/src/cubing/puzzles/stickerings/cube-stickerings.ts#L67",
+  );
+}

package/src/cubing/search/.gitignore

@@ -1,2 +1 @@
-/worker-inside-generated.js
-/worker-inside-generated-string.js
+/worker-inside-generated*

package/src/cubing/search/esm-test-worker.js

@@ -1,5 +1,5 @@
 // We need to use a static `import` statement instead of dynamic `import()` to
-// tst true compatibility (Snowpack behaves differently for those two, for
+// test true compatibility (Snowpack behaves differently for those two, for
 // example). This may result in an unpreventable extra error in the console.
 import { expose } from "./vendor/comlink-everywhere/inside";
 

package/src/cubing/search/index.ts

@@ -5,6 +5,7 @@ export {
   solveSkewb,
   solvePyraminx,
   solveMegaminx,
+  setDebug,
 } from "./outside";
 
 // TODO: handle centers properly.

package/src/cubing/search/inside/api.spec.ts

@@ -17,6 +17,7 @@ const events = [
   "sq1",
   "444bf",
   "555bf",
+  "333mb",
 ];
 
 setDebugMeasurePerf(false);

package/src/cubing/search/inside/api.ts

@@ -1,5 +1,4 @@
 import type { Alg } from "../../alg";
-import type { Transformation } from "../../puzzle-geometry/interfaces";
 import {
   preInitialize222,
   random222Scramble,
@@ -30,6 +29,7 @@ import { setIsInsideWorker } from "./inside-worker";
 import { bigCubeRandomMoves } from "./solve/puzzles/big-cubes";
 import { oriented555RandomMoves } from "./solve/puzzles/5x5x5";
 import { getRandomSquare1Scramble } from "./solve/puzzles/sq1";
+import type { Transformation } from "../../kpuzzle";
 
 setIsInsideWorker(true);
 
@@ -90,6 +90,7 @@ export const insideAPI = {
           random333FewestMovesScramble,
         );
       case "333bf":
+      case "333mb":
         return measurePerf(
           "random333OrientedScramble",
           random333OrientedScramble,
@@ -161,6 +162,10 @@ export const insideAPI = {
   solveMegaminxToString: async (s: Transformation): Promise<string> => {
     return (await solveMegaminx(s)).toString();
   },
+
+  setDebugMeasurePerf: async (measure: boolean): Promise<void> => {
+    setDebugMeasurePerf(measure);
+  },
 };
 
 export type WorkerInsideAPI = typeof insideAPI;

package/src/cubing/search/inside/solve/parseSGS.ts

@@ -38,7 +38,7 @@ export function parseSGS(def: KPuzzleDefinition, sgs: string): SGSCachedData {
       kpuzzle.applyAlg(alg);
       sgsActions.push({ alg: alg, transformation: kpuzzle.state });
     } else if (line.startsWith("SubgroupSizes ")) {
-      for (var j = 1; j < lineTokens.length; j++) {
+      for (let j = 1; j < lineTokens.length; j++) {
         subgroupSizes.push(parseInt(lineTokens[j]));
       }
     }
@@ -59,10 +59,9 @@ export function parseSGS(def: KPuzzleDefinition, sgs: string): SGSCachedData {
   }
   if (sgsActions.length !== sum) {
     throw Error(
-      "Bad sgs; expected " +
-        (sum - subgroupSizes.length) +
-        " algs but saw " +
-        (sgsActions.length - subgroupSizes.length),
+      `Bad sgs; expected ${sum - subgroupSizes.length} algs but saw ${
+        sgsActions.length - subgroupSizes.length
+      }`,
     );
   }
   const processedPieces: Record<string, boolean[]> = {};
@@ -100,12 +99,9 @@ export function parseSGS(def: KPuzzleDefinition, sgs: string): SGSCachedData {
       let key = "";
       for (let k = 0; k < pieceOrdering.length; k++) {
         const loc = pieceOrdering[k];
-        key =
-          key +
-          " " +
-          transformation[loc.orbitName].permutation[loc.permutationIdx] +
-          " " +
-          transformation[loc.orbitName].orientation[loc.permutationIdx];
+        key = `${key} ${
+          transformation[loc.orbitName].permutation[loc.permutationIdx]
+        } ${transformation[loc.orbitName].orientation[loc.permutationIdx]}`;
       }
       lookup[key] = sgsActions[j];
       sgsActions[j].alg = sgsActions[j].alg.invert();

package/src/cubing/search/inside/solve/puzzles/2x2x2.ts

@@ -62,7 +62,7 @@ async function randomizeOrbit(
 
   let sum = 0;
   for (let i = 0; i < orbitDef.numPieces; i++) {
-    const o = await randomUIntBelow(orbitDef.orientations);
+    const o = randomUIntBelow(orbitDef.orientations);
     ori[i] = o;
     sum += o;
   }
@@ -71,7 +71,7 @@ async function randomizeOrbit(
   if (options && "orientationSum" in options) {
     // console.log("sfdsf", options!.orientationSum),
     ori[0] =
-      (((ori[0] + options!.orientationSum! - sum) % orbitDef.orientations) +
+      (((ori[0] + options.orientationSum! - sum) % orbitDef.orientations) +
         orbitDef.orientations) %
       orbitDef.orientations;
   }
@@ -82,7 +82,7 @@ export async function random222State(): Promise<Transformation> {
   const nonExtensibleDef = await puzzles["2x2x2"].def();
   const def = Object.assign({}, nonExtensibleDef);
   const kpuzzle = new KPuzzle(def);
-  const stateCopy = JSON.parse(JSON.stringify(kpuzzle.state)); // TODO
+  const stateCopy: Transformation = JSON.parse(JSON.stringify(kpuzzle.state)); // TODO
   await randomizeOrbit(def, "CORNERS", stateCopy, { orientationSum: 0 });
   return stateCopy;
 }

package/src/cubing/search/inside/solve/puzzles/3x3x3/filter.ts

@@ -1,15 +1,9 @@
-// @ts-ignore
 import { Move } from "../../../../../alg";
 import {
-  // @ts-ignore
   KPuzzle,
-  // @ts-ignore
   areOrbitTransformationsEquivalent,
-  // @ts-ignore
   KPuzzleDefinition,
-  // @ts-ignore
   Transformation,
-  // @ts-ignore
 } from "../../../../../kpuzzle";
 
 export function isEquivalentTranformationIgnoringCENTERS(

package/src/cubing/search/inside/solve/puzzles/3x3x3/index.ts

@@ -1,7 +1,5 @@
 import { Alg, AlgBuilder } from "../../../../../alg";
-// @ts-ignore
 import { KPuzzle, Transformation } from "../../../../../kpuzzle";
-// @ts-ignore
 import { puzzles } from "../../../../../puzzles";
 import { mustBeInsideWorker } from "../../../inside-worker";
 import { addOrientationSuffix } from "../../addOrientationSuffix";

package/src/cubing/search/inside/solve/puzzles/FTO.sgs

@@ -0,0 +1,264 @@
+SubgroupSizes 12 12 11 12 12 11 10 9 11 8 10 9 7 8 10 10 6 9 8 5 7 6 5 4 4 8 7 3 6 6 2 5 3 4 3
+
+Alg BB
+Alg BB'
+Alg U
+Alg U'
+Alg BB BL
+Alg BB BL'
+Alg BB' BR
+Alg BB' BR'
+Alg U R'
+Alg U' L
+Alg BB BL' D
+
+Alg R
+Alg R'
+Alg R D
+Alg R D'
+Alg R BR
+Alg R BR'
+Alg R' F
+Alg R' L
+Alg R' L'
+Alg BB L BB'
+Alg U L' U'
+
+Alg BB U BB'
+Alg BB U' BB'
+Alg BB R BB'
+Alg BB R' BB'
+Alg BB' U' BB
+Alg BB' U BB L
+Alg BB' U BB L'
+Alg BB' U' BB BL'
+Alg BB U' BB' BR
+Alg BB' R' BB F
+
+Alg BR
+Alg BR'
+Alg BR BL
+Alg BR BL'
+Alg BR' F
+Alg BR' F'
+Alg BR' D
+Alg BB BR BB'
+Alg U F U'
+Alg BR BL L
+Alg BR' D BR'
+
+Alg BB' BL BB
+Alg BB' BL' BB
+Alg BR D' BR'
+Alg BB' BL BB D'
+Alg BB' BL BB BL
+Alg BB' BL BB BL'
+Alg BB' BL L BB
+Alg BB' BL' BB F'
+Alg BB' BL' BB L'
+Alg BB' BL' BB BL'
+Alg BB' BL' L BL' BB
+
+Alg R' BR R
+Alg R' BR' R
+Alg BR BL' D BR
+Alg R' BR D R
+Alg R' BR D' R
+Alg R' BR R BL
+Alg BB' D' BL D BB
+Alg BR BB D' BB' BR'
+Alg BR BL' D BR L'
+Alg BR BL' D BL BR
+
+Alg U BR U'
+Alg U BR' U'
+Alg U' R U
+Alg U' R' U
+Alg U BR BB' U'
+Alg U BR' U' D
+Alg U BR' U' D'
+Alg U' R F' U
+Alg U' R' U L'
+
+Alg U BB U'
+Alg U BB' U'
+Alg U BB U' L
+Alg U BB U' L'
+Alg U BB' U' BL'
+Alg U BB U' L F
+Alg U BB U' L F'
+Alg U BB' U' BL' D'
+
+Alg BB BL' L BL BB'
+Alg BB BL' L' BL BB'
+Alg U BB' D BB U'
+Alg U BB' D' BB U'
+Alg U R D R' U'
+Alg U R D' R' U'
+Alg R' F L F' R
+Alg R' F L' F' R
+Alg BB L' BB F' D BB
+Alg U BB' D' BB U' D
+
+Alg F
+Alg F'
+Alg F D
+Alg F D'
+Alg F' L
+Alg F' L'
+Alg F D' BL
+
+Alg F BL F'
+Alg F BL' F'
+Alg BR' BL BR
+Alg BR' BL' BR
+Alg F BR F' BR'
+Alg F BL F' BL'
+Alg F BL' F' L
+Alg F BL' L' F'
+Alg F BR' BL BR F'
+
+Alg F' BL F
+Alg F' BL' F
+Alg U BL U'
+Alg U BL' U'
+Alg F U' F' U
+Alg F' BL F D'
+Alg F' BL F BL'
+Alg F' BL D F
+
+Alg L
+Alg L'
+Alg L BL
+Alg L BL'
+Alg F' D F
+Alg L BL D
+
+Alg L' BL L
+Alg L' BL' L
+Alg L' BL D L
+Alg L' BL D' L
+Alg L' BL L BL'
+Alg L' BL D' L BL
+Alg L' BL D' L BL'
+
+Alg L D L'
+Alg L D' L'
+Alg R' D R
+Alg R' D' R
+Alg L D L' D'
+Alg L R L' R'
+Alg L' BB' L BB
+Alg R' D R BL
+Alg L BL' L' BL L'
+
+Alg U L' D L U'
+Alg U BB D BB' U'
+Alg U L' D' L U'
+Alg U BB D' BB' U'
+Alg R' D' BL' D R
+Alg U BB D' BB' U' D
+Alg U BB' L BB L' U'
+Alg U BB D BB' U' BL'
+Alg U BB D' BB' L' D' L U'
+
+Alg F L F'
+Alg F L' F'
+Alg F L F' D
+Alg F L F' D'
+Alg F L' F' BL'
+
+Alg L BL' D BL L'
+Alg L BL' D' BL L'
+Alg F D L D' L' F'
+Alg F L D L' D' F'
+Alg F L' BB' L BB F'
+Alg F' D' R' D R F
+Alg F D L D' L' F' BL'
+Alg F' R' BB' R' BB R' F
+
+Alg BB D BB'
+Alg BB D' BB'
+Alg L' D L
+Alg L' D' L
+Alg BB D BB' D'
+Alg BB' L BB L'
+Alg BB D BB' D' BL
+
+Alg D
+Alg D'
+Alg D BL
+Alg D BL'
+
+Alg D BL' D BL D'
+Alg D BL' D' BL D'
+Alg BB D R D' R' BB'
+Alg BB R D R' D' BB'
+Alg D BL' D BL D' BL
+Alg D BL' D BL D' BL'
+
+Alg D BL D BL' D'
+Alg D BL D' BL' D'
+Alg BB' BL' BB BR D' BR'
+Alg D BL D BL' D' BL
+Alg D BL D BL' D' BL'
+
+Alg D' BL D
+Alg D' BL' D
+Alg D' BL D BL
+Alg D' BL D BL'
+
+Alg BB D' BB' BL BB D BB'
+Alg BB D' BB' BL' BB D BB'
+Alg D' BL' D BL D' BL D
+
+Alg BB R' BB' BL BB R BB'
+Alg BB R' BB' BL' BB R BB'
+Alg L R L' BL' L R' L'
+
+Alg F BL' BB' BL F' BL' BB
+Alg F' R' F BL F' R F
+Alg F' R' F BL' F' R F
+Alg BR R BR' BL' BR R' BR'
+Alg F L' BL U BL' U' L F'
+Alg F' U' F D F' U F D'
+Alg F BL F' D F BL' F' BL D'
+
+Alg F D F U' F' U D' F'
+Alg F D F' BL F BL' D' F'
+Alg F U D BL' U' BL D' F'
+Alg F U' D F U F' D' F'
+Alg F' BR L F BR' F' L' F
+Alg U R BL' F BL F' R' U'
+
+Alg BL
+Alg BL'
+
+Alg F U BL U' BL' F'
+Alg F BL U BL' U' F'
+Alg U BL BR BL' BR' U'
+Alg BR F BL F' BL' BR'
+Alg F U' F' U BL' U BL U'
+
+Alg F U' F' D F U F' D'
+Alg BB' U' F U BB U' F' U
+Alg D F U' F' D' F U F'
+Alg BR' U BR D' BR' U' BR D
+Alg D' BR BL' F BL' F' BL BR' BL D
+
+Alg U BR' U' BR BL' BR BL BR'
+
+Alg F L F' BL D F' D' F BL' L'
+Alg F' BR F BR' L BL' BR' BL BR L'
+Alg BB BR' U R BR' R' BR U' BB' BR
+Alg U BR' U' BR L' BL BR BL' BR' L
+
+Alg F BL F' BL F BL F' BL
+Alg F BL' F' BL' F BL' F' BL'
+
+Alg F' D BR F' R F R' BR' F D'
+Alg BB BL U' L U L' BL' U BB' U'
+Alg U BB U' BL L U' L' U BL' BB'
+
+Alg F BL F' BL' BB F' BR F BR' BB'
+Alg BB BR F' BR' BB' F BL F BL' F'

package/src/cubing/search/inside/solve/puzzles/megaminx.sgs.json.ts

@@ -3,12 +3,10 @@ import { getPuzzleGeometryByName } from "../../../../puzzle-geometry";
 import { parseSGS, SGSCachedData } from "../parseSGS";
 
 async function megaminxDefWithoutMO(): Promise<KPuzzleDefinition> {
-  return getPuzzleGeometryByName("megaminx", [
-    "allmoves",
-    "true",
-    "rotations",
-    "true",
-  ]).writekpuzzle(true);
+  return getPuzzleGeometryByName("megaminx", {
+    allMoves: true,
+    addRotations: true,
+  }).writekpuzzle(true);
 }
 
 // TODO: Implement a general lazy Promise/ Promise cache wrapper

package/src/cubing/search/inside/solve/puzzles/skewb.sgs.json.ts

@@ -3,12 +3,10 @@ import { getPuzzleGeometryByName } from "../../../../puzzle-geometry";
 import { parseSGS, SGSCachedData } from "../parseSGS";
 
 async function skewbDefWithoutMO(): Promise<KPuzzleDefinition> {
-  return getPuzzleGeometryByName("skewb", [
-    "allmoves",
-    "true",
-    "rotations",
-    "true",
-  ]).writekpuzzle(true);
+  return getPuzzleGeometryByName("skewb", {
+    allMoves: true,
+    addRotations: true,
+  }).writekpuzzle(true);
 }
 
 // TODO: Implement a general lazy Promise/ Promise cache wrapper

package/src/cubing/search/inside/solve/tremble.ts

@@ -40,6 +40,7 @@ function calculateMoves(
       );
     }
     kpuzzle.reset();
+    // eslint-disable-next-line no-constant-condition
     for (let i = 1; true; i++) {
       kpuzzle.applyMove(rootMove);
       // console.log(kpuzzle.state, identityTransformation(def));
@@ -96,7 +97,7 @@ export class TrembleSolver {
     quantumMoveOrder?: (quantumMove: QuantumMove) => number,
   ): Promise<Alg> {
     let bestAlg: Alg | null = null;
-    var bestLen = 1000000;
+    let bestLen = 1000000;
     const recur = (
       recursiveState: Transformation,
       togo: number,
@@ -116,8 +117,8 @@ export class TrembleSolver {
         const len = countMoves(newAlg);
         if (bestAlg === null || len < bestLen) {
           if (DEBUG) {
-            console.log(`New best (${len} moves): ${newAlg}`);
-            console.log(`Tremble moves are: ${sofar}`);
+            console.log(`New best (${len} moves): ${newAlg.toString()}`);
+            console.log(`Tremble moves are: ${sofar.toString()}`);
           }
           bestAlg = newAlg;
           bestLen = len;
@@ -136,7 +137,7 @@ export class TrembleSolver {
         );
       }
     };
-    for (var d = 0; d <= stage1DepthLimit; d++) {
+    for (let d = 0; d <= stage1DepthLimit; d++) {
       recur(state, d, new Alg());
     }
     if (bestAlg === null) {
@@ -167,11 +168,7 @@ export class TrembleSolver {
         const loc = cubieSeq[i];
         const orbitName = loc.orbitName;
         const idx = loc.permutationIdx;
-        key +=
-          " " +
-          inverseState[orbitName].permutation[idx] +
-          " " +
-          inverseState[orbitName].orientation[idx];
+        key += ` ${inverseState[orbitName].permutation[idx]} ${inverseState[orbitName].orientation[idx]}`;
       }
       const info = step.lookup[key];
       if (!info) {