cubing 0.55.1 → 0.56.0

package/dist/lib/cubing/{index-BaPEgEPZ.d.ts → index-g0IQg962.d.ts}

@@ -1,4 +1,4 @@
-import { s as Alg, K as KPattern, v as KPuzzle } from './KPattern-BXlfgC6b.js';
+import { s as Alg, K as KPattern, v as KPuzzle } from './PuzzleLoader-DWqO9l1G.js';
 
 declare enum PrefetchLevel {
     Auto = "auto",

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

@@ -1,2 +1,2 @@
-export { K as KPattern, a9 as KPatternData, aa as KPatternOrbitData, v as KPuzzle, a8 as KPuzzleDefinition, z as KTransformation, ab as KTransformationData, ac as KTransformationOrbitData } from '../KPattern-BXlfgC6b.js';
-import 'three';
+export { K as KPattern, a9 as KPatternData, aa as KPatternOrbitData, v as KPuzzle, a8 as KPuzzleDefinition, z as KTransformation, ab as KTransformationData, ac as KTransformationOrbitData } from '../PuzzleLoader-DWqO9l1G.js';
+import 'three/src/Three.js';

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

@@ -1,5 +1,5 @@
-import { s as Alg, t as PuzzleLoader } from '../KPattern-BXlfgC6b.js';
-import 'three';
+import { s as Alg, t as PuzzleLoader } from '../PuzzleLoader-DWqO9l1G.js';
+import 'three/src/Three.js';
 
 declare enum CommonMetric {
     OuterBlockTurnMetric = "OBTM",

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

@@ -5,8 +5,8 @@ import {
   countMetricMoves,
   countMoves,
   countMovesETM
-} from "../chunks/chunk-PJH5IVDC.js";
-import "../chunks/chunk-SGPKF5IH.js";
+} from "../chunks/chunk-MA47PABE.js";
+import "../chunks/chunk-YQVHA4F6.js";
 import "../chunks/chunk-TQF5J7MH.js";
 import "../chunks/chunk-2SBMIHZV.js";
 export {

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

@@ -1,5 +1,5 @@
-import { K as KPattern } from '../KPattern-BXlfgC6b.js';
-import 'three';
+import { K as KPattern } from '../PuzzleLoader-DWqO9l1G.js';
+import 'three/src/Three.js';
 
 type Binary3x3x3Pattern = Uint8Array;
 interface Binary3x3x3Components {

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

@@ -5,8 +5,8 @@ import {
   spacedHexToBuffer,
   twizzleBinaryToBinaryComponents,
   twizzleBinaryToReid3x3x3
-} from "../chunks/chunk-2QDTMC3W.js";
-import "../chunks/chunk-SGPKF5IH.js";
+} from "../chunks/chunk-YFGRXDD4.js";
+import "../chunks/chunk-YQVHA4F6.js";
 import "../chunks/chunk-TQF5J7MH.js";
 import "../chunks/chunk-2SBMIHZV.js";
 export {

package/dist/lib/cubing/puzzle-geometry/index.d.ts

@@ -1,6 +1,6 @@
-import { P as Perm } from '../KPattern-BXlfgC6b.js';
-export { q as EXPERIMENTAL_PUZZLE_BASE_SHAPES, n as EXPERIMENTAL_PUZZLE_CUT_TYPES, k as ExperimentalPGNotation, r as ExperimentalPuzzleBaseShape, l as ExperimentalPuzzleCutDescription, o as ExperimentalPuzzleCutType, m as ExperimentalPuzzleDescription, j as ExperimentalPuzzleGeometryOptions, d as PuzzleGeometry, Q as Quat, S as StickerDat, e as StickerDatAxis, f as StickerDatFace, h as StickerDatSticker, c as getPG3DNamedPuzzles, g as getPuzzleDescriptionString, a as getPuzzleGeometryByDesc, b as getPuzzleGeometryByName, i as parseOptions, p as parsePuzzleDescription } from '../KPattern-BXlfgC6b.js';
-import 'three';
+import { P as Perm } from '../PuzzleLoader-DWqO9l1G.js';
+export { q as EXPERIMENTAL_PUZZLE_BASE_SHAPES, n as EXPERIMENTAL_PUZZLE_CUT_TYPES, k as ExperimentalPGNotation, r as ExperimentalPuzzleBaseShape, l as ExperimentalPuzzleCutDescription, o as ExperimentalPuzzleCutType, m as ExperimentalPuzzleDescription, j as ExperimentalPuzzleGeometryOptions, d as PuzzleGeometry, Q as Quat, S as StickerDat, e as StickerDatAxis, f as StickerDatFace, h as StickerDatSticker, c as getPG3DNamedPuzzles, g as getPuzzleDescriptionString, a as getPuzzleGeometryByDesc, b as getPuzzleGeometryByName, i as parseOptions, p as parsePuzzleDescription } from '../PuzzleLoader-DWqO9l1G.js';
+import 'three/src/Three.js';
 
 declare function schreierSims(g: Perm[], disp: (s: string) => void): bigint;
 

package/dist/lib/cubing/puzzle-geometry/index.js

@@ -2512,7 +2512,7 @@ function findelement(a, p) {
       return i;
     }
   }
-  throw new Error("Element not found");
+  throw Error("Element not found");
 }
 function getPG3DNamedPuzzles() {
   return PGPuzzles;
@@ -2546,7 +2546,7 @@ function parsePuzzleDescription(s) {
 function getPuzzleGeometryByDesc(desc, options = {}) {
   const parsed = parsePuzzleDescription(desc);
   if (parsed === null) {
-    throw new Error("Could not parse the puzzle description");
+    throw Error("Could not parse the puzzle description");
   }
   const pg = new PuzzleGeometry(
     parsed,
@@ -2580,7 +2580,7 @@ function getmovename(geo, bits, slices) {
       movenamePrefix = String(bits[1] + 1);
     }
   } else {
-    throw new Error(
+    throw Error(
       `We only support slice and outer block moves right now. ${bits}`
     );
   }
@@ -2603,7 +2603,7 @@ function splitByFaceNames(s, facenames) {
       r.push(currentMatch);
       at += currentMatch.length;
     } else {
-      throw new Error(`Could not split ${s} into face names.`);
+      throw Error(`Could not split ${s} into face names.`);
     }
   }
   return r;
@@ -2716,7 +2716,7 @@ var PuzzleGeometry = class {
   swizzler;
   notationMapper = new NullMapper();
   addNotationMapper = "";
-  setReidOrder = false;
+  setReidOrSpeffzOrder = false;
   options;
   create(puzzleDescription) {
     const { shape, cuts } = puzzleDescription;
@@ -2747,7 +2747,7 @@ var PuzzleGeometry = class {
         break;
       }
       default:
-        throw new Error(`Bad shape argument: ${shape}`);
+        throw Error(`Bad shape argument: ${shape}`);
     }
     this.rotations = closure(g);
     if (this.options.verbosity) {
@@ -2809,7 +2809,7 @@ var PuzzleGeometry = class {
           break;
         }
         default:
-          throw new Error(`Bad cut argument: ${cut.cutType}`);
+          throw Error(`Bad cut argument: ${cut.cutType}`);
       }
       cutplanes.push(normal.makecut(cut.distance));
       intersects.push(cut.distance < distance);
@@ -2865,7 +2865,7 @@ var PuzzleGeometry = class {
         } else if (i === el[2]) {
           facelist.push(el[1]);
         } else {
-          throw new Error("Could not find edge");
+          throw Error("Could not find edge");
         }
       }
       otherfaces.push(facelist);
@@ -2880,7 +2880,7 @@ var PuzzleGeometry = class {
       const f0 = neti[0];
       const fi = facenametoindex[f0];
       if (fi === void 0) {
-        throw new Error("Bad edge description; first edge not connected");
+        throw Error("Bad edge description; first edge not connected");
       }
       let ii = -1;
       for (let j = 0; j < otherfaces[fi].length; j++) {
@@ -2891,7 +2891,7 @@ var PuzzleGeometry = class {
         }
       }
       if (ii < 0) {
-        throw new Error("First element of a net not known");
+        throw Error("First element of a net not known");
       }
       for (let j = 2; j < neti.length; j++) {
         if (neti[j] === "") {
@@ -2900,7 +2900,7 @@ var PuzzleGeometry = class {
         const of = otherfaces[fi][(j + ii - 1) % edgesperface];
         const fn2 = faceindextoname[of];
         if (fn2 !== void 0 && fn2 !== neti[j]) {
-          throw new Error("Face mismatch in net");
+          throw Error("Face mismatch in net");
         }
         faceindextoname[of] = neti[j];
         facenametoindex[neti[j]] = of;
@@ -2965,7 +2965,7 @@ var PuzzleGeometry = class {
     }
     for (let i = 0; i < edgenames.length; i++) {
       if (edgenames[i].length !== 3) {
-        throw new Error(`Bad length in edge names ${edgenames[i]}`);
+        throw Error(`Bad length in edge names ${edgenames[i]}`);
       }
       const f1 = edgenames[i][1];
       const f2 = edgenames[i][2];
@@ -2982,7 +2982,7 @@ var PuzzleGeometry = class {
     for (let i = 0; i < vertexnames.length; i++) {
       let bits = 0;
       if (vertexnames[i].length < 4) {
-        throw new Error("Bad length in vertex names");
+        throw Error("Bad length in vertex names");
       }
       for (let j = 1; j < vertexnames[i].length; j++) {
         bits |= 1 << facenametoindex[vertexnames[i][j][0]];
@@ -2995,7 +2995,7 @@ var PuzzleGeometry = class {
         }
       }
       if (st < 0) {
-        throw new Error(
+        throw Error(
           "Internal error; couldn't find face name when fixing corners"
         );
       }
@@ -3127,7 +3127,7 @@ var PuzzleGeometry = class {
     }
     if (shape === "c" && sawface && !sawedge && !sawvertex) {
       this.addNotationMapper = "NxNxNCubeMapper";
-      this.setReidOrder = true;
+      this.setReidOrSpeffzOrder = true;
     }
     if (shape === "c" && sawvertex && !sawface && !sawedge) {
       this.addNotationMapper = "SkewbMapper";
@@ -3257,6 +3257,16 @@ var PuzzleGeometry = class {
     );
     return [x1, y1, off];
   }
+  // Given an string of uppercase letters, make a bitmask
+  // indicating what letters are in it.  Cheap swizzling
+  // for internal use.
+  upperStringToBitSet(geo) {
+    let r = 0;
+    for (let i = 0; i < geo.length; i++) {
+      r |= 1 << geo.charCodeAt(i) - 65;
+    }
+    return r;
+  }
   allstickers() {
     const t1 = tstart("allstickers");
     this.faces = expandfaces(this.baseplanerot, this.faces);
@@ -3357,7 +3367,7 @@ var PuzzleGeometry = class {
         }
       }
       if (pos === null || neg === null) {
-        throw new Error("Saw positive or negative sides as null");
+        throw Error("Saw positive or negative sides as null");
       }
       movesetgeos.push([
         pos[0],
@@ -3455,7 +3465,7 @@ var PuzzleGeometry = class {
             break;
           }
           if (looplimit > 1e3) {
-            throw new Error("Bad epsilon math; too close to border");
+            throw Error("Bad epsilon math; too close to border");
           }
         }
         let bits = 0;
@@ -3470,7 +3480,7 @@ var PuzzleGeometry = class {
           }
         }
         if (mini < 0) {
-          throw new Error("Could not find marked face in list");
+          throw Error("Could not find marked face in list");
         }
         if (mini !== 0) {
           const ofacelist = facelist.slice();
@@ -3550,7 +3560,7 @@ var PuzzleGeometry = class {
       }
       cubiesetnum++;
     }
-    if (this.setReidOrder && 4 <= this.stickersperface && this.stickersperface <= 9) {
+    if (this.setReidOrSpeffzOrder && 4 <= this.stickersperface) {
       const reidorder = [
         [
           "UF",
@@ -3569,23 +3579,130 @@ var PuzzleGeometry = class {
         ["UFR", "URB", "UBL", "ULF", "DRF", "DFL", "DLB", "DBR"],
         ["U", "L", "F", "R", "B", "D"]
       ];
+      const spefffaceorder = ["U", "L", "F", "R", "B", "D"];
+      const speffcornerorder = [
+        "UBL",
+        "URB",
+        "UFR",
+        "ULF",
+        "UBL",
+        "ULF",
+        "DFL",
+        "DLB",
+        "ULF",
+        "UFR",
+        "DRF",
+        "DFL",
+        "UFR",
+        "URB",
+        "DBR",
+        "DRF",
+        "URB",
+        "UBL",
+        "DLB",
+        "DBR",
+        "DFL",
+        "DRF",
+        "DBR",
+        "DLB"
+      ];
       const reidmap = {};
       for (const cubie of reidorder) {
         for (let j = 0; j < cubie.length; j++) {
-          let mask = 0;
-          for (let k = 0; k < cubie[j].length; k++) {
-            mask |= 1 << cubie[j].charCodeAt(k) - 65;
-          }
-          reidmap[mask] = j;
+          reidmap[this.upperStringToBitSet(cubie[j])] = j;
+        }
+      }
+      const cornerloc = {};
+      const spefffacelookup = {};
+      const speffcornerlocs = [];
+      const speffuncorner = [
+        -1,
+        0,
+        1,
+        0,
+        2,
+        -1,
+        1,
+        -1,
+        3,
+        3,
+        -1,
+        -1,
+        2,
+        -1,
+        -1,
+        -1
+      ];
+      if (this.stickersperface > 9) {
+        for (const vertex of this.vertexnames) {
+          cornerloc[this.upperStringToBitSet(vertex[1])] = vertex[0];
+        }
+        for (let i = 0; i < 6; i++) {
+          spefffacelookup[spefffaceorder[i]] = i;
+        }
+        for (const co of speffcornerorder) {
+          speffcornerlocs.push(cornerloc[this.upperStringToBitSet(co)]);
         }
       }
       for (const cubieset of cubiesetcubies) {
         for (const cubienum of cubieset) {
-          let mask = 0;
-          for (const cubie of cubies[cubienum]) {
-            mask |= 1 << this.facenames[this.getfaceindex(cubie)][1].charCodeAt(0) - 65;
+          if (cubies[cubienum].length === 3 || this.stickersperface <= 9) {
+            let mask = 0;
+            for (const cubie of cubies[cubienum]) {
+              mask |= 1 << this.facenames[this.getfaceindex(cubie)][1].charCodeAt(0) - 65;
+            }
+            cubieordnums[cubienum] = reidmap[mask];
+          } else {
+            if (cubies[cubienum].length <= 2) {
+              const ordset = [];
+              for (let k = 0; k < cubies[cubienum].length; k++) {
+                const sticker = cubies[cubienum][k];
+                const facekey = spefffacelookup[this.facenames[this.getfaceindex(sticker)][1]];
+                let bestdist = 1e20;
+                const cubieloc = this.faces[sticker].centermass();
+                let bestmask = 0;
+                for (let i = 0; i < 4; i++) {
+                  const t = cubieloc.dist(speffcornerlocs[4 * facekey + i]);
+                  if (t + eps3 < bestdist) {
+                    bestdist = t;
+                    bestmask = 1 << i;
+                  } else if (t < bestdist + eps3) {
+                    bestmask |= 1 << i;
+                  }
+                }
+                bestmask = speffuncorner[bestmask];
+                if (bestmask >= 0) {
+                  const speffind = 4 * facekey + bestmask;
+                  ordset.push([speffind, speffcornerorder[speffind]]);
+                }
+              }
+              if (ordset.length > 0) {
+                if (cubies[cubienum].length === 1) {
+                  cubieordnums[cubienum] = ordset[0][0];
+                } else if (ordset.length === 2 && ordset[0][1] === ordset[1][1]) {
+                  let k = 0;
+                  const f0c = spefffaceorder[ordset[0][0] >> 2];
+                  const f1c = spefffaceorder[ordset[1][0] >> 2];
+                  const corn = ordset[0][1];
+                  while (k < 3 && (f0c === corn.charAt(k) || f1c === corn.charAt(k))) {
+                    k++;
+                  }
+                  if (k === 3) {
+                    throw Error("Internal error (2) in Speffz");
+                  }
+                  k = (k + 1) % 3;
+                  if (f0c === corn.charAt(k)) {
+                    cubieordnums[cubienum] = ordset[0][0];
+                  } else if (f1c === corn.charAt(k)) {
+                    cubieordnums[cubienum] = ordset[1][0];
+                  } else {
+                    console.log(f0c, f1c, corn, k, ordset);
+                    throw Error("Internal error (3) in Speffz");
+                  }
+                }
+              }
+            }
           }
-          cubieordnums[cubienum] = reidmap[mask];
         }
       }
     }
@@ -3604,7 +3721,7 @@ var PuzzleGeometry = class {
         }
       }
       if (this.fixedCubie < 0) {
-        throw new Error(
+        throw Error(
           `Could not find a cubie of type ${this.options.fixedPieceType} to fix.`
         );
       }
@@ -3627,14 +3744,14 @@ var PuzzleGeometry = class {
     const re = /^(([0-9]+)-)?([0-9]+)?([^0-9]+)([0-9]+'?)?$/;
     const p = mv.match(re);
     if (p === null) {
-      throw new Error(`Bad move passed ${mv}`);
+      throw Error(`Bad move passed ${mv}`);
     }
     const grip = p[4];
     let loslice = void 0;
     let hislice = void 0;
     if (p[2] !== void 0) {
       if (p[3] === void 0) {
-        throw new Error("Missing second number in range");
+        throw Error("Missing second number in range");
       }
       loslice = parseInt(p[2], 10);
     }
@@ -3655,14 +3772,14 @@ var PuzzleGeometry = class {
   parseMove(move) {
     const bm = this.notationMapper.notationToInternal(move);
     if (bm === null) {
-      throw new Error(`Bad move ${move.family}`);
+      throw Error(`Bad move ${move.family}`);
     }
     move = bm;
     let grip = move.family;
     let fullrotation = false;
     if (grip.endsWith("v") && grip[0] <= "Z") {
       if (move.innerLayer !== void 0 || move.outerLayer !== void 0) {
-        throw new Error("Cannot use a prefix with full cube rotations");
+        throw Error("Cannot use a prefix with full cube rotations");
       }
       grip = grip.slice(0, -1);
       fullrotation = true;
@@ -3693,7 +3810,7 @@ var PuzzleGeometry = class {
       hislice = 2;
     }
     if (geo === void 0) {
-      throw new Error(`Bad grip in move ${move.family}`);
+      throw Error(`Bad grip in move ${move.family}`);
     }
     if (move.outerLayer !== void 0) {
       loslice = move.outerLayer;
@@ -3717,14 +3834,12 @@ var PuzzleGeometry = class {
       hislice = this.moveplanesets[msi].length;
     }
     if (loslice < 0 || loslice > this.moveplanesets[msi].length || hislice < 0 || hislice > this.moveplanesets[msi].length) {
-      throw new Error(
+      throw Error(
         `Bad slice spec ${loslice} ${hislice} vs ${this.moveplanesets[msi].length}`
       );
     }
     if (!permissivieMoveParsing && loslice === 0 && hislice === this.moveplanesets[msi].length && !fullrotation) {
-      throw new Error(
-        "! full puzzle rotations must be specified with v suffix."
-      );
+      throw Error("! full puzzle rotations must be specified with v suffix.");
     }
     return [void 0, msi, loslice, hislice, firstgrip, move.amount];
   }
@@ -3845,7 +3960,7 @@ var PuzzleGeometry = class {
                 }
               }
               if (o < 0) {
-                throw new Error(
+                throw Error(
                   "Couldn't find rotation of center faces; ignoring for now."
                 );
               } else {
@@ -3870,7 +3985,7 @@ var PuzzleGeometry = class {
         }
         if (b.length > 2 && !cubiedone[b[0]]) {
           if (b.length !== 2 * this.movesetorders[k]) {
-            throw new Error("Bad length in perm gen");
+            throw Error("Bad length in perm gen");
           }
           for (const v of b) {
             axiscmoves[sc].push(v);
@@ -4076,7 +4191,7 @@ ${comment}
     const internalDefinition = od.toKPuzzleDefinition(includemoves);
     internalDefinition.experimentalPuzzleDescription = this.puzzleDescription;
     if (!internalDefinition) {
-      throw new Error("Missing definition!");
+      throw Error("Missing definition!");
     }
     return internalDefinition;
   }
@@ -4234,7 +4349,7 @@ ${comment}
               }
             }
             if (found < 0) {
-              throw new Error("Could not find rotation");
+              throw Error("Could not find rotation");
             }
             const cmp = mps[found];
             if (cmp.length !== mps[k].length || this.moveplanesets[k].length !== this.moveplanesets[found].length || this.diffmvsets(
@@ -4260,7 +4375,7 @@ ${comment}
         } else if (addrot[i] === 3) {
           addrot[i] = 0;
         } else {
-          throw new Error("Impossible addrot val");
+          throw Error("Impossible addrot val");
         }
       }
     }
@@ -4276,7 +4391,7 @@ ${comment}
       for (let i = 0; i < moveset.length; i += 2) {
         for (let j = 0; j < i; j += 2) {
           if (moveset[i][0] === moveset[j][0] && moveset[i][1] === moveset[j][1]) {
-            throw new Error("Redundant moves in moveset.");
+            throw Error("Redundant moves in moveset.");
           }
         }
       }
@@ -4460,10 +4575,10 @@ ${comment}
       }
     }
     if (!feature1) {
-      throw new Error(`Could not find feature ${feature1name}`);
+      throw Error(`Could not find feature ${feature1name}`);
     }
     if (!feature2) {
-      throw new Error(`Could not find feature ${feature2name}`);
+      throw Error(`Could not find feature ${feature2name}`);
     }
     const r1 = feature1.pointrotation(direction1);
     const feature2rot = feature2.rotatepoint(r1);
@@ -4482,7 +4597,7 @@ ${comment}
       orientationDescription = defaultOrientations()[basefacecount];
     }
     if (!orientationDescription) {
-      throw new Error("No default orientation?");
+      throw Error("No default orientation?");
     }
     return this.getOrientationRotation(orientationDescription);
   }
@@ -4508,7 +4623,7 @@ ${comment}
     const polyn = face0.length;
     const net = this.net;
     if (net === null) {
-      throw new Error("No net?");
+      throw Error("No net?");
     }
     const edges = {};
     let minx = 0;
@@ -4523,7 +4638,7 @@ ${comment}
     for (const neti of net) {
       const f0 = neti[0];
       if (!edges[f0]) {
-        throw new Error("Bad edge description; first edge not connected.");
+        throw Error("Bad edge description; first edge not connected.");
       }
       for (let j = 1; j < neti.length; j++) {
         const f1 = neti[j];
@@ -4564,7 +4679,7 @@ ${comment}
     for (const neti of net) {
       const f0 = neti[0];
       if (!edges2[f0]) {
-        throw new Error("Bad edge description; first edge not connected.");
+        throw Error("Bad edge description; first edge not connected.");
       }
       let gfi = -1;
       for (let j = 0; j < bg.facenames.length; j++) {
@@ -4574,7 +4689,7 @@ ${comment}
         }
       }
       if (gfi < 0) {
-        throw new Error(`Could not find first face name ${f0}`);
+        throw Error(`Could not find first face name ${f0}`);
       }
       const thisface = bg.facenames[gfi][0];
       for (let j = 1; j < neti.length; j++) {
@@ -4601,7 +4716,7 @@ ${comment}
           }
         }
         if (gf1i < 0) {
-          throw new Error("Could not find second face name");
+          throw Error("Could not find second face name");
         }
         const otherface = bg.facenames[gf1i][0];
         for (let k = 0; k < otherface.length; k++) {