cubing 0.63.7 → 0.64.0

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

@@ -18,27 +18,30 @@ import {
   rawRenderPooled,
   setCameraFromOrbitCoordinates,
   setTwistyDebug
-} from "../chunks/chunk-YR72E7KZ.js";
+} from "../chunks/chunk-GO2SL6SC.js";
 import {
+  CommonMetric,
   countAnimatedLeaves,
   countLeavesInExpansionForSimultaneousMoveIndexer,
   countMetricMoves
-} from "../chunks/chunk-UEUJSZTX.js";
+} from "../chunks/chunk-UWJ575HH.js";
 import {
   puzzles
-} from "../chunks/chunk-FUAADKXE.js";
+} from "../chunks/chunk-KHUP3BPA.js";
 import {
+  PieceStickering,
   cube3x3x3,
   customPGPuzzleLoader,
   getPartialAppendOptionsForPuzzleSpecificSimplifyOptions,
   getPieceStickeringMask
-} from "../chunks/chunk-A7FK4XKU.js";
-import "../chunks/chunk-5ONX3JVC.js";
+} from "../chunks/chunk-5LBACZOM.js";
+import "../chunks/chunk-THRYJMRP.js";
 import {
   Alg,
   AlgBuilder,
   Conjugate,
   Grouping,
+  IterationDirection,
   LineComment,
   Move,
   Newline,
@@ -52,7 +55,7 @@ import {
   functionFromTraversal,
   offsetMod,
   startCharIndexKey
-} from "../chunks/chunk-N5FJ5YIA.js";
+} from "../chunks/chunk-YFNXHRNE.js";
 
 // src/cubing/twisty/controllers/indexer/AlgDuration.ts
 function defaultDurationForAmount(amount) {
@@ -69,11 +72,11 @@ function defaultDurationForAmount(amount) {
 }
 var AlgDuration = class extends TraversalUp {
   // TODO: Pass durationForAmount as Down type instead?
+  durationForAmount = defaultDurationForAmount;
   constructor(durationForAmount = defaultDurationForAmount) {
     super();
     this.durationForAmount = durationForAmount;
   }
-  durationForAmount;
   traverseAlg(alg) {
     let total = 0;
     for (const algNode of alg.childAlgNodes()) {
@@ -106,16 +109,16 @@ var AlgDuration = class extends TraversalUp {
 
 // src/cubing/twisty/controllers/indexer/SimpleAlgIndexer.ts
 var SimpleAlgIndexer = class {
-  constructor(kpuzzle, alg) {
-    this.kpuzzle = kpuzzle;
-    this.moves = new Alg(alg.experimentalExpand());
-  }
-  kpuzzle;
   moves;
   // TODO: Allow custom `durationFn`.
   durationFn = new AlgDuration(
     defaultDurationForAmount
   );
+  kpuzzle;
+  constructor(kpuzzle, alg) {
+    this.kpuzzle = kpuzzle;
+    this.moves = new Alg(alg.experimentalExpand());
+  }
   getAnimLeaf(index) {
     return Array.from(this.moves.childAlgNodes())[index];
   }
@@ -157,6 +160,11 @@ var SimpleAlgIndexer = class {
 
 // src/cubing/twisty/controllers/indexer/tree/AlgWalker.ts
 var AlgWalkerDecoration = class {
+  moveCount;
+  duration;
+  forward;
+  backward;
+  children = [];
   constructor(moveCount, duration, forward, backward, children = []) {
     this.moveCount = moveCount;
     this.duration = duration;
@@ -164,13 +172,15 @@ var AlgWalkerDecoration = class {
     this.backward = backward;
     this.children = children;
   }
-  moveCount;
-  duration;
-  forward;
-  backward;
-  children;
 };
 var DecoratorConstructor = class extends TraversalUp {
+  identity;
+  dummyLeaf;
+  durationFn = new AlgDuration(
+    defaultDurationForAmount
+  );
+  cache = {};
+  kpuzzle;
   constructor(kpuzzle) {
     super();
     this.kpuzzle = kpuzzle;
@@ -183,13 +193,6 @@ var DecoratorConstructor = class extends TraversalUp {
       []
     );
   }
-  kpuzzle;
-  identity;
-  dummyLeaf;
-  durationFn = new AlgDuration(
-    defaultDurationForAmount
-  );
-  cache = {};
   traverseAlg(alg) {
     let moveCount = 0;
     let duration = 0;
@@ -293,14 +296,27 @@ var DecoratorConstructor = class extends TraversalUp {
   }
 };
 var WalkerDown = class {
+  apd;
+  back;
   constructor(apd, back) {
     this.apd = apd;
     this.back = back;
   }
-  apd;
-  back;
 };
 var AlgWalker = class extends TraversalDownUp {
+  move;
+  moveDuration;
+  back;
+  st;
+  root;
+  i;
+  dur;
+  goalIndex;
+  goalDuration;
+  kpuzzle;
+  algOrAlgNode;
+  // TODO: can we keep these separate?
+  apd;
   constructor(kpuzzle, algOrAlgNode, apd) {
     super();
     this.kpuzzle = kpuzzle;
@@ -316,18 +332,6 @@ var AlgWalker = class extends TraversalDownUp {
     this.st = this.kpuzzle.identityTransformation();
     this.root = new WalkerDown(this.apd, false);
   }
-  kpuzzle;
-  algOrAlgNode;
-  apd;
-  move;
-  moveDuration;
-  back;
-  st;
-  root;
-  i;
-  dur;
-  goalIndex;
-  goalDuration;
   moveByIndex(loc) {
     if (this.i >= 0 && this.i === loc) {
       return this.move !== void 0;
@@ -359,7 +363,7 @@ var AlgWalker = class extends TraversalDownUp {
     let i = wd.back ? alg.experimentalNumChildAlgNodes() - 1 : 0;
     for (const algNode of directedGenerator(
       alg.childAlgNodes(),
-      wd.back ? -1 /* Backwards */ : 1 /* Forwards */
+      wd.back ? IterationDirection.Backwards : IterationDirection.Forwards
     )) {
       if (this.traverseAlgNode(
         algNode,
@@ -566,6 +570,9 @@ var chunkAlgs = functionFromTraversal(ChunkAlgs);
 
 // src/cubing/twisty/controllers/indexer/tree/TreeAlgIndexer.ts
 var TreeAlgIndexer = class {
+  decoration;
+  walker;
+  kpuzzle;
   constructor(kpuzzle, alg) {
     this.kpuzzle = kpuzzle;
     const deccon = new DecoratorConstructor(this.kpuzzle);
@@ -573,9 +580,6 @@ var TreeAlgIndexer = class {
     this.decoration = deccon.traverseAlg(chunkedAlg);
     this.walker = new AlgWalker(this.kpuzzle, chunkedAlg, this.decoration);
   }
-  kpuzzle;
-  decoration;
-  walker;
   getAnimLeaf(index) {
     if (this.walker.moveByIndex(index)) {
       if (!this.walker.move) {
@@ -668,6 +672,14 @@ var colorMaps = {
   invisible: "#00000000"
 };
 var TwistyAnimatedSVG = class {
+  wrapperElement;
+  svgElement;
+  gradientDefs;
+  originalColors = {};
+  gradients = {};
+  svgID;
+  kpuzzle;
+  showUnknownOrientations = false;
   constructor(kpuzzle, svgSource, experimentalStickeringMask, showUnknownOrientations = false) {
     this.kpuzzle = kpuzzle;
     this.showUnknownOrientations = showUnknownOrientations;
@@ -746,14 +758,6 @@ var TwistyAnimatedSVG = class {
       this.drawPattern(this.kpuzzle.defaultPattern());
     }
   }
-  kpuzzle;
-  showUnknownOrientations;
-  wrapperElement;
-  svgElement;
-  gradientDefs;
-  originalColors = {};
-  gradients = {};
-  svgID;
   drawPattern(pattern, nextPattern, fraction) {
     this.draw(pattern, nextPattern, fraction);
   }
@@ -875,16 +879,16 @@ var TwistyAnimatedSVG = class {
 
 // src/cubing/twisty/views/ClassListManager.ts
 var ClassListManager = class {
+  #currentClassName = null;
+  elem;
+  prefix;
+  validSuffixes;
   // The prefix should ideally end in a dash.
   constructor(elem, prefix, validSuffixes) {
     this.elem = elem;
     this.prefix = prefix;
     this.validSuffixes = validSuffixes;
   }
-  elem;
-  prefix;
-  validSuffixes;
-  #currentClassName = null;
   // Does nothing if there was no value.
   clearValue() {
     if (this.#currentClassName) {
@@ -942,23 +946,32 @@ function modIntoRange(v, rangeMin, rangeMax) {
 }
 
 // src/cubing/twisty/controllers/AnimationTypes.ts
+var Direction = {
+  Forwards: 1,
+  Paused: 0,
+  Backwards: -1
+};
 function directionScalar(direction) {
   return direction;
 }
+var BoundaryType = {
+  Move: "move",
+  EntireTimeline: "entire-timeline"
+};
 
 // src/cubing/twisty/controllers/TwistyAnimationController.ts
 var CatchUpHelper = class {
+  catchingUp = false;
+  pendingFrame = false;
+  tempoScale = 1;
   // TODO
+  model;
   constructor(model) {
     this.model = model;
     model.tempoScale.addFreshListener((tempoScale) => {
       this.tempoScale = tempoScale;
     });
   }
-  model;
-  catchingUp = false;
-  pendingFrame = false;
-  tempoScale = 1;
   scheduler = new RenderScheduler(
     this.animFrame.bind(this)
   );
@@ -1006,18 +1019,9 @@ var CatchUpHelper = class {
   }
 };
 var TwistyAnimationController = class {
-  constructor(model, delegate) {
-    this.delegate = delegate;
-    this.model = model;
-    this.lastTimestampPromise = this.#effectiveTimestampMilliseconds();
-    this.model.playingInfo.addFreshListener(this.onPlayingProp.bind(this));
-    this.catchUpHelper = new CatchUpHelper(this.model);
-    this.model.catchUpMove.addFreshListener(this.onCatchUpMoveProp.bind(this));
-  }
-  delegate;
   // TODO: #private?
   playing = false;
-  direction = 1 /* Forwards */;
+  direction = Direction.Forwards;
   catchUpHelper;
   model;
   lastDatestamp = 0;
@@ -1025,6 +1029,15 @@ var TwistyAnimationController = class {
   scheduler = new RenderScheduler(
     this.animFrame.bind(this)
   );
+  delegate;
+  constructor(model, delegate) {
+    this.delegate = delegate;
+    this.model = model;
+    this.lastTimestampPromise = this.#effectiveTimestampMilliseconds();
+    this.model.playingInfo.addFreshListener(this.onPlayingProp.bind(this));
+    this.catchUpHelper = new CatchUpHelper(this.model);
+    this.model.catchUpMove.addFreshListener(this.onCatchUpMoveProp.bind(this));
+  }
   // TODO: Do we need this?
   async onPlayingProp(playingInfo) {
     if (playingInfo.playing !== this.playing) {
@@ -1069,14 +1082,14 @@ var TwistyAnimationController = class {
   // TODO: bundle playing direction, and boundary into `toggle`.
   play(options) {
     void (async () => {
-      const direction = options?.direction ?? 1 /* Forwards */;
+      const direction = options?.direction ?? Direction.Forwards;
       const coarseTimelineInfo = await this.model.coarseTimelineInfo.get();
       if (options?.autoSkipToOtherEndIfStartingAtBoundary ?? true) {
-        if (direction === 1 /* Forwards */ && coarseTimelineInfo.atEnd) {
+        if (direction === Direction.Forwards && coarseTimelineInfo.atEnd) {
           this.model.timestampRequest.set("start");
           this.delegate.flash();
         }
-        if (direction === -1 /* Backwards */ && coarseTimelineInfo.atStart) {
+        if (direction === Direction.Backwards && coarseTimelineInfo.atStart) {
           this.model.timestampRequest.set("end");
           this.delegate.flash();
         }
@@ -1084,7 +1097,7 @@ var TwistyAnimationController = class {
       this.model.playingInfo.set({
         playing: true,
         direction,
-        untilBoundary: options?.untilBoundary ?? "entire-timeline" /* EntireTimeline */,
+        untilBoundary: options?.untilBoundary ?? BoundaryType.EntireTimeline,
         loop: options?.loop ?? false
       });
       this.playing = true;
@@ -1098,7 +1111,7 @@ var TwistyAnimationController = class {
     this.scheduler.cancelAnimFrame();
     this.model.playingInfo.set({
       playing: false,
-      untilBoundary: "entire-timeline" /* EntireTimeline */
+      untilBoundary: BoundaryType.EntireTimeline
     });
   }
   #animFrameEffectiveTimestampStaleDropper = new StaleDropper();
@@ -1122,11 +1135,11 @@ var TwistyAnimationController = class {
       return;
     }
     let end = currentMoveInfo.earliestEnd;
-    if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === "entire-timeline" /* EntireTimeline */) {
+    if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === BoundaryType.EntireTimeline) {
       end = timeRange.end;
     }
     let start = currentMoveInfo.latestStart;
-    if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === "entire-timeline" /* EntireTimeline */) {
+    if (currentMoveInfo.currentMoves.length === 0 || playingInfo.untilBoundary === BoundaryType.EntireTimeline) {
       start = timeRange.start;
     }
     let delta = (frameDatestamp - lastDatestamp) * directionScalar(this.direction) * tempoScale;
@@ -1181,12 +1194,12 @@ var TwistyAnimationController = class {
 
 // src/cubing/twisty/controllers/TwistyPlayerController.ts
 var TwistyPlayerController = class {
+  animationController;
+  model;
   constructor(model, delegate) {
     this.model = model;
     this.animationController = new TwistyAnimationController(model, delegate);
   }
-  model;
-  animationController;
   jumpToStart(options) {
     this.animationController.jumpToStart(options);
   }
@@ -1306,14 +1319,21 @@ svg {
 
 // src/cubing/twisty/views/2D/Twisty2DPuzzle.ts
 var Twisty2DPuzzle = class extends ManagedCustomElement {
+  svgWrapper;
+  scheduler = new RenderScheduler(this.render.bind(this));
+  #cachedPosition = null;
   // TODO: pull when needed.
+  model;
+  kpuzzle;
+  svgSource;
+  options;
+  puzzleLoader;
   constructor(model, kpuzzle, svgSource, options, puzzleLoader) {
     super();
     this.model = model;
     this.kpuzzle = kpuzzle;
     this.svgSource = svgSource;
     this.options = options;
-    this.puzzleLoader = puzzleLoader;
     this.addCSS(twisty2DSVGCSS);
     this.resetSVG();
     this.#freshListenerManager.addListener(
@@ -1340,14 +1360,6 @@ var Twisty2DPuzzle = class extends ManagedCustomElement {
       );
     }
   }
-  model;
-  kpuzzle;
-  svgSource;
-  options;
-  puzzleLoader;
-  svgWrapper;
-  scheduler = new RenderScheduler(this.render.bind(this));
-  #cachedPosition = null;
   #freshListenerManager = new FreshListenerManager();
   disconnect() {
     this.#freshListenerManager.disconnect();
@@ -1357,7 +1369,7 @@ var Twisty2DPuzzle = class extends ManagedCustomElement {
       if (position.movesInProgress.length > 0) {
         const move = position.movesInProgress[0].move;
         let partialMove = move;
-        if (position.movesInProgress[0].direction === -1 /* Backwards */) {
+        if (position.movesInProgress[0].direction === Direction.Backwards) {
           partialMove = move.invert();
         }
         const newPattern = position.pattern.applyMove(partialMove);
@@ -1420,6 +1432,10 @@ customElementsShim.define("twisty-2d-puzzle", Twisty2DPuzzle);
 
 // src/cubing/twisty/views/2D/Twisty2DPuzzleWrapper.ts
 var Twisty2DPuzzleWrapper = class {
+  model;
+  schedulable;
+  puzzleLoader;
+  effectiveVisualization;
   constructor(model, schedulable, puzzleLoader, effectiveVisualization) {
     this.model = model;
     this.schedulable = schedulable;
@@ -1435,10 +1451,6 @@ var Twisty2DPuzzleWrapper = class {
       }
     );
   }
-  model;
-  schedulable;
-  puzzleLoader;
-  effectiveVisualization;
   #freshListenerManager = new FreshListenerManager();
   disconnect() {
     this.#freshListenerManager.disconnect();
@@ -1464,17 +1476,17 @@ var Twisty2DPuzzleWrapper = class {
 
 // src/cubing/twisty/views/2D/Twisty2DSceneWrapper.ts
 var Twisty2DSceneWrapper = class extends ManagedCustomElement {
+  #freshListenerManager = new FreshListenerManager();
+  disconnect() {
+    this.#freshListenerManager.disconnect();
+  }
+  model;
+  effectiveVisualization;
   constructor(model, effectiveVisualization) {
     super();
     this.model = model;
     this.effectiveVisualization = effectiveVisualization;
   }
-  model;
-  effectiveVisualization;
-  #freshListenerManager = new FreshListenerManager();
-  disconnect() {
-    this.#freshListenerManager.disconnect();
-  }
   async connectedCallback() {
     this.addCSS(twistyViewerWrapperCSS);
     if (this.model) {
@@ -1538,6 +1550,10 @@ var InitialValueTracker = class {
 
 // src/cubing/twisty/views/3D/Twisty3DPuzzleWrapper.ts
 var Twisty3DPuzzleWrapper = class extends EventTarget {
+  model;
+  schedulable;
+  puzzleLoader;
+  visualizationStrategy;
   constructor(model, schedulable, puzzleLoader, visualizationStrategy) {
     super();
     this.model = model;
@@ -1626,10 +1642,6 @@ var Twisty3DPuzzleWrapper = class extends EventTarget {
       }
     );
   }
-  model;
-  schedulable;
-  puzzleLoader;
-  visualizationStrategy;
   #freshListenerManager = new FreshListenerManager();
   disconnect() {
     this.#freshListenerManager.disconnect();
@@ -1724,11 +1736,6 @@ var Twisty3DPuzzleWrapper = class extends EventTarget {
 
 // src/cubing/twisty/views/3D/Twisty3DSceneWrapper.ts
 var Twisty3DSceneWrapper = class extends ManagedCustomElement {
-  constructor(model) {
-    super();
-    this.model = model;
-  }
-  model;
   // @ts-expect-error TypeScript type inference appears to be borked: ts(2322)
   #backViewClassListManager = new ClassListManager(this, "back-view-", [
     "auto",
@@ -1740,6 +1747,11 @@ var Twisty3DSceneWrapper = class extends ManagedCustomElement {
   disconnect() {
     this.#freshListenerManager.disconnect();
   }
+  model;
+  constructor(model) {
+    super();
+    this.model = model;
+  }
   async connectedCallback() {
     this.addCSS(twistyViewerWrapperCSS);
     const vantage = new Twisty3DVantage(this.model, this);
@@ -2105,6 +2117,10 @@ var buttonCommands = {
   "twizzle-link": true
 };
 var TwistyButtons = class extends ManagedCustomElement {
+  buttons = null;
+  model;
+  controller;
+  defaultFullscreenElement;
   // TODO: Privacy
   constructor(model, controller, defaultFullscreenElement) {
     super();
@@ -2112,10 +2128,6 @@ var TwistyButtons = class extends ManagedCustomElement {
     this.controller = controller;
     this.defaultFullscreenElement = defaultFullscreenElement;
   }
-  model;
-  controller;
-  defaultFullscreenElement;
-  buttons = null;
   connectedCallback() {
     this.addCSS(buttonGridCSS);
     const buttons = {};
@@ -2146,8 +2158,8 @@ var TwistyButtons = class extends ManagedCustomElement {
       }
       case "play-step-backwards": {
         this.controller?.animationController.play({
-          direction: -1 /* Backwards */,
-          untilBoundary: "move" /* Move */
+          direction: Direction.Backwards,
+          untilBoundary: BoundaryType.Move
         });
         break;
       }
@@ -2157,8 +2169,8 @@ var TwistyButtons = class extends ManagedCustomElement {
       }
       case "play-step": {
         this.controller?.animationController.play({
-          direction: 1 /* Forwards */,
-          untilBoundary: "move" /* Move */
+          direction: Direction.Forwards,
+          untilBoundary: BoundaryType.Move
         });
         break;
       }
@@ -2304,13 +2316,13 @@ var lastPreval = 0;
 var scaling = false;
 var currentClickNum = 0;
 var TwistyScrubber = class extends ManagedCustomElement {
+  model;
+  controller;
   constructor(model, controller) {
     super();
     this.model = model;
     this.controller = controller;
   }
-  model;
-  controller;
   async onDetailedTimelineInfo(detailedTimelineInfo) {
     const inputElem = await this.inputElem();
     inputElem.min = detailedTimelineInfo.timeRange.start.toString();
@@ -2358,8 +2370,8 @@ var TwistyScrubber = class extends ManagedCustomElement {
       // fallthrough
       case "ArrowRight": {
         this.controller?.animationController.play({
-          direction: e.key === "ArrowLeft" ? -1 /* Backwards */ : 1 /* Forwards */,
-          untilBoundary: "move" /* Move */
+          direction: e.key === "ArrowLeft" ? Direction.Backwards : Direction.Forwards,
+          untilBoundary: BoundaryType.Move
         });
         e.preventDefault();
         break;
@@ -2729,7 +2741,7 @@ var CurrentMoveInfoProp = class extends TwistyPropDerived {
       if (inputs.detailedTimelineInfo.atEnd && inputs.catchUpMove.move !== null) {
         currentMoveInfo.currentMoves.push({
           move: inputs.catchUpMove.move,
-          direction: -1 /* Backwards */,
+          direction: Direction.Backwards,
           fraction: 1 - inputs.catchUpMove.amount,
           startTimestamp: -1,
           // TODO
@@ -2767,7 +2779,7 @@ var CurrentMoveInfoProp = class extends TwistyPropDerived {
         const end = start + duration;
         const currentMove = {
           move,
-          direction: 1 /* Forwards */,
+          direction: Direction.Forwards,
           fraction,
           startTimestamp: start,
           endTimestamp: end
@@ -2957,13 +2969,13 @@ function simulMoves(a) {
 
 // src/cubing/twisty/controllers/indexer/simultaneous-moves/SimultaneousMoveIndexer.ts
 var SimultaneousMoveIndexer = class {
+  animLeaves;
   // TODO: Allow custom `durationFn`.
+  kpuzzle;
   constructor(kpuzzle, alg, options) {
     this.kpuzzle = kpuzzle;
     this.animLeaves = options?.animationTimelineLeaves ?? simulMoves(alg);
   }
-  kpuzzle;
-  animLeaves;
   getAnimLeaf(index) {
     return this.animLeaves[Math.min(index, this.animLeaves.length - 1)]?.animLeaf ?? null;
   }
@@ -3045,7 +3057,7 @@ var SimultaneousMoveIndexer = class {
           }
           const currentMove = {
             move,
-            direction: 1 /* Forwards */,
+            direction: Direction.Forwards,
             fraction,
             startTimestamp: leafWithRange.start,
             endTimestamp: leafWithRange.end
@@ -3319,9 +3331,9 @@ var DetailedTimelineInfoProp = class extends TwistyPropDerived {
 var PlayingInfoProp = class extends TwistyPropSource {
   async getDefaultValue() {
     return {
-      direction: 1 /* Forwards */,
+      direction: Direction.Forwards,
       playing: false,
-      untilBoundary: "entire-timeline" /* EntireTimeline */,
+      untilBoundary: BoundaryType.EntireTimeline,
       loop: false
     };
   }
@@ -3537,22 +3549,22 @@ var StickeringMaskProp = class extends TwistyPropDerived {
 
 // src/cubing/twisty/model/props/puzzle/display/parseSerializedStickeringMask.ts
 var charMap = {
-  "-": "Regular" /* Regular */,
-  D: "Dim" /* Dim */,
-  I: "Ignored" /* Ignored */,
+  "-": PieceStickering.Regular,
+  D: PieceStickering.Dim,
+  I: PieceStickering.Ignored,
   // o: ExperimentalPieceStickering.OrientationStickers, // TODO: hack for centers
-  X: "Invisible" /* Invisible */,
-  O: "IgnoreNonPrimary" /* IgnoreNonPrimary */,
+  X: PieceStickering.Invisible,
+  O: PieceStickering.IgnoreNonPrimary,
   // orient color known
-  P: "PermuteNonPrimary" /* PermuteNonPrimary */,
+  P: PieceStickering.PermuteNonPrimary,
   // Example: PLL
-  o: "Ignoriented" /* Ignoriented */,
+  o: PieceStickering.Ignoriented,
   // Example: LL edges during CLS
-  "?": "OrientationWithoutPermutation" /* OrientationWithoutPermutation */,
+  "?": PieceStickering.OrientationWithoutPermutation,
   // ACube: ignore position
-  M: "Mystery" /* Mystery */,
+  M: PieceStickering.Mystery,
   // This piece needs highlighting, but we know nothing about it.
-  "@": "Regular" /* Regular */
+  "@": PieceStickering.Regular
   // ACube: ignore orientation // TODO: distinguish from "regular"
 };
 function parseSerializedStickeringMask(serializedStickeringMask) {
@@ -3766,21 +3778,6 @@ function defaultCameraOrbitCoordinates(puzzleID, strategy) {
 
 // src/cubing/twisty/model/TwistySceneModel.ts
 var TwistySceneModel = class {
-  constructor(twistyPlayerModel) {
-    this.twistyPlayerModel = twistyPlayerModel;
-    this.orbitCoordinates = new OrbitCoordinatesProp({
-      orbitCoordinatesRequest: this.orbitCoordinatesRequest,
-      latitudeLimit: this.latitudeLimit,
-      puzzleID: twistyPlayerModel.puzzleID,
-      strategy: twistyPlayerModel.visualizationStrategy
-    });
-    this.stickeringMask = new StickeringMaskProp({
-      stickeringMaskRequest: this.stickeringMaskRequest,
-      stickeringRequest: this.stickeringRequest,
-      puzzleLoader: twistyPlayerModel.puzzleLoader
-    });
-  }
-  twistyPlayerModel;
   // Depth 0
   background = new BackgroundProp();
   colorSchemeRequest = new ColorSchemeRequestProp();
@@ -3813,6 +3810,21 @@ var TwistySceneModel = class {
   // Dependence on TwistyPlayerModel
   orbitCoordinates;
   stickeringMask;
+  twistyPlayerModel;
+  constructor(twistyPlayerModel) {
+    this.twistyPlayerModel = twistyPlayerModel;
+    this.orbitCoordinates = new OrbitCoordinatesProp({
+      orbitCoordinatesRequest: this.orbitCoordinatesRequest,
+      latitudeLimit: this.latitudeLimit,
+      puzzleID: twistyPlayerModel.puzzleID,
+      strategy: twistyPlayerModel.visualizationStrategy
+    });
+    this.stickeringMask = new StickeringMaskProp({
+      stickeringMaskRequest: this.stickeringMaskRequest,
+      stickeringRequest: this.stickeringRequest,
+      puzzleLoader: twistyPlayerModel.puzzleLoader
+    });
+  }
 };
 
 // src/cubing/twisty/model/UserVisibleErrorTracker.ts
@@ -4317,10 +4329,10 @@ var TwistyPlayerSettable = class extends ManagedCustomElement {
   experimentalGet = new ExperimentalGetters(this.experimentalModel);
 };
 var ExperimentalGetters = class {
+  model;
   constructor(model) {
     this.model = model;
   }
-  model;
   async alg() {
     return (await this.model.alg.get()).alg;
   }
@@ -5308,8 +5320,7 @@ twistyAlgViewerCSS.replaceSync(
   `
 :host {
   display: inline;
-  --comment-shade: oklab(0.69 -0.19 0.14);
-  --comment-opacity: 0.6;
+  --comment-opacity: 0.4;
   --active-background-shade: rgba(66, 133, 244);
 }
 
@@ -5341,7 +5352,6 @@ a {
 }
 
 twisty-alg-leaf-elem.twisty-alg-line-comment {
-  color: color-mix(in oklab, var(--comment-shade) 75%, currentColor);
   opacity: var(--comment-opacity);
 }
 
@@ -5359,6 +5369,7 @@ twisty-alg-leaf-elem.twisty-alg-line-comment {
 // src/cubing/twisty/views/TwistyAlgViewer.ts
 var DEFAULT_OFFSET_FRACTION = 0.25;
 var TwistyAlgLeafElem = class extends HTMLElementShim {
+  algOrAlgNode;
   constructor(className, text, dataDown, algOrAlgNode, offsetIntoMove, clickable) {
     super();
     this.algOrAlgNode = algOrAlgNode;
@@ -5378,7 +5389,6 @@ var TwistyAlgLeafElem = class extends HTMLElementShim {
       this.appendChild(document.createElement("span")).textContent = text;
     }
   }
-  algOrAlgNode;
   pathToIndex(_index) {
     return [];
   }
@@ -5388,13 +5398,13 @@ var TwistyAlgLeafElem = class extends HTMLElementShim {
 };
 customElementsShim.define("twisty-alg-leaf-elem", TwistyAlgLeafElem);
 var TwistyAlgWrapperElem = class extends HTMLElementShim {
+  queue = [];
+  algOrAlgNode;
   constructor(className, algOrAlgNode) {
     super();
     this.algOrAlgNode = algOrAlgNode;
     this.classList.add(className);
   }
-  algOrAlgNode;
-  queue = [];
   addString(str) {
     const span = document.createElement("span");
     span.textContent = str;
@@ -5404,7 +5414,7 @@ var TwistyAlgWrapperElem = class extends HTMLElementShim {
     this.queue.push(dataUp.element);
     return dataUp.moveCount;
   }
-  flushQueue(direction = 1 /* Forwards */) {
+  flushQueue(direction = IterationDirection.Forwards) {
     for (const node of maybeReverseList(this.queue, direction)) {
       this.append(node);
     }
@@ -5416,13 +5426,13 @@ var TwistyAlgWrapperElem = class extends HTMLElementShim {
 };
 customElementsShim.define("twisty-alg-wrapper-elem", TwistyAlgWrapperElem);
 function oppositeDirection(direction) {
-  return direction === 1 /* Forwards */ ? -1 /* Backwards */ : 1 /* Forwards */;
+  return direction === IterationDirection.Forwards ? IterationDirection.Backwards : IterationDirection.Forwards;
 }
 function updateDirectionByAmount(currentDirection, amount) {
   return amount < 0 ? oppositeDirection(currentDirection) : currentDirection;
 }
 function maybeReverseList(l, direction) {
-  if (direction === 1 /* Forwards */) {
+  if (direction === IterationDirection.Forwards) {
     return l;
   }
   const copy = Array.from(l);
@@ -5672,7 +5682,7 @@ var TwistyAlgViewer = class extends ManagedCustomElement {
     this.#domTree = algToDOMTree(alg, {
       earliestMoveIndex: 0,
       twistyAlgViewer: this,
-      direction: 1 /* Forwards */
+      direction: IterationDirection.Forwards
     }).element;
     this.#domTreeAlg = alg;
     this.contentWrapper.textContent = "";
@@ -5957,40 +5967,40 @@ function getConfigFromURL(prefix = "", url = location.href) {
 var OUTER_BLOCK_MOVES_EXPLANATION = "outer block moves (e.g. R, Rw, or 4r)";
 var INNER_BLOCK_MOVES_EXPLANATION = "inner block moves (e.g. M or 2-5r)";
 var METRIC_EXPLANATIONS = {
-  ["OBTM" /* OuterBlockTurnMetric */]: `HTM = OBTM ("Outer Block Turn Metric"):
+  [CommonMetric.OuterBlockTurnMetric]: `HTM = OBTM ("Outer Block Turn Metric"):
 \u2022 ${INNER_BLOCK_MOVES_EXPLANATION} count as 2 turns
 \u2022 ${OUTER_BLOCK_MOVES_EXPLANATION} count as 1 turn
 \u2022 rotations (e.g. x) count as 0 turns`,
-  ["OBQTM" /* OuterBlockQuantumTurnMetric */]: `QTM = OBQTM ("Outer Block Quantum Turn Metric"):
+  [CommonMetric.OuterBlockQuantumTurnMetric]: `QTM = OBQTM ("Outer Block Quantum Turn Metric"):
 \u2022 ${INNER_BLOCK_MOVES_EXPLANATION} count as 2 turns per quantum (e.g. M2 counts as 4)
 \u2022 ${OUTER_BLOCK_MOVES_EXPLANATION} count as 1 turn per quantum (e.g. R2 counts as 2)
 \u2022 rotations (e.g. x) count as 0 turns`,
-  ["RBTM" /* RangeBlockTurnMetric */]: `STM = RBTM ("Range Block Turn Metric"):
+  [CommonMetric.RangeBlockTurnMetric]: `STM = RBTM ("Range Block Turn Metric"):
 \u2022 ${INNER_BLOCK_MOVES_EXPLANATION} count as 1 turn
 \u2022 ${OUTER_BLOCK_MOVES_EXPLANATION} count as 1 turn
 \u2022 rotations (e.g. x) count as 0 turns`,
-  ["RBQTM" /* RangeBlockQuantumTurnMetric */]: `SQTM = RBQTM ("Range Block Quantum Turn Metric"):
+  [CommonMetric.RangeBlockQuantumTurnMetric]: `SQTM = RBQTM ("Range Block Quantum Turn Metric"):
 \u2022 ${INNER_BLOCK_MOVES_EXPLANATION} count as 1 turn per quantum (e.g. M2 counts as 2)
 \u2022 ${OUTER_BLOCK_MOVES_EXPLANATION} count as 1 turn per quantum (e.g. R2 counts as 2)
 \u2022 rotations (e.g. x) count as 0 turns`,
-  ["ETM" /* ExecutionTurnMetric */]: `ETM ("Execution Turn Metric"):
+  [CommonMetric.ExecutionTurnMetric]: `ETM ("Execution Turn Metric"):
 \u2022 all moves (including rotations) count as 1 turn`
 };
 var CONSISTENT_METRIC_ABBREVIATIONS = {
-  ["OBTM" /* OuterBlockTurnMetric */]: "OB",
-  ["OBQTM" /* OuterBlockQuantumTurnMetric */]: "OBQ",
-  ["RBTM" /* RangeBlockTurnMetric */]: "RB",
-  ["RBQTM" /* RangeBlockQuantumTurnMetric */]: "RBQ",
-  ["ETM" /* ExecutionTurnMetric */]: "E"
+  [CommonMetric.OuterBlockTurnMetric]: "OB",
+  [CommonMetric.OuterBlockQuantumTurnMetric]: "OBQ",
+  [CommonMetric.RangeBlockTurnMetric]: "RB",
+  [CommonMetric.RangeBlockQuantumTurnMetric]: "RBQ",
+  [CommonMetric.ExecutionTurnMetric]: "E"
 };
 var TwizzleLink = class extends ManagedCustomElement {
+  twistyPlayer = null;
+  a = null;
+  options;
   constructor(options) {
     super({ mode: "open" });
     this.options = options;
   }
-  options;
-  twistyPlayer = null;
-  a = null;
   #fallback() {
     this.contentWrapper.textContent = "";
     if (this.a) {
@@ -6161,14 +6171,14 @@ function constructMoveCountDisplay(model, elem = document.createElement("span"))
     }
     elem.textContent = "(";
     if (puzzleLoader.id === "3x3x3") {
-      addMetric("OBTM" /* OuterBlockTurnMetric */);
-      addMetric("OBQTM" /* OuterBlockQuantumTurnMetric */);
-      addMetric("RBTM" /* RangeBlockTurnMetric */);
+      addMetric(CommonMetric.OuterBlockTurnMetric);
+      addMetric(CommonMetric.OuterBlockQuantumTurnMetric);
+      addMetric(CommonMetric.RangeBlockTurnMetric);
     } else if (puzzleLoader.pg) {
-      addMetric("RBTM" /* RangeBlockTurnMetric */);
-      addMetric("RBQTM" /* RangeBlockQuantumTurnMetric */);
+      addMetric(CommonMetric.RangeBlockTurnMetric);
+      addMetric(CommonMetric.RangeBlockQuantumTurnMetric);
     }
-    addMetric("ETM" /* ExecutionTurnMetric */);
+    addMetric(CommonMetric.ExecutionTurnMetric);
     elem.append(")");
   }
   model.puzzleAlg.addFreshListener(update);