cubing 0.21.0-pre8 → 0.21.2

package/dist/types/vendor/three/examples/jsm/libs/stats.modified.module.d.ts

@@ -0,0 +1,33 @@
+/**
+ * @author mrdoob / http://mrdoob.com/
+ * ESM conversion by Lucas Garron, 2021-12-21
+ */
+export declare class Stats {
+    mode: number;
+    dom: HTMLDivElement;
+    constructor();
+    addPanel(panel: StatsPanel): StatsPanel;
+    showPanel(id: number): void;
+    beginTime: number;
+    prevTime: number;
+    frames: number;
+    fpsPanel: StatsPanel;
+    msPanel: StatsPanel;
+    memPanel: StatsPanel | null;
+    REVISION: number;
+    begin(): void;
+    end(): number;
+    update(): void;
+}
+export declare class StatsPanel {
+    private name;
+    private fg;
+    private bg;
+    min: number;
+    max: number;
+    dom: HTMLCanvasElement;
+    context: CanvasRenderingContext2D;
+    constructor(name: string, fg: string, bg: string);
+    update(value: number, maxValue: number): void;
+}
+//# sourceMappingURL=stats.modified.module.d.ts.map

package/dist/types/vendor/three/examples/jsm/libs/stats.modified.module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stats.modified.module.d.ts","sourceRoot":"","sources":["../../../../../../../src/cubing/vendor/three/examples/jsm/libs/stats.modified.module.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAWH,qBAAa,KAAK;IAChB,IAAI,SAAK;IAET,GAAG,iBAAiC;;IAiBpC,QAAQ,CAAC,KAAK,EAAE,UAAU,GAAG,UAAU;IAKvC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI;IAS3B,SAAS,SAA+B;IACxC,QAAQ,SAAkB;IAC1B,MAAM,SAAK;IAEX,QAAQ,aAAwD;IAChE,OAAO,aAAuD;IAC9D,QAAQ,oBAEC;IACT,QAAQ,SAAM;IAEd,KAAK;IAIL,GAAG;IAyBH,MAAM;CAGP;AAaD,qBAAa,UAAU;IAKT,OAAO,CAAC,IAAI;IAAU,OAAO,CAAC,EAAE;IAAU,OAAO,CAAC,EAAE;IAJhE,GAAG,SAAY;IACf,GAAG,SAAK;IACR,GAAG,oBAAoC;IACvC,OAAO,2BAA8B;gBACjB,IAAI,EAAE,MAAM,EAAU,EAAE,EAAE,MAAM,EAAU,EAAE,EAAE,MAAM;IAoBxE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;CAiDvC"}

package/docs/cubing/scramble/index.html

@@ -17,17 +17,22 @@
     </div>
     <section class="no-header">
       <p>
-        <code>cubing/scramble</code> is the part of <code>cubing.js</code> that lets you generate fair random-state scrambles.
+        <code>cubing/scramble</code> is the part of <code>cubing.js</code> that lets you generate fair random-state
+        scrambles.
       </p>
     </section>
 
     <section id="random-scramble">
       <h1><a href="#random-scramble">Random Scramble</a></h1>
-      <p>Use <code>randomScrambleForEvent</code> to get a scramble. This returns a JavaScript <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a> for an <a href="../alg/"><code>Alg</code></a>, which is easiest to use with <a href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function"><code>await</code></a>.</p>
+      <p>Use <code>randomScrambleForEvent</code> to get a scramble. This returns a JavaScript <a
+          href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise">Promise</a>
+        for an <a href="../alg/"><code>Alg</code></a>, which is easiest to use with <a
+          href="https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/async_function"><code>await</code></a>.
+      </p>
       <div class="code-demo">
         <div>
           <code class="sample">
-            <span>import { randomScrambleForEvent } from &quot;cubing/alg&quot;<br>
+            <span>import { randomScrambleForEvent } from &quot;cubing/scramble&quot;;<br>
 <br>
 const scramble = await randomScrambleForEvent("333");
 console.log(scramble.toString());</span>
@@ -41,7 +46,7 @@ console.log(scramble.toString());</span>
       <div class="code-demo">
         <div>
           <code class="sample">
-            <span>import { randomScrambleForEvent } from &quot;cubing/alg&quot;<br>
+            <span>import { randomScrambleForEvent } from &quot;cubing/scramble&quot;;<br>
 <br>
 (await randomScrambleForEvent("333")).log();<br>
 (await randomScrambleForEvent("333bf")).log();<br>
@@ -65,25 +70,36 @@ console.log(scramble.toString());</span>
         </code>
       </div>
       <p>Note that:
-        <ul>
-          <li>The <code>Alg</code> class supports all WCA notation. If you call <code>.toString()</code> on a scramble, you will get a string compatible with WCA notation for the event.</li>
-          <li>The only current way to get scrambles is by WCA event code. Note that different events for the same puzzle may use different kinds of scrambles.</li>
-          <li>All scrambles are random-state, as defined by <a href="https://www.worldcubeassociation.org/regulations/#4b3">WCA Regulation 4b3.</a>
-            <ul>
-              <li>This includes 4x4x4 events!</li>
-              <li>Exception: scramble filtering is not implemented yet. It will be implemented in the future for full compatibility with the WCA Regulations.</li>
-            </ul>
-          </li>
-          <li>Scrambles for 3x3x3 Fewest Moves include <code>R' U' F</code> at the beginning and end, matching TNoodle. However, these added moves can currently produce cancellations. This will be fixed in the future.</li>
-          <li>2x2x2 scrambles may include &lt;D, B, L&gt; moves so that there is no fixed piece in the resulting scramble. This is compatible with the WCA Regulations, but be aware that it does not match TNoodle (which only uses &lt;U, F, R&gt; moves).</li>
-          <li>Only use <code>cubing.js</code> to generate scrambles for unofficial software/competitions/events. Official WCA competitions must use the current version of <a href="https://www.worldcubeassociation.org/regulations/scrambles/">the official scramble program</a>.</li>
-        </ul>
+      <ul>
+        <li>The <code>Alg</code> class supports all WCA notation. If you call <code>.toString()</code> on a scramble,
+          you will get a string compatible with WCA notation for the event.</li>
+        <li>The only current way to get scrambles is by WCA event code. Note that different events for the same puzzle
+          may use different kinds of scrambles.</li>
+        <li>All scrambles are random-state where required by <a
+            href="https://www.worldcubeassociation.org/regulations/#4b3">WCA Regulation 4b3 (i.e. all events except for
+            Megaminx and big cubes).</a>
+          <ul>
+            <li>This includes 4x4x4 events!</li>
+            <li>Exception: scramble filtering is not implemented yet. It will be implemented in the future for full
+              compatibility with the WCA Regulations.</li>
+          </ul>
+        </li>
+        <li>Scrambles for 3x3x3 Fewest Moves include <code>R' U' F</code> at the beginning and end, matching TNoodle.
+          However, these added moves can currently produce cancellations. This will be fixed in the future.</li>
+        <li>2x2x2 scrambles may include &lt;D, B, L&gt; moves so that there is no fixed piece in the resulting scramble.
+          This is compatible with the WCA Regulations, but be aware that it does not match TNoodle (which only uses
+          &lt;U, F, R&gt; moves).</li>
+        <li>Only use <code>cubing.js</code> to generate scrambles for unofficial software/competitions/events. Official
+          WCA competitions must use the current version of <a
+            href="https://www.worldcubeassociation.org/regulations/scrambles/">the official scramble program</a>.</li>
+      </ul>
       </p>
     </section>
 
     <section id="with-twisty-player">
       <h1><a href="#with-twisty-player">With <code>&lt;twisty-player&gt;</code></a></h1>
-      <p>You can assign a scramble or a scramble Promise to <code>&lt;twisty-player&gt;</code>. Here is a simple way to display a scramble alg with an associated player:
+      <p>You can assign a scramble or a scramble <code>Promise</code> to <code>&lt;twisty-player&gt;</code>. Here is a
+        simple way to display a scramble alg with an associated player:
       <div class="code-demo">
         <div>
           <code class="sample">
@@ -106,7 +122,7 @@ console.log(scramble.toString());</span>
 <script type="module">
   import "https://cdn.cubing.net/js/cubing/twisty";
   import { randomScrambleForEvent } from "https://cdn.cubing.net/js/cubing/scramble";
-  
+
   const scramblePromise = randomScrambleForEvent("333");
   document.querySelector("#main-player").alg = scramblePromise;
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cubing",
-  "version": "0.21.0-pre8",
+  "version": "0.21.2",
   "description": "A collection of Javascript cubing libraries.",
   "author": "The js.cubing.net team",
   "type": "module",
@@ -8,10 +8,10 @@
   "license": "GPL-3.0-or-later",
   "repository": "github:cubing/cubing.js",
   "dependencies": {
-    "@types/three": "^0.126.1",
-    "@types/web-bluetooth": "0.0.4",
+    "@types/three": "^0.135.0",
+    "@types/web-bluetooth": "^0.0.12",
     "comlink": "^4.3.1",
-    "three": "^0.126.1"
+    "three": "^0.135.0"
   },
   "devDependencies": {
     "@babel/eslint-parser": "^7.15.8",
@@ -66,7 +66,7 @@
     "test-import-restrictions": "node ./script/test/import-restrictions/main.js",
     "test-jest": "npx jest --collectCoverage",
     "test-tsc": "npm run build-types && npx tsc --build ./tsconfig.json",
-    "format": "npx eslint --fix --ext=js,ts .; npx prettier --write src script",
+    "format": "npx eslint --fix --ext=js,ts src script; npx prettier --write src script",
     "setup": "npm install",
     "initial-setup-checked": "[ -d \"node_modules\" ] || npm run initial-setup",
     "initial-setup": "node ./script/initial-setup/main.js",

package/src/cubing/bluetooth/connect/index.ts

@@ -13,7 +13,7 @@ function requestOptions<T>(
         optionalServices: [] as BluetoothServiceUUID[],
       }
     : {
-        filters: [] as BluetoothRequestDeviceFilter[],
+        filters: [] as BluetoothLEScanFilter[],
         optionalServices: [] as BluetoothServiceUUID[],
       };
   for (const config of configs) {

package/src/cubing/bluetooth/smart-puzzle/bluetooth-puzzle.ts

@@ -36,7 +36,7 @@ export interface BluetoothConfig<T> {
   ) => Promise<T>;
   // TODO: Can we reuse `filters`?
   prefixes: string[]; // `[""]` for GiiKER
-  filters: BluetoothRequestDeviceFilter[];
+  filters: BluetoothLEScanFilter[];
   optionalServices: BluetoothServiceUUID[];
 }
 

package/src/cubing/cubing.bundle-global.ts

@@ -10,7 +10,7 @@ import * as stream from "./stream";
 import * as search from "./search";
 import * as twisty from "./twisty";
 
-export const cubing = {
+const cubing = {
   alg,
   bluetooth,
   kpuzzle,
@@ -29,3 +29,7 @@ try {
 } catch (e) {
   console.log("Unable to set `cubing` on the global object.");
 }
+
+if (globalThis.module?.exports) {
+  globalThis.module.exports = cubing;
+}

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

@@ -69,7 +69,7 @@ export class PGOrbitsDef {
     result.push("");
     for (let i = 0; i < this.orbitnames.length; i++) {
       result.push(
-        `"Set ${this.orbitnames[i]} ${this.orbitdefs[i].size} ${this.orbitdefs[i].mod}`,
+        `Set ${this.orbitnames[i]} ${this.orbitdefs[i].size} ${this.orbitdefs[i].mod}`,
       );
     }
     result.push("");

package/src/cubing/puzzles/PuzzleLoader.ts

@@ -5,7 +5,7 @@ import type { PuzzleAppearance } from "./stickerings/appearance";
 
 export interface PuzzleLoader {
   id: string;
-  // shortname?: string;
+  // shortName?: string;
   fullName: string;
   inventedBy?: string[];
   inventionYear?: number; // TODO: date?

package/src/cubing/puzzles/implementations/fto/index.ts

@@ -1,20 +1,28 @@
+import type { PuzzleLoader } from "../..";
 import type { ExperimentalStickering } from "../../../twisty";
-import { genericPGPuzzleLoader } from "../../async/async-pg3d";
+import { asyncGetDef, asyncGetPuzzleGeometry } from "../../async/async-pg3d";
 import type { PuzzleAppearance } from "../../stickerings/appearance";
 import {
   ftoStickering,
   ftoStickerings,
 } from "../../stickerings/fto-stickerings";
 
-const fto = genericPGPuzzleLoader("FTO", "Face-Turning Octahedron", {
+export const fto: PuzzleLoader = {
+  id: "fto",
+  fullName: "Face-Turning Octahedron",
   inventedBy: ["Karl Rohrbach", "David Pitcher"], // http://twistypuzzles.com/cgi-bin/puzzle.cgi?pkey=1663
   inventionYear: 1983, // http://twistypuzzles.com/cgi-bin/puzzle.cgi?pkey=1663
-});
-
-// TODO: loading the stickering code async.
-fto.appearance = (
-  stickering: ExperimentalStickering,
-): Promise<PuzzleAppearance> => ftoStickering(fto, stickering);
-fto.stickerings = ftoStickerings;
-
-export { fto };
+  def: async () => {
+    return asyncGetDef("FTO");
+  },
+  svg: async () => {
+    const pg = await asyncGetPuzzleGeometry("FTO");
+    return pg.generatesvg();
+  },
+  pg: async () => {
+    return asyncGetPuzzleGeometry("FTO");
+  },
+  appearance: (stickering: ExperimentalStickering): Promise<PuzzleAppearance> =>
+    ftoStickering(fto, stickering),
+  stickerings: ftoStickerings,
+};

package/src/cubing/puzzles/index.ts

@@ -62,24 +62,31 @@ export type {
   PuzzleAppearance as ExperimentalPuzzleAppearance,
 } from "./stickerings/appearance";
 
-const wcaEvents: Record<string, PuzzleID> = {
-  "333": "3x3x3",
-  "222": "2x2x2",
-  "444": "4x4x4",
-  "555": "5x5x5",
-  "666": "6x6x6",
-  "777": "7x7x7",
-  "333bf": "3x3x3",
-  "333fm": "3x3x3",
-  "333oh": "3x3x3",
-  "clock": "clock",
-  "minx": "megaminx",
-  "pyram": "pyraminx",
-  "skewb": "skewb",
-  "sq1": "square1",
-  "444bf": "4x4x4",
-  "555bf": "5x5x5",
+interface WCAEventInfo {
+  puzzleID: PuzzleID;
+  eventName: string;
+}
+
+const wcaEvents: Record<string, WCAEventInfo> = {
+  "333": { puzzleID: "3x3x3", eventName: "3x3x3 Cube" },
+  "222": { puzzleID: "2x2x2", eventName: "2x2x2 Cube" },
+  "444": { puzzleID: "4x4x4", eventName: "4x4x4 Cube" },
+  "555": { puzzleID: "5x5x5", eventName: "5x5x5 Cube" },
+  "666": { puzzleID: "6x6x6", eventName: "6x6x6 Cube" },
+  "777": { puzzleID: "7x7x7", eventName: "7x7x7 Cube" },
+  "333bf": { puzzleID: "3x3x3", eventName: "3x3x3 Blindfolded" },
+  "333fm": { puzzleID: "3x3x3", eventName: "3x3x3 Fewest Moves" },
+  "333oh": { puzzleID: "3x3x3", eventName: "3x3x3 One-Handed" },
+  "clock": { puzzleID: "clock", eventName: "Clock" },
+  "minx": { puzzleID: "megaminx", eventName: "Megaminx" },
+  "pyram": { puzzleID: "pyraminx", eventName: "Pyraminx" },
+  "skewb": { puzzleID: "skewb", eventName: "Skewb" },
+  "sq1": { puzzleID: "square1", eventName: "Square-1" },
+  "444bf": { puzzleID: "4x4x4", eventName: "4x4x4 Blindfolded" },
+  "555bf": { puzzleID: "5x5x5", eventName: "5x5x5 Blindfolded" },
+  "333mb": { puzzleID: "3x3x3", eventName: " 3x3x3 Multi-Blind" },
 };
-export function puzzleIDForWCAEvent(event: string): PuzzleID | null {
+
+export function wcaEventInfo(event: string): WCAEventInfo | null {
   return wcaEvents[event] ?? null;
 }

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

@@ -39,6 +39,7 @@ export async function ftoStickering(
       m.or([
         m.and([m.move("F"), m.move("BL")]),
         m.and([m.move("F"), m.move("BR")]),
+        m.and([m.move("BL"), m.move("BR")]),
       ]),
     );
 
@@ -56,24 +57,31 @@ export async function ftoStickering(
         m.not(experimentalFTO_F2T()),
         PieceStickering.Ignored,
       );
+      puzzleStickering.set(experimentalFTO_FC(), PieceStickering.Dim);
       break;
     case "experimental-fto-sc":
       puzzleStickering.set(
         m.not(experimentalFTO_SC()),
         PieceStickering.Ignored,
       );
+      puzzleStickering.set(experimentalFTO_F2T(), PieceStickering.Dim);
       break;
     case "experimental-fto-l2c":
       puzzleStickering.set(
         m.not(experimentalFTO_L2C()),
         PieceStickering.Ignored,
       );
+      puzzleStickering.set(experimentalFTO_SC(), PieceStickering.Dim);
       break;
     case "experimental-fto-lbt":
       puzzleStickering.set(
         m.not(experimentalFTO_LBT()),
         PieceStickering.Ignored,
       );
+      puzzleStickering.set(experimentalFTO_L2C(), PieceStickering.Dim);
+      break;
+    case "experimental-fto-l3t":
+      puzzleStickering.set(experimentalFTO_LBT(), PieceStickering.Dim);
       break;
     default:
       console.warn(
@@ -92,5 +100,6 @@ export async function ftoStickerings(): Promise<ExperimentalStickering[]> {
     "experimental-fto-sc",
     "experimental-fto-l2c",
     "experimental-fto-lbt",
+    "experimental-fto-l3t",
   ];
 }

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

@@ -17,6 +17,7 @@ const events = [
   "sq1",
   "444bf",
   "555bf",
+  "333mb",
 ];
 
 setDebugMeasurePerf(false);

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

@@ -90,6 +90,7 @@ export const insideAPI = {
           random333FewestMovesScramble,
         );
       case "333bf":
+      case "333mb":
         return measurePerf(
           "random333OrientedScramble",
           random333OrientedScramble,