cubing 0.21.1 → 0.22.1

package/dist/types/{search/inside/solve/vendor → vendor}/random-uint-below/index.d.ts

@@ -1,4 +1,4 @@
 export { randomChoiceFactory } from "./random-choice";
-export { randomUIntBelowFactory } from "./random-int";
+export { randomUIntBelowFactory } from "./random53BitValue";
 export declare function randomPermute<T>(list: T[]): Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/dist/types/vendor/random-uint-below/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/cubing/vendor/random-uint-below/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAK5D,wBAAsB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAK/D"}

package/dist/types/vendor/random-uint-below/random-choice.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"random-choice.d.ts","sourceRoot":"","sources":["../../../../src/cubing/vendor/random-uint-below/random-choice.ts"],"names":[],"mappings":"AAKA,wBAAsB,mBAAmB,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAG5E"}

package/dist/types/{search/inside/solve/vendor/random-uint-below/random-int.d.ts → vendor/random-uint-below/random53BitValue.d.ts}

@@ -1,2 +1,2 @@
 export declare function randomUIntBelowFactory(): Promise<(max: number) => number>;
-//# sourceMappingURL=random-int.d.ts.map
+//# sourceMappingURL=random53BitValue.d.ts.map

package/dist/types/vendor/random-uint-below/random53BitValue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"random53BitValue.d.ts","sourceRoot":"","sources":["../../../../src/cubing/vendor/random-uint-below/random53BitValue.ts"],"names":[],"mappings":"AAyCA,wBAAsB,sBAAsB,IAAI,OAAO,CACrD,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CACxB,CAoBA"}

package/dist/types/vendor/sq12phase/scramble_sq1.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scramble_sq1.d.ts","sourceRoot":"","sources":["../../../../src/cubing/vendor/sq12phase/scramble_sq1.js"],"names":[],"mappings":"AAk1BA,+DAEC"}

package/dist/types/vendor/unsafe-raw-aes/unsafe-raw-aes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"unsafe-raw-aes.d.ts","sourceRoot":"","sources":["../../../../src/cubing/vendor/unsafe-raw-aes/unsafe-raw-aes.ts"],"names":[],"mappings":"AAOA,wBAAsB,SAAS,CAAC,QAAQ,EAAE,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,CAKzE;AAkBD,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,SAAS,EACd,cAAc,EAAE,WAAW,GAC1B,OAAO,CAAC,WAAW,CAAC,CAKtB;AAED,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,SAAS,EACd,eAAe,EAAE,WAAW,GAC3B,OAAO,CAAC,WAAW,CAAC,CAoBtB"}

package/docs/cubing/api/index.html

@@ -17,8 +17,9 @@
     </div>
 
     <section class="no-header">
-      Note: These documents are still in early draft stage. Each method and should have enough examples to demonstrate all possible arguments.
-        </section>
+      Note: These documents are still in early draft stage. Each method and should have enough examples to demonstrate
+      all possible arguments.
+    </section>
 
     <section id="alg">
       <h1><a href="#alg"><code>cubing/alg</code></a></h1>
@@ -58,7 +59,7 @@
 &nbsp;&nbsp;experimentalNumUnits(): number;<br>
 }</code>
 
-<p>Example:</p>
+      <p>Example:</p>
       <div class="code-demo">
         <div>
           <code class="sample">
@@ -72,16 +73,17 @@ antiSune.<b><u>expand()</u></b>.log();<br>
 antiSune.expand().<b><u>simplify()</u></b>.log();</span>
           </code>
         </div>
-          <code class="sample output">
+        <code class="sample output">
             <span>Alg{}&nbsp;&quot;[[R: U], R U R2']&quot;</span>
             <span>Alg{}&nbsp;&quot;R U R' R U R2' R U' R' R2 U' R'&quot;</span>
             <span>Alg{}&nbsp;&quot;R U2 R' U' R U' R'&quot;</span>
           </code>
       </div>
 
-<p>A <code>Move</code> is a <code>QuantumMove</code> (like <code>R</code> or <code>UL</code>) with an amount (any integer).</p>
+      <p>A <code>Move</code> is a <code>QuantumMove</code> (like <code>R</code> or <code>UL</code>) with an amount (any
+        integer).</p>
 
-<code class="sample">class Move {<br>
+      <code class="sample">class Move {<br>
 &nbsp;&nbsp;// Constructors<br>
 &nbsp;&nbsp;constructor(s: string);<br>
 &nbsp;&nbsp;constructor(quantumMove: string, amount: number);<br>
@@ -108,7 +110,7 @@ antiSune.expand().<b><u>simplify()</u></b>.log();</span>
 &nbsp;&nbsp;get amount(): number;<br>
 &nbsp;&nbsp;log(message?: string): Alg;<br>
 }</code>
-<code class="sample">class QuantumMove {<br>
+      <code class="sample">class QuantumMove {<br>
 &nbsp;&nbsp;// Constructors<br>
 &nbsp;&nbsp;constructor(family: string, innerLayer?: number | null, outerLayer?: number | null);<br>
 <br>
@@ -141,53 +143,10 @@ antiSune.expand().<b><u>simplify()</u></b>.log();</span>
       </p>
 
       <code class="sample">class TwistyPlayer {<br>
-&nbsp;&nbsp;// Constructor<br>
-&nbsp;&nbsp;constructor(initialConfig?: {<br>
-&nbsp;&nbsp;&nbsp;&nbsp;// Note that any of the config options can be accessed<br>
-&nbsp;&nbsp;&nbsp;&nbsp;// or updated as properties on a TwistyPlayer instance directly.<br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;alg?: Alg | string;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalSetupAlg?: Alg | string;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalSetupAnchor?: "start" | "end";<br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;puzzle?: PuzzleID;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;visualization?: "3D" | "2D" | "experimental-2D-LL" | "PG3D";<br>
-&nbsp;&nbsp;&nbsp;&nbsp;hintFacelets?: "floating" | "none";<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalStickering?: ExperimentalStickering;<br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;background?: BackgroundTheme;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;controlPanel?: "bottom-row" | "none";<br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;backView?: BackViewLayout;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalCameraLatitude?: Vector3;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalCameraLongitude?: Vector3;<br>
-&nbsp;&nbsp;&nbsp;&nbsp;experimentalCameraLatitudeLimits?: "auto" | "none";<br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;viewerLink?: "twizzle" | "none";<br>
-&nbsp;&nbsp;})<br>
-<br>
-&nbsp;&nbsp;// Structure<br>
-&nbsp;&nbsp;timeline: Timeline;<br>
-&nbsp;&nbsp;cursor: AlgCursor | null;<br>
-&nbsp;&nbsp;viewerElems: TwistyViewerElement[];<br>
-&nbsp;&nbsp;controlElems: TwistyControlElement[];<br>
-&nbsp;&nbsp;fullscreen(): void;<br>
-<br>
-&nbsp;&nbsp;// Twizzle<br>
-&nbsp;&nbsp;twizzleLink(): string;<br>
-&nbsp;&nbsp;visitTwizzleLink(): void;<br>
-<br>
-&nbsp;&nbsp;// 3D code<br>
-&nbsp;&nbsp;scene: Twisty3DScene | null;<br>
-&nbsp;&nbsp;twisty3D: Twisty3DPuzzle | null;<br>
-<br>
-&nbsp;&nbsp;// Experimental methods<br>
-&nbsp;&nbsp;experimentalSetStartStateOverride(state: Transformation | null): void;<br>
-&nbsp;&nbsp;experimentalSetCursorIndexer(cursorName: "simple" | "tree" | "simultaneous"): void;<br>
-&nbsp;&nbsp;experimentalAddMove(move: Move, coalesce?: boolean, coalesceDelayed?: boolean): void;<br>
+&nbsp;&nbsp;// TODO<br>
 }
 </code>
-</section>
+    </section>
 
     <section id="methods">
       <h1><a href="#methods">Examples</a></h1>

package/docs/cubing/index.html

@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <html>
+
 <head>
   <meta charset="utf8">
   <title>cubing.js</title>
@@ -12,6 +13,7 @@
     experimentalSetShareAllNewRenderers(true);
   </script>
 </head>
+
 <body>
   <content>
     <!-- Tip: Avoid using specialized terminology (e.g. "element", "attribute") where possible. -->
@@ -29,13 +31,14 @@
         puzzles.
       </p>
       <p>You may use it for free in any website or app, for any personal use or if you <a
-      href="https://github.com/cubing/cubing.js/blob/main/LICENSE.md">publicly
-      share any code that uses it</a>.</p>
+          href="https://github.com/cubing/cubing.js/blob/main/LICENSE.md">publicly
+          share any code that uses it</a>.</p>
     </section>
 
     <section id="twisty">
       <h1><a href="./twisty/">cubing/twisty</a></h1>
-      <p>The main feature of <code>cubing.js</code> is the <code>&lt;twisty-player&gt;</code> element that can be used on any website:</p>
+      <p>The main feature of <code>cubing.js</code> is the <code>&lt;twisty-player&gt;</code> element that can be used
+        on any website:</p>
 
       <div class="code-demo">
         <div>
@@ -57,17 +60,18 @@
 
     <section id="alg">
       <h1><a href="./alg/">cubing/alg</a></h1>
-      <p>At the core of <code>cubing.js</code> is a powerful <code>Alg</code> class that is compatible with all SiGN and WCA notation.</p>
+      <p>At the core of <code>cubing.js</code> is a powerful <code>Alg</code> class that is compatible with all SiGN and
+        WCA notation.</p>
 
       <div class="code-demo">
         <div>
           <code class="sample">
 <code class="boilerplate">&lt;script type=&quot;module&quot;&gt;</code><br>
-import { Alg } from &quot;https://cdn.cubing.net/js/cubing/alg&quot;;<br>
-<br>
-const commutator = new Alg(&quot;[R, [U': L']]&quot;);<br>
-commutator.invert().expand().log();<br>
-<code class="boilerplate">&lt;/script&gt;</code>
+          import { Alg } from &quot;https://cdn.cubing.net/js/cubing/alg&quot;;<br>
+          <br>
+          const commutator = new Alg(&quot;[R, [U': L']]&quot;);<br>
+          commutator.invert().expand().log();<br>
+          <code class="boilerplate">&lt;/script&gt;</code>
           </code>
         </div>
         <code class="sample output">
@@ -87,11 +91,11 @@ commutator.invert().expand().log();<br>
         <div>
           <code class="sample">
 <code class="boilerplate">&lt;script type=&quot;module&quot;&gt;<br></code>
-import { randomScrambleForEvent } from &quot;https://cdn.cubing.net/js/cubing/scramble&quot;;<br>
-<br>
-const scramble = await randomScrambleForEvent("333");<br>
-scramble.log();<br>
-<code class="boilerplate">&lt;/script&gt;</code>
+          import { randomScrambleForEvent } from &quot;https://cdn.cubing.net/js/cubing/scramble&quot;;<br>
+          <br>
+          const scramble = await randomScrambleForEvent("333");<br>
+          scramble.log();<br>
+          <code class="boilerplate">&lt;/script&gt;</code>
           </code>
         </div>
         <code class="sample output">
@@ -106,7 +110,8 @@ scramble.log();<br>
     <section id="javascript">
       <h1><a href="#javascript"><code>npm</code> package</a></h1>
       <p>
-        <code>cubing.js</code> is published <a href="https://www.npmjs.com/package/cubing">as an <code>npm</code> package</a>.
+        <code>cubing.js</code> is published <a href="https://www.npmjs.com/package/cubing">as
+          <code>cubing</code>on <code>npm</code></a>.
         If you are familiar with tools like JavaScript bundlers, you can use this for development.
         Install the package:
       </p>
@@ -120,32 +125,67 @@ import { Alg } from &quot;cubing/alg&quot;;<br>
 import { TwistyPlayer } from &quot;cubing/twisty&quot;;
         </span>
       </code>
-      <p>This should work with most tools. We recommend using <a
-      href="https://parceljs.org/">Parcel</a> to build your web apps, if you
-      haven't picked a tool yet.</p>
-      <p>
-        If you aren't using <code>npm</code>, you can use our CDN directly, by adding <code>https://cdn.cubing.net/js/</code> before every imported package (like in the examples above):
+      <p>This should work with most tools. We recommend using <a href="https://parceljs.org/">Parcel</a> to build your
+        web apps, if you
+        haven't picked a tool yet.</p>
       </p>
-      <code class="sample">
-import { Alg } from &quot;https://cdn.cubing.net/js/cubing/alg&quot;;<br>
-import { TwistyPlayer } from &quot;https://cdn.cubing.net/js/cubing/twisty&quot;;
+      <div id="translating-cdn-paths">
+        <h2><a href="#translating-cdn-paths">Translating package paths to the CDN</a></h2>
+        <p>
+          If you aren't using <code>npm</code>, you can use our CDN directly, by adding
+          <code>https://cdn.cubing.net/js/</code> before every imported package (like in the examples above):
+        </p>
+        <p>
+          <code class="sample">
+import { Alg } from &quot;<b><u>https://cdn.cubing.net/js/</u></b>cubing/alg&quot;;<br>
+import { TwistyPlayer } from &quot;<b><u>https://cdn.cubing.net/js/</u></b>cubing/twisty&quot;;
       </code>
+        </p>
+      </div>
+
+      <div id="npm-package-troubleshooting">
+        <h2><a href="#npm-package-troubleshooting">Troubleshooting</a></h2>
+
+        <div id="ignoring-built-in-node-modules">
+          <h3><a href="#ignoring-built-in-node-modules">Ignoring built-in <code>node</code> modules</a></h3>
+          The <code>cubing.js</code> library on <code>npm</code> has several dependencies, which are listed
+          in its <code>package.json</code>. In addition, it contains dynamic imports that are used when the code is
+          running
+          in <code>node</code>, currently:
+          <ul>
+            <li><code>crypto</code></li>
+            <li><code>worker_threads</code></li>
+          </ul>
+
+          <p>
+            You may need to tell your tools to ignore (e.g. "exclude" or mark as
+            "external") these imports for the browser. For example, when using <a
+              href="https://esbuild.github.io/api/#external"><code>esbuild</code></a>:
+
+            <code class="sample">
+              esbuild <b><u>--external:crypto</u></b> <b><u>--external:worker_threads</u></b> [other arguments]
+          </code>
+          </p>
+        </div>
+      </div>
+
     </section>
 
     <section id="code-experiments">
       <h1><a href="#code-experiments">Code Experiments</a></h1>
-      <p>For a taste of upcoming features, check out the <a href="https://experiments.cubing.net/cubing.js/">development experiments</a> site.</p>
+      <p>For a taste of upcoming features, check out the <a href="https://experiments.cubing.net/cubing.js/">development
+          experiments</a> site.</p>
     </section>
 
     <section id="contribute">
       <h1><a href="#contribute">Contribute</a></h1>
       <p>If you have any questions or ideas, please visit the
-      project source on GitHub:</p>
+        project source on GitHub:</p>
       <div style="font-size: 1.25em; word-break: break-all;">
-        <a
-        href="https://github.com/cubing/cubing.js">https://github.com/cubing/cubing.js</a>
+        <a href="https://github.com/cubing/cubing.js">https://github.com/cubing/cubing.js</a>
       </div>
     </section>
   </content>
 </body>
+
 </html>

package/docs/main.css

@@ -82,26 +82,27 @@ section:not(:first-child) {
   border-top: 1px solid #4285f466;
 }
 
-section:target {
+section:target,
+div:target {
   background: #00448811;
 }
 
-section h1 {
+section :is(h1, h2, h3) {
   margin-top: 0;
 }
 
-section h1 a:hover::before {
+section :is(h1, h2, h3) a:hover::before {
   position: absolute;
   transform: translateX(-1.25em);
   font-size: 0.75em;
   content: "🔗";
 }
 
-section h1 a {
+section :is(h1, h2, h3) a {
   color: inherit;
 }
 
-section h1 a:not(:hover) {
+section :is(h1, h2, h3) a:not(:hover) {
   text-decoration: none;
 }
 
@@ -188,5 +189,5 @@ code.sample span.js-object {
 }
 
 .boilerplate {
-  color: #559BD4;
+  color: #559bd4;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cubing",
-  "version": "0.21.1",
+  "version": "0.22.1",
   "description": "A collection of Javascript cubing libraries.",
   "author": "The js.cubing.net team",
   "type": "module",
@@ -17,12 +17,12 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-env": "^7.15.8",
     "@babel/preset-typescript": "^7.13.0",
-    "@babylonjs/core": "^5.0.0-alpha.24",
     "@types/jest": "^26.0.23",
+    "@types/node": "^17.0.6",
     "@typescript-eslint/eslint-plugin": "^5.1.0",
     "@typescript-eslint/parser": "^5.1.0",
     "babel-jest": "^27.2.4",
-    "barely-a-dev-server": "^0.2.4",
+    "barely-a-dev-server": "^0.2.6",
     "esbuild": "^0.12.29",
     "eslint": "^8.0.1",
     "eslint-config-prettier": "^8.3.0",
@@ -33,12 +33,10 @@
     "peggy": "^1.1.0",
     "prettier": "^2.2.1",
     "puppeteer": "^8.0.0",
-    "ts-jest": "^27.0.3",
-    "typescript": "^4.3.2",
+    "typescript": "^4.5.4",
     "yargs": "^16.2.0"
   },
-  "mainDevDependencies": [
-    "@babylonjs/core",
+  "minimalDevDependencies": [
     "barely-a-dev-server",
     "esbuild",
     "jszip"
@@ -63,9 +61,10 @@
     "test-dist-esm-parcel": "node ./script/test/dist/esm/parcel/main.js",
     "test-dist-esm-perf": "node script/test/dist/esm/perf/*.mjs",
     "test-dist-experiments": "node ./script/test/dist/experiments/main.js",
+    "test-dist-not-imported-from-src": "node ./script/test/dist/not-imported-from-src/main.js",
     "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",
+    "test-tsc": "npm run build-types && npx tsc --project ./tsconfig.json",
     "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",
@@ -91,7 +90,7 @@
   "eslintConfig": {
     "parser": "@babel/eslint-parser",
     "parserOptions": {
-      "project": "./tsconfig-eslint.json"
+      "project": "./tsconfig.json"
     },
     "overrides": [
       {

package/src/cubing/alg/index.ts

@@ -4,6 +4,7 @@ export { TraversalDownUp, TraversalUp } from "./traversal";
 export { Example } from "./example";
 export { keyToMove } from "./keyboard";
 export * from "./units";
+export { MoveModifications } from "./units/leaves/Move";
 
 export { algCubingNetLink } from "./url";
 export type { AlgCubingNetOptions } from "./url";

package/src/cubing/alg/units/leaves/Move.ts

@@ -126,7 +126,7 @@ export class QuantumMove extends Comparable {
   }
 }
 
-interface MoveModifications {
+export interface MoveModifications {
   outerLayer?: number;
   innerLayer?: number;
   family?: string;

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

@@ -10,7 +10,10 @@ import {
   BluetoothPuzzle,
   PuzzleState,
 } from "./bluetooth-puzzle";
-import { importKey, unsafeDecryptBlock } from "./unsafe-raw-aes";
+import {
+  importKey,
+  unsafeDecryptBlock,
+} from "../../vendor/unsafe-raw-aes/unsafe-raw-aes";
 
 // This needs to be short enough to capture 6 moves (OBQTM).
 const DEFAULT_INTERVAL_MS = 150;

package/src/cubing/bluetooth/smart-timer/GanTimer.ts

@@ -1,4 +1,4 @@
-import type { MillisecondTimestamp } from "../../twisty/old/animation/cursor/CursorTypes";
+import type { MillisecondTimestamp } from "../../twisty/controllers/AnimationTypes";
 import type { BluetoothConfig } from "../smart-puzzle/bluetooth-puzzle";
 
 // TODO: Short IDs

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

@@ -0,0 +1,25 @@
+import * as alg from "./alg";
+import * as bluetooth from "./bluetooth";
+import * as kpuzzle from "./kpuzzle";
+import * as notation from "./notation";
+import * as protocol from "./protocol";
+import * as puzzleGeometry from "./puzzle-geometry";
+import * as puzzles from "./puzzles";
+import * as scramble from "./scramble";
+import * as stream from "./stream";
+import * as search from "./search";
+import * as twisty from "./twisty";
+
+export const cubingBundleGlobalExports = {
+  alg,
+  bluetooth,
+  kpuzzle,
+  notation,
+  protocol,
+  puzzleGeometry,
+  puzzles,
+  scramble,
+  stream,
+  search,
+  twisty,
+};

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

@@ -1,31 +1,7 @@
-import * as alg from "./alg";
-import * as bluetooth from "./bluetooth";
-import * as kpuzzle from "./kpuzzle";
-import * as notation from "./notation";
-import * as protocol from "./protocol";
-import * as puzzleGeometry from "./puzzle-geometry";
-import * as puzzles from "./puzzles";
-import * as scramble from "./scramble";
-import * as stream from "./stream";
-import * as search from "./search";
-import * as twisty from "./twisty";
-
-export const cubing = {
-  alg,
-  bluetooth,
-  kpuzzle,
-  notation,
-  protocol,
-  puzzleGeometry,
-  puzzles,
-  scramble,
-  stream,
-  search,
-  twisty,
-};
+import { cubingBundleGlobalExports } from "./cubing.bundle-global.exports";
 
 try {
-  (globalThis as any).cubing = cubing;
+  (globalThis as any).cubing = cubingBundleGlobalExports;
 } catch (e) {
-  console.log("Unable to set `cubing` on the global object.");
+  console.error("Unable to set `cubing` on the global object.");
 }

package/src/cubing/puzzle-geometry/PGPuzzles.spec.ts

@@ -1,3 +1,7 @@
+/**
+ * @jest-environment jsdom
+ */
+
 import { getPuzzleGeometryByDesc } from ".";
 import { PGPuzzles } from "./PGPuzzles";
 import { transformationOrder, Transformation } from "../kpuzzle";

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

@@ -66,7 +66,11 @@ export interface StickerDatFace {
   name: string;
 }
 
-export type StickerDatAxis = [number[], string, number];
+export type StickerDatAxis = {
+  coordinates: number[];
+  quantumMove: Move;
+  order: number;
+};
 
 export interface StickerDat {
   stickers: StickerDatSticker[];
@@ -407,12 +411,16 @@ function findelement(a: Quat[][], p: Quat): number {
   throw new Error("Element not found");
 }
 
-export function getpuzzles(): { [s: string]: PuzzleDescriptionString } {
+export function getPG3DNamedPuzzles(): {
+  [s: string]: PuzzleDescriptionString;
+} {
   // get some simple definitions of basic puzzles
   return PGPuzzles;
 }
 
-export function getpuzzle(puzzleName: PuzzleName): PuzzleDescriptionString {
+export function getPuzzleDescriptionString(
+  puzzleName: PuzzleName,
+): PuzzleDescriptionString {
   // get some simple definitions of basic puzzles
   return PGPuzzles[puzzleName];
 }
@@ -2851,12 +2859,16 @@ export class PuzzleGeometry {
       const order = this.movesetorders[i];
       for (const gn of this.geonormals) {
         if (msg[0] === gn[1] && msg[1] === gn[2]) {
-          grips.push([toCoords(gn[0].rotatepoint(rot), 1), msg[0], order]);
-          grips.push([
-            toCoords(gn[0].rotatepoint(rot).smul(-1), 1),
-            msg[2],
+          grips.push({
+            coordinates: toCoords(gn[0].rotatepoint(rot), 1),
+            quantumMove: new Move(msg[0]),
             order,
-          ]);
+          });
+          grips.push({
+            coordinates: toCoords(gn[0].rotatepoint(rot).smul(-1), 1),
+            quantumMove: new Move(msg[2]),
+            order,
+          });
         }
       }
     }

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

@@ -1,8 +1,8 @@
 export {
-  getpuzzle,
+  getPuzzleDescriptionString,
   getPuzzleGeometryByDesc,
   getPuzzleGeometryByName,
-  getpuzzles,
+  getPG3DNamedPuzzles,
   parsePuzzleDescription,
   PuzzleGeometry,
 } from "./PuzzleGeometry";

package/src/cubing/puzzles/index.ts

@@ -3,7 +3,7 @@ export { experimentalCube3x3x3KPuzzle as experimentalCube3x3x3KPuzzle } from "..
 
 export { cubeAppearance as experimentalCubeAppearance } from "./stickerings/cube-stickerings";
 
-import type { PuzzleID } from "../twisty/old/dom/TwistyPlayerConfig";
+import type { PuzzleID } from "../twisty";
 import { cubePGPuzzleLoader, genericPGPuzzleLoader } from "./async/async-pg3d";
 import { cube2x2x2 } from "./implementations/2x2x2";
 import { cube3x3x3 } from "./implementations/3x3x3";

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

@@ -158,6 +158,22 @@ export async function cubeAppearance(
         PieceStickering.OrientationWithoutPermutation,
       );
       break;
+    case "EOline":
+      puzzleStickering.set(CORNERS(), PieceStickering.Ignored);
+      puzzleStickering.set(
+        EDGES(),
+        PieceStickering.OrientationWithoutPermutation,
+      );
+      puzzleStickering.set(m.and(m.moves(["D", "M"])), PieceStickering.Regular);
+      break;
+    case "EOcross":
+      puzzleStickering.set(
+        EDGES(),
+        PieceStickering.OrientationWithoutPermutation,
+      );
+      puzzleStickering.set(m.move("D"), PieceStickering.Regular);
+      puzzleStickering.set(CORNERS(), PieceStickering.Ignored);
+      break;
     case "CMLL":
       puzzleStickering.set(F2L(), PieceStickering.Dim);
       puzzleStickering.set(L6E(), PieceStickering.Ignored);
@@ -269,6 +285,8 @@ export async function cubeStickerings(): Promise<ExperimentalStickering[]> {
     "VLS",
     "LS",
     "EO",
+    "EOline",
+    "EOcross",
     "CMLL",
     "L6E",
     "L6EO",