cubing 0.21.2 → 0.23.0

package/src/cubing/twisty/{old/animation/cursor/CursorTypes.ts → controllers/AnimationTypes.ts}

@@ -1,5 +1,5 @@
-import type { Move } from "../../../../alg";
-import type { Transformation as KPuzzleState } from "../../../../kpuzzle";
+import type { Move } from "../../alg";
+import type { Transformation as KPuzzleState } from "../../kpuzzle";
 
 export type MillisecondTimestamp = number;
 
@@ -38,4 +38,13 @@ export enum BoundaryType {
   EntireTimeline = "entire-timeline",
 }
 
+export interface TimeRange {
+  start: MillisecondTimestamp;
+  end: MillisecondTimestamp;
+}
+
 // export type DurationForAmount = (amount: number) => Duration;
+
+export interface PositionListener {
+  onPositionChange(position: PuzzlePosition): void;
+}

package/src/cubing/twisty/controllers/TwistyAnimationController.ts

@@ -1,18 +1,18 @@
-import type { TimeRange } from "../old/animation/cursor/AlgCursor";
 import {
   BoundaryType,
   Direction,
   directionScalar,
   MillisecondTimestamp,
-} from "../old/animation/cursor/CursorTypes";
-import { RenderScheduler } from "../old/animation/RenderScheduler";
+  TimeRange,
+} from "./AnimationTypes";
+import { RenderScheduler } from "./RenderScheduler";
 import type {
   PlayingInfo,
   SimpleDirection,
 } from "../model/props/timeline/PlayingInfoProp";
 import type { TwistyPlayerModel } from "../model/TwistyPlayerModel";
 import { StaleDropper } from "../model/PromiseFreshener";
-import type { CurrentMoveInfo } from "../old/animation/indexer/AlgIndexer";
+import type { CurrentMoveInfo } from "./indexer/AlgIndexer";
 import type { TimestampRequest } from "../model/props/timeline/TimestampRequestProp";
 import { modIntoRange } from "../model/helpers";
 import type { CatchUpMove } from "../model/props/puzzle/state/CatchUpMoveProp";

package/src/cubing/twisty/{old/animation → controllers}/indexer/AlgDuration.ts

@@ -8,8 +8,8 @@ import {
   Newline,
   Pause,
   TraversalUp,
-} from "../../../../alg";
-import type { Duration } from "../cursor/CursorTypes";
+} from "../../../alg";
+import type { Duration } from "../AnimationTypes";
 
 export function constantDurationForAmount(_amount: number): Duration {
   return 1000;

package/src/cubing/twisty/{old/animation → controllers}/indexer/AlgIndexer.ts

@@ -1,16 +1,16 @@
-import type { Move } from "../../../../alg/units";
-import { arrayEqualsCompare } from "../../../model/helpers";
+import type { Move } from "../../../alg/units";
+import { arrayEqualsCompare } from "../../model/helpers";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../views/3D/puzzles/KPuzzleWrapper";
+} from "../../views/3D/puzzles/KPuzzleWrapper";
 import type {
   Direction,
   Duration,
   MillisecondTimestamp,
   PuzzlePosition,
   Timestamp,
-} from "../cursor/CursorTypes";
+} from "../AnimationTypes";
 import type { AnimatedLeafUnit } from "./simultaneous-moves/simul-moves";
 
 export interface CurrentMove {

package/src/cubing/twisty/{old/animation → controllers}/indexer/SimpleAlgIndexer.ts

@@ -1,10 +1,10 @@
-import { Alg, Move, TraversalUp } from "../../../../alg";
-import { countAnimatedLeaves } from "../../../../notation";
+import { Alg, Move, TraversalUp } from "../../../alg";
+import { countAnimatedLeaves } from "../../../notation";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../views/3D/puzzles/KPuzzleWrapper";
-import type { Duration, Timestamp } from "../cursor/CursorTypes";
+} from "../../views/3D/puzzles/KPuzzleWrapper";
+import type { Duration, Timestamp } from "../AnimationTypes";
 import { AlgDuration, defaultDurationForAmount } from "./AlgDuration";
 import type { AlgIndexer } from "./AlgIndexer";
 

package/src/cubing/twisty/{old/animation → controllers}/indexer/simultaneous-moves/SimultaneousMoveIndexer.ts

@@ -1,14 +1,14 @@
-import { Alg, Move } from "../../../../../alg";
+import { Alg, Move } from "../../../../alg";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../../views/3D/puzzles/KPuzzleWrapper";
+} from "../../../views/3D/puzzles/KPuzzleWrapper";
 import {
   Direction,
   Duration,
   PuzzlePosition,
   Timestamp,
-} from "../../cursor/CursorTypes";
+} from "../../AnimationTypes";
 import type { AlgIndexer } from "../AlgIndexer";
 import { AnimatedLeafUnit, AnimLeafWithRange, simulMoves } from "./simul-moves";
 

package/src/cubing/twisty/{old/animation → controllers}/indexer/simultaneous-moves/SimultaneousMoveIndexerV2.ts

@@ -1,14 +1,14 @@
-import { Alg, Move } from "../../../../../alg";
+import { Alg, Move } from "../../../../alg";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../../views/3D/puzzles/KPuzzleWrapper";
+} from "../../../views/3D/puzzles/KPuzzleWrapper";
 import {
   Direction,
   Duration,
   PuzzlePosition,
   Timestamp,
-} from "../../cursor/CursorTypes";
+} from "../../AnimationTypes";
 import type { AlgIndexer, CurrentMove, CurrentMoveInfo } from "../AlgIndexer";
 import { AnimatedLeafUnit, AnimLeafWithRange, simulMoves } from "./simul-moves";
 

package/src/cubing/twisty/{old/animation → controllers}/indexer/simultaneous-moves/simul-moves.ts

@@ -8,8 +8,8 @@ import {
   Alg,
   Grouping,
   Newline,
-} from "../../../../../alg";
-import type { MillisecondTimestamp } from "../../cursor/CursorTypes";
+} from "../../../../alg";
+import type { MillisecondTimestamp } from "../../AnimationTypes";
 import { defaultDurationForAmount } from "../AlgDuration";
 
 export type AnimatedLeafUnit = Move | Pause;

package/src/cubing/twisty/{old/animation → controllers}/indexer/tree/AlgWalker.ts

@@ -10,16 +10,16 @@ import {
   TraversalDownUp,
   TraversalUp,
   Unit,
-} from "../../../../../alg";
+} from "../../../../alg";
 import {
   experimentalDirectedGenerator,
   ExperimentalIterationDirection,
-} from "../../../../../alg";
+} from "../../../../alg";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../../views/3D/puzzles/KPuzzleWrapper";
-import type { Duration } from "../../cursor/CursorTypes";
+} from "../../../views/3D/puzzles/KPuzzleWrapper";
+import type { Duration } from "../../AnimationTypes";
 import { AlgDuration, defaultDurationForAmount } from "../AlgDuration";
 
 export class AlgPartDecoration<P extends PuzzleWrapper> {

package/src/cubing/twisty/{old/animation → controllers}/indexer/tree/TreeAlgIndexer.ts

@@ -1,9 +1,9 @@
-import type { Alg, Move } from "../../../../../alg";
+import type { Alg, Move } from "../../../../alg";
 import type {
   PuzzleWrapper,
   State,
-} from "../../../../views/3D/puzzles/KPuzzleWrapper";
-import type { Duration, Timestamp } from "../../cursor/CursorTypes";
+} from "../../../views/3D/puzzles/KPuzzleWrapper";
+import type { Duration, Timestamp } from "../../AnimationTypes";
 import type { AlgIndexer } from "../AlgIndexer";
 import { chunkAlgs } from "./chunkAlgs";
 import {

package/src/cubing/twisty/{old/animation → controllers}/indexer/tree/chunkAlgs.ts

@@ -9,8 +9,8 @@ import {
   Pause,
   TraversalUp,
   Unit,
-} from "../../../../../alg";
-import { AlgBuilder } from "../../../../../alg";
+} from "../../../../alg";
+import { AlgBuilder } from "../../../../alg";
 
 const MIN_CHUNKING_THRESHOLD = 16;
 

package/src/cubing/twisty/{old/animation → controllers}/stream/timeline-move-calculation-draft.ts

@@ -1,5 +1,5 @@
-import { Move, QuantumMove } from "../../../../alg";
-import type { Duration, Timestamp } from "../cursor/CursorTypes";
+import { Move, QuantumMove } from "../../../alg";
+import type { Duration, Timestamp } from "../AnimationTypes";
 
 interface Event {
   timeStamp: Timestamp;

package/src/cubing/twisty/heavy-code-imports/dynamic-entries/3d.ts

@@ -1,26 +1,18 @@
 import { cube3x3x3, PuzzleLoader } from "../../../puzzles";
-import type { AlgCursor } from "../../old/animation/cursor/AlgCursor";
-import type { HintFaceletStyle } from "../../old/dom/TwistyPlayerConfig";
+import type { HintFaceletStyle } from "../../model/props/puzzle/display/HintFaceletProp";
 import { Cube3D, Cube3DOptions } from "../../views/3D/puzzles/Cube3D";
 import { PG3D } from "../../views/3D/puzzles/PG3D";
 
 // Mangled to avoid autocompleting.
 // This must not be imported directly.
 export * as T3I from "three";
-export { Twisty3DCanvas } from "../../old/dom/viewers/Twisty3DCanvas";
 export { Cube3D } from "../../views/3D/puzzles/Cube3D";
 export { PG3D } from "../../views/3D/puzzles/PG3D";
 export { Twisty3DScene } from "../../views/3D/Twisty3DScene";
 
 export async function cube3DShim(options?: Cube3DOptions): Promise<Cube3D> {
-  const cursorShim = { addPositionListener: () => {} } as any as AlgCursor; // TODO
   const renderCallbackShim = () => {};
-  return new Cube3D(
-    await cube3x3x3.def(),
-    cursorShim,
-    renderCallbackShim,
-    options,
-  );
+  return new Cube3D(await cube3x3x3.def(), renderCallbackShim, options);
 }
 
 // TODO: take loader?
@@ -28,10 +20,8 @@ export async function pg3dShim(
   puzzleLoader: PuzzleLoader,
   hintFacelets: HintFaceletStyle,
 ): Promise<PG3D> {
-  const cursorShim = { addPositionListener: () => {} } as any as AlgCursor; // TODO
   const renderCallbackShim = () => {};
   return new PG3D(
-    cursorShim,
     renderCallbackShim,
     await puzzleLoader.def(),
     (await puzzleLoader.pg!()).get3d(),

package/src/cubing/twisty/index.ts

@@ -5,27 +5,20 @@ export type { TwistyPlayerConfig } from "./views/TwistyPlayer";
 export { experimentalForceNewRendererSharing } from "./views/3D/Twisty3DVantage";
 
 export { NO_VALUE as EXPERIMENTAL_PROP_NO_VALUE } from "./model/props/TwistyProp";
-
-// Old
-export type { Twisty3DPuzzle } from "./views/3D/puzzles/Twisty3DPuzzle";
+export { ExperimentalStickering } from "./model/props/puzzle/display/StickeringProp";
 export {
-  experimentalShowRenderStats,
-  Twisty3DCanvas,
-} from "./old/dom/viewers/Twisty3DCanvas";
-export { TwistyPlayerV1 } from "./old/dom/TwistyPlayer";
-export type {
-  TwistyPlayerInitialConfig,
-  ExperimentalStickering,
-} from "./old/dom/TwistyPlayerConfig";
-export { TimestampLocationType } from "./old/animation/Timeline";
-export type { TimelineActionEvent } from "./old/animation/Timeline";
-export { TwistyAlgViewerV1 } from "./old/dom/TwistyAlgViewerV1";
+  BackViewLayout,
+  backViewLayouts,
+} from "./model/props/viewer/BackViewProp";
+export type { PuzzleID } from "./model/props/puzzle/structure/PuzzleIDRequestProp";
+export { VisualizationFormat } from "./model/props/viewer/VisualizationProp";
+
+export { debugShowRenderStats as experimentalDebugShowRenderStats } from "./views/3D/Twisty3DVantage";
 
 // Older
 export { Cube3D } from "./views/3D/puzzles/Cube3D";
 export { PG3D } from "./views/3D/puzzles/PG3D";
-export type { AlgIndexer } from "./old/animation/indexer/AlgIndexer";
-export { SimpleAlgIndexer } from "./old/animation/indexer/SimpleAlgIndexer";
-export { TreeAlgIndexer } from "./old/animation/indexer/tree/TreeAlgIndexer";
+export type { AlgIndexer } from "./controllers/indexer/AlgIndexer";
+export { SimpleAlgIndexer } from "./controllers/indexer/SimpleAlgIndexer";
+export { TreeAlgIndexer } from "./controllers/indexer/tree/TreeAlgIndexer";
 export { KPuzzleWrapper as KSolvePuzzle } from "./views/3D/puzzles/KPuzzleWrapper";
-export type { BackViewLayout } from "./old/dom/viewers/TwistyViewerWrapper";

package/src/cubing/twisty/model/TwistyPlayerModel.ts

@@ -37,6 +37,10 @@ import { LegacyPositionProp } from "./props/puzzle/state/LegacyPositionProp";
 import { PuzzleDefProp } from "./props/puzzle/structure/PuzzleDefProp";
 import { UserVisibleErrorTracker } from "./UserVisibleErrorTracker";
 import { CatchUpMoveProp } from "./props/puzzle/state/CatchUpMoveProp";
+import { experimentalAppendMove, Move } from "../../alg";
+import { NaiveMoveCountProp } from "./props/puzzle/state/NaiveMoveCountProp";
+import { MovePressInputProp } from "./props/puzzle/state/MovePressInputProp";
+import { FoundationDisplayProp } from "./props/puzzle/display/FoundationDisplayProp";
 
 export class TwistyPlayerModel {
   // TODO: incorporate error handling into the entire prop graph.
@@ -51,14 +55,15 @@ export class TwistyPlayerModel {
   backViewProp = new BackViewProp();
   controlPanelProp = new ControlPanelProp();
   catchUpMoveProp = new CatchUpMoveProp();
+  foundationDisplayProp = new FoundationDisplayProp();
   foundationStickerSpriteURL = new URLProp();
   hintFaceletProp = new HintFaceletProp();
   hintStickerSpriteURL = new URLProp();
   indexerConstructorRequestProp = new IndexerConstructorRequestProp();
   latitudeLimitProp = new LatitudeLimitProp();
+  movePressInputProp = new MovePressInputProp();
   orbitCoordinatesRequestProp: OrbitCoordinatesRequestProp =
     new OrbitCoordinatesRequestProp();
-
   playingInfoProp = new PlayingInfoProp();
   puzzleDescriptionRequestProp = new PGPuzzleDescriptionStringProp();
   puzzleIDRequestProp = new PuzzleIDRequestProp();
@@ -117,6 +122,8 @@ export class TwistyPlayerModel {
     indexerConstructorRequest: this.indexerConstructorRequestProp,
   });
 
+  moveCountProp = new NaiveMoveCountProp({ alg: this.puzzleAlgProp });
+
   orbitCoordinatesProp = new OrbitCoordinatesProp({
     orbitCoordinatesRequest: this.orbitCoordinatesRequestProp,
     latitudeLimit: this.latitudeLimitProp,
@@ -196,11 +203,12 @@ export class TwistyPlayerModel {
   public async twizzleLink(): Promise<string> {
     const url = new URL("https://alpha.twizzle.net/edit/");
 
-    const [puzzle, alg, setup, anchor] = await Promise.all([
+    const [puzzle, alg, setup, anchor, experimentalStickering] = await Promise.all([
       this.puzzleIDProp.get(),
       this.algProp.get(),
       this.setupProp.get(),
       this.setupAnchorProp.get(),
+      this.stickeringProp.get(),
     ]);
 
     if (!alg.alg.experimentalIsEmpty()) {
@@ -212,14 +220,37 @@ export class TwistyPlayerModel {
     if (anchor !== "start") {
       url.searchParams.set("setup-anchor", anchor);
     }
-    // if (this.experimentalStickering !== "full") {
-    //   url.searchParams.set(
-    //     "experimental-stickering",
-    //     this.experimentalStickering,
-    //   );
+    if (experimentalStickering !== "full") {
+      url.searchParams.set(
+        "experimental-stickering",
+        experimentalStickering,
+      );
+    }
     if (puzzle !== "3x3x3") {
       url.searchParams.set("puzzle", puzzle);
     }
     return url.toString();
   }
+
+  // TODO: Animate the new move.
+  experimentalAddMove(
+    flexibleMove: Move | string,
+    options: { coalesce?: boolean; mod?: number } = {},
+  ): void {
+    const move =
+      typeof flexibleMove === "string" ? new Move(flexibleMove) : flexibleMove;
+    (async () => {
+      const alg = (await this.algProp.get()).alg;
+      const newAlg = experimentalAppendMove(alg, move, {
+        coalesce: options?.coalesce,
+        mod: options?.mod,
+      });
+      this.algProp.set(newAlg);
+      this.timestampRequestProp.set("end");
+      this.catchUpMoveProp.set({
+        move: move,
+        amount: 0,
+      });
+    })();
+  }
 }

package/src/cubing/twisty/model/props/TwistyPropDebugger.ts

@@ -1,11 +1,11 @@
 import type { Alg } from "../../../alg";
 import { countMoves } from "../../../notation";
-import { ClassListManager } from "../../old/dom/element/ClassListManager";
+import { ClassListManager } from "../../views/ClassListManager";
 import {
   CSSSource,
   ManagedCustomElement,
-} from "../../old/dom/element/ManagedCustomElement";
-import { customElementsShim } from "../../old/dom/element/node-custom-element-shims";
+} from "../../views/ManagedCustomElement";
+import { customElementsShim } from "../../views/node-custom-element-shims";
 import type { TwistyPlayer } from "../../views/TwistyPlayer";
 import type { AlgIssues } from "./puzzle/state/AlgProp";
 import type { TwistyPropParent } from "./TwistyProp";

package/src/cubing/twisty/model/props/puzzle/display/FoundationDisplayProp.ts

@@ -0,0 +1,9 @@
+import { SimpleTwistyPropSource } from "../../TwistyProp";
+
+export type FoundationDisplay = "auto" | "opaque" | "none";
+
+export class FoundationDisplayProp extends SimpleTwistyPropSource<FoundationDisplay> {
+  getDefaultValue(): FoundationDisplay {
+    return "auto";
+  }
+}

package/src/cubing/twisty/model/props/puzzle/display/HintFaceletProp.ts

@@ -1,6 +1,11 @@
-import type { HintFaceletStyle } from "../../../../old/dom/TwistyPlayerConfig";
 import { SimpleTwistyPropSource } from "../../TwistyProp";
 
+// TODO: turn these maps into lists?
+export const hintFaceletStyles = {
+  floating: true, // default
+  none: true,
+};
+export type HintFaceletStyle = keyof typeof hintFaceletStyles;
 export type HintFaceletStyleWithAuto = HintFaceletStyle | "auto";
 
 export class HintFaceletProp extends SimpleTwistyPropSource<HintFaceletStyleWithAuto> {

package/src/cubing/twisty/model/props/puzzle/display/StickeringProp.ts

@@ -1,6 +1,54 @@
-import type { ExperimentalStickering } from "../../../..";
 import { SimpleTwistyPropSource } from "../../TwistyProp";
 
+// TODO: turn these maps into lists?
+// TODO: alg.cubing.net parity
+export const experimentalStickerings = {
+  "full": true, // default
+  "centers-only": true, // TODO
+  "PLL": true,
+  "CLS": true,
+  "OLL": true,
+  "COLL": true,
+  "OCLL": true,
+  "CLL": true,
+  "ELL": true,
+  "ELS": true,
+  "LL": true,
+  "F2L": true,
+  "ZBLL": true,
+  "ZBLS": true,
+  "WVLS": true,
+  "VLS": true,
+  "LS": true,
+  "EO": true,
+  "EOline": true,
+  "EOcross": true,
+  "CMLL": true,
+  "L6E": true,
+  "L6EO": true,
+  "Daisy": true,
+  "Cross": true,
+  "2x2x2": true,
+  "2x2x3": true,
+  "Void Cube": true,
+  "invisible": true,
+  "picture": true,
+  "experimental-centers-U": true,
+  "experimental-centers-U-D": true,
+  "experimental-centers-U-L-D": true,
+  "experimental-centers-U-L-B-D": true,
+  "experimental-centers": true,
+  "experimental-fto-fc": true,
+  "experimental-fto-f2t": true,
+  "experimental-fto-sc": true,
+  "experimental-fto-l2c": true,
+  "experimental-fto-lbt": true,
+  "experimental-fto-l3t": true,
+  "experimental-global-custom-1": true,
+  "experimental-global-custom-2": true,
+};
+export type ExperimentalStickering = keyof typeof experimentalStickerings;
+
 export class StickeringProp extends SimpleTwistyPropSource<ExperimentalStickering> {
   getDefaultValue(): ExperimentalStickering {
     return "full"; // TODO: auto

package/src/cubing/twisty/model/props/puzzle/state/AlgTransformationProp.ts

@@ -1,7 +1,7 @@
 import type { Alg } from "../../../../../alg";
 import type { KPuzzleDefinition, Transformation } from "../../../../../kpuzzle";
 import { KPuzzleWrapper } from "../../../../views/3D/puzzles/KPuzzleWrapper";
-import { TreeAlgIndexer } from "../../../../old/animation/indexer/tree/TreeAlgIndexer";
+import { TreeAlgIndexer } from "../../../../controllers/indexer/tree/TreeAlgIndexer";
 import type { AlgWithIssues } from "./AlgProp";
 import { TwistyPropDerived } from "../../TwistyProp";
 

package/src/cubing/twisty/model/props/puzzle/state/AnchoredStartProp.ts

@@ -4,9 +4,9 @@ import {
   KPuzzleDefinition,
   Transformation,
 } from "../../../../../kpuzzle";
-import type { AlgIndexer } from "../../../../old/animation/indexer/AlgIndexer";
-import type { SetupToLocation } from "../../../../old/dom/TwistyPlayerConfig";
+import type { AlgIndexer } from "../../../../controllers/indexer/AlgIndexer";
 import { TwistyPropDerived } from "../../TwistyProp";
+import type { SetupToLocation } from "./SetupAnchorProp";
 
 interface AnchoredStartPropInputs {
   setupAnchor: SetupToLocation;

package/src/cubing/twisty/model/props/puzzle/state/CurrentLeavesProp.ts

@@ -1,9 +1,9 @@
 import { Move } from "../../../../../alg";
-import { Direction } from "../../../../old/animation/cursor/CursorTypes";
+import { Direction } from "../../../../controllers/AnimationTypes";
 import type {
   AlgIndexer,
   CurrentMoveInfo,
-} from "../../../../old/animation/indexer/AlgIndexer";
+} from "../../../../controllers/indexer/AlgIndexer";
 import type { DetailedTimelineInfo } from "../../timeline/DetailedTimelineInfoProp";
 import { TwistyPropDerived } from "../../TwistyProp";
 import type { CatchUpMove } from "./CatchUpMoveProp";

package/src/cubing/twisty/model/props/puzzle/state/CurrentLeavesSimplified.ts

@@ -1,5 +1,5 @@
 import type { Move } from "../../../../../alg";
-import type { CurrentMoveInfo } from "../../../../old/animation/indexer/AlgIndexer";
+import type { CurrentMoveInfo } from "../../../../controllers/indexer/AlgIndexer";
 import { arrayEqualsCompare } from "../../../helpers";
 import { TwistyPropDerived } from "../../TwistyProp";
 

package/src/cubing/twisty/model/props/puzzle/state/CurrentTransformationProp.ts

@@ -4,7 +4,7 @@ import {
   KPuzzleDefinition,
   Transformation,
 } from "../../../../../kpuzzle";
-import type { AlgIndexer } from "../../../../old/animation/indexer/AlgIndexer";
+import type { AlgIndexer } from "../../../../controllers/indexer/AlgIndexer";
 import type { CurrentLeavesSimplified } from "./CurrentLeavesSimplified";
 import { TwistyPropDerived } from "../../TwistyProp";
 

package/src/cubing/twisty/model/props/puzzle/state/IndexerConstructorProp.ts

@@ -1,13 +1,20 @@
 import { countMoves } from "../../../../../notation";
-import type { IndexerConstructor } from "../../../../old/animation/cursor/AlgCursor";
-import { SimpleAlgIndexer } from "../../../../old/animation/indexer/SimpleAlgIndexer";
-import { SimultaneousMoveIndexerV2 } from "../../../../old/animation/indexer/simultaneous-moves/SimultaneousMoveIndexerV2";
-import { TreeAlgIndexer } from "../../../../old/animation/indexer/tree/TreeAlgIndexer";
-import type { PuzzleID } from "../../../../old/dom/TwistyPlayerConfig";
+import { SimpleAlgIndexer } from "../../../../controllers/indexer/SimpleAlgIndexer";
+import { SimultaneousMoveIndexerV2 } from "../../../../controllers/indexer/simultaneous-moves/SimultaneousMoveIndexerV2";
+import { TreeAlgIndexer } from "../../../../controllers/indexer/tree/TreeAlgIndexer";
 import type { AlgWithIssues } from "./AlgProp";
 import type { IndexerStrategyName } from "./IndexerConstructorRequestProp";
 import type { VisualizationStrategy } from "../../viewer/VisualizationStrategyProp";
 import { TwistyPropDerived } from "../../TwistyProp";
+import type { PuzzleID } from "../structure/PuzzleIDRequestProp";
+import type { KPuzzleWrapper } from "../../../../views/3D/puzzles/KPuzzleWrapper";
+import type { Alg } from "../../../../../alg";
+import type { AlgIndexer } from "../../../..";
+
+export type IndexerConstructor = new (
+  puzzle: KPuzzleWrapper,
+  alg: Alg,
+) => AlgIndexer<KPuzzleWrapper>;
 
 interface IndexerConstructorPropInputs {
   puzzle: PuzzleID;

package/src/cubing/twisty/model/props/puzzle/state/IndexerProp.ts

@@ -1,9 +1,9 @@
 import type { KPuzzleDefinition } from "../../../../../kpuzzle";
 import { KPuzzleWrapper } from "../../../../views/3D/puzzles/KPuzzleWrapper";
-import type { IndexerConstructor } from "../../../../old/animation/cursor/AlgCursor";
-import type { AlgIndexer } from "../../../../old/animation/indexer/AlgIndexer";
+import type { AlgIndexer } from "../../../../controllers/indexer/AlgIndexer";
 import type { AlgWithIssues } from "./AlgProp";
 import { TwistyPropDerived } from "../../TwistyProp";
+import type { IndexerConstructor } from "./IndexerConstructorProp";
 
 type IndexerPropInputs = {
   indexerConstructor: IndexerConstructor;

package/src/cubing/twisty/model/props/puzzle/state/LegacyPositionProp.ts

@@ -1,6 +1,6 @@
 import type { Transformation } from "../../../../../kpuzzle";
-import type { PuzzlePosition } from "../../../../old/animation/cursor/CursorTypes";
-import type { CurrentMoveInfo } from "../../../../old/animation/indexer/AlgIndexer";
+import type { PuzzlePosition } from "../../../../controllers/AnimationTypes";
+import type { CurrentMoveInfo } from "../../../../controllers/indexer/AlgIndexer";
 import { TwistyPropDerived } from "../../TwistyProp";
 
 export interface LegacyPositionPropInputs {

package/src/cubing/twisty/model/props/puzzle/state/MovePressInputProp.ts

@@ -0,0 +1,14 @@
+import { SimpleTwistyPropSource } from "../../TwistyProp";
+
+export const movePressInputNames = {
+  auto: true,
+  none: true,
+  basic: true,
+};
+export type MovePressInput = keyof typeof movePressInputNames;
+
+export class MovePressInputProp extends SimpleTwistyPropSource<MovePressInput> {
+  getDefaultValue(): MovePressInput {
+    return "auto";
+  }
+}

package/src/cubing/twisty/model/props/puzzle/state/NaiveMoveCountProp.ts

@@ -0,0 +1,20 @@
+import { countMoves } from "../../../../../notation";
+import { TwistyPropDerived } from "../../TwistyProp";
+import type { AlgWithIssues } from "./AlgProp";
+
+interface NaiveMoveCountPropInputs {
+  alg: AlgWithIssues;
+}
+
+// TODO: handle metrics
+export class NaiveMoveCountProp extends TwistyPropDerived<
+  NaiveMoveCountPropInputs,
+  number | null
+> {
+  derive(inputs: NaiveMoveCountPropInputs): number | null {
+    if (inputs.alg.issues.errors.length > 0) {
+      return null;
+    }
+    return countMoves(inputs.alg.alg);
+  }
+}