@cubingcenter/scrambler 0.3.0 → 0.4.1

package/dist-cjs/puzzles/skewb/index.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.skewbScrambleGenerator = exports.generateSkewbScramble = exports.getStateFromIndex = exports.getStateIndex = exports.solveSkewb = exports.toSkewbFacelets = exports.getSkewbFaceOrder = exports.formatSkewbFacelets = exports.createSolvedSkewbFacelets = exports.generateRandomSkewbState = exports.isOneMoveFromSolvedSkewbState = exports.isAllowedRandomSkewbState = exports.validateSkewbState = exports.permutationParity = exports.skewbStatesEqual = exports.isSolvedSkewbState = exports.createSolvedSkewbState = exports.cloneSkewbState = exports.parseSkewbMove = exports.parseSkewbAlgorithm = exports.invertSkewbMove = exports.invertSkewbAlgorithm = exports.formatSkewbAlgorithm = exports.applySkewbMove = exports.applySkewbAlgorithm = exports.SKEWB_FACES = exports.SKEWB_MOVES = void 0;
+exports.initializeScrambler = exports.getSupportedEvents = exports.getEventInfo = exports.generateScrambles = exports.generateScramble = exports.skewbScrambleGenerator = exports.generateSkewbScramble = exports.getStateFromIndex = exports.getStateIndex = exports.solveSkewb = exports.toSkewbFacelets = exports.getSkewbFaceOrder = exports.formatSkewbFacelets = exports.createSolvedSkewbFacelets = exports.generateRandomSkewbState = exports.isOneMoveFromSolvedSkewbState = exports.isAllowedRandomSkewbState = exports.validateSkewbState = exports.permutationParity = exports.skewbStatesEqual = exports.isSolvedSkewbState = exports.createSolvedSkewbState = exports.cloneSkewbState = exports.parseSkewbMove = exports.parseSkewbAlgorithm = exports.invertSkewbMove = exports.invertSkewbAlgorithm = exports.formatSkewbAlgorithm = exports.applySkewbMove = exports.applySkewbAlgorithm = exports.SKEWB_FACES = exports.SKEWB_MOVES = void 0;
+const index_js_1 = require("../../core/index.js");
+const scrambler_js_1 = require("./scrambler.js");
+(0, index_js_1.registerScrambleGenerator)(scrambler_js_1.skewbScrambleGenerator);
 var types_js_1 = require("./types.js");
 Object.defineProperty(exports, "SKEWB_MOVES", { enumerable: true, get: function () { return types_js_1.SKEWB_MOVES; } });
 Object.defineProperty(exports, "SKEWB_FACES", { enumerable: true, get: function () { return types_js_1.SKEWB_FACES; } });
@@ -33,6 +36,12 @@ var solver_js_1 = require("./solver.js");
 Object.defineProperty(exports, "solveSkewb", { enumerable: true, get: function () { return solver_js_1.solveSkewb; } });
 Object.defineProperty(exports, "getStateIndex", { enumerable: true, get: function () { return solver_js_1.getStateIndex; } });
 Object.defineProperty(exports, "getStateFromIndex", { enumerable: true, get: function () { return solver_js_1.getStateFromIndex; } });
-var scrambler_js_1 = require("./scrambler.js");
-Object.defineProperty(exports, "generateSkewbScramble", { enumerable: true, get: function () { return scrambler_js_1.generateSkewbScramble; } });
-Object.defineProperty(exports, "skewbScrambleGenerator", { enumerable: true, get: function () { return scrambler_js_1.skewbScrambleGenerator; } });
+var scrambler_js_2 = require("./scrambler.js");
+Object.defineProperty(exports, "generateSkewbScramble", { enumerable: true, get: function () { return scrambler_js_2.generateSkewbScramble; } });
+Object.defineProperty(exports, "skewbScrambleGenerator", { enumerable: true, get: function () { return scrambler_js_2.skewbScrambleGenerator; } });
+var index_js_2 = require("../../core/index.js");
+Object.defineProperty(exports, "generateScramble", { enumerable: true, get: function () { return index_js_2.generateScramble; } });
+Object.defineProperty(exports, "generateScrambles", { enumerable: true, get: function () { return index_js_2.generateScrambles; } });
+Object.defineProperty(exports, "getEventInfo", { enumerable: true, get: function () { return index_js_2.getEventInfo; } });
+Object.defineProperty(exports, "getSupportedEvents", { enumerable: true, get: function () { return index_js_2.getSupportedEvents; } });
+Object.defineProperty(exports, "initializeScrambler", { enumerable: true, get: function () { return index_js_2.initializeScrambler; } });

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

@@ -9,7 +9,7 @@ const solver_js_1 = require("./solver.js");
 const facelets_js_1 = require("./facelets.js");
 exports.skewbScrambleGenerator = {
     info: {
-        eventId: "skewb",
+        eventId: "skwb",
         name: "Skewb",
         puzzle: "skewb",
         quality: "random-state",
@@ -37,7 +37,7 @@ async function generateSkewbScramble(options = {}) {
     }
     const facelets = (0, facelets_js_1.toSkewbFacelets)(state);
     const result = {
-        eventId: "skewb",
+        eventId: "skwb",
         scramble: (0, moves_js_1.formatSkewbAlgorithm)(scrambleMoves),
         moves: scrambleMoves,
         quality: "random-state",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cubingcenter/scrambler",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "Extensible scramble generation toolkit for CubingCenter projects.",
   "type": "module",
   "license": "MIT",
@@ -13,7 +13,13 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "require": "./dist-cjs/index.js"
-    }
+    },
+    "./puzzles/*": {
+      "types": "./dist/puzzles/*/index.d.ts",
+      "import": "./dist/puzzles/*/index.js",
+      "require": "./dist-cjs/puzzles/*/index.js"
+    },
+    "./package.json": "./package.json"
   },
   "types": "./dist/index.d.ts",
   "files": [
@@ -28,17 +34,22 @@
     "test": "node --test --import tsx test/*.test.ts",
     "lint": "tsc -p tsconfig.json --noEmit",
     "package:check": "pnpm build && node scripts/check-package.cjs",
-    "verify": "pnpm lint && pnpm test && pnpm build && pnpm cube3:tables:check && pnpm cube4:tables:check && pnpm cube2:tables:check && pnpm package:check",
+    "verify": "pnpm lint && pnpm test && pnpm build && pnpm cube3:tables:check && pnpm cube2:tables:check && pnpm pyraminx:tables:check && pnpm package:check",
     "dev": "tsx src/cli/index.ts",
     "cube3:tables": "node --import tsx scripts/generate-cube3-solver-tables.ts",
     "cube3:tables:check": "node --import tsx scripts/check-cube3-solver-tables.ts",
-    "cube4:tables": "node --import tsx scripts/generate-cube4-reduction-tables.ts",
-    "cube4:tables:check": "node --import tsx scripts/check-cube4-reduction-tables.ts",
     "cube2:tables": "node --import tsx scripts/generate-cube2-solver-tables.ts",
     "cube2:tables:check": "node --import tsx scripts/check-cube2-solver-tables.ts",
+    "pyraminx:tables": "node --import tsx scripts/generate-pyraminx-solver-tables.ts",
+    "pyraminx:tables:check": "node --import tsx scripts/check-pyraminx-solver-tables.ts",
+    "tables:web:sync": "node --import tsx scripts/sync-web-tables.ts",
+    "verify:scrambles": "node --import tsx scripts/verify-scrambles.ts",
+    "verify:pyraminx:exhaustive": "node --import tsx scripts/verify-pyraminx-exhaustive.ts",
     "bench": "node --import tsx bench.ts",
     "bench:cube2": "node --import tsx bench-cube2.ts",
-    "bench:cube3": "node --import tsx bench-cube3.ts"
+    "bench:cube3": "node --import tsx bench-cube3.ts",
+    "bench:skewb": "node --import tsx bench-skewb.ts",
+    "bench:pyraminx": "node --import tsx bench-pyraminx.ts"
   },
   "devDependencies": {
     "@cubingcenter/viz": "link:../cubingcenter-viz",

package/dist/puzzles/pyraminx/solver.d.ts

@@ -1,10 +0,0 @@
-import type { PyraminxState, PyraminxMove } from "./types.js";
-export declare function getPermutationIndex(perm: readonly number[]): number;
-export declare function getPermutationFromIndex(index: number, n: number): number[];
-export declare function getOrientationIndex(orient: readonly number[]): number;
-export declare function getOrientationFromIndex(index: number): number[];
-export declare function getCentersIndex(centers: readonly number[]): number;
-export declare function getCentersFromIndex(index: number): number[];
-export declare function getStateIndex(state: PyraminxState): number;
-export declare function solvePyraminx(state: PyraminxState): PyraminxMove[];
-//# sourceMappingURL=solver.d.ts.map

package/dist/puzzles/pyraminx/solver.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"solver.d.ts","sourceRoot":"","sources":["../../../src/puzzles/pyraminx/solver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAS9D,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAWnE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAY1E;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAMrE;AAED,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAY/D;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAElE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CAQ3D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAM1D;AAKD,wBAAgB,aAAa,CAAC,KAAK,EAAE,aAAa,GAAG,YAAY,EAAE,CA8DlE"}

package/dist/puzzles/pyraminx/solver.js

@@ -1,160 +0,0 @@
-import { applyPyraminxMove } from "./moves.js";
-import { createSolvedPyraminxState } from "./state.js";
-// Fast state-to-index encoder/decoder to allow optimal BFS solving
-// Factorials for permutation encoding
-const FACT = [1, 1, 2, 6, 24, 120, 720];
-export function getPermutationIndex(perm) {
-    let index = 0;
-    const n = perm.length;
-    for (let i = 0; i < n; i++) {
-        let count = 0;
-        for (let j = i + 1; j < n; j++) {
-            if (perm[j] < perm[i])
-                count++;
-        }
-        index += count * FACT[n - 1 - i];
-    }
-    return index;
-}
-export function getPermutationFromIndex(index, n) {
-    const perm = Array(n).fill(0);
-    const temp = Array.from({ length: n }, (_, i) => i);
-    let val = index;
-    for (let i = 0; i < n; i++) {
-        const f = FACT[n - 1 - i];
-        const choice = Math.floor(val / f);
-        val %= f;
-        perm[i] = temp[choice];
-        temp.splice(choice, 1);
-    }
-    return perm;
-}
-export function getOrientationIndex(orient) {
-    let index = 0;
-    for (let i = 0; i < 5; i++) {
-        index = (index << 1) | orient[i];
-    }
-    return index;
-}
-export function getOrientationFromIndex(index) {
-    const orient = Array(6).fill(0);
-    let temp = index;
-    let sum = 0;
-    for (let i = 4; i >= 0; i--) {
-        const bit = temp & 1;
-        orient[i] = bit;
-        sum += bit;
-        temp >>= 1;
-    }
-    orient[5] = sum % 2 === 0 ? 0 : 1;
-    return orient;
-}
-export function getCentersIndex(centers) {
-    return centers[0] + 3 * centers[1] + 9 * centers[2] + 27 * centers[3];
-}
-export function getCentersFromIndex(index) {
-    let temp = index;
-    const centers = Array(4).fill(0);
-    for (let i = 0; i < 4; i++) {
-        centers[i] = temp % 3;
-        temp = Math.floor(temp / 3);
-    }
-    return centers;
-}
-export function getStateIndex(state) {
-    const c = getCentersIndex(state.centers);
-    const p = getPermutationIndex(state.edgesPerm);
-    const o = getOrientationIndex(state.edgesOrient);
-    // c is 0..80, p is 0..719, o is 0..31
-    return c + 81 * (p + 720 * o);
-}
-// Bidirectional BFS solver
-const MOVES = ["U", "U'", "L", "L'", "R", "R'", "B", "B'"];
-export function solvePyraminx(state) {
-    const startIdx = getStateIndex(state);
-    const solvedIdx = getStateIndex(createSolvedPyraminxState());
-    if (startIdx === solvedIdx)
-        return [];
-    // Bidirectional BFS:
-    // forwardMap and backwardMap store the move that led to this index and the parent index
-    const forwardMap = new Map();
-    const backwardMap = new Map();
-    const forwardQueue = [startIdx];
-    const backwardQueue = [solvedIdx];
-    forwardMap.set(startIdx, { move: "", parent: -1 });
-    backwardMap.set(solvedIdx, { move: "", parent: -1 });
-    while (forwardQueue.length > 0 && backwardQueue.length > 0) {
-        // Expand forward
-        const fSize = forwardQueue.length;
-        for (let i = 0; i < Math.min(fSize, 1000); i++) {
-            const currIdx = forwardQueue.shift();
-            const currState = getPyraminxStateFromIndex(currIdx);
-            for (const move of MOVES) {
-                const nextState = applyPyraminxMove(currState, move);
-                const nextIdx = getStateIndex(nextState);
-                if (!forwardMap.has(nextIdx)) {
-                    forwardMap.set(nextIdx, { move, parent: currIdx });
-                    if (backwardMap.has(nextIdx)) {
-                        return reconstructPath(nextIdx, forwardMap, backwardMap);
-                    }
-                    forwardQueue.push(nextIdx);
-                }
-            }
-        }
-        // Expand backward
-        const bSize = backwardQueue.length;
-        for (let i = 0; i < Math.min(bSize, 1000); i++) {
-            const currIdx = backwardQueue.shift();
-            const currState = getPyraminxStateFromIndex(currIdx);
-            for (const move of MOVES) {
-                const nextState = applyPyraminxMove(currState, move);
-                const nextIdx = getStateIndex(nextState);
-                if (!backwardMap.has(nextIdx)) {
-                    // Note: we record the inverse move since we are searching from solved
-                    const invMove = move.endsWith("'") ? move.slice(0, -1) : `${move}'`;
-                    backwardMap.set(nextIdx, { move: invMove, parent: currIdx });
-                    if (forwardMap.has(nextIdx)) {
-                        return reconstructPath(nextIdx, forwardMap, backwardMap);
-                    }
-                    backwardQueue.push(nextIdx);
-                }
-            }
-        }
-    }
-    throw new Error("Pyraminx state is unsolvable");
-}
-function getPyraminxStateFromIndex(index) {
-    let val = index;
-    const centersIdx = val % 81;
-    val = Math.floor(val / 81);
-    const permIdx = val % 720;
-    const orientIdx = Math.floor(val / 720);
-    return {
-        centers: getCentersFromIndex(centersIdx),
-        edgesPerm: getPermutationFromIndex(permIdx, 6),
-        edgesOrient: getOrientationFromIndex(orientIdx),
-        tips: [0, 0, 0, 0] // tips are solved separately
-    };
-}
-function reconstructPath(meetingIdx, forwardMap, backwardMap) {
-    const path = [];
-    // Reconstruct forward path
-    let curr = meetingIdx;
-    while (curr !== -1) {
-        const edge = forwardMap.get(curr);
-        if (edge.parent !== -1) {
-            path.unshift(edge.move);
-        }
-        curr = edge.parent;
-    }
-    // Reconstruct backward path
-    curr = meetingIdx;
-    while (curr !== -1) {
-        const edge = backwardMap.get(curr);
-        if (edge.parent !== -1) {
-            path.push(edge.move);
-        }
-        curr = edge.parent;
-    }
-    return path;
-}

package/dist-cjs/puzzles/pyraminx/solver.js

@@ -1,170 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPermutationIndex = getPermutationIndex;
-exports.getPermutationFromIndex = getPermutationFromIndex;
-exports.getOrientationIndex = getOrientationIndex;
-exports.getOrientationFromIndex = getOrientationFromIndex;
-exports.getCentersIndex = getCentersIndex;
-exports.getCentersFromIndex = getCentersFromIndex;
-exports.getStateIndex = getStateIndex;
-exports.solvePyraminx = solvePyraminx;
-const moves_js_1 = require("./moves.js");
-const state_js_1 = require("./state.js");
-// Fast state-to-index encoder/decoder to allow optimal BFS solving
-// Factorials for permutation encoding
-const FACT = [1, 1, 2, 6, 24, 120, 720];
-function getPermutationIndex(perm) {
-    let index = 0;
-    const n = perm.length;
-    for (let i = 0; i < n; i++) {
-        let count = 0;
-        for (let j = i + 1; j < n; j++) {
-            if (perm[j] < perm[i])
-                count++;
-        }
-        index += count * FACT[n - 1 - i];
-    }
-    return index;
-}
-function getPermutationFromIndex(index, n) {
-    const perm = Array(n).fill(0);
-    const temp = Array.from({ length: n }, (_, i) => i);
-    let val = index;
-    for (let i = 0; i < n; i++) {
-        const f = FACT[n - 1 - i];
-        const choice = Math.floor(val / f);
-        val %= f;
-        perm[i] = temp[choice];
-        temp.splice(choice, 1);
-    }
-    return perm;
-}
-function getOrientationIndex(orient) {
-    let index = 0;
-    for (let i = 0; i < 5; i++) {
-        index = (index << 1) | orient[i];
-    }
-    return index;
-}
-function getOrientationFromIndex(index) {
-    const orient = Array(6).fill(0);
-    let temp = index;
-    let sum = 0;
-    for (let i = 4; i >= 0; i--) {
-        const bit = temp & 1;
-        orient[i] = bit;
-        sum += bit;
-        temp >>= 1;
-    }
-    orient[5] = sum % 2 === 0 ? 0 : 1;
-    return orient;
-}
-function getCentersIndex(centers) {
-    return centers[0] + 3 * centers[1] + 9 * centers[2] + 27 * centers[3];
-}
-function getCentersFromIndex(index) {
-    let temp = index;
-    const centers = Array(4).fill(0);
-    for (let i = 0; i < 4; i++) {
-        centers[i] = temp % 3;
-        temp = Math.floor(temp / 3);
-    }
-    return centers;
-}
-function getStateIndex(state) {
-    const c = getCentersIndex(state.centers);
-    const p = getPermutationIndex(state.edgesPerm);
-    const o = getOrientationIndex(state.edgesOrient);
-    // c is 0..80, p is 0..719, o is 0..31
-    return c + 81 * (p + 720 * o);
-}
-// Bidirectional BFS solver
-const MOVES = ["U", "U'", "L", "L'", "R", "R'", "B", "B'"];
-function solvePyraminx(state) {
-    const startIdx = getStateIndex(state);
-    const solvedIdx = getStateIndex((0, state_js_1.createSolvedPyraminxState)());
-    if (startIdx === solvedIdx)
-        return [];
-    // Bidirectional BFS:
-    // forwardMap and backwardMap store the move that led to this index and the parent index
-    const forwardMap = new Map();
-    const backwardMap = new Map();
-    const forwardQueue = [startIdx];
-    const backwardQueue = [solvedIdx];
-    forwardMap.set(startIdx, { move: "", parent: -1 });
-    backwardMap.set(solvedIdx, { move: "", parent: -1 });
-    while (forwardQueue.length > 0 && backwardQueue.length > 0) {
-        // Expand forward
-        const fSize = forwardQueue.length;
-        for (let i = 0; i < Math.min(fSize, 1000); i++) {
-            const currIdx = forwardQueue.shift();
-            const currState = getPyraminxStateFromIndex(currIdx);
-            for (const move of MOVES) {
-                const nextState = (0, moves_js_1.applyPyraminxMove)(currState, move);
-                const nextIdx = getStateIndex(nextState);
-                if (!forwardMap.has(nextIdx)) {
-                    forwardMap.set(nextIdx, { move, parent: currIdx });
-                    if (backwardMap.has(nextIdx)) {
-                        return reconstructPath(nextIdx, forwardMap, backwardMap);
-                    }
-                    forwardQueue.push(nextIdx);
-                }
-            }
-        }
-        // Expand backward
-        const bSize = backwardQueue.length;
-        for (let i = 0; i < Math.min(bSize, 1000); i++) {
-            const currIdx = backwardQueue.shift();
-            const currState = getPyraminxStateFromIndex(currIdx);
-            for (const move of MOVES) {
-                const nextState = (0, moves_js_1.applyPyraminxMove)(currState, move);
-                const nextIdx = getStateIndex(nextState);
-                if (!backwardMap.has(nextIdx)) {
-                    // Note: we record the inverse move since we are searching from solved
-                    const invMove = move.endsWith("'") ? move.slice(0, -1) : `${move}'`;
-                    backwardMap.set(nextIdx, { move: invMove, parent: currIdx });
-                    if (forwardMap.has(nextIdx)) {
-                        return reconstructPath(nextIdx, forwardMap, backwardMap);
-                    }
-                    backwardQueue.push(nextIdx);
-                }
-            }
-        }
-    }
-    throw new Error("Pyraminx state is unsolvable");
-}
-function getPyraminxStateFromIndex(index) {
-    let val = index;
-    const centersIdx = val % 81;
-    val = Math.floor(val / 81);
-    const permIdx = val % 720;
-    const orientIdx = Math.floor(val / 720);
-    return {
-        centers: getCentersFromIndex(centersIdx),
-        edgesPerm: getPermutationFromIndex(permIdx, 6),
-        edgesOrient: getOrientationFromIndex(orientIdx),
-        tips: [0, 0, 0, 0] // tips are solved separately
-    };
-}
-function reconstructPath(meetingIdx, forwardMap, backwardMap) {
-    const path = [];
-    // Reconstruct forward path
-    let curr = meetingIdx;
-    while (curr !== -1) {
-        const edge = forwardMap.get(curr);
-        if (edge.parent !== -1) {
-            path.unshift(edge.move);
-        }
-        curr = edge.parent;
-    }
-    // Reconstruct backward path
-    curr = meetingIdx;
-    while (curr !== -1) {
-        const edge = backwardMap.get(curr);
-        if (edge.parent !== -1) {
-            path.push(edge.move);
-        }
-        curr = edge.parent;
-    }
-    return path;
-}