cubing 0.24.0-pre3 → 0.24.1

package/dist/esm/twisty/index.js

@@ -10,7 +10,7 @@ import {
   TwistyPropDerived,
   TwistyPropSource,
   proxy3D
-} from "../chunk-FK43AAW3.js";
+} from "../chunk-42DBDQQX.js";
 import {
   countAnimatedLeaves,
   countMoves
@@ -20,8 +20,8 @@ import {
   cubeAppearance,
   customPGPuzzleLoader,
   puzzles
-} from "../chunk-5LJOQJWE.js";
-import "../chunk-DLOXZJ66.js";
+} from "../chunk-SLUMTYHP.js";
+import "../chunk-B27E6KTE.js";
 import {
   Alg,
   AlgBuilder,
@@ -1656,11 +1656,14 @@ var Twisty3DSceneWrapper = class extends ManagedCustomElement {
   }
   async setCurrentTwisty3DPuzzleWrapper(scene, twisty3DPuzzleWrapper) {
     const old = __privateGet(this, _currentTwisty3DPuzzleWrapper);
-    __privateSet(this, _currentTwisty3DPuzzleWrapper, twisty3DPuzzleWrapper);
-    old?.disconnect();
-    scene.add(await twisty3DPuzzleWrapper.twisty3DPuzzle());
-    if (old) {
-      scene.remove(await old.twisty3DPuzzle());
+    try {
+      __privateSet(this, _currentTwisty3DPuzzleWrapper, twisty3DPuzzleWrapper);
+      old?.disconnect();
+      scene.add(await twisty3DPuzzleWrapper.twisty3DPuzzle());
+    } finally {
+      if (old) {
+        scene.remove(await old.twisty3DPuzzle());
+      }
     }
   }
   async onPuzzle(inputs) {
@@ -2051,12 +2054,14 @@ input {
 var SLOW_DOWN_SCRUBBING = false;
 var isMouseDown = false;
 globalSafeDocument?.addEventListener("mousedown", function(event) {
-  if (event.which)
+  if (event.which) {
     isMouseDown = true;
+  }
 }, true);
 globalSafeDocument?.addEventListener("mouseup", function(event) {
-  if (event.which)
+  if (event.which) {
     isMouseDown = false;
+  }
 }, true);
 var y = 0;
 var clickNum = 0;
@@ -2776,8 +2781,9 @@ var LocalSimulMoves = class extends TraversalUp {
       return [];
     }
     for (const unit of alg.units()) {
-      if (!unit.is(Move))
+      if (!unit.is(Move)) {
         return this.traverseAlg(alg);
+      }
     }
     const moves = Array.from(alg.units());
     let maxSimulDur = defaultDurationForAmount(moves[0].amount);
@@ -3433,10 +3439,13 @@ var IndexerConstructorProp = class extends TwistyPropDerived {
 };
 
 // src/cubing/twisty/model/props/puzzle/state/PuzzleAlgProp.ts
+var validate = true;
 var PuzzleAlgProp = class extends TwistyPropDerived {
   async derive(inputs) {
     try {
-      inputs.kpuzzle.algToTransformation(inputs.algWithIssues.alg);
+      if (validate) {
+        inputs.kpuzzle.algToTransformation(inputs.algWithIssues.alg);
+      }
       return inputs.algWithIssues;
     } catch (e) {
       return {
@@ -3816,14 +3825,26 @@ var TwistyPlayerModel = class {
     });
   }
   async twizzleLink() {
-    const url = new URL("https://alpha.twizzle.net/edit/");
-    const [puzzle, alg, setup, anchor, experimentalStickering] = await Promise.all([
+    const [
+      viewerLink,
+      puzzleID,
+      puzzleDescription,
+      alg,
+      setup,
+      anchor,
+      experimentalStickering
+    ] = await Promise.all([
+      this.viewerLinkProp.get(),
       this.puzzleIDProp.get(),
+      this.puzzleDescriptionRequestProp.get(),
       this.algProp.get(),
       this.setupProp.get(),
       this.setupAnchorProp.get(),
       this.stickeringProp.get()
     ]);
+    const isExplorer = viewerLink === "experimental-twizzle-explorer";
+    console.log({ isExplorer, viewerLink });
+    const url = new URL(`https://alpha.twizzle.net/${isExplorer ? "explore" : "edit"}/`);
     if (!alg.alg.experimentalIsEmpty()) {
       url.searchParams.set("alg", alg.alg.toString());
     }
@@ -3836,8 +3857,10 @@ var TwistyPlayerModel = class {
     if (experimentalStickering !== "full") {
       url.searchParams.set("experimental-stickering", experimentalStickering);
     }
-    if (puzzle !== "3x3x3") {
-      url.searchParams.set("puzzle", puzzle);
+    if (isExplorer && puzzleDescription !== NO_VALUE) {
+      url.searchParams.set("puzzle-description", puzzleDescription);
+    } else if (puzzleID !== "3x3x3") {
+      url.searchParams.set("puzzle", puzzleID);
     }
     return url.toString();
   }
@@ -5009,6 +5032,155 @@ padSuffix_fn = function(s) {
 };
 _highlightedLeaf = new WeakMap();
 customElementsShim.define("twisty-alg-editor", TwistyAlgEditor);
+
+// src/cubing/twisty/views/twizzle/TwizzleLink.css.ts
+var twizzleLinkCSS = new CSSSource(`
+.wrapper {
+  background: rgb(255, 245, 235);
+  display: grid;
+  grid-template-columns: 1fr;
+  border: 1px solid rgba(0, 0, 0, 0.25);
+}
+
+.setup-alg, twisty-alg-viewer {
+  padding: 0.5em 1em;
+}
+
+.heading {
+  background: rgba(255, 230, 210, 1);
+  font-weight: bold;
+  padding: 0.25em 0.5em;
+}
+
+twisty-player {
+  width: 100%;
+}
+
+twisty-player + .heading {
+  padding-top: 0.5em;
+}
+`);
+
+// src/cubing/twisty/views/twizzle/url-params.ts
+function updateURL(url) {
+  window.history.replaceState("", "", url.toString());
+}
+var _prefix;
+var URLParamUpdater = class {
+  constructor(model, options) {
+    __privateAdd(this, _prefix, void 0);
+    __privateSet(this, _prefix, options?.prefix ?? "");
+    this.listenToAlgProp(model.algProp, "alg");
+    this.listenToAlgProp(model.setupProp, "setup-alg");
+    this.listenToStringSourceProp(model.stickeringProp, "stickering");
+    this.listenToStringSourceProp(model.setupAnchorProp, "setup-anchor");
+    this.listenToStringOrNoValueProp(model.puzzleIDRequestProp, "puzzle", NO_VALUE);
+    this.listenToStringOrNoValueProp(model.puzzleDescriptionRequestProp, "puzzle-description", NO_VALUE);
+  }
+  setURLParam(unprefixedKey, value, defaultString) {
+    const prefixedKey = __privateGet(this, _prefix) + unprefixedKey;
+    const url = new URL(location.href);
+    if (value === defaultString) {
+      url.searchParams.delete(prefixedKey);
+    } else {
+      url.searchParams.set(prefixedKey, value);
+    }
+    updateURL(url);
+  }
+  async listenToStringSourceProp(prop, key, defaultString) {
+    const actualDefaultString = defaultString ?? await prop.getDefaultValue();
+    prop.addFreshListener((s) => {
+      this.setURLParam(key, s, actualDefaultString);
+    });
+  }
+  async listenToStringOrNoValueProp(prop, key, defaultString) {
+    prop.addFreshListener((s) => {
+      if (s === NO_VALUE) {
+        s = defaultString;
+      }
+      if (s === NO_VALUE) {
+        this.setURLParam(key, "", "");
+      } else {
+        this.setURLParam(key, s, "");
+      }
+    });
+  }
+  listenToAlgProp(prop, key) {
+    prop.addFreshListener((algWithIssues) => {
+      this.setURLParam(key, algWithIssues.alg.toString(), "");
+    });
+  }
+};
+_prefix = new WeakMap();
+function getConfigFromURL(prefix = "", url = location.href) {
+  const paramMapping = {
+    "alg": "alg",
+    "setup-alg": "experimental-setup-alg",
+    "setup-anchor": "experimental-setup-anchor",
+    "puzzle": "puzzle",
+    "stickering": "experimental-stickering",
+    "puzzle-description": "experimental-puzzle-description"
+  };
+  const params = new URL(url).searchParams;
+  const config = {};
+  for (const [ourParam, twistyPlayerParam] of Object.entries(paramMapping)) {
+    const paramValue = params.get(prefix + ourParam);
+    if (paramValue !== null) {
+      const configKey = twistyPlayerAttributeMap[twistyPlayerParam];
+      config[configKey] = paramValue;
+    }
+  }
+  return config;
+}
+
+// src/cubing/twisty/views/twizzle/TwizzleLink.ts
+var TwizzleLink = class extends ManagedCustomElement {
+  constructor() {
+    super({ mode: "open" });
+    this.twistyPlayer = null;
+    this.a = null;
+  }
+  async connectedCallback() {
+    this.addCSS(twizzleLinkCSS);
+    this.a = this.querySelector("a");
+    if (!this.a) {
+      return;
+    }
+    const config = getConfigFromURL("", this.a.href);
+    const href = this.a?.href;
+    const { hostname, pathname } = new URL(href);
+    if (hostname !== "alpha.twizzle.net") {
+      return;
+    }
+    if (["/edit/", "/explore/"].includes(pathname)) {
+      const isExplorer = pathname === "/explore/";
+      if (config.puzzle && !(config.puzzle in puzzles)) {
+        const puzzleDescription = (await import("../puzzle-geometry/index.js")).getPuzzleDescriptionString(config.puzzle);
+        delete config.puzzle;
+        config.experimentalPuzzleDescription = puzzleDescription;
+      }
+      this.twistyPlayer = this.addElement(new TwistyPlayer({
+        ...config,
+        viewerLink: isExplorer ? "experimental-twizzle-explorer" : "auto"
+      }));
+      if (config.experimentalSetupAlg) {
+        this.addHeading("Setup");
+        const setupAlgDiv = this.addElement(document.createElement("div"));
+        setupAlgDiv.classList.add("setup-alg");
+        setupAlgDiv.textContent = new Alg(config.experimentalSetupAlg).toString();
+      }
+      this.addHeading("Moves");
+      const twistyAlgViewer = this.addElement(new TwistyAlgViewer({ twistyPlayer: this.twistyPlayer }));
+      twistyAlgViewer.part.add("twisty-alg-viewer");
+    }
+  }
+  addHeading(text) {
+    const headingDiv = this.addElement(document.createElement("div"));
+    headingDiv.classList.add("heading");
+    headingDiv.textContent = text;
+  }
+};
+customElementsShim.define("twizzle-link", TwizzleLink);
 export {
   NO_VALUE as EXPERIMENTAL_PROP_NO_VALUE,
   KPuzzleSVGWrapper as ExperimentalKPuzzleSVGWrapper,
@@ -5017,6 +5189,7 @@ export {
   TwistyAlgEditor,
   TwistyAlgViewer,
   TwistyPlayer,
+  TwizzleLink,
   backViewLayouts,
   debugShowRenderStats as experimentalDebugShowRenderStats,
   experimentalForceNewRendererSharing