cubing 0.55.2 → 0.57.0

package/dist/lib/cubing/alg/index.d.ts

@@ -1,6 +1,6 @@
-import { O as AlgNode, s as Alg, M as Move, R as AppendOptions, U as KeyMapping, A as AlgLeaf, W as Grouping, X as Commutator, Y as Conjugate, Z as Pause, _ as Newline, $ as LineComment } from '../PuzzleLoader-DGpDr4U9.js';
-export { a1 as AlgBranch, a2 as AppendCancelOptions, a5 as ExperimentalNotationType, a4 as ExperimentalParsed, a6 as ExperimentalSerializationOptions, a0 as MoveModifications, x as PuzzleSpecificSimplifyOptions, a7 as QuantumMove, a3 as SimplifyOptions } from '../PuzzleLoader-DGpDr4U9.js';
-import 'three';
+import { O as AlgNode, s as Alg, M as Move, R as AppendOptions, U as Grouping, W as LineComment, X as Commutator, Y as Conjugate, Z as Newline, _ as Pause, $ as KeyMapping, A as AlgLeaf } from '../PuzzleLoader-Dd4G1VlU.js';
+export { a0 as AlgBranch, a5 as AppendCancelOptions, a3 as ExperimentalNotationType, a2 as ExperimentalParsed, a4 as ExperimentalSerializationOptions, a1 as MoveModifications, x as PuzzleSpecificSimplifyOptions, a7 as QuantumMove, a6 as SimplifyOptions } from '../PuzzleLoader-Dd4G1VlU.js';
+import 'three/src/Three.js';
 
 /** @deprecated */
 type Unit = AlgNode;
@@ -18,6 +18,10 @@ declare class AlgBuilder {
     reset(): void;
 }
 
+declare function setAlgDebug(options: {
+    caretNISSNotationEnabled?: boolean;
+}): void;
+
 declare const Example: {
     Sune: Alg;
     AntiSune: Alg;
@@ -32,6 +36,8 @@ declare const Example: {
     TriplePause: Alg;
 };
 
+declare function experimentalIs(v: any, c: typeof Alg | typeof Grouping | typeof LineComment | typeof Commutator | typeof Conjugate | typeof Move | typeof Newline | typeof Pause): boolean;
+
 declare function keyToMove(keyMapping: KeyMapping | undefined, e: KeyboardEvent): AlgLeaf | null;
 
 declare abstract class TraversalDownUp<DataDown, DataAlgUp, DataAlgNodeUp = DataAlgUp> {
@@ -74,10 +80,4 @@ interface AlgCubingNetOptions {
 /** @deprecated */
 declare function experimentalAlgCubingNetLink(options: AlgCubingNetOptions): string;
 
-declare function experimentalIs(v: any, c: typeof Alg | typeof Grouping | typeof LineComment | typeof Commutator | typeof Conjugate | typeof Move | typeof Newline | typeof Pause): boolean;
-
-declare function setAlgDebug(options: {
-    caretNISSNotationEnabled?: boolean;
-}): void;
-
 export { Alg, AlgBuilder, type AlgCubingNetOptions, AlgLeaf, AlgNode, Commutator, Conjugate, Example, Grouping, LineComment, Move, Newline, Pause, TraversalDownUp, TraversalUp, type Unit, experimentalAlgCubingNetLink, experimentalAppendMove, experimentalIs, functionFromTraversal, keyToMove, setAlgDebug };

package/dist/lib/cubing/alg/index.js

@@ -18,7 +18,7 @@ import {
   functionFromTraversal,
   keyToMove,
   setAlgDebug
-} from "../chunks/chunk-2SBMIHZV.js";
+} from "../chunks/chunk-SWKNZGJF.js";
 export {
   Alg,
   AlgBuilder,

package/dist/lib/cubing/bluetooth/index.d.ts

@@ -1,19 +1,18 @@
-import { u as PuzzleID, t as PuzzleLoader, K as KPattern, s as Alg, M as Move } from '../PuzzleLoader-DGpDr4U9.js';
-import { B as BluetoothPuzzle } from '../bluetooth-puzzle-C097rA5h.js';
-export { A as MoveEvent, O as OrientationEvent } from '../bluetooth-puzzle-C097rA5h.js';
-import 'three';
+import { u as PuzzleID, t as PuzzleLoader, $ as KeyMapping, K as KPattern, s as Alg, M as Move } from '../PuzzleLoader-Dd4G1VlU.js';
+import { B as BluetoothPuzzle } from '../bluetooth-puzzle-FIXncgc8.js';
+export { A as MoveEvent, O as OrientationEvent } from '../bluetooth-puzzle-FIXncgc8.js';
+import 'three/src/Three.js';
 
 declare function enableDebugLogging(enable: boolean): void;
 
 /** @category Keyboard Puzzles */
 declare class KeyboardPuzzle extends BluetoothPuzzle {
     private target;
-    private keyMappingPromise;
-    private pattern;
-    listener: (e: KeyboardEvent) => Promise<void>;
+    private keyMappingAndPatternPromise;
+    listener: EventListener;
     constructor(target: Element, puzzle?: PuzzleID | PuzzleLoader);
     name(): string | undefined;
-    setPuzzle(puzzle: PuzzleID | PuzzleLoader): Promise<void>;
+    setPuzzleInternal(puzzle: PuzzleID | PuzzleLoader): Promise<[KeyMapping | undefined, KPattern]>;
     disconnect(): void;
     getPattern(): Promise<KPattern>;
     private onKeyDown;
@@ -56,9 +55,9 @@ declare class GanCube extends BluetoothPuzzle {
     faceletStatus2Characteristic(): Promise<BluetoothRemoteGATTCharacteristic>;
     actualAngleAndBatteryCharacteristic(): Promise<BluetoothRemoteGATTCharacteristic>;
     reset(): Promise<void>;
-    readFaceletStatus1Characteristic(): Promise<ArrayBuffer>;
+    readFaceletStatus1Characteristic(): Promise<ArrayBufferLike>;
     readFaceletStatus2Characteristic(): Promise<string>;
-    readActualAngleAndBatteryCharacteristic(): Promise<ArrayBuffer>;
+    readActualAngleAndBatteryCharacteristic(): Promise<ArrayBufferLike>;
 }
 
 /** @category Smart Puzzles */
@@ -116,7 +115,7 @@ declare class GanRobot extends EventTarget {
     name(): string | undefined;
     disconnect(): void;
     onDisconnect(): void;
-    private moveToNibble;
+    private algNodeToNibble;
     private writeNibbles;
     private getStatus;
     locked: boolean;
@@ -142,7 +141,7 @@ declare class GanTimer extends EventTarget {
     disconnect(): void;
     poll(): Promise<void>;
     onDisconnect(): void;
-    getTimeCharacteristic(): Promise<Uint8Array>;
+    getTimeCharacteristic(): Promise<Uint8Array<ArrayBufferLike>>;
     getTime(): Promise<number>;
     decodeTimeMs(bytes: Uint8Array): number;
     startPolling(): void;

package/dist/lib/cubing/bluetooth/index.js

@@ -1,23 +1,23 @@
 import {
   binaryComponentsToReid3x3x3,
   twizzleBinaryToBinaryComponents
-} from "../chunks/chunk-2QDTMC3W.js";
+} from "../chunks/chunk-KAXXPFNE.js";
 import {
   cube3x3x3,
   puzzles
-} from "../chunks/chunk-MFK4M6PV.js";
+} from "../chunks/chunk-J6NSY47E.js";
 import {
   experimental3x3x3KPuzzle
-} from "../chunks/chunk-SGPKF5IH.js";
+} from "../chunks/chunk-MITU5GJ5.js";
 import {
   KPattern
-} from "../chunks/chunk-TQF5J7MH.js";
+} from "../chunks/chunk-3YVVF3KK.js";
 import {
   Alg,
   Move,
   experimentalAppendMove,
   keyToMove
-} from "../chunks/chunk-2SBMIHZV.js";
+} from "../chunks/chunk-SWKNZGJF.js";
 
 // src/cubing/bluetooth/debug.ts
 var DEBUG_LOGGING_ENABLED = false;
@@ -36,7 +36,8 @@ function debugLog(...args) {
 }
 
 // src/cubing/bluetooth/transformer.ts
-import { Quaternion, Vector3 } from "three";
+import { Quaternion } from "three/src/math/Quaternion.js";
+import { Vector3 } from "three/src/math/Vector3.js";
 function maxAxis(v) {
   const maxVal = Math.max(Math.abs(v.x), Math.abs(v.y), Math.abs(v.z));
   switch (maxVal) {
@@ -131,6 +132,7 @@ var BluetoothPuzzle = class extends EventTarget {
 
 // src/cubing/bluetooth/keyboard.ts
 var KeyboardPuzzle = class extends BluetoothPuzzle {
+  // (e: KeyboardEvent) => Promise<void>;
   // TODO: Decide on the right arguments.
   // TODO: support tying the puzzle to a TwistyPlayer.
   constructor(target, puzzle = "3x3x3") {
@@ -138,41 +140,43 @@ var KeyboardPuzzle = class extends BluetoothPuzzle {
     this.target = target;
     this.listener = this.onKeyDown.bind(this);
     target.addEventListener("keydown", this.listener);
-    this.setPuzzle(puzzle);
+    this.keyMappingAndPatternPromise = this.setPuzzleInternal(puzzle);
   }
-  keyMappingPromise;
-  pattern;
+  keyMappingAndPatternPromise;
   listener;
   name() {
     return "Keyboard Input";
   }
-  async setPuzzle(puzzle) {
-    const puzzlePromise = (async () => typeof puzzle === "string" ? (await import("../puzzles/index.js")).puzzles[puzzle] : puzzle)();
-    const kpuzzlePromise = (async () => (await puzzlePromise).kpuzzle())();
-    this.keyMappingPromise = (async () => (await puzzlePromise).keyMapping?.())();
-    this.pattern = (async () => (await kpuzzlePromise).defaultPattern())();
+  async setPuzzleInternal(puzzle) {
+    const puzzleLoader = await (async () => typeof puzzle === "string" ? (await import("../puzzles/index.js")).puzzles[puzzle] : puzzle)();
+    const kpuzzle = await (async () => puzzleLoader.kpuzzle())();
+    return Promise.all([puzzleLoader.keyMapping?.(), kpuzzle.defaultPattern()]);
   }
   disconnect() {
     this.target.removeEventListener("keydown", this.listener);
   }
   async getPattern() {
-    return this.pattern;
+    return (await this.keyMappingAndPatternPromise)[1];
   }
   async onKeyDown(e) {
     if (e.altKey || e.ctrlKey || e.metaKey || e.shiftKey) {
       return;
     }
-    const algLeaf = keyToMove(await this.keyMappingPromise, e);
-    if (algLeaf) {
-      const newPattern = (await this.pattern).applyAlg(new Alg([algLeaf]));
-      this.pattern = Promise.resolve(newPattern);
-      this.dispatchAlgLeaf({
-        latestAlgLeaf: algLeaf,
-        timeStamp: e.timeStamp,
-        pattern: newPattern
-      });
-      e.preventDefault();
-    }
+    this.keyMappingAndPatternPromise = (async () => {
+      const [keyMapping, pattern] = await this.keyMappingAndPatternPromise;
+      const algLeaf = keyToMove(keyMapping, e);
+      let newPattern;
+      if (algLeaf) {
+        newPattern = pattern.applyAlg(new Alg([algLeaf]));
+        this.dispatchAlgLeaf({
+          latestAlgLeaf: algLeaf,
+          timeStamp: e.timeStamp,
+          pattern: newPattern
+        });
+        e.preventDefault();
+      }
+      return [keyMapping, newPattern ?? pattern];
+    })();
   }
 };
 async function debugKeyboardConnect(target = window, puzzle = "3x3x3") {
@@ -218,7 +222,7 @@ async function bluetoothConnect(configs, options = {}) {
     consecutiveFailures = 0;
   } catch (e) {
     consecutiveFailures++;
-    throw new Error(e);
+    throw e;
   }
   debugLog("Device:", device);
   if (typeof device.gatt === "undefined") {
@@ -238,7 +242,7 @@ async function bluetoothConnect(configs, options = {}) {
 }
 
 // src/cubing/bluetooth/smart-puzzle/gan.ts
-import { Quaternion as Quaternion2 } from "three";
+import { Quaternion as Quaternion2 } from "three/src/math/Quaternion.js";
 
 // src/cubing/vendor/public-domain/unsafe-raw-aes/unsafe-raw-aes.ts
 var blockSize = 16;
@@ -639,13 +643,13 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
     };
     for (const cornerMapping of gan356iCornerMappings) {
       const pieceInfo = pieceMap[cornerMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      patternData.CORNERS.pieces.push(pieceInfo.piece);
-      patternData.CORNERS.orientation.push(pieceInfo.orientation);
+      patternData["CORNERS"].pieces.push(pieceInfo.piece);
+      patternData["CORNERS"].orientation.push(pieceInfo.orientation);
     }
     for (const edgeMapping of gan356iEdgeMappings) {
       const pieceInfo = pieceMap[edgeMapping.map((i) => faceOrder[stickers[i]]).join("")];
-      patternData.EDGES.pieces.push(pieceInfo.piece);
-      patternData.EDGES.orientation.push(pieceInfo.orientation);
+      patternData["EDGES"].pieces.push(pieceInfo.piece);
+      patternData["EDGES"].orientation.push(pieceInfo.orientation);
     }
     return new KPattern(this.kpuzzle, patternData);
   }
@@ -663,7 +667,7 @@ var GanCube = class _GanCube extends BluetoothPuzzle {
   }
   async reset() {
     const faceletStatus1Characteristic = await this.faceletStatus1Characteristic();
-    await faceletStatus1Characteristic.writeValue(commands.reset);
+    await faceletStatus1Characteristic.writeValue(commands["reset"]);
   }
   async readFaceletStatus1Characteristic() {
     const faceletStatus1Characteristic = await this.faceletStatus1Characteristic();
@@ -857,13 +861,13 @@ var GiiKERCube = class _GiiKERCube extends BluetoothPuzzle {
     };
     for (let i = 0; i < 12; i++) {
       const gi = epReid333toGiiKER[i];
-      patternData.EDGES.pieces[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
-      patternData.EDGES.orientation[i] = this.getBit(val, gi + 112) ^ preEO[patternData.EDGES.pieces[i]] ^ postEO[i];
+      patternData["EDGES"].pieces[i] = epGiiKERtoReid333[getNibble(val, gi + 16) - 1];
+      patternData["EDGES"].orientation[i] = this.getBit(val, gi + 112) ^ preEO[patternData["EDGES"].pieces[i]] ^ postEO[i];
     }
     for (let i = 0; i < 8; i++) {
       const gi = cpReid333toGiiKER[i];
-      patternData.CORNERS.pieces[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
-      patternData.CORNERS.orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[patternData.CORNERS.pieces[i]] + postCO[i]) % 3;
+      patternData["CORNERS"].pieces[i] = cpGiiKERtoReid333[getNibble(val, gi) - 1];
+      patternData["CORNERS"].orientation[i] = (getNibble(val, gi + 8) * coFlip[gi] + preCO[patternData["CORNERS"].pieces[i]] + postCO[i]) % 3;
     }
     return new KPattern(experimental3x3x3KPuzzle, patternData);
   }
@@ -935,7 +939,7 @@ var giiKERConfig = {
 };
 
 // src/cubing/bluetooth/smart-puzzle/gocube.ts
-import { Quaternion as Quaternion3 } from "three";
+import { Quaternion as Quaternion3 } from "three/src/math/Quaternion.js";
 var UUIDs3 = {
   goCubeService: "6e400001-b5a3-f393-e0a9-e50e24dcca9e",
   goCubeStateCharacteristic: "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
@@ -1275,9 +1279,9 @@ function isDoubleTurnNibble(nibble) {
 function nibbleDuration(nibble) {
   return isDoubleTurnNibble(nibble) ? DOUBLE_TURN_DURATION_MS : QUANTUM_TURN_DURATION_MS;
 }
-function throwInvalidMove(move) {
-  console.error("invalid move", move, move.toString());
-  throw new Error("invalid move!");
+function throwInvalidAlgNode(algNode) {
+  console.error("invalid alg node", algNode, algNode.toString());
+  throw new Error("invalid alg node!");
 }
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
@@ -1332,10 +1336,14 @@ var GanRobot = class _GanRobot extends EventTarget {
   onDisconnect() {
     this.dispatchEvent(new CustomEvent("disconnect"));
   }
-  moveToNibble(move) {
+  algNodeToNibble(algNode) {
+    const move = algNode.as(Move);
+    if (!move) {
+      throwInvalidAlgNode(algNode);
+    }
     const nibble = (this.experimentalOptions.xAngle ? moveMapX : moveMap2)[move.toString()] ?? null;
     if (nibble === null) {
-      throwInvalidMove(move);
+      throwInvalidAlgNode(move);
     }
     return nibble;
   }
@@ -1398,22 +1406,29 @@ var GanRobot = class _GanRobot extends EventTarget {
         while (this.moveQueue.experimentalNumChildAlgNodes() > 0) {
           let algNodes = Array.from(this.moveQueue.childAlgNodes());
           if (this.experimentalOptions.singleMoveFixHack && algNodes.length === 1) {
-            const move = algNodes[0];
-            if (move.amount === 2) {
-              algNodes = [
-                move.modified({ amount: 1 }),
-                move.modified({ amount: 1 })
-              ];
-            } else {
-              algNodes = [
-                move.modified({ amount: -move.amount }),
-                move.modified({ amount: 2 })
-              ];
+            const move = algNodes[0].as(Move);
+            if (move) {
+              if (move.amount === 2) {
+                algNodes = [
+                  move.modified({ amount: 1 }),
+                  move.modified({ amount: 1 })
+                ];
+              } else {
+                algNodes = [
+                  move.modified({ amount: -move.amount }),
+                  move.modified({ amount: 2 })
+                ];
+              }
             }
           }
-          const moves2 = algNodes.splice(0, MAX_NIBBLES_PER_WRITE);
-          const nibbles = moves2.map(this.moveToNibble.bind(this));
-          const sending = new Alg(moves2);
+          const splicedAlgNodes = algNodes.splice(
+            0,
+            MAX_NIBBLES_PER_WRITE
+          );
+          const nibbles = splicedAlgNodes.map(
+            this.algNodeToNibble.bind(this)
+          );
+          const sending = new Alg(splicedAlgNodes);
           this.experimentalDebugLog("SENDING", sending.toString());
           if (this.experimentalDebugOnSend) {
             this.experimentalDebugOnSend(sending);