cubing 0.21.3 → 0.22.0

package/src/cubing/twisty/views/TwistyPlayer.ts

@@ -1,23 +1,25 @@
 import type { ExperimentalStickering, PG3D } from "..";
-import { Alg, experimentalAppendMove, Move } from "../../alg";
+import type { Alg, Move } from "../../alg";
 import type { PuzzleDescriptionString } from "../../puzzle-geometry/PGPuzzles";
 import type { TwistyAnimationControllerDelegate } from "../controllers/TwistyAnimationController";
 import { TwistyPlayerController } from "../controllers/TwistyPlayerController";
 import type { HintFaceletStyleWithAuto } from "../model/props/puzzle/display/HintFaceletProp";
+import type { MovePressInput } from "../model/props/puzzle/state/MovePressInputProp";
+import type { SetupToLocation } from "../model/props/puzzle/state/SetupAnchorProp";
+import type { PuzzleID } from "../model/props/puzzle/structure/PuzzleIDRequestProp";
 import type { BackgroundThemeWithAuto } from "../model/props/viewer/BackgroundProp";
 import type { BackViewLayoutWithAuto } from "../model/props/viewer/BackViewProp";
-import type { ControlPanelThemeWithAuto } from "../model/props/viewer/ControlPanelProp";
+import {
+  ControlPanelThemeWithAuto,
+  controlsLocations,
+} from "../model/props/viewer/ControlPanelProp";
 import type { ViewerLinkPageWithAuto } from "../model/props/viewer/ViewerLinkProp";
 import type { VisualizationFormatWithAuto } from "../model/props/viewer/VisualizationProp";
 import type { VisualizationStrategy } from "../model/props/viewer/VisualizationStrategyProp";
-import { ClassListManager } from "../old/dom/element/ClassListManager";
-import { customElementsShim } from "../old/dom/element/node-custom-element-shims";
-import { twistyPlayerCSS } from "../old/dom/TwistyPlayer.css";
-import {
-  controlsLocations,
-  PuzzleID,
-  SetupToLocation,
-} from "../old/dom/TwistyPlayerConfig";
+import { ClassListManager } from "./ClassListManager";
+import { customElementsShim } from "./node-custom-element-shims";
+import { twistyPlayerCSS } from "./TwistyPlayer.css";
+
 import { Twisty2DSceneWrapper } from "./2D/Twisty2DSceneWrapper";
 import { Twisty3DSceneWrapper } from "./3D/Twisty3DSceneWrapper";
 import { TwistyButtonsV2 } from "./control-panel/TwistyButtonsV2";
@@ -49,6 +51,7 @@ export const twistyPlayerAttributeMap = {
   "back-view": "backView",
   // "indexer": "indexer",
   "viewer-link": "viewerLink",
+  "experimental-move-press-input": "experimentalMovePressInput",
 
   // Number-based
   "camera-latitude": "cameraLatitude",
@@ -86,6 +89,7 @@ export interface TwistyPlayerConfig {
   backView?: BackViewLayoutWithAuto;
   // "indexer"?: "indexer";
   viewerLink?: ViewerLinkPageWithAuto;
+  experimentalMovePressInput?: MovePressInput;
 
   // Number-based
   cameraLatitude?: number;
@@ -253,7 +257,7 @@ export class TwistyPlayer
     if (wrapper instanceof Twisty3DSceneWrapper) {
       const vantages = wrapper.experimentalVantages();
       for (const vantage of vantages) {
-        canvases.push(await vantage.canvas());
+        canvases.push((await vantage.canvasInfo()).canvas);
       }
     }
     return canvases;
@@ -297,20 +301,7 @@ export class TwistyPlayer
     flexibleMove: Move | string,
     options: { coalesce?: boolean } = {},
   ): void {
-    const move =
-      typeof flexibleMove === "string" ? new Move(flexibleMove) : flexibleMove;
-    (async () => {
-      const alg = (await this.experimentalModel.algProp.get()).alg;
-      const newAlg = experimentalAppendMove(alg, move, {
-        coalesce: options?.coalesce,
-      });
-      this.experimentalModel.algProp.set(newAlg);
-      this.experimentalModel.timestampRequestProp.set("end");
-      this.experimentalModel.catchUpMoveProp.set({
-        move: move,
-        amount: 0,
-      });
-    })();
+    this.experimentalModel.experimentalAddMove(flexibleMove, options);
   }
 
   static get observedAttributes(): string[] {

package/src/cubing/twisty/views/TwistyPlayerSettable.ts

@@ -1,6 +1,6 @@
 import type { Alg } from "../../alg";
 import type { PuzzleDescriptionString } from "../../puzzle-geometry/PGPuzzles";
-import type { ExperimentalStickering } from "../../twisty";
+import type { ExperimentalStickering, PuzzleID } from "../../twisty";
 import type { BackgroundThemeWithAuto } from "../model/props/viewer/BackgroundProp";
 import type { BackViewLayoutWithAuto } from "../model/props/viewer/BackViewProp";
 import type { ControlPanelThemeWithAuto } from "../model/props/viewer/ControlPanelProp";
@@ -10,9 +10,10 @@ import type { TimestampRequest } from "../model/props/timeline/TimestampRequestP
 import type { ViewerLinkPageWithAuto } from "../model/props/viewer/ViewerLinkProp";
 import type { VisualizationFormatWithAuto } from "../model/props/viewer/VisualizationProp";
 import { TwistyPlayerModel } from "../model/TwistyPlayerModel";
-import type { MillisecondTimestamp } from "../old/animation/cursor/CursorTypes";
-import { ManagedCustomElement } from "../old/dom/element/ManagedCustomElement";
-import type { PuzzleID, SetupToLocation } from "../old/dom/TwistyPlayerConfig";
+import type { MillisecondTimestamp } from "../controllers/AnimationTypes";
+import { ManagedCustomElement } from "./ManagedCustomElement";
+import type { MovePressInput } from "../model/props/puzzle/state/MovePressInputProp";
+import type { SetupToLocation } from "../model/props/puzzle/state/SetupAnchorProp";
 
 function err(propName: string): Error {
   return new Error(
@@ -55,25 +56,28 @@ export abstract class TwistyPlayerSettable extends ManagedCustomElement {
   get background(): never { throw err("background"); }
 
   set controlPanel(newControlPanel: ControlPanelThemeWithAuto) { this.experimentalModel.controlPanelProp.set(newControlPanel); }
-  get controlPanel(): never { throw new Error( "Cannot get `.controlPanel` directly from a `TwistyPlayer`."); }
+  get controlPanel(): never { throw err("controlPanel"); }
 
   set visualization(visualizationFormat: VisualizationFormatWithAuto) { this.experimentalModel.visualizationFormatProp.set(visualizationFormat); }
-  get visualization(): never { throw new Error( "Cannot get `.visualization` directly from a `TwistyPlayer`."); }
+  get visualization(): never { throw err("visualization"); }
 
   set viewerLink(viewerLinkPage: ViewerLinkPageWithAuto) { this.experimentalModel.viewerLinkProp.set(viewerLinkPage); }
   get viewerLink(): never { throw err("viewerLink"); }
 
+  set experimentalMovePressInput(movePressInput: MovePressInput) { this.experimentalModel.movePressInputProp.set(movePressInput); }
+  get experimentalMovePressInput(): never { throw err("experimentalMovePressInput"); }
+
   set cameraLatitude(latitude: number) { this.experimentalModel.orbitCoordinatesRequestProp.set({ latitude }); }
-  get cameraLatitude(): never { throw new Error( "Cannot get `.cameraLatitude` directly from a `TwistyPlayer`."); }
+  get cameraLatitude(): never { throw err("cameraLatitude"); }
 
   set cameraLongitude(longitude: number) { this.experimentalModel.orbitCoordinatesRequestProp.set({ longitude }); }
-  get cameraLongitude(): never { throw new Error( "Cannot get `.cameraLongitude` directly from a `TwistyPlayer`."); }
+  get cameraLongitude(): never { throw err("cameraLongitude"); }
 
   set cameraDistance(distance: number) { this.experimentalModel.orbitCoordinatesRequestProp.set({ distance }); }
-  get cameraDistance(): never { throw new Error( "Cannot get `.cameraDistance` directly from a `TwistyPlayer`."); }
+  get cameraDistance(): never { throw err("cameraDistance"); }
 
   set cameraLatitudeLimit(latitudeLimit: number) { this.experimentalModel.latitudeLimitProp.set(latitudeLimit); }
-  get cameraLatitudeLimit(): never { throw new Error( "Cannot get `.cameraLatitudeLimit` directly from a `TwistyPlayer`."); }
+  get cameraLatitudeLimit(): never { throw err("cameraLatitudeLimit"); }
 
   set indexer(indexer: IndexerStrategyName) { this.experimentalModel.indexerConstructorRequestProp.set(indexer); }
   get indexer(): never { throw err("indexer"); }

package/src/cubing/twisty/{old/dom/viewers → views}/TwistyViewerWrapper.css.ts

@@ -1,4 +1,4 @@
-import { CSSSource } from "../element/ManagedCustomElement";
+import { CSSSource } from "./ManagedCustomElement";
 
 export const twistyViewerWrapperCSS = new CSSSource(`
 :host {

package/src/cubing/twisty/{old/dom/controls/buttons.css.ts → views/control-panel/TwistyButtonsV2.css.ts}

@@ -1,4 +1,4 @@
-import { CSSSource } from "../element/ManagedCustomElement";
+import { CSSSource } from "../ManagedCustomElement";
 
 export const buttonGridCSS = new CSSSource(`
 :host {

package/src/cubing/twisty/views/control-panel/TwistyButtonsV2.ts

@@ -1,11 +1,8 @@
-import {
-  BoundaryType,
-  Direction,
-} from "../../old/animation/cursor/CursorTypes";
-import { buttonCSS, buttonGridCSS } from "../../old/dom/controls/buttons.css";
-import { ClassListManager } from "../../old/dom/element/ClassListManager";
-import { ManagedCustomElement } from "../../old/dom/element/ManagedCustomElement";
-import { customElementsShim } from "../../old/dom/element/node-custom-element-shims";
+import { BoundaryType, Direction } from "../../controllers/AnimationTypes";
+import { buttonCSS, buttonGridCSS } from "./TwistyButtonsV2.css";
+import { ClassListManager } from "../ClassListManager";
+import { ManagedCustomElement } from "../ManagedCustomElement";
+import { customElementsShim } from "../node-custom-element-shims";
 import {
   ButtonAppearances,
   ButtonIcon,

package/src/cubing/twisty/{old/dom/controls → views/control-panel}/TwistyScrubber.css.ts

@@ -1,4 +1,4 @@
-import { CSSSource } from "../element/ManagedCustomElement";
+import { CSSSource } from "../ManagedCustomElement";
 
 export const twistyScrubberCSS = new CSSSource(`
 :host {

package/src/cubing/twisty/views/control-panel/TwistyScrubberV2.ts

@@ -1,6 +1,6 @@
-import { twistyScrubberCSS } from "../../old/dom/controls/TwistyScrubber.css";
-import { ManagedCustomElement } from "../../old/dom/element/ManagedCustomElement";
-import { customElementsShim } from "../../old/dom/element/node-custom-element-shims";
+import { twistyScrubberCSS } from "./TwistyScrubber.css";
+import { ManagedCustomElement } from "../ManagedCustomElement";
+import { customElementsShim } from "../node-custom-element-shims";
 import type { DetailedTimelineInfo } from "../../model/props/timeline/DetailedTimelineInfoProp";
 import type { TwistyPlayerModel } from "../../model/TwistyPlayerModel";
 import { globalSafeDocument } from "../document";

package/src/cubing/twisty/{old/dom → views}/stream/TwistyStreamSource.css.ts

@@ -1,4 +1,4 @@
-import { CSSSource } from "../element/ManagedCustomElement";
+import { CSSSource } from "../ManagedCustomElement";
 
 export const twistyStreamSourceCSS = new CSSSource(`
 :host {

package/src/cubing/twisty/{old/dom → views}/stream/TwistyStreamSource.ts

@@ -1,12 +1,12 @@
-import type { KeyboardPuzzle } from "../../../../bluetooth/keyboard";
+import type { KeyboardPuzzle } from "../../../bluetooth/keyboard";
 import type {
   BluetoothPuzzle,
   MoveEvent,
-} from "../../../../bluetooth/smart-puzzle/bluetooth-puzzle";
-import type { TwizzleStreamServer } from "../../../../stream";
-import type { PuzzleStreamMoveEventRegisterCompatible } from "../../../../stream/process/ReorientedStream";
-import { ManagedCustomElement } from "../element/ManagedCustomElement";
-import { customElementsShim } from "../element/node-custom-element-shims";
+} from "../../../bluetooth/smart-puzzle/bluetooth-puzzle";
+import type { TwizzleStreamServer } from "../../../stream";
+import type { PuzzleStreamMoveEventRegisterCompatible } from "../../../stream/process/ReorientedStream";
+import { ManagedCustomElement } from "../ManagedCustomElement";
+import { customElementsShim } from "../node-custom-element-shims";
 import { twistyStreamSourceCSS } from "./TwistyStreamSource.css";
 
 interface StreamSource extends EventTarget {
@@ -28,7 +28,7 @@ class BluetoothStreamSource extends EventTarget {
   }
 
   static async connect(): Promise<BluetoothStreamSource> {
-    const bluetooth = await import("../../../../bluetooth");
+    const bluetooth = await import("../../../bluetooth");
     const puzzle = await bluetooth.connectSmartPuzzle();
     return new BluetoothStreamSource(puzzle);
   }
@@ -53,7 +53,7 @@ class KeyboardStreamSource extends EventTarget {
   }
 
   static async connect(): Promise<KeyboardStreamSource> {
-    const bluetooth = await import("../../../../bluetooth");
+    const bluetooth = await import("../../../bluetooth");
     const puzzle = await bluetooth.debugKeyboardConnect();
     return new KeyboardStreamSource(puzzle);
   }
@@ -116,7 +116,7 @@ export class TwistyStreamSource extends ManagedCustomElement {
 
     let streamServer: TwizzleStreamServer | null = null;
     button.addEventListener("click", async () => {
-      const TwizzleStreamServer = (await import("../../../../stream"))
+      const TwizzleStreamServer = (await import("../../../stream"))
         .TwizzleStreamServer;
       streamServer ||= new TwizzleStreamServer();
       const streams = await streamServer.streams();

package/dist/esm/3d-B25DP5PE.js

@@ -1,39 +0,0 @@
-import {
-  Cube3D,
-  PG3D,
-  Twisty3DCanvas,
-  Twisty3DScene
-} from "./chunk-APIIMJG6.js";
-import {
-  cube3x3x3
-} from "./chunk-MUQMBH2S.js";
-import "./chunk-YV3RT5PX.js";
-import "./chunk-BU5PUJK3.js";
-import "./chunk-WO2AXYFE.js";
-
-// src/cubing/twisty/heavy-code-imports/dynamic-entries/3d.ts
-import * as T3I from "three";
-async function cube3DShim(options) {
-  const cursorShim = { addPositionListener: () => {
-  } };
-  const renderCallbackShim = () => {
-  };
-  return new Cube3D(await cube3x3x3.def(), cursorShim, renderCallbackShim, options);
-}
-async function pg3dShim(puzzleLoader, hintFacelets) {
-  const cursorShim = { addPositionListener: () => {
-  } };
-  const renderCallbackShim = () => {
-  };
-  return new PG3D(cursorShim, renderCallbackShim, await puzzleLoader.def(), (await puzzleLoader.pg()).get3d(), true, hintFacelets === "floating");
-}
-export {
-  Cube3D,
-  PG3D,
-  T3I,
-  Twisty3DCanvas,
-  Twisty3DScene,
-  cube3DShim,
-  pg3dShim
-};
-//# sourceMappingURL=3d-B25DP5PE.js.map

package/dist/esm/3d-B25DP5PE.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/cubing/twisty/heavy-code-imports/dynamic-entries/3d.ts"],
-  "sourcesContent": ["import { cube3x3x3, PuzzleLoader } from \"../../../puzzles\";\nimport type { AlgCursor } from \"../../old/animation/cursor/AlgCursor\";\nimport type { HintFaceletStyle } from \"../../old/dom/TwistyPlayerConfig\";\nimport { Cube3D, Cube3DOptions } from \"../../views/3D/puzzles/Cube3D\";\nimport { PG3D } from \"../../views/3D/puzzles/PG3D\";\n\n// Mangled to avoid autocompleting.\n// This must not be imported directly.\nexport * as T3I from \"three\";\nexport { Twisty3DCanvas } from \"../../old/dom/viewers/Twisty3DCanvas\";\nexport { Cube3D } from \"../../views/3D/puzzles/Cube3D\";\nexport { PG3D } from \"../../views/3D/puzzles/PG3D\";\nexport { Twisty3DScene } from \"../../views/3D/Twisty3DScene\";\n\nexport async function cube3DShim(options?: Cube3DOptions): Promise<Cube3D> {\n  const cursorShim = { addPositionListener: () => {} } as any as AlgCursor; // TODO\n  const renderCallbackShim = () => {};\n  return new Cube3D(\n    await cube3x3x3.def(),\n    cursorShim,\n    renderCallbackShim,\n    options,\n  );\n}\n\n// TODO: take loader?\nexport async function pg3dShim(\n  puzzleLoader: PuzzleLoader,\n  hintFacelets: HintFaceletStyle,\n): Promise<PG3D> {\n  const cursorShim = { addPositionListener: () => {} } as any as AlgCursor; // TODO\n  const renderCallbackShim = () => {};\n  return new PG3D(\n    cursorShim,\n    renderCallbackShim,\n    await puzzleLoader.def(),\n    (await puzzleLoader.pg!()).get3d(),\n    true,\n    hintFacelets === \"floating\",\n  );\n}\n"],
-  "mappings": ";;;;;;;;;;;;;;AAQA;AAMA,0BAAiC,SAA0C;AACzE,QAAM,aAAa,EAAE,qBAAqB,MAAM;AAAA;AAChD,QAAM,qBAAqB,MAAM;AAAA;AACjC,SAAO,IAAI,OACT,MAAM,UAAU,OAChB,YACA,oBACA;AAAA;AAKJ,wBACE,cACA,cACe;AACf,QAAM,aAAa,EAAE,qBAAqB,MAAM;AAAA;AAChD,QAAM,qBAAqB,MAAM;AAAA;AACjC,SAAO,IAAI,KACT,YACA,oBACA,MAAM,aAAa,OAClB,OAAM,aAAa,MAAO,SAC3B,MACA,iBAAiB;AAAA;",
-  "names": []
-}