cubing 0.21.0-pre8 → 0.21.2

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

@@ -9,24 +9,87 @@ import { RenderScheduler } from "../old/animation/RenderScheduler";
 import type {
   PlayingInfo,
   SimpleDirection,
-} from "../model/depth-0/PlayingInfoProp";
+} 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 { TimestampRequest } from "../model/depth-0/TimestampRequestProp";
+import type { TimestampRequest } from "../model/props/timeline/TimestampRequestProp";
 import { modIntoRange } from "../model/helpers";
+import type { CatchUpMove } from "../model/props/puzzle/state/CatchUpMoveProp";
 
 // TODO: Figure out a better way for the controller to instruct the player.
 export interface TwistyAnimationControllerDelegate {
   flash(): void;
 }
 
+// We use a separate helper to separate the anim frame callbacks (and their cancellations).
+// TODO: fold this into the main controller
+class CatchUpHelper {
+  catchingUp: boolean = false;
+  pendingFrame = false;
+
+  constructor(private model: TwistyPlayerModel) {}
+
+  private scheduler: RenderScheduler = new RenderScheduler(
+    this.animFrame.bind(this),
+  );
+
+  start(): void {
+    if (!this.catchingUp) {
+      this.lastTimestamp = performance.now();
+    }
+    this.catchingUp = true;
+    this.pendingFrame = true;
+    this.scheduler.requestAnimFrame();
+  }
+
+  stop(): void {
+    this.catchingUp = false;
+    this.scheduler.cancelAnimFrame();
+  }
+
+  catchUpMs = 500;
+  lastTimestamp = 0;
+  animFrame(timestamp: MillisecondTimestamp): void {
+    this.scheduler.requestAnimFrame();
+    const delta = (timestamp - this.lastTimestamp) / this.catchUpMs;
+    this.lastTimestamp = timestamp;
+
+    this.model.catchUpMoveProp.set(
+      (async () => {
+        const previousCatchUpMove = await this.model.catchUpMoveProp.get();
+        if (previousCatchUpMove.move === null) {
+          return previousCatchUpMove;
+        }
+
+        const amount = previousCatchUpMove.amount + delta; // TODO: use tempo scale?
+        if (amount >= 1) {
+          this.pendingFrame = true;
+          this.stop();
+          this.model.timestampRequestProp.set("end");
+          return {
+            move: null,
+            amount: 0,
+          };
+        }
+        this.pendingFrame = false;
+        return {
+          move: previousCatchUpMove.move,
+          amount: amount,
+        };
+      })(),
+    );
+  }
+}
+
 // This controls the logic for animation, so that the main controller can focus on the right API abstractions.
 export class TwistyAnimationController {
   // TODO: #private?
   private playing: boolean = false;
   private direction: Direction = Direction.Forwards;
 
+  private catchUpHelper: CatchUpHelper;
+
   private model: TwistyPlayerModel;
 
   private lastDatestamp: MillisecondTimestamp = 0;
@@ -44,6 +107,11 @@ export class TwistyAnimationController {
     this.lastTimestampPromise = this.#effectiveTimestampMilliseconds();
 
     this.model.playingInfoProp.addFreshListener(this.onPlayingProp.bind(this)); // TODO
+
+    this.catchUpHelper = new CatchUpHelper(this.model);
+    this.model.catchUpMoveProp.addFreshListener(
+      this.onCatchUpMoveProp.bind(this),
+    ); // TODO
   }
 
   // TODO: Do we need this?
@@ -53,6 +121,15 @@ export class TwistyAnimationController {
     }
   }
 
+  // TODO: Do we need this?
+  async onCatchUpMoveProp(catchUpMove: CatchUpMove): Promise<void> {
+    const catchingUp = catchUpMove.move !== null;
+    if (catchingUp !== this.catchUpHelper.catchingUp) {
+      catchingUp ? this.catchUpHelper.start() : this.catchUpHelper.stop();
+    }
+    this.scheduler.requestAnimFrame();
+  }
+
   async #effectiveTimestampMilliseconds(): Promise<MillisecondTimestamp> {
     return (await this.model.detailedTimelineInfoProp.get()).timestamp;
   }
@@ -161,7 +238,7 @@ export class TwistyAnimationController {
       freshenerResult;
 
     // TODO: Get this without wasting time on the others?
-    if (playingInfo.playing === false) {
+    if (!playingInfo.playing) {
       this.playing = false;
       // TODO: Ideally we'd cancel the anim frame from the top of this method.
       // But `this.scheduler.cancelAnimFrame();` might accidentally cancel a

package/src/cubing/twisty/index.ts

@@ -2,13 +2,13 @@ export { TwistyPlayer } from "./views/TwistyPlayer";
 export { TwistyAlgViewer } from "./views/TwistyAlgViewer";
 export { TwistyAlgEditor } from "./views/TwistyAlgEditor/TwistyAlgEditor";
 export type { TwistyPlayerConfig } from "./views/TwistyPlayer";
+export { experimentalForceNewRendererSharing } from "./views/3D/Twisty3DVantage";
 
-export { NO_VALUE as EXPERIMENTAL_PROP_NO_VALUE } from "./model/TwistyProp";
+export { NO_VALUE as EXPERIMENTAL_PROP_NO_VALUE } from "./model/props/TwistyProp";
 
 // Old
 export type { Twisty3DPuzzle } from "./views/3D/puzzles/Twisty3DPuzzle";
 export {
-  experimentalSetShareAllNewRenderers,
   experimentalShowRenderStats,
   Twisty3DCanvas,
 } from "./old/dom/viewers/Twisty3DCanvas";

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

@@ -1,42 +1,48 @@
-import { AlgProp } from "./depth-0/AlgProp";
-import { BackgroundProp } from "./depth-0/BackgroundProp";
-import { BackViewProp } from "./depth-0/BackViewProp";
-import { ControlPanelProp } from "./depth-0/ControlPanelProp";
-import { HintFaceletProp } from "./depth-0/HintFaceletProp";
-import { IndexerConstructorRequestProp } from "./depth-0/IndexerConstructorRequestProp";
-import { LatitudeLimitProp } from "./depth-0/LatitudeLimit";
-import { OrbitCoordinatesRequestProp } from "./depth-0/OrbitCoordinatesRequestProp";
-import { PlayingInfoProp } from "./depth-0/PlayingInfoProp";
-import { PGPuzzleDescriptionStringProp } from "./depth-0/PuzzleDescriptionProp";
-import { PuzzleIDRequestProp } from "./depth-0/PuzzleIDRequestProp";
-import { PuzzleLoaderProp } from "./depth-1/PuzzleLoaderProp";
-import { SetupAnchorProp } from "./depth-0/SetupAnchorProp";
-import { StickeringProp } from "./depth-0/StickeringProp";
-import { TempoScaleProp } from "./depth-0/TempoScaleProp";
-import { TimestampRequestProp } from "./depth-0/TimestampRequestProp";
-import { URLProp } from "./depth-0/URLProp";
-import { ViewerLinkProp } from "./depth-0/ViewerLinkProp";
-import { VisualizationFormatProp } from "./depth-0/VisualizationProp";
-import { OrbitCoordinatesProp } from "./depth-4/OrbitCoordinatesProp";
-import { PuzzleIDProp } from "./depth-2/PuzzleIDProp";
-import { SpriteProp } from "./depth-1/SpriteProp";
-import { VisualizationStrategyProp } from "./depth-3/VisualizationStrategyProp";
-import { IndexerConstructorProp } from "./depth-4/IndexerConstructorProp";
-import { PuzzleAlgProp } from "./depth-3/PuzzleAlgProp";
-import { AlgTransformationProp } from "./depth-4/AlgTransformationProp";
-import { IndexerProp } from "./depth-5/IndexerProp";
-import { AnchoredStartProp } from "./depth-6/AnchoredStartProp";
-import { TimeRangeProp } from "./depth-6/TimeRangeProp";
-import { DetailedTimelineInfoProp } from "./depth-7/DetailedTimelineInfoProp";
-import { CoarseTimelineInfoProp } from "./depth-8/CoarseTimelineInfoProp";
-import { CurrentLeavesProp } from "./depth-8/CurrentLeavesProp";
-import { ButtonAppearanceProp } from "./depth-9/ButtonAppearanceProp";
-import { CurrentLeavesSimplifiedProp } from "./depth-9/CurrentLeavesSimplified";
-import { CurrentTransformationProp } from "./depth-10/CurrentTransformationProp";
-import { LegacyPositionProp } from "./depth-11/LegacyPositionProp";
-import { PuzzleDefProp } from "./depth-2/PuzzleDefProp";
+import { AlgProp } from "./props/puzzle/state/AlgProp";
+import { BackgroundProp } from "./props/viewer/BackgroundProp";
+import { BackViewProp } from "./props/viewer/BackViewProp";
+import { ControlPanelProp } from "./props/viewer/ControlPanelProp";
+import { HintFaceletProp } from "./props/puzzle/display/HintFaceletProp";
+import { IndexerConstructorRequestProp } from "./props/puzzle/state/IndexerConstructorRequestProp";
+import { LatitudeLimitProp } from "./props/viewer/LatitudeLimit";
+import { OrbitCoordinatesRequestProp } from "./props/viewer/OrbitCoordinatesRequestProp";
+import { PlayingInfoProp } from "./props/timeline/PlayingInfoProp";
+import { PGPuzzleDescriptionStringProp } from "./props/puzzle/structure/PuzzleDescriptionProp";
+import { PuzzleIDRequestProp } from "./props/puzzle/structure/PuzzleIDRequestProp";
+import { PuzzleLoaderProp } from "./props/puzzle/structure/PuzzleLoaderProp";
+import { SetupAnchorProp } from "./props/puzzle/state/SetupAnchorProp";
+import { StickeringProp } from "./props/puzzle/display/StickeringProp";
+import { TempoScaleProp } from "./props/timeline/TempoScaleProp";
+import { TimestampRequestProp } from "./props/timeline/TimestampRequestProp";
+import { URLProp } from "./props/general/URLProp";
+import { ViewerLinkProp } from "./props/viewer/ViewerLinkProp";
+import { VisualizationFormatProp } from "./props/viewer/VisualizationProp";
+import { OrbitCoordinatesProp } from "./props/viewer/OrbitCoordinatesProp";
+import { PuzzleIDProp } from "./props/puzzle/structure/PuzzleIDProp";
+import { SpriteProp } from "./props/puzzle/display/SpriteProp";
+import { VisualizationStrategyProp } from "./props/viewer/VisualizationStrategyProp";
+import { IndexerConstructorProp } from "./props/puzzle/state/IndexerConstructorProp";
+import { PuzzleAlgProp } from "./props/puzzle/state/PuzzleAlgProp";
+import { AlgTransformationProp } from "./props/puzzle/state/AlgTransformationProp";
+import { IndexerProp } from "./props/puzzle/state/IndexerProp";
+import { AnchoredStartProp } from "./props/puzzle/state/AnchoredStartProp";
+import { TimeRangeProp } from "./props/viewer/TimeRangeProp";
+import { DetailedTimelineInfoProp } from "./props/timeline/DetailedTimelineInfoProp";
+import { CoarseTimelineInfoProp } from "./props/timeline/CoarseTimelineInfoProp";
+import { CurrentLeavesProp } from "./props/puzzle/state/CurrentLeavesProp";
+import { ButtonAppearanceProp } from "./props/viewer/ButtonAppearanceProp";
+import { CurrentLeavesSimplifiedProp } from "./props/puzzle/state/CurrentLeavesSimplified";
+import { CurrentTransformationProp } from "./props/puzzle/state/CurrentTransformationProp";
+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";
 
 export class TwistyPlayerModel {
+  // TODO: incorporate error handling into the entire prop graph.
+  // TODO: Make this something that can't get confused with normal props?
+  userVisibleErrorTracker = new UserVisibleErrorTracker();
+
   // TODO: Redistribute and group props with controllers.
 
   // Depth 0
@@ -44,6 +50,7 @@ export class TwistyPlayerModel {
   backgroundProp = new BackgroundProp();
   backViewProp = new BackViewProp();
   controlPanelProp = new ControlPanelProp();
+  catchUpMoveProp = new CatchUpMoveProp();
   foundationStickerSpriteURL = new URLProp();
   hintFaceletProp = new HintFaceletProp();
   hintStickerSpriteURL = new URLProp();
@@ -72,10 +79,13 @@ export class TwistyPlayerModel {
     spriteURL: this.hintStickerSpriteURL,
   });
 
-  puzzleLoaderProp = new PuzzleLoaderProp({
-    puzzleIDRequest: this.puzzleIDRequestProp,
-    puzzleDescriptionRequest: this.puzzleDescriptionRequestProp,
-  });
+  puzzleLoaderProp = new PuzzleLoaderProp(
+    {
+      puzzleIDRequest: this.puzzleIDRequestProp,
+      puzzleDescriptionRequest: this.puzzleDescriptionRequestProp,
+    },
+    this.userVisibleErrorTracker,
+  );
 
   // Depth 2
   puzzleDefProp = new PuzzleDefProp({ puzzleLoader: this.puzzleLoaderProp });
@@ -155,6 +165,7 @@ export class TwistyPlayerModel {
   currentLeavesProp = new CurrentLeavesProp({
     indexer: this.indexerProp,
     detailedTimelineInfo: this.detailedTimelineInfoProp,
+    catchUpMove: this.catchUpMoveProp,
   });
 
   // Depth 9

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

@@ -0,0 +1,22 @@
+import { arrayEquals } from "./helpers";
+import { SimpleTwistyPropSource } from "./props/TwistyProp";
+
+interface UserVisibleError {
+  errors: string[];
+}
+
+const EMPTY_ERRORS = { errors: [] };
+
+export class UserVisibleErrorTracker extends SimpleTwistyPropSource<UserVisibleError> {
+  override getDefaultValue(): UserVisibleError {
+    return EMPTY_ERRORS;
+  }
+
+  reset() {
+    this.set(this.getDefaultValue());
+  }
+
+  canReuseValue(_v1: UserVisibleError, _v2: UserVisibleError): boolean {
+    return arrayEquals(_v1.errors, _v2.errors);
+  }
+}

package/src/cubing/twisty/model/{TwistyProp.ts → props/TwistyProp.ts}

@@ -1,5 +1,6 @@
-import { from } from "../../vendor/p-lazy/p-lazy";
-import { StaleDropper } from "./PromiseFreshener";
+import { from } from "../../../vendor/p-lazy/p-lazy";
+import { StaleDropper } from "../PromiseFreshener";
+import type { UserVisibleErrorTracker } from "../UserVisibleErrorTracker";
 
 /*eslint @typescript-eslint/ban-types:off */
 type InputRecord = {};
@@ -200,7 +201,10 @@ export abstract class TwistyPropDerived<
   // cachedInputs:
   #parents: InputProps<InputTypes>;
 
-  constructor(parents: InputProps<InputTypes>) {
+  constructor(
+    parents: InputProps<InputTypes>,
+    protected userVisibleErrorTracker?: UserVisibleErrorTracker,
+  ) {
     super();
     this.#parents = parents;
     for (const parent of Object.values(parents)) {
@@ -238,6 +242,7 @@ export abstract class TwistyPropDerived<
     };
     this.#cachedLatestGenerationCalculation = latestGenerationCalculation;
 
+    this.userVisibleErrorTracker?.reset();
     return latestGenerationCalculation.output;
   }
 
@@ -306,7 +311,8 @@ export class FreshListenerManager {
     let disconnected = false;
     const wrappedListener = (value: T) => {
       if (disconnected) {
-        console.warn("Should be disconnected!");
+        // TODO
+        // console.warn("Should be disconnected!");
         return;
       }
       listener(value);
@@ -327,15 +333,17 @@ export class FreshListenerManager {
     let disconnected = false;
     const wrappedListener = async (_: any) => {
       if (disconnected) {
-        console.warn("Should be disconnected!");
+        // TODO
+        // console.warn("Should be disconnected!");
         return;
       }
       // We rely on `TwistyProp` caching to give us the full set of latest
       // values efficiently.
-      const values = (await Promise.all(
-        props.map((prop) => prop.get() as Promise<U | V>),
-      )) as [U, V];
-      listener(values);
+      const promises = (props as TwistyPropParent<any>[]).map((prop) =>
+        prop.get(),
+      );
+      const values = await Promise.all(promises);
+      listener(values as any); // TODO: fix up types
     };
 
     for (const prop of props) {

package/src/cubing/twisty/model/{TwistyPropDebugger.ts → props/TwistyPropDebugger.ts}

@@ -1,13 +1,13 @@
-import type { Alg } from "../../alg";
-import { countMoves } from "../../notation";
-import { ClassListManager } from "../old/dom/element/ClassListManager";
+import type { Alg } from "../../../alg";
+import { countMoves } from "../../../notation";
+import { ClassListManager } from "../../old/dom/element/ClassListManager";
 import {
   CSSSource,
   ManagedCustomElement,
-} from "../old/dom/element/ManagedCustomElement";
-import { customElementsShim } from "../old/dom/element/node-custom-element-shims";
-import type { TwistyPlayer } from "../views/TwistyPlayer";
-import type { AlgIssues } from "./depth-0/AlgProp";
+} from "../../old/dom/element/ManagedCustomElement";
+import { customElementsShim } from "../../old/dom/element/node-custom-element-shims";
+import type { TwistyPlayer } from "../../views/TwistyPlayer";
+import type { AlgIssues } from "./puzzle/state/AlgProp";
 import type { TwistyPropParent } from "./TwistyProp";
 
 export function splitFieldName(s: string): string {

package/src/cubing/twisty/model/{depth-0 → props/puzzle/display}/HintFaceletProp.ts

@@ -1,5 +1,5 @@
-import type { HintFaceletStyle } from "../../old/dom/TwistyPlayerConfig";
-import { SimpleTwistyPropSource } from "../TwistyProp";
+import type { HintFaceletStyle } from "../../../../old/dom/TwistyPlayerConfig";
+import { SimpleTwistyPropSource } from "../../TwistyProp";
 
 export type HintFaceletStyleWithAuto = HintFaceletStyle | "auto";
 

package/src/cubing/twisty/model/{depth-1 → props/puzzle/display}/SpriteProp.ts

@@ -1,6 +1,6 @@
 import type { Texture, TextureLoader } from "three";
-import { THREEJS } from "../../heavy-code-imports/3d";
-import { TwistyPropDerived } from "../TwistyProp";
+import { THREEJS } from "../../../../heavy-code-imports/3d";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 let cachedLoader: TextureLoader | null = null;
 async function loader(): Promise<TextureLoader> {

package/src/cubing/twisty/model/{depth-0 → props/puzzle/display}/StickeringProp.ts

@@ -1,5 +1,5 @@
-import type { ExperimentalStickering } from "../../../twisty";
-import { SimpleTwistyPropSource } from "../TwistyProp";
+import type { ExperimentalStickering } from "../../../..";
+import { SimpleTwistyPropSource } from "../../TwistyProp";
 
 export class StickeringProp extends SimpleTwistyPropSource<ExperimentalStickering> {
   getDefaultValue(): ExperimentalStickering {

package/src/cubing/twisty/model/{depth-0 → props/puzzle/state}/AlgProp.ts

@@ -1,6 +1,6 @@
-import { Alg } from "../../../alg";
-import { arrayEquals } from "../helpers";
-import { TwistyPropSource } from "../TwistyProp";
+import { Alg } from "../../../../../alg";
+import { arrayEquals } from "../../../helpers";
+import { TwistyPropSource } from "../../TwistyProp";
 
 export class AlgIssues {
   // TODO: (string | Error)[]

package/src/cubing/twisty/model/{depth-4 → props/puzzle/state}/AlgTransformationProp.ts

@@ -1,9 +1,9 @@
-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 type { AlgWithIssues } from "../depth-0/AlgProp";
-import { TwistyPropDerived } from "../TwistyProp";
+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 type { AlgWithIssues } from "./AlgProp";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 type AlgTransformationPropInputs = {
   alg: AlgWithIssues;

package/src/cubing/twisty/model/{depth-6 → props/puzzle/state}/AnchoredStartProp.ts

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

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

@@ -0,0 +1,17 @@
+import type { Move } from "../../../../../alg";
+import { SimpleTwistyPropSource } from "../../TwistyProp";
+
+export interface CatchUpMove {
+  move: Move | null;
+  amount: number;
+}
+
+export class CatchUpMoveProp extends SimpleTwistyPropSource<CatchUpMove> {
+  getDefaultValue(): CatchUpMove {
+    return { move: null, amount: 0 };
+  }
+
+  canReuseValue(v1: CatchUpMove, v2: CatchUpMove) {
+    return v1.move === v2.move && v1.amount === v2.amount;
+  }
+}

package/src/cubing/twisty/model/{depth-8 → props/puzzle/state}/CurrentLeavesProp.ts

@@ -1,15 +1,17 @@
-import { Move } from "../../../alg";
-import { Direction } from "../../old/animation/cursor/CursorTypes";
+import { Move } from "../../../../../alg";
+import { Direction } from "../../../../old/animation/cursor/CursorTypes";
 import type {
   AlgIndexer,
   CurrentMoveInfo,
-} from "../../old/animation/indexer/AlgIndexer";
-import type { DetailedTimelineInfo } from "../depth-7/DetailedTimelineInfoProp";
-import { TwistyPropDerived } from "../TwistyProp";
+} from "../../../../old/animation/indexer/AlgIndexer";
+import type { DetailedTimelineInfo } from "../../timeline/DetailedTimelineInfoProp";
+import { TwistyPropDerived } from "../../TwistyProp";
+import type { CatchUpMove } from "./CatchUpMoveProp";
 
 interface PositionPropInputs {
   indexer: AlgIndexer<any>;
   detailedTimelineInfo: DetailedTimelineInfo;
+  catchUpMove: CatchUpMove;
 }
 
 // TODO: Rename "current" (implies a single one) to "active"?
@@ -18,10 +20,26 @@ export class CurrentLeavesProp extends TwistyPropDerived<
   CurrentMoveInfo
 > {
   derive(inputs: PositionPropInputs): CurrentMoveInfo {
+    function addCatchUpMove(currentMoveInfo: CurrentMoveInfo): CurrentMoveInfo {
+      if (
+        inputs.detailedTimelineInfo.atEnd &&
+        inputs.catchUpMove.move !== null
+      ) {
+        currentMoveInfo.currentMoves.push({
+          move: inputs.catchUpMove.move,
+          direction: Direction.Backwards,
+          fraction: 1 - inputs.catchUpMove.amount,
+          startTimestamp: -1, // TODO
+          endTimestamp: -1, // TODO
+        });
+      }
+      return currentMoveInfo;
+    }
+
     // Copied from AlgCursor
     if (inputs.indexer.currentMoveInfo) {
-      return inputs.indexer.currentMoveInfo(
-        inputs.detailedTimelineInfo.timestamp,
+      return addCatchUpMove(
+        inputs.indexer.currentMoveInfo(inputs.detailedTimelineInfo.timestamp),
       );
     } else {
       const idx = inputs.indexer.timestampToIndex(
@@ -40,7 +58,7 @@ export class CurrentLeavesProp extends TwistyPropDerived<
       if (inputs.indexer.numAnimatedLeaves() > 0) {
         const move = inputs.indexer.getAnimLeaf(idx)?.as(Move);
         if (!move) {
-          return currentMoveInfo;
+          return addCatchUpMove(currentMoveInfo);
         }
         const start = inputs.indexer.indexToMoveStartTimestamp(idx);
         const duration = inputs.indexer.moveDuration(idx);
@@ -85,7 +103,7 @@ export class CurrentLeavesProp extends TwistyPropDerived<
         // }
         // }
       }
-      return currentMoveInfo;
+      return addCatchUpMove(currentMoveInfo);
     }
   }
 }

package/src/cubing/twisty/model/{depth-9 → props/puzzle/state}/CurrentLeavesSimplified.ts

@@ -1,7 +1,7 @@
-import type { Move } from "../../../alg";
-import type { CurrentMoveInfo } from "../../old/animation/indexer/AlgIndexer";
-import { arrayEqualsCompare } from "../helpers";
-import { TwistyPropDerived } from "../TwistyProp";
+import type { Move } from "../../../../../alg";
+import type { CurrentMoveInfo } from "../../../../old/animation/indexer/AlgIndexer";
+import { arrayEqualsCompare } from "../../../helpers";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 interface CurrentLeavesSimplifiedPropInputs {
   currentMoveInfo: CurrentMoveInfo;

package/src/cubing/twisty/model/{depth-10 → props/puzzle/state}/CurrentTransformationProp.ts

@@ -1,12 +1,12 @@
-import { KSolvePuzzle } from "../..";
+import { KSolvePuzzle } from "../../../..";
 import {
   combineTransformations,
   KPuzzleDefinition,
   Transformation,
-} from "../../../kpuzzle";
-import type { AlgIndexer } from "../../old/animation/indexer/AlgIndexer";
-import type { CurrentLeavesSimplified } from "../depth-9/CurrentLeavesSimplified";
-import { TwistyPropDerived } from "../TwistyProp";
+} from "../../../../../kpuzzle";
+import type { AlgIndexer } from "../../../../old/animation/indexer/AlgIndexer";
+import type { CurrentLeavesSimplified } from "./CurrentLeavesSimplified";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 interface CurrentTransformationPropInputs {
   anchoredStart: Transformation;

package/src/cubing/twisty/model/{depth-4 → props/puzzle/state}/IndexerConstructorProp.ts

@@ -1,13 +1,13 @@
-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 type { AlgWithIssues } from "../depth-0/AlgProp";
-import type { IndexerStrategyName } from "../depth-0/IndexerConstructorRequestProp";
-import type { VisualizationStrategy } from "../depth-3/VisualizationStrategyProp";
-import { TwistyPropDerived } from "../TwistyProp";
+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 type { AlgWithIssues } from "./AlgProp";
+import type { IndexerStrategyName } from "./IndexerConstructorRequestProp";
+import type { VisualizationStrategy } from "../../viewer/VisualizationStrategyProp";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 interface IndexerConstructorPropInputs {
   puzzle: PuzzleID;

package/src/cubing/twisty/model/{depth-0 → props/puzzle/state}/IndexerConstructorRequestProp.ts

@@ -1,4 +1,4 @@
-import { SimpleTwistyPropSource } from "../TwistyProp";
+import { SimpleTwistyPropSource } from "../../TwistyProp";
 
 export const indexerStrategyNames = {
   auto: true,

package/src/cubing/twisty/model/{depth-5 → 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 { AlgWithIssues } from "../depth-0/AlgProp";
-import { TwistyPropDerived } from "../TwistyProp";
+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 { AlgWithIssues } from "./AlgProp";
+import { TwistyPropDerived } from "../../TwistyProp";
 
 type IndexerPropInputs = {
   indexerConstructor: IndexerConstructor;

package/src/cubing/twisty/model/{depth-11 → props/puzzle/state}/LegacyPositionProp.ts

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