cubing 0.35.6 → 0.35.7

package/dist/esm/{search-worker-js-entry-MGEIHNU7.js → search-worker-js-entry-MD2B4SHI.js}

@@ -3,15 +3,15 @@ import {
 } from "./chunk-Z6WT2ASL.js";
 import {
   insideAPI
-} from "./chunk-MQ5I2HUI.js";
+} from "./chunk-R2RLTVRW.js";
 import "./chunk-EV25IJFC.js";
-import "./chunk-KOJ2BN7S.js";
-import "./chunk-IN66QSRW.js";
-import "./chunk-XUDPTWYN.js";
-import "./chunk-AJS6B74K.js";
+import "./chunk-DKG7EU7X.js";
+import "./chunk-QS5BDQVQ.js";
+import "./chunk-67PUZ2YF.js";
+import "./chunk-6TTWMZXN.js";
 import "./chunk-KLI2E737.js";
 import "./chunk-VZP3KFTU.js";
 
 // src/cubing/search/inside/search-worker-js-entry.js
 expose(insideAPI);
-//# sourceMappingURL=search-worker-js-entry-MGEIHNU7.js.map
+//# sourceMappingURL=search-worker-js-entry-MD2B4SHI.js.map

package/dist/esm/{search-worker-ts-entry-FIZRQDEE.js → search-worker-ts-entry-JAOMZEKM.js}

@@ -9,7 +9,7 @@ import "./chunk-EV25IJFC.js";
 // src/cubing/search/inside/search-worker-ts-entry.ts
 if (exposeAPI.expose) {
   (async () => {
-    await import("./search-worker-js-entry-MGEIHNU7.js");
+    await import("./search-worker-js-entry-MD2B4SHI.js");
     const messagePort = globalThis.postMessage ? globalThis : await nodeEndpointPort();
     messagePort.postMessage("comlink-exposed");
   })();
@@ -18,4 +18,4 @@ var WORKER_ENTRY_FILE_URL = import.meta.url;
 export {
   WORKER_ENTRY_FILE_URL
 };
-//# sourceMappingURL=search-worker-ts-entry-FIZRQDEE.js.map
+//# sourceMappingURL=search-worker-ts-entry-JAOMZEKM.js.map

package/dist/esm/twisty/index.js

@@ -18,20 +18,22 @@ import {
   rawRenderPooled,
   setCameraFromOrbitCoordinates,
   setTwistyDebug
-} from "../chunk-4YKAQ3XM.js";
+} from "../chunk-A4YLPGWM.js";
 import {
   countAnimatedLeaves,
-  countMoves
-} from "../chunk-IN66QSRW.js";
+  countMetricMoves,
+  countMoves,
+  countMovesETM
+} from "../chunk-QS5BDQVQ.js";
 import {
   cube3x3x3,
   puzzles
-} from "../chunk-XUDPTWYN.js";
+} from "../chunk-67PUZ2YF.js";
 import {
   customPGPuzzleLoader,
   getPartialAppendOptionsForPuzzleSpecificSimplifyOptions,
   getPieceStickeringMask
-} from "../chunk-AJS6B74K.js";
+} from "../chunk-6TTWMZXN.js";
 import "../chunk-KLI2E737.js";
 import {
   Alg,
@@ -5321,6 +5323,8 @@ var twizzleLinkCSS = new CSSSource(
   background: rgba(255, 230, 210, 1);
   font-weight: bold;
   padding: 0.25em 0.5em;
+  display: grid;
+  grid-template-columns: auto 1fr;
 }
 
 .heading.title {
@@ -5329,6 +5333,12 @@ var twizzleLinkCSS = new CSSSource(
   white-space: pre;
 }
 
+.heading .move-count {
+  font-weight: initial;
+  text-align: right;
+  opacity: 0.5;
+}
+
 .heading a {
   text-decoration: none;
   color: inherit;
@@ -5454,6 +5464,9 @@ function getConfigFromURL(prefix = "", url = location.href) {
 }
 
 // src/cubing/twisty/views/twizzle/TwizzleLink.ts
+var NBSP = "\xA0";
+var OBTM_EXPLANATION = "OBTM: rotations count as 0 turns, outer block turns count as 1 turn, slices count as 2 turn";
+var ETM_EXPLANATION = "ETM: all moves (including rotations) count as 1 turn";
 var TwizzleLink = class extends ManagedCustomElement {
   constructor(options) {
     super({ mode: "open" });
@@ -5478,6 +5491,7 @@ var TwizzleLink = class extends ManagedCustomElement {
   #cssCDNForumTweaksElem;
   #scrollableRegion;
   #responsiveWrapper;
+  #moveCountElem;
   async connectedCallback() {
     this.#responsiveWrapper = this.addElement(document.createElement("div"));
     this.#responsiveWrapper.classList.add("responsive-wrapper");
@@ -5538,10 +5552,14 @@ var TwizzleLink = class extends ManagedCustomElement {
           config.experimentalSetupAlg
         ).toString();
       }
-      this.addHeading(
+      const movesHeading = this.addHeading(
         "Moves",
         async () => (await this.twistyPlayer?.experimentalModel.alg.get())?.alg.toString() ?? null
       );
+      this.#moveCountElem = movesHeading.appendChild(
+        constructMoveCountDisplay(this.twistyPlayer.experimentalModel)
+      );
+      this.#moveCountElem.classList.add("move-count");
       const twistyAlgViewer = this.#scrollableRegion.appendChild(
         new TwistyAlgViewer({ twistyPlayer: this.twistyPlayer })
       );
@@ -5555,10 +5573,11 @@ var TwizzleLink = class extends ManagedCustomElement {
       document.createElement("div")
     );
     headingDiv.classList.add("heading");
-    headingDiv.textContent = text;
+    const wrapperSpan = headingDiv.appendChild(document.createElement("span"));
+    wrapperSpan.textContent = text;
     if (getTextToCopy) {
-      headingDiv.textContent += " ";
-      const a = headingDiv.appendChild(document.createElement("a"));
+      wrapperSpan.textContent += " ";
+      const a = wrapperSpan.appendChild(document.createElement("a"));
       a.textContent = "\u{1F4CB}";
       a.href = "#";
       a.title = "Copy to clipboard";
@@ -5590,6 +5609,28 @@ var TwizzleLink = class extends ManagedCustomElement {
   }
 };
 customElementsShim.define("twizzle-link", TwizzleLink);
+function constructMoveCountDisplay(model, elem = document.createElement("span")) {
+  model.puzzleAlg.addFreshListener(async (algWithIssues) => {
+    if (algWithIssues.issues.errors.length !== 0) {
+      elem.textContent = "";
+      return;
+    }
+    const puzzleLoader = await model.puzzleLoader.get();
+    const moveCountETM = countMovesETM(algWithIssues.alg);
+    if (puzzleLoader.id === "3x3x3") {
+      elem.textContent = ` (${countMetricMoves(
+        puzzleLoader,
+        "OBTM" /* OuterBlockTurnMetric */,
+        algWithIssues.alg
+      )}${NBSP}OBTM / ${moveCountETM}${NBSP}ETM)`;
+      elem.title = `${OBTM_EXPLANATION} / ${ETM_EXPLANATION}`;
+    } else {
+      elem.textContent = ` (${moveCountETM}${NBSP}ETM)`;
+      elem.title = ETM_EXPLANATION;
+    }
+  });
+  return elem;
+}
 export {
   NO_VALUE as EXPERIMENTAL_PROP_NO_VALUE,
   KPuzzleSVGWrapper as ExperimentalKPuzzleSVGWrapper,