cubing 0.23.0 → 0.24.0-pre1

package/dist/esm/{2x2x2.kpuzzle.json-JOGUSQ4N.js → 2x2x2.kpuzzle.json-U5KOZCMU.js}

@@ -1,14 +1,14 @@
 import "./chunk-WO2AXYFE.js";
 
 // src/cubing/puzzles/implementations/2x2x2/2x2x2.kpuzzle.json.ts
-var cube2x2x2KPuzzle = {
+var cube2x2x2KPuzzleDefinition = {
   name: "2x2x2",
   orbits: {
     CORNERS: { numPieces: 8, orientations: 3 }
   },
-  startPieces: {
+  startStateData: {
     CORNERS: {
-      permutation: [0, 1, 2, 3, 4, 5, 6, 7],
+      pieces: [0, 1, 2, 3, 4, 5, 6, 7],
       orientation: [0, 0, 0, 0, 0, 0, 0, 0]
     }
   },
@@ -69,28 +69,28 @@ var cube2x2x2KPuzzle = {
     }
   }
 };
-cube2x2x2KPuzzle.moves["Rv"] = cube2x2x2KPuzzle.moves["x"];
-cube2x2x2KPuzzle.moves["Uv"] = cube2x2x2KPuzzle.moves["y"];
-cube2x2x2KPuzzle.moves["Fv"] = cube2x2x2KPuzzle.moves["z"];
-cube2x2x2KPuzzle.moves["Lv"] = {
+cube2x2x2KPuzzleDefinition.moves["Rv"] = cube2x2x2KPuzzleDefinition.moves["x"];
+cube2x2x2KPuzzleDefinition.moves["Uv"] = cube2x2x2KPuzzleDefinition.moves["y"];
+cube2x2x2KPuzzleDefinition.moves["Fv"] = cube2x2x2KPuzzleDefinition.moves["z"];
+cube2x2x2KPuzzleDefinition.moves["Lv"] = {
   CORNERS: {
     permutation: [1, 7, 6, 2, 0, 3, 5, 4],
     orientation: [2, 1, 2, 1, 1, 2, 1, 2]
   }
 };
-cube2x2x2KPuzzle.moves["Dv"] = {
+cube2x2x2KPuzzleDefinition.moves["Dv"] = {
   CORNERS: {
     permutation: [3, 0, 1, 2, 5, 6, 7, 4],
     orientation: [0, 0, 0, 0, 0, 0, 0, 0]
   }
 };
-cube2x2x2KPuzzle.moves["Bv"] = {
+cube2x2x2KPuzzleDefinition.moves["Bv"] = {
   CORNERS: {
     permutation: [4, 7, 1, 0, 5, 3, 2, 6],
     orientation: [1, 2, 1, 2, 2, 1, 2, 1]
   }
 };
 export {
-  cube2x2x2KPuzzle
+  cube2x2x2KPuzzleDefinition
 };
-//# sourceMappingURL=2x2x2.kpuzzle.json-JOGUSQ4N.js.map
+//# sourceMappingURL=2x2x2.kpuzzle.json-U5KOZCMU.js.map

package/dist/esm/2x2x2.kpuzzle.json-U5KOZCMU.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/cubing/puzzles/implementations/2x2x2/2x2x2.kpuzzle.json.ts"],
+  "sourcesContent": ["import type { KPuzzleDefinition } from \"../../../kpuzzle\";\n\nexport const cube2x2x2KPuzzleDefinition: KPuzzleDefinition = {\n  name: \"2x2x2\",\n  orbits: {\n    CORNERS: { numPieces: 8, orientations: 3 },\n  },\n  startStateData: {\n    CORNERS: {\n      pieces: [0, 1, 2, 3, 4, 5, 6, 7],\n      orientation: [0, 0, 0, 0, 0, 0, 0, 0],\n    },\n  },\n  moves: {\n    U: {\n      CORNERS: {\n        permutation: [1, 2, 3, 0, 4, 5, 6, 7],\n        orientation: [0, 0, 0, 0, 0, 0, 0, 0],\n      },\n    },\n    y: {\n      CORNERS: {\n        permutation: [1, 2, 3, 0, 7, 4, 5, 6],\n        orientation: [0, 0, 0, 0, 0, 0, 0, 0],\n      },\n    },\n    x: {\n      CORNERS: {\n        permutation: [4, 0, 3, 5, 7, 6, 2, 1],\n        orientation: [2, 1, 2, 1, 1, 2, 1, 2],\n      },\n    },\n    L: {\n      CORNERS: {\n        permutation: [0, 1, 6, 2, 4, 3, 5, 7],\n        orientation: [0, 0, 2, 1, 0, 2, 1, 0],\n      },\n    },\n    F: {\n      CORNERS: {\n        permutation: [3, 1, 2, 5, 0, 4, 6, 7],\n        orientation: [1, 0, 0, 2, 2, 1, 0, 0],\n      },\n    },\n    R: {\n      CORNERS: {\n        permutation: [4, 0, 2, 3, 7, 5, 6, 1],\n        orientation: [2, 1, 0, 0, 1, 0, 0, 2],\n      },\n    },\n    B: {\n      CORNERS: {\n        permutation: [0, 7, 1, 3, 4, 5, 2, 6],\n        orientation: [0, 2, 1, 0, 0, 0, 2, 1],\n      },\n    },\n    D: {\n      CORNERS: {\n        permutation: [0, 1, 2, 3, 5, 6, 7, 4],\n        orientation: [0, 0, 0, 0, 0, 0, 0, 0],\n      },\n    },\n    z: {\n      CORNERS: {\n        permutation: [3, 2, 6, 5, 0, 4, 7, 1],\n        orientation: [1, 2, 1, 2, 2, 1, 2, 1],\n      },\n    },\n  },\n};\n\ncube2x2x2KPuzzleDefinition.moves[\"Rv\"] = cube2x2x2KPuzzleDefinition.moves[\"x\"];\ncube2x2x2KPuzzleDefinition.moves[\"Uv\"] = cube2x2x2KPuzzleDefinition.moves[\"y\"];\ncube2x2x2KPuzzleDefinition.moves[\"Fv\"] = cube2x2x2KPuzzleDefinition.moves[\"z\"];\ncube2x2x2KPuzzleDefinition.moves[\"Lv\"] = {\n  CORNERS: {\n    permutation: [1, 7, 6, 2, 0, 3, 5, 4],\n    orientation: [2, 1, 2, 1, 1, 2, 1, 2],\n  },\n};\ncube2x2x2KPuzzleDefinition.moves[\"Dv\"] = {\n  CORNERS: {\n    permutation: [3, 0, 1, 2, 5, 6, 7, 4],\n    orientation: [0, 0, 0, 0, 0, 0, 0, 0],\n  },\n};\ncube2x2x2KPuzzleDefinition.moves[\"Bv\"] = {\n  CORNERS: {\n    permutation: [4, 7, 1, 0, 5, 3, 2, 6],\n    orientation: [1, 2, 1, 2, 2, 1, 2, 1],\n  },\n};\n"],
+  "mappings": "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",
+  "names": []
+}

package/dist/esm/{2x2x2.sgs.json-FRBWMMA7.js → 2x2x2.sgs.json-VLYEQLNB.js}

@@ -1,10 +1,10 @@
 import {
   parseSGS
-} from "./chunk-XVZOMB6J.js";
+} from "./chunk-27KJGD3S.js";
 import {
   cube2x2x2
-} from "./chunk-DK6PXBB2.js";
-import "./chunk-X6JHXPDX.js";
+} from "./chunk-25PPOENI.js";
+import "./chunk-PMAQZQHL.js";
 import "./chunk-EWRBHQFX.js";
 import "./chunk-WO2AXYFE.js";
 
@@ -14,7 +14,7 @@ async function cachedData222() {
   return cachedData ?? (cachedData = data222());
 }
 async function data222() {
-  return parseSGS(await cube2x2x2.def(), `SubgroupSizes 24 21 18 15 12 9 6
+  return parseSGS(await cube2x2x2.kpuzzle(), `SubgroupSizes 24 21 18 15 12 9 6
 
 Alg F
 Alg F2
@@ -119,4 +119,4 @@ export {
   cachedData222,
   data222
 };
-//# sourceMappingURL=2x2x2.sgs.json-FRBWMMA7.js.map
+//# sourceMappingURL=2x2x2.sgs.json-VLYEQLNB.js.map

package/dist/esm/2x2x2.sgs.json-VLYEQLNB.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/cubing/search/inside/solve/puzzles/2x2x2.sgs.json.ts"],
+  "sourcesContent": ["import { cube2x2x2 } from \"../../../../puzzles\";\nimport { parseSGS, SGSCachedData } from \"../parseSGS\";\n\nlet cachedData: Promise<SGSCachedData> | null = null;\nexport async function cachedData222() {\n  return (cachedData ??= data222());\n}\n\n// TODO: Reduce info.\nexport async function data222(): Promise<SGSCachedData> {\n  return parseSGS(\n    await cube2x2x2.kpuzzle(),\n    `SubgroupSizes 24 21 18 15 12 9 6\n\nAlg F\nAlg F2\nAlg F'\nAlg D\nAlg D2\nAlg D'\nAlg L\nAlg L2\nAlg L'\nAlg F U\nAlg F U2\nAlg F U'\nAlg F L\nAlg F L2\nAlg F L'\nAlg F2 U\nAlg F2 U'\nAlg F2 R\nAlg F2 R'\nAlg F' D\nAlg F' D'\nAlg F' R\nAlg F' R'\nAlg B\nAlg B2\nAlg B'\nAlg B R\nAlg B R2\nAlg B R'\nAlg B2 U\nAlg B2 U2\nAlg B2 U'\nAlg B2 R\nAlg B2 R2\nAlg B2 R'\nAlg B' U\nAlg B' U'\nAlg F D' F'\nAlg F2 L F2\nAlg B R' B2\nAlg B R' U2\nAlg B2 U R'\nAlg B2 R B'\nAlg R\nAlg R2\nAlg R'\nAlg R2 U\nAlg R2 U2\nAlg R2 U'\nAlg R' U\nAlg R' U2\nAlg R' U'\nAlg F R F'\nAlg F R2 F'\nAlg L2 D' L2\nAlg L' B L\nAlg R2 U' R\nAlg R' U R2\nAlg R' U R'\nAlg F R F' U2\nAlg F' U F\nAlg F' U2 F\nAlg F' U' F\nAlg L F L'\nAlg L F2 L'\nAlg L F' L'\nAlg F' D R D'\nAlg F' U2 F U'\nAlg F D2 B D2 F'\nAlg F2 D' L2 D F2\nAlg F2 L F L' F\nAlg L' F2 L' F2 L\nAlg F L' U' L2 F L'\nAlg F2 L F L' U2 F\nAlg U\nAlg U2\nAlg U'\nAlg F2 D2 B D2 F2\nAlg F2 D2 B' D2 F2\nAlg L2 D2 R D2 L2\nAlg L2 D2 R' D2 L2\nAlg F2 D2 B D2 F2 U\nAlg F2 D2 B D2 F2 U'\nAlg U F2 D2 B D2 F2\nAlg U F2 D2 B' D2 F2\nAlg F D B D' R' F' U\nAlg F' D L F U B' L'\nAlg F' L' F U L U L'\nAlg D' L F D R' U' F'\nAlg L F L' U' F' U' F\nAlg L D' F' L' U' R F\nAlg F D F U F' L' F' R'\nAlg F2 D' F L F2 D F' R'\nAlg F D' F L' D F R2 U2 F' U'\nAlg F D' L D' L F D2 L2 B' R'\nAlg F L' D F R2 D2 L D F' U2\nAlg F L' D F2 D' L F L2 F2 U\nAlg F D F' D L2 F R' F' D' B2 U'`,\n  );\n}\n"],
+  "mappings": ";;;;;;;;;;;AAGA,IAAI,aAA4C;AAChD,+BAAsC;AACpC,SAAQ,4BAAe;AAAA;AAIzB,yBAAwD;AACtD,SAAO,SACL,MAAM,UAAU,WAChB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;",
+  "names": []
+}

package/dist/esm/{3d-Q4WSD4BC.js → 3d-KAC5GXA4.js}

@@ -5,9 +5,9 @@ import {
   Twisty3DScene,
   cube3DShim,
   pg3dShim
-} from "./chunk-N3RNWU5T.js";
-import "./chunk-DK6PXBB2.js";
-import "./chunk-X6JHXPDX.js";
+} from "./chunk-PQKDEV4Z.js";
+import "./chunk-25PPOENI.js";
+import "./chunk-PMAQZQHL.js";
 import "./chunk-EWRBHQFX.js";
 import "./chunk-WO2AXYFE.js";
 export {
@@ -18,4 +18,4 @@ export {
   cube3DShim,
   pg3dShim
 };
-//# sourceMappingURL=3d-Q4WSD4BC.js.map
+//# sourceMappingURL=3d-KAC5GXA4.js.map

package/dist/esm/bluetooth/index.js

@@ -1,11 +1,14 @@
 import {
-  puzzles
-} from "../chunk-DK6PXBB2.js";
-import {
-  KPuzzle,
   binaryComponentsToReid3x3x3,
   twizzleBinaryToBinaryComponents
-} from "../chunk-X6JHXPDX.js";
+} from "../chunk-W6AA6TVR.js";
+import {
+  puzzles
+} from "../chunk-25PPOENI.js";
+import {
+  KState,
+  experimental3x3x3KPuzzle
+} from "../chunk-PMAQZQHL.js";
 import {
   Alg,
   Move,
@@ -128,7 +131,8 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
   constructor(target) {
     super();
     this.target = target;
-    this.puzzle = (async () => new KPuzzle(await puzzles["3x3x3"].def()))();
+    this.puzzle = puzzles["3x3x3"].kpuzzle();
+    this.state = (async () => (await this.puzzle).startState())();
     this.listener = this.onKeyDown.bind(this);
     target.addEventListener("keydown", this.listener);
   }
@@ -139,7 +143,7 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
     this.target.removeEventListener("keydown", this.listener);
   }
   async getState() {
-    return (await this.puzzle).state;
+    return this.state;
   }
   async onKeyDown(e) {
     if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
@@ -147,11 +151,12 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
     }
     const move = keyToMove(e);
     if (move) {
-      (await this.puzzle).applyMove(move);
+      const newState = (await this.state).applyMove(move);
+      this.state = Promise.resolve(newState);
       this.dispatchMove({
         latestMove: move,
         timeStamp: e.timeStamp,
-        state: (await this.puzzle).state
+        state: newState
       });
       e.preventDefault();
     }
@@ -455,8 +460,9 @@ async function getKey(server) {
   return importKey(key);
 }
 var GanCube = class extends BluetoothPuzzle {
-  constructor(def, service, server, physicalStateCharacteristic, lastMoveCounter, aesKey) {
+  constructor(kpuzzle, service, server, physicalStateCharacteristic, lastMoveCounter, aesKey) {
     super();
+    this.kpuzzle = kpuzzle;
     this.service = service;
     this.server = server;
     this.physicalStateCharacteristic = physicalStateCharacteristic;
@@ -464,7 +470,7 @@ var GanCube = class extends BluetoothPuzzle {
     this.aesKey = aesKey;
     this.INTERVAL_MS = DEFAULT_INTERVAL_MS;
     this.intervalHandle = null;
-    this.kpuzzle = new KPuzzle(def);
+    this.state = kpuzzle.startState();
     this.startTrackingMoves();
   }
   static async connect(server) {
@@ -475,7 +481,7 @@ var GanCube = class extends BluetoothPuzzle {
     const aesKey = await getKey(server);
     const initialMoveCounter = (await PhysicalState.read(physicalStateCharacteristic, aesKey)).moveCounter();
     debugLog("Initial Move Counter:", initialMoveCounter);
-    const cube = new GanCube(await puzzles["3x3x3"].def(), ganCubeService, server, physicalStateCharacteristic, initialMoveCounter, aesKey);
+    const cube = new GanCube(await puzzles["3x3x3"].kpuzzle(), ganCubeService, server, physicalStateCharacteristic, initialMoveCounter, aesKey);
     return cube;
   }
   name() {
@@ -502,12 +508,12 @@ var GanCube = class extends BluetoothPuzzle {
       numInterveningMoves = MAX_LATEST_MOVES;
     }
     for (const move of physicalState.latestMoves(numInterveningMoves)) {
-      this.kpuzzle.applyMove(move);
+      this.state = this.state.applyMove(move);
       this.dispatchMove({
         latestMove: move,
         timeStamp: physicalState.timeStamp,
         debug: physicalState.debugInfo(),
-        state: this.kpuzzle.state
+        state: this.state
       });
     }
     this.dispatchOrientation({
@@ -529,31 +535,31 @@ var GanCube = class extends BluetoothPuzzle {
         v >>= 3;
       }
     }
-    const state = {
+    const stateData = {
       CORNERS: {
-        permutation: [],
+        pieces: [],
         orientation: []
       },
       EDGES: {
-        permutation: [],
+        pieces: [],
         orientation: []
       },
       CENTERS: {
-        permutation: [0, 1, 2, 3, 4, 5],
+        pieces: [0, 1, 2, 3, 4, 5],
         orientation: [0, 0, 0, 0, 0, 0]
       }
     };
     for (const cornerMapping of gan356iCornerMappings) {
       const pieceInfo = pieceMap[cornerMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      state.CORNERS.permutation.push(pieceInfo.piece);
-      state.CORNERS.orientation.push(pieceInfo.orientation);
+      stateData.CORNERS.pieces.push(pieceInfo.piece);
+      stateData.CORNERS.orientation.push(pieceInfo.orientation);
     }
     for (const edgeMapping of gan356iEdgeMappings) {
       const pieceInfo = pieceMap[edgeMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      state.EDGES.permutation.push(pieceInfo.piece);
-      state.EDGES.orientation.push(pieceInfo.orientation);
+      stateData.EDGES.pieces.push(pieceInfo.piece);
+      stateData.EDGES.orientation.push(pieceInfo.orientation);
     }
-    return state;
+    return new KState(this.kpuzzle, stateData);
   }
   async faceletStatus1Characteristic() {
     this.cachedFaceletStatus1Characteristic = this.cachedFaceletStatus1Characteristic || this.service.getCharacteristic(UUIDs.faceletStatus1Characteristic);
@@ -624,7 +630,7 @@ function giikerStateStr(giikerState) {
   return str;
 }
 var Reid333SolvedCenters = {
-  permutation: [0, 1, 2, 3, 4, 5],
+  pieces: [0, 1, 2, 3, 4, 5],
   orientation: [0, 0, 0, 0, 0, 0]
 };
 var epGiiKERtoReid333 = [4, 8, 0, 9, 5, 1, 3, 7, 6, 10, 2, 11];
@@ -734,26 +740,26 @@ var GiiKERCube = class extends BluetoothPuzzle {
   toReid333(val) {
     const state = {
       EDGES: {
-        permutation: new Array(12),
+        pieces: new Array(12),
         orientation: new Array(12)
       },
       CORNERS: {
-        permutation: new Array(8),
+        pieces: new Array(8),
         orientation: new Array(8)
       },
       CENTERS: Reid333SolvedCenters
     };
     for (let i = 0; i < 12; i++) {
       const gi = epReid333toGiiKER[i];
-      state.EDGES.permutation[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
-      state.EDGES.orientation[i] = this.getBit(val, gi + 112) ^ preEO[state.EDGES.permutation[i]] ^ postEO[i];
+      state.EDGES.pieces[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
+      state.EDGES.orientation[i] = this.getBit(val, gi + 112) ^ preEO[state.EDGES.pieces[i]] ^ postEO[i];
     }
     for (let i = 0; i < 8; i++) {
       const gi = cpReid333toGiiKER[i];
-      state.CORNERS.permutation[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
-      state.CORNERS.orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[state.CORNERS.permutation[i]] + postCO[i]) % 3;
+      state.CORNERS.pieces[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
+      state.CORNERS.orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[state.CORNERS.pieces[i]] + postCO[i]) % 3;
     }
-    return state;
+    return new KState(experimental3x3x3KPuzzle, state);
   }
   async onCubeCharacteristicChanged(event) {
     const val = await decodeState(new Uint8Array(event.target.value.buffer));
@@ -943,7 +949,7 @@ var UUIDs4 = {
   batteryCharacteristic: "fd51b3ba-99c7-49c6-9f85-5644ff56a378"
 };
 var HeykubeCube = class extends BluetoothPuzzle {
-  constructor(_def, _service, device, server, stateCharacteristic) {
+  constructor(_kpuzzle, _service, device, server, stateCharacteristic) {
     super();
     this.server = server;
     this.stateCharacteristic = stateCharacteristic;
@@ -956,7 +962,7 @@ var HeykubeCube = class extends BluetoothPuzzle {
     debugLog("Service:", service);
     const stateCharacteristic = await service.getCharacteristic(UUIDs4.stateCharacteristic);
     debugLog("Characteristic:", stateCharacteristic);
-    const cube = new HeykubeCube(await puzzles["3x3x3"].def(), service, device, server, stateCharacteristic);
+    const cube = new HeykubeCube(await puzzles["3x3x3"].kpuzzle(), service, device, server, stateCharacteristic);
     return cube;
   }
   name() {