@wodzik/cubecore 0.1.7 → 0.1.8

package/bluetooth/rotations.d.ts

@@ -64,12 +64,14 @@ export interface HeldOptions {
     /**
      * Wide moves to read from one face turn and the core's rotation — the rest
      * stay a face turn and a rotation. Default r, l, f, b: a u or d is almost
-     * always a U / D turn and a y regrip. Slices (both faces of an axis) are
-     * always read.
+     * always a U / D turn and a y regrip.
      */
     wide?: readonly string[];
+    /** Slices to read from both faces of an axis and the core's rotation (default M, E, S); the rest stay two face turns and a rotation. */
+    slices?: readonly string[];
 }
 export declare const DEFAULT_WIDE: readonly string[];
+export declare const DEFAULT_SLICES: readonly string[];
 export declare function heldTokens(moves: readonly TimedMove[], startRotation: string, rotations: readonly RotationRecord[], options?: HeldOptions): HeldToken[];
 /** A rotation and the face moves around it that make a slice / wide move → that move. */
 export declare function mergeSlicesAndWides(tokens: readonly HeldToken[], allowed?: ReadonlySet<string>): HeldToken[];

package/bluetooth/rotations.js

@@ -29,8 +29,9 @@ export function heldMove(move, grip) {
     return canonical ? canonical + move.slice(1) : move;
 }
 export const DEFAULT_WIDE = ["r", "l", "f", "b"];
+export const DEFAULT_SLICES = ["M", "E", "S"];
 export function heldTokens(moves, startRotation, rotations, options = {}) {
-    const allowed = new Set(options.wide ?? DEFAULT_WIDE);
+    const allowed = new Set([...(options.wide ?? DEFAULT_WIDE), ...(options.slices ?? DEFAULT_SLICES)]);
     let grip = rotateGrip(IDENTITY_GRIP, startRotation);
     const rots = snapToSlices(moves, grip, [...rotations].sort((a, b) => a.after - b.after || a.t - b.t), allowed);
     const tokens = [];
@@ -69,13 +70,13 @@ const AXIS_FACES = { x: ["R", "L"], y: ["U", "D"], z: ["F", "B"] };
 const SLICE_WIDE = ["M", "E", "S", "r", "l", "u", "d", "f", "b"].flatMap((f) => [f, `${f}'`, `${f}2`]);
 const effect = (alg) => applyMoves(solvedState(), alg).join();
 const SLICE_WIDE_EFFECT = new Map();
-/** The slice (or an `allowed` wide move) the group (held letters and a rotation) amounts to, or null. */
+/** The slice / wide move the group (held letters and a rotation) amounts to, if `allowed` (by its letter), or null. */
 function sliceOrWide(group, allowed) {
     if (SLICE_WIDE_EFFECT.size === 0)
         for (const m of SLICE_WIDE)
             SLICE_WIDE_EFFECT.set(effect(m), m);
     const m = SLICE_WIDE_EFFECT.get(effect(group.join(" ")));
-    return m && ("MES".includes(m[0]) || allowed.has(m[0])) ? m : null;
+    return m && allowed.has(m[0]) ? m : null;
 }
 /**
  * The consecutive run (up to MAX_GROUP) of moves on the axis nearest to
@@ -142,7 +143,7 @@ function snapToSlices(moves, startGrip, rotations, allowed) {
     return out.sort((a, b) => a.after - b.after || a.t - b.t);
 }
 /** A rotation and the face moves around it that make a slice / wide move → that move. */
-export function mergeSlicesAndWides(tokens, allowed = new Set(DEFAULT_WIDE)) {
+export function mergeSlicesAndWides(tokens, allowed = new Set([...DEFAULT_WIDE, ...DEFAULT_SLICES])) {
     const out = [...tokens];
     for (let k = 0; k < out.length; k++) {
         const rot = out[k];

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "A 3×3×3 cube library for the web, built around smart (Bluetooth) cubes: state, notation, methods, solvers and scrambles, a three.js renderer with skins, pictures, web components, React bindings.",
   "license": "MPL-2.0",
   "author": "Tomasz Wodzikowski <wodziszczakow@gmail.com>",