@cubingcenter/scrambler 0.6.0 → 0.6.2

package/dist-cjs/puzzles/cube4/scrambler.js

@@ -3,6 +3,10 @@
  * The 4x4 scramble generator: sample a uniform random state, solve it with
  * the reduction solver (phases 1-4), and invert the solution. The scramble
  * always reproduces the sampled target state and facelets exactly.
+ *
+ * If the solver fails after 5 attempts it falls back to cubing.js
+ * `randomScrambleForEvent("444")` (also random-state). If that also fails,
+ * a WCA-compatible random-moves sequence (40 moves) is returned.
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -39,7 +43,6 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cube4ScrambleGenerator = void 0;
-exports.isCube4TablesLoaded = isCube4TablesLoaded;
 exports.generateCube4Scramble = generateCube4Scramble;
 const moves_js_1 = require("./moves.js");
 const random_state_js_1 = require("./random-state.js");
@@ -47,6 +50,95 @@ const state_js_1 = require("./state.js");
 const facelets_js_1 = require("./facelets.js");
 const solve_js_1 = require("./reduction/solve.js");
 const index_js_1 = require("../cube3/solver/index.js");
+const index_js_2 = require("../../random/index.js");
+// ────────────────────────────────────────────────────────────
+// cubing.js fallback (random-state, WCA-compliant)
+// ────────────────────────────────────────────────────────────
+/**
+ * Try to generate a 4x4 scramble using cubing.js `randomScrambleForEvent`.
+ * Uses a dynamic import so browser bundles can tree-shake it when unused.
+ * Returns null if cubing.js is unavailable.
+ */
+async function generateCube4WithCubingJs() {
+    try {
+        const { randomScrambleForEvent } = await Promise.resolve().then(() => __importStar(require(
+        /* webpackIgnore: true */
+        /* @vite-ignore */
+        "cubing/scramble")));
+        const alg = await randomScrambleForEvent("444");
+        const scramble = alg.toString();
+        const moves = scramble.trim().split(/\s+/);
+        return {
+            eventId: "444",
+            scramble,
+            moves,
+            quality: "random-state",
+            generator: "cubing-js",
+            metadata: {
+                generator: "cubing-js",
+                distribution: "random-state",
+                note: "Generated by cubing.js randomScrambleForEvent as fallback."
+            }
+        };
+    }
+    catch {
+        return null;
+    }
+}
+// ────────────────────────────────────────────────────────────
+// Last-resort: random-moves (no external dep, always works)
+// ────────────────────────────────────────────────────────────
+const CUBE4_FACES = ["U", "R", "F", "D", "L", "B"];
+// Opposite face indices (U↔D, R↔L, F↔B)
+const CUBE4_OPPOSITE = { U: "D", D: "U", R: "L", L: "R", F: "B", B: "F" };
+const CUBE4_SUFFIXES = ["", "2", "'"];
+const CUBE4_WIDE_FACES = ["Uw", "Rw", "Fw", "Dw", "Lw", "Bw"];
+// Opposite wide-move faces
+const CUBE4_WIDE_OPPOSITE = {
+    Uw: "Dw", Dw: "Uw", Rw: "Lw", Lw: "Rw", Fw: "Bw", Bw: "Fw"
+};
+// All available move bases (outer + wide). Outer and wide turns are treated
+// independently for the same-face/opposite-face check using their base letter.
+const ALL_MOVE_BASES = [...CUBE4_FACES, ...CUBE4_WIDE_FACES];
+function generateCube4RandomMoves(options = {}) {
+    const rng = (0, index_js_2.createRandomSource)(options.seed);
+    const moveCount = 40;
+    const moves = [];
+    let lastFace = null;
+    let secondLastFace = null;
+    const getBaseLetter = (face) => face.length > 1 ? face[0] : face;
+    for (let i = 0; i < moveCount; i++) {
+        let face;
+        // Reject same face as last or opposite face when the last two moves
+        // share the same axis (to avoid redundant move pairs like R L R).
+        do {
+            face = ALL_MOVE_BASES[rng.nextInt(ALL_MOVE_BASES.length)];
+        } while (face === lastFace ||
+            (lastFace !== null &&
+                (CUBE4_OPPOSITE[face] === lastFace || CUBE4_WIDE_OPPOSITE[face] === lastFace) &&
+                secondLastFace !== null &&
+                getBaseLetter(secondLastFace) === getBaseLetter(face)));
+        const suffix = CUBE4_SUFFIXES[rng.nextInt(3)];
+        moves.push(`${face}${suffix}`);
+        secondLastFace = lastFace;
+        lastFace = face;
+    }
+    const scramble = moves.join(" ");
+    return {
+        eventId: "444",
+        scramble,
+        moves,
+        quality: "random-moves",
+        generator: "cube4-random-moves-fallback",
+        metadata: {
+            generator: "cube4-random-moves-fallback",
+            distribution: "random-moves",
+            note: "Reduction solver and cubing.js both failed; using random-moves.",
+            ...options.metadata
+        }
+    };
+}
+// ────────────────────────────────────────────────────────────
 let cachedTables;
 async function loadCube4Tables(baseUrl) {
     if (cachedTables)
@@ -78,18 +170,6 @@ async function loadCube4Tables(baseUrl) {
     cachedTables = tables;
     return tables;
 }
-function isCube4TablesLoaded() {
-    // For the scrambler retry logic, we need to know if tables are already
-    // loaded to avoid re-loading on every attempt.
-    try {
-        // @ts-ignore
-        const loader = globalThis;
-        return false;
-    }
-    catch {
-        return false;
-    }
-}
 exports.cube4ScrambleGenerator = {
     info: {
         eventId: "444",
@@ -97,7 +177,7 @@ exports.cube4ScrambleGenerator = {
         puzzle: "cube-4x4",
         quality: "random-state",
         generator: "cube4-reduction",
-        description: "Random-state 4x4 scramble via the reduction solver (centers + pairing + 3x3 finish)."
+        description: "Random-state 4x4 scramble via the reduction solver (centers + pairing + 3x3 finish). Falls back to random-moves if the solver fails."
     },
     generate(options = {}) {
         return generateCube4Scramble(options);
@@ -174,5 +254,11 @@ async function generateCube4Scramble(options = {}) {
             throw error;
         }
     }
-    throw lastError;
+    // All solver attempts exhausted — try cubing.js first, then random-moves.
+    console.warn("[cube4-scrambler] Reduction solver failed after 5 attempts; trying cubing.js fallback.", lastError);
+    const cubingJsResult = await generateCube4WithCubingJs();
+    if (cubingJsResult)
+        return cubingJsResult;
+    console.warn("[cube4-scrambler] cubing.js fallback also failed; using random-moves.");
+    return generateCube4RandomMoves(options);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubingcenter/scrambler",
-  "version": "0.6.0",
+  "version": "0.6.2",
   "description": "Extensible scramble generation toolkit for CubingCenter projects.",
   "type": "module",
   "license": "MIT",
@@ -57,6 +57,9 @@
     "tsx": "^4.20.0",
     "typescript": "^5.9.0"
   },
+  "dependencies": {
+    "cubing": "^0.63.4"
+  },
   "scripts": {
     "build": "node scripts/clean.cjs && tsc -p tsconfig.json && tsc -p tsconfig.cjs.json && node scripts/write-cjs-package.cjs && node scripts/copy-assets.cjs",
     "test": "node --test --import tsx test/*.test.ts",