cubing 0.21.2 → 0.23.0

package/src/cubing/puzzle-geometry/PuzzleGeometry.ts

@@ -66,7 +66,11 @@ export interface StickerDatFace {
   name: string;
 }
 
-export type StickerDatAxis = [number[], string, number];
+export type StickerDatAxis = {
+  coordinates: number[];
+  quantumMove: Move;
+  order: number;
+};
 
 export interface StickerDat {
   stickers: StickerDatSticker[];
@@ -407,12 +411,16 @@ function findelement(a: Quat[][], p: Quat): number {
   throw new Error("Element not found");
 }
 
-export function getpuzzles(): { [s: string]: PuzzleDescriptionString } {
+export function getPG3DNamedPuzzles(): {
+  [s: string]: PuzzleDescriptionString;
+} {
   // get some simple definitions of basic puzzles
   return PGPuzzles;
 }
 
-export function getpuzzle(puzzleName: PuzzleName): PuzzleDescriptionString {
+export function getPuzzleDescriptionString(
+  puzzleName: PuzzleName,
+): PuzzleDescriptionString {
   // get some simple definitions of basic puzzles
   return PGPuzzles[puzzleName];
 }
@@ -2851,12 +2859,16 @@ export class PuzzleGeometry {
       const order = this.movesetorders[i];
       for (const gn of this.geonormals) {
         if (msg[0] === gn[1] && msg[1] === gn[2]) {
-          grips.push([toCoords(gn[0].rotatepoint(rot), 1), msg[0], order]);
-          grips.push([
-            toCoords(gn[0].rotatepoint(rot).smul(-1), 1),
-            msg[2],
+          grips.push({
+            coordinates: toCoords(gn[0].rotatepoint(rot), 1),
+            quantumMove: new Move(msg[0]),
             order,
-          ]);
+          });
+          grips.push({
+            coordinates: toCoords(gn[0].rotatepoint(rot).smul(-1), 1),
+            quantumMove: new Move(msg[2]),
+            order,
+          });
         }
       }
     }

package/src/cubing/puzzle-geometry/index.ts

@@ -1,8 +1,8 @@
 export {
-  getpuzzle,
+  getPuzzleDescriptionString,
   getPuzzleGeometryByDesc,
   getPuzzleGeometryByName,
-  getpuzzles,
+  getPG3DNamedPuzzles,
   parsePuzzleDescription,
   PuzzleGeometry,
 } from "./PuzzleGeometry";

package/src/cubing/puzzles/index.ts

@@ -3,7 +3,7 @@ export { experimentalCube3x3x3KPuzzle as experimentalCube3x3x3KPuzzle } from "..
 
 export { cubeAppearance as experimentalCubeAppearance } from "./stickerings/cube-stickerings";
 
-import type { PuzzleID } from "../twisty/old/dom/TwistyPlayerConfig";
+import type { PuzzleID } from "../twisty";
 import { cubePGPuzzleLoader, genericPGPuzzleLoader } from "./async/async-pg3d";
 import { cube2x2x2 } from "./implementations/2x2x2";
 import { cube3x3x3 } from "./implementations/3x3x3";

package/src/cubing/puzzles/stickerings/cube-stickerings.ts

@@ -158,6 +158,22 @@ export async function cubeAppearance(
         PieceStickering.OrientationWithoutPermutation,
       );
       break;
+    case "EOline":
+      puzzleStickering.set(CORNERS(), PieceStickering.Ignored);
+      puzzleStickering.set(
+        EDGES(),
+        PieceStickering.OrientationWithoutPermutation,
+      );
+      puzzleStickering.set(m.and(m.moves(["D", "M"])), PieceStickering.Regular);
+      break;
+    case "EOcross":
+      puzzleStickering.set(
+        EDGES(),
+        PieceStickering.OrientationWithoutPermutation,
+      );
+      puzzleStickering.set(m.move("D"), PieceStickering.Regular);
+      puzzleStickering.set(CORNERS(), PieceStickering.Ignored);
+      break;
     case "CMLL":
       puzzleStickering.set(F2L(), PieceStickering.Dim);
       puzzleStickering.set(L6E(), PieceStickering.Ignored);
@@ -269,6 +285,8 @@ export async function cubeStickerings(): Promise<ExperimentalStickering[]> {
     "VLS",
     "LS",
     "EO",
+    "EOline",
+    "EOcross",
     "CMLL",
     "L6E",
     "L6EO",

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

@@ -46,7 +46,7 @@ export function useGlobalCustomStickerer(
 }
 
 if (
-  typeof location !== "undefined" &&
+  globalThis.location &&
   new URL(location.href).searchParams.get("global-custom-stickerer") === "true"
 ) {
   (window as any).setGlobalCustomStickerer = setGlobalCustomStickerer;

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

@@ -1,7 +1,7 @@
 // We need to use a static `import` statement instead of dynamic `import()` to
 // 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";
+import { expose } from "../vendor/comlink-everywhere/inside";
 
 export const esmTestAPIImplementation = {
   test: (s) => {

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

@@ -30,6 +30,7 @@ import { bigCubeRandomMoves } from "./solve/puzzles/big-cubes";
 import { oriented555RandomMoves } from "./solve/puzzles/5x5x5";
 import { getRandomSquare1Scramble } from "./solve/puzzles/sq1";
 import type { Transformation } from "../../kpuzzle";
+import { randomFTOScramble } from "./solve/puzzles/fto";
 
 setIsInsideWorker(true);
 
@@ -134,6 +135,8 @@ export const insideAPI = {
           "getRandomSquare1Scramble",
           getRandomSquare1Scramble,
         );
+      case "fto":
+        return measurePerf("randomFTOScramble", randomFTOScramble);
       default:
         throw new Error(`unsupported event: ${eventID}`);
     }

package/src/cubing/search/inside/entry.js

@@ -1,4 +1,4 @@
-import { expose } from "../vendor/comlink-everywhere/inside";
+import { expose } from "../../vendor/comlink-everywhere/inside";
 import { insideAPI } from "./api";
 
 expose(insideAPI);

package/src/cubing/search/inside/inside-worker.ts

@@ -7,7 +7,7 @@ export function setIsInsideWorker(inside: boolean) {
 export function mustBeInsideWorker(): void {
   if (!isInsideWorker) {
     throw new Error(
-      "Must be called from inside a worker, to avoid impct on page performance. Try importing from the top level of `cubing/solve`?",
+      "Must be called from inside a worker, to avoid impact on page performance. Try importing from the top level of `cubing/solve`?",
     );
   }
 }

package/src/cubing/search/inside/module-entry-path-getter.ts

@@ -0,0 +1,5 @@
+(globalThis as any).DO_NOT_EXPOSE_API = true;
+
+export async function getWorkerEntryFileURL() {
+  return (await import("./module-entry")).WORKER_ENTRY_FILE_URL
+}

package/src/cubing/search/inside/module-entry.ts

@@ -0,0 +1,20 @@
+// TODO: can we avoid this?
+async function getNodeMessagePort() {
+  return (
+    await import("../../vendor/comlink-everywhere/inside/node.js")
+  ).port();
+}
+
+if (!(globalThis as any).DO_NOT_EXPOSE_API) {
+  (async () => {
+    await import("./entry.js");
+
+    // // Workaround for `node`
+    const messagePort = (globalThis as any).postMessage
+      ? globalThis
+      : await getNodeMessagePort();
+    messagePort.postMessage("comlink-exposed");
+  })();
+}
+
+export const WORKER_ENTRY_FILE_URL = import.meta.url;

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

@@ -1,5 +1,5 @@
 import { Alg, AlgBuilder, Move } from "../../../alg";
-import { randomChoiceFactory } from "./vendor/random-uint-below";
+import { randomChoiceFactory } from "../../../vendor/random-uint-below";
 
 export async function addOrientationSuffix(
   alg: Alg,

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

@@ -9,7 +9,7 @@ import { mustBeInsideWorker } from "../../inside-worker";
 import {
   randomPermute,
   randomUIntBelowFactory,
-} from "../vendor/random-uint-below";
+} from "../../../../vendor/random-uint-below";
 import type { SGSCachedData } from "../parseSGS";
 import { TrembleSolver } from "../tremble";
 

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

@@ -3,8 +3,7 @@ import { KPuzzle, Transformation } from "../../../../../kpuzzle";
 import { puzzles } from "../../../../../puzzles";
 import { mustBeInsideWorker } from "../../../inside-worker";
 import { addOrientationSuffix } from "../../addOrientationSuffix";
-import { initialize, solveState } from "../../vendor/min2phase/gwt";
-import { randomChoiceFactory } from "../../vendor/random-uint-below";
+import { randomChoiceFactory } from "../../../../../vendor/random-uint-below";
 import { toMin2PhaseState } from "./convert";
 import { passesFilter } from "./filter";
 import { sgs3x3x3 } from "./legacy-sgs";
@@ -23,9 +22,20 @@ export async function random333State(): Promise<Transformation> {
   return kpuzzle.state;
 }
 
+let cachedImport: Promise<
+  typeof import("../../../../../vendor/min2phase/gwt")
+> | null = null;
+function dynamicMin2phaseGWT(): Promise<
+  typeof import("../../../../../vendor/min2phase/gwt")
+> {
+  return (cachedImport ??= import("../../../../../vendor/min2phase/gwt"));
+}
+
 export async function solve333(s: Transformation): Promise<Alg> {
   mustBeInsideWorker();
-  return Alg.fromString(solveState(toMin2PhaseState(s)));
+  return Alg.fromString(
+    (await dynamicMin2phaseGWT()).solveState(toMin2PhaseState(s)),
+  );
 }
 
 export async function random333Scramble(): Promise<Alg> {
@@ -33,7 +43,7 @@ export async function random333Scramble(): Promise<Alg> {
 }
 
 export async function initialize333(): Promise<void> {
-  initialize();
+  (await dynamicMin2phaseGWT()).initialize();
 }
 
 const randomSuffixes = [

package/src/cubing/search/inside/solve/puzzles/4x4x4.ts

@@ -1,16 +1,30 @@
 import type { Alg } from "../../../../alg";
 import { addOrientationSuffix } from "../addOrientationSuffix";
-import { random444Scramble } from "../vendor/cstimer/src/js/scramble/scramble_444";
-export {
-  initialize as initialize444,
-  random444Scramble,
-} from "../vendor/cstimer/src/js/scramble/scramble_444";
 
 const randomSuffixes = [
   [null, "x", "x2", "x'", "z", "z'"],
   [null, "y", "y2", "y'"],
 ];
 
+let cachedImport: Promise<
+  typeof import("../../../../vendor/cstimer/src/js/scramble/scramble_444")
+> | null = null;
+function dynamicScramble444(): Promise<
+  typeof import("../../../../vendor/cstimer/src/js/scramble/scramble_444")
+> {
+  return (cachedImport ??= import(
+    "../../../../vendor/cstimer/src/js/scramble/scramble_444"
+  ));
+}
+
+export async function initialize444(): Promise<void> {
+  return (await dynamicScramble444()).initialize();
+}
+
+export async function random444Scramble(): Promise<Alg> {
+  return (await dynamicScramble444()).random444Scramble();
+}
+
 export async function random444OrientedScramble(): Promise<Alg> {
   return addOrientationSuffix(await random444Scramble(), randomSuffixes);
 }

package/src/cubing/search/inside/solve/puzzles/big-cubes.ts

@@ -2,7 +2,7 @@ import { Alg, AlgBuilder, Move, QuantumMove } from "../../../../alg";
 import {
   randomChoiceFactory,
   randomUIntBelowFactory,
-} from "../vendor/random-uint-below";
+} from "../../../../vendor/random-uint-below";
 
 function numMoves(n: number): number {
   switch (n) {

package/src/cubing/search/inside/solve/puzzles/clock.ts

@@ -1,4 +1,4 @@
-import { randomUIntBelowFactory } from "../vendor/random-uint-below";
+import { randomUIntBelowFactory } from "../../../../vendor/random-uint-below";
 
 const pins = ["UR", "DR", "DL", "UL"];
 const backMoves = ["U", "R", "D", "L", "ALL"];