cubing 0.35.10 → 0.35.11

package/dist/types/{TwizzleLink-aa6700aa.d.ts → TwizzleLink-a537bbef.d.ts}

@@ -1363,7 +1363,7 @@ declare class TwizzleLink extends ManagedCustomElement {
     a: HTMLAnchorElement | null;
     constructor(options?: {
         cdnForumTweaks?: boolean | undefined;
-        darkMode: boolean;
+        darkMode?: boolean | undefined;
     } | undefined);
     fallback(): void;
     connectedCallback(): Promise<void>;

package/dist/types/notation/index.d.ts

@@ -1,5 +1,5 @@
 import { a as Alg } from '../Alg-c6770822.js';
-import { P as PuzzleLoader } from '../TwizzleLink-aa6700aa.js';
+import { P as PuzzleLoader } from '../TwizzleLink-a537bbef.js';
 import 'three';
 import '../parseAlg-d2c83795.js';
 import '../KState-2a93cf5c.js';

package/dist/types/puzzles/index.d.ts

@@ -1,5 +1,5 @@
-import { a as PuzzleID, P as PuzzleLoader } from '../TwizzleLink-aa6700aa.js';
-export { P as PuzzleLoader } from '../TwizzleLink-aa6700aa.js';
+import { a as PuzzleID, P as PuzzleLoader } from '../TwizzleLink-a537bbef.js';
+export { P as PuzzleLoader } from '../TwizzleLink-a537bbef.js';
 import 'three';
 import '../Alg-c6770822.js';
 import '../parseAlg-d2c83795.js';

package/dist/types/twisty/index.d.ts

@@ -1,5 +1,5 @@
-import { A as AlgIndexer, T as Timestamp, D as Duration, S as StickeringMask } from '../TwizzleLink-aa6700aa.js';
-export { A as AlgIndexer, B as BackViewLayout, N as EXPERIMENTAL_PROP_NO_VALUE, M as ExperimentalMillisecondTimestamp, E as ExperimentalStickering, a as PuzzleID, d as TwistyAlgEditor, c as TwistyAlgViewer, b as TwistyPlayer, e as TwistyPlayerConfig, g as TwizzleLink, V as VisualizationFormat, f as backViewLayouts } from '../TwizzleLink-aa6700aa.js';
+import { A as AlgIndexer, T as Timestamp, D as Duration, S as StickeringMask } from '../TwizzleLink-a537bbef.js';
+export { A as AlgIndexer, B as BackViewLayout, N as EXPERIMENTAL_PROP_NO_VALUE, M as ExperimentalMillisecondTimestamp, E as ExperimentalStickering, a as PuzzleID, d as TwistyAlgEditor, c as TwistyAlgViewer, b as TwistyPlayer, e as TwistyPlayerConfig, g as TwizzleLink, V as VisualizationFormat, f as backViewLayouts } from '../TwizzleLink-a537bbef.js';
 import { a as Alg, M as Move } from '../Alg-c6770822.js';
 import { a as KPuzzle, K as KState, e as KTransformation } from '../KState-2a93cf5c.js';
 import 'three';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cubing",
-  "version": "0.35.10",
+  "version": "0.35.11",
   "description": "A collection of JavaScript cubing libraries.",
   "author": "The js.cubing.net team",
   "type": "module",

package/dist/esm/chunk-7FZAZ3C3.js.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../src/cubing/notation/commonMetrics.ts", "../../src/cubing/notation/cube3x3x3Metrics.ts", "../../src/cubing/notation/CountMoves.ts", "../../src/cubing/notation/CountAnimatedLeaves.ts"],
-  "sourcesContent": ["export enum CommonMetric {\n  // OBTM (Outer Block Turn Metric)\n  OuterBlockTurnMetric = \"OBTM\",\n  // RBTM (Range Block Turn Metric)\n  RangeBlockTurnMetric = \"RBTM\",\n  // SSTM (Single Slice Turn Metric)\n  SingleSliceTurnMetric = \"SSTM\",\n  // OBQTM (Outer Block Quantum Turn Metric)\n  OuterBlockQuantumTurnMetric = \"OBQTM\",\n  // RBQTM (Range Block Quantum Turn Metric)\n  RangeBlockQuantumTurnMetric = \"RBQTM\",\n  // SSQTM (Single Slice Quantum Turn Metric)\n  SingleSliceQuantumTurnMetric = \"SSQTM\",\n  ExecutionTurnMetric = \"ETM\",\n}\n\nexport enum CommonMetricAlias {\n  // QTM (Quantum Turn Metric)\n  QuantumTurnMetric = \"OBQTM\",\n  // HTM (Hand Turn Metric)\n  HandTurnMetric = \"OBTM\",\n  // STM (Slice Turn Metric)\n  SliceTurnMetric = \"RBTM\",\n}\n", "// TODO: move this into the 3x3x3 puzzle loader.\n\nimport type { Move } from \"../alg\";\nimport { experimentalCube3x3x3KPuzzleDefinition } from \"../puzzles/cubing-private\";\nimport { CommonMetric } from \"./commonMetrics\";\n\nenum MoveType {\n  Rotation = \"Rotation\",\n  Outer = \"Outer\",\n  Inner = \"Inner\",\n}\n\nfunction uncachedMoveCount(moveQuantumString: string): MoveType {\n  if (\n    moveQuantumString.endsWith(\"v\") ||\n    [\"x\", \"y\", \"z\"].includes(moveQuantumString)\n  ) {\n    // Rv\n    return MoveType.Rotation;\n  }\n  if (\n    moveQuantumString.startsWith(\"2\") ||\n    [\"M\", \"E\", \"S\"].includes(moveQuantumString)\n  ) {\n    return MoveType.Inner;\n  }\n  return MoveType.Outer;\n}\n\nlet cache: Record<string, MoveType> | undefined;\nfunction getCache(): Record<string, MoveType> {\n  if (cache) {\n    return cache;\n  }\n  cache = {};\n  const moveQuantumStrings = [\n    ...Object.keys(experimentalCube3x3x3KPuzzleDefinition.moves),\n    ...Object.keys(\n      experimentalCube3x3x3KPuzzleDefinition.experimentalDerivedMoves!,\n    ),\n  ];\n  for (const moveQuantumString of moveQuantumStrings) {\n    cache[moveQuantumString] = uncachedMoveCount(moveQuantumString);\n  }\n  return cache;\n}\n\n// Ancient wisdom: https://github.com/cubing/alg.js/blob/0599fad84d81b8d943ad3ea3e5dc191db8b6c157/alg.js#L638-L651\n/**\n * A move with an amount of 0 always has 0 cost. Else, the cost is\n *\n * constantFactor + amountFactor * Math.abs(move.amount)\n *\n */\nconst costFactorsByMetric: Partial<\n  Record<\n    CommonMetric,\n    Record<\n      MoveType,\n      {\n        constantFactor: number;\n        amountFactor: number;\n      }\n    >\n  >\n> = {\n  // Note: these are hardcoded for 3x3x3. They will not automatically generalize to any other puzzles.\n  [CommonMetric.OuterBlockTurnMetric]: {\n    [MoveType.Rotation]: { constantFactor: 0, amountFactor: 0 },\n    [MoveType.Outer]: { constantFactor: 1, amountFactor: 0 },\n    [MoveType.Inner]: { constantFactor: 2, amountFactor: 0 },\n  },\n  [CommonMetric.RangeBlockTurnMetric]: {\n    [MoveType.Rotation]: { constantFactor: 0, amountFactor: 0 },\n    [MoveType.Outer]: { constantFactor: 1, amountFactor: 0 },\n    [MoveType.Inner]: { constantFactor: 1, amountFactor: 0 },\n  },\n  [CommonMetric.ExecutionTurnMetric]: {\n    [MoveType.Rotation]: { constantFactor: 1, amountFactor: 0 },\n    [MoveType.Outer]: { constantFactor: 1, amountFactor: 0 },\n    [MoveType.Inner]: { constantFactor: 1, amountFactor: 0 },\n  },\n};\n\nexport function countMove3x3x3(metric: CommonMetric, move: Move): number {\n  const costFactors = costFactorsByMetric[metric];\n  if (!costFactors) {\n    throw new Error(`Invalid metric for 3x3x3: ${metric}`);\n  }\n  const cache = getCache();\n  const moveQuantumString = move.quantum.toString();\n  if (!(moveQuantumString in cache)) {\n    throw new Error(`Invalid move for 3x3x3 ${metric}: ${moveQuantumString}`);\n  }\n  const costType = cache[moveQuantumString];\n  const { constantFactor, amountFactor } = costFactors[costType];\n  return constantFactor + amountFactor * Math.abs(move.amount);\n}\n", "// TODO: move this file somewhere permanent.\nimport {\n  Alg,\n  Commutator,\n  Conjugate,\n  functionFromTraversal,\n  Grouping,\n  LineComment,\n  Move,\n  Newline,\n  Pause,\n  TraversalUp,\n} from \"../alg\";\nimport type { PuzzleLoader } from \"../puzzles\";\nimport { CommonMetric } from \"./commonMetrics\";\nimport { countMove3x3x3 } from \"./cube3x3x3Metrics\";\n\n/*\n *   For movecount, that understands puzzle rotations.  This code\n *   should be moved to the alg class, probably.\n */\nclass CountMoves extends TraversalUp<number> {\n  constructor(private metric: (move: Move) => number) {\n    super();\n  }\n\n  public traverseAlg(alg: Alg): number {\n    let r = 0;\n    for (const algNode of alg.childAlgNodes()) {\n      r += this.traverseAlgNode(algNode);\n    }\n    return r;\n  }\n\n  public traverseGrouping(grouping: Grouping): number {\n    const alg: Alg = grouping.alg;\n    return this.traverseAlg(alg) * Math.abs(grouping.amount);\n  }\n\n  public traverseMove(move: Move): number {\n    return this.metric(move);\n  }\n\n  public traverseCommutator(commutator: Commutator): number {\n    return (\n      2 * (this.traverseAlg(commutator.A) + this.traverseAlg(commutator.B))\n    );\n  }\n\n  public traverseConjugate(conjugate: Conjugate): number {\n    return 2 * this.traverseAlg(conjugate.A) + this.traverseAlg(conjugate.B);\n  }\n\n  // TODO: Remove spaces between repeated pauses (in traverseSequence)\n  public traversePause(_pause: Pause): number {\n    return 0;\n  }\n\n  public traverseNewline(_newLine: Newline): number {\n    return 0;\n  }\n\n  // TODO: Enforce being followed by a newline (or the end of the alg)?\n  public traverseLineComment(_comment: LineComment): number {\n    return 0;\n  }\n}\n\nfunction isCharUppercase(c: string): boolean {\n  return \"A\" <= c && c <= \"Z\";\n}\n\n// TODO: Implement a puzzle-specific way to calculate this.\nfunction baseMetric(move: Move): number {\n  const fam = move.family;\n  if (\n    (isCharUppercase(fam[0]) && fam[fam.length - 1] === \"v\") ||\n    fam === \"x\" ||\n    fam === \"y\" ||\n    fam === \"z\" ||\n    fam === \"T\"\n  ) {\n    return 0;\n  } else {\n    return 1;\n  }\n}\n\nfunction etmMetric(_move: Move): number {\n  return 1;\n}\n\n// TODO: Implement a puzzle-specific way to calculate this.\nfunction quantumMetric(move: Move): number {\n  const fam = move.family;\n  if (\n    (isCharUppercase(fam[0]) && fam[fam.length - 1] === \"v\") ||\n    fam === \"x\" ||\n    fam === \"y\" ||\n    fam === \"z\" ||\n    fam === \"T\"\n  ) {\n    return 0;\n  } else {\n    return Math.abs(move.amount);\n  }\n}\n\nexport const countMoves = functionFromTraversal(CountMoves, [baseMetric]);\nexport const countMovesETM = functionFromTraversal(CountMoves, [etmMetric]);\nexport const countQuantumMoves = functionFromTraversal(CountMoves, [\n  quantumMetric,\n]);\n\n/**\n * Only implemented so far:\n *\n * - 3x3x3: OBTM, RBTM, ETM\n */\nexport function countMetricMoves(\n  puzzle: PuzzleLoader,\n  metric: CommonMetric,\n  alg: Alg,\n): number {\n  if (puzzle.id === \"3x3x3\") {\n    switch (metric) {\n      case CommonMetric.OuterBlockTurnMetric:\n      case CommonMetric.RangeBlockTurnMetric:\n      case CommonMetric.ExecutionTurnMetric:\n        return functionFromTraversal(CountMoves, [\n          (move: Move) => countMove3x3x3(metric, move),\n        ])(alg);\n    }\n  } else {\n    switch (metric) {\n      case CommonMetric.ExecutionTurnMetric:\n        return countMovesETM(alg);\n    }\n  }\n  throw new Error(\"Unsupported puzzle or metric.\");\n}\n", "import {\n  Alg,\n  Commutator,\n  Conjugate,\n  Grouping,\n  LineComment,\n  Move,\n  Newline,\n  Pause,\n  TraversalUp,\n} from \"../alg\";\nimport { functionFromTraversal } from \"../alg\";\n\n// TODO: Include Pause, include amounts\nclass CountAnimatedLeaves extends TraversalUp<number, number> {\n  public traverseAlg(alg: Alg): number {\n    let total = 0;\n    for (const part of alg.childAlgNodes()) {\n      total += this.traverseAlgNode(part);\n    }\n    return total;\n  }\n\n  public traverseGrouping(grouping: Grouping): number {\n    return this.traverseAlg(grouping.alg) * Math.abs(grouping.amount);\n  }\n\n  public traverseMove(_move: Move): number {\n    return 1;\n  }\n\n  public traverseCommutator(commutator: Commutator): number {\n    return (\n      2 * (this.traverseAlg(commutator.A) + this.traverseAlg(commutator.B))\n    );\n  }\n\n  public traverseConjugate(conjugate: Conjugate): number {\n    return 2 * this.traverseAlg(conjugate.A) + this.traverseAlg(conjugate.B);\n  }\n\n  public traversePause(_pause: Pause): number {\n    return 1;\n  }\n\n  public traverseNewline(_newline: Newline): number {\n    return 0;\n  }\n\n  public traverseLineComment(_comment: LineComment): number {\n    return 0;\n  }\n}\n\nexport const countAnimatedLeaves = functionFromTraversal(CountAnimatedLeaves);\n"],
-  "mappings": "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",
-  "names": ["CommonMetric", "CommonMetricAlias", "cache"]
-}