@khanacademy/perseus 54.0.0 → 54.1.0

package/dist/es/index.js

@@ -1,6 +1,6 @@
 import * as KAS from '@khanacademy/kas';
 import { MathInputI18nContext, CursorContext, getKeyTranslator, createMathField, getCursorContext, DesktopKeypad, convertDotToTimesByLocale, mathQuillInstance, KeypadInput, KeypadType, KeyArray, keypadElementPropType } from '@khanacademy/math-input';
-import { PerseusError, Errors, expressionLogic, getDecimalSeparator, approximateDeepEqual, pluck, CoreWidgetRegistry, getUpgradedWidgetOptions, mapObject, passageRefLogic, radioLogic, GrapherUtil as GrapherUtil$1, lockedFigureColors, lockedFigureFillStyles, approximateEqual, getMatrixSize, measurerLogic, addLibraryVersionToPerseusDebug, upgradeWidgetInfoToLatestVersion, getWidgetIdsFromContentByType } from '@khanacademy/perseus-core';
+import { PerseusError, Errors, expressionLogic, getDecimalSeparator, approximateDeepEqual, pluck, CoreWidgetRegistry, getUpgradedWidgetOptions, mapObject, passageRefLogic, radioLogic, shuffle, random, GrapherUtil as GrapherUtil$1, lockedFigureColors, lockedFigureFillStyles, approximateEqual, shuffleMatcher, getMatrixSize, measurerLogic, addLibraryVersionToPerseusDebug, upgradeWidgetInfoToLatestVersion, getWidgetIdsFromContentByType } from '@khanacademy/perseus-core';
 export { isFailure, isSuccess, parseAndMigratePerseusArticle, parseAndMigratePerseusItem, parsePerseusItem } from '@khanacademy/perseus-core';
 import * as PerseusLinter from '@khanacademy/perseus-linter';
 import { linterContextDefault, Rule } from '@khanacademy/perseus-linter';
@@ -1939,54 +1939,6 @@ const rWidgetRule = /^\[\[\u2603 (([a-z-]+) ([0-9]+))\]\]/;
 const rTypeFromWidgetId = /^([a-z-]+) ([0-9]+)$/;
 const rWidgetParts = new RegExp(rWidgetRule.source + "$");
 const snowman = "\u2603";
-const seededRNG$1 = function seededRNG(seed) {
-  let randomSeed = seed;
-  return function () {
-    // Robert Jenkins' 32 bit integer hash function.
-    let seed = randomSeed;
-    seed = seed + 0x7ed55d16 + (seed << 12) & 0xffffffff;
-    seed = (seed ^ 0xc761c23c ^ seed >>> 19) & 0xffffffff;
-    seed = seed + 0x165667b1 + (seed << 5) & 0xffffffff;
-    seed = (seed + 0xd3a2646c ^ seed << 9) & 0xffffffff;
-    seed = seed + 0xfd7046c5 + (seed << 3) & 0xffffffff;
-    seed = (seed ^ 0xb55a4f09 ^ seed >>> 16) & 0xffffffff;
-    return (randomSeed = seed & 0xfffffff) / 0x10000000;
-  };
-};
-
-// Shuffle an array using a given random seed or function.
-// If `ensurePermuted` is true, the input and ouput are guaranteed to be
-// distinct permutations.
-function shuffle$3(array, randomSeed, ensurePermuted = false) {
-  // Always return a copy of the input array
-  const shuffled = _.clone(array);
-
-  // Handle edge cases (input array is empty or uniform)
-  if (!shuffled.length || _.all(shuffled, function (value) {
-    return _.isEqual(value, shuffled[0]);
-  })) {
-    return shuffled;
-  }
-  let random;
-  if (typeof randomSeed === "function") {
-    random = randomSeed;
-  } else {
-    random = seededRNG$1(randomSeed);
-  }
-  do {
-    // Fischer-Yates shuffle
-    for (let top = shuffled.length; top > 0; top--) {
-      const newEnd = Math.floor(random() * top);
-      const temp = shuffled[newEnd];
-
-      // @ts-expect-error - TS2542 - Index signature in type 'readonly T[]' only permits reading.
-      shuffled[newEnd] = shuffled[top - 1];
-      // @ts-expect-error - TS2542 - Index signature in type 'readonly T[]' only permits reading.
-      shuffled[top - 1] = temp;
-    }
-  } while (ensurePermuted && _.isEqual(array, shuffled));
-  return shuffled;
-}
 
 /**
  * TODO(somewhatabstract, FEI-3463):
@@ -2419,7 +2371,6 @@ const textarea = {
  * to translate it but don't need the extra dollar signs.
  */
 const unescapeMathMode$1 = label => label.startsWith("$") && label.endsWith("$") ? label.slice(1, -1) : label;
-const random$1 = seededRNG$1(new Date().getTime() & 0xffffffff);
 const Util = {
   inputPathsEqual,
   nestedMap: nestedMap$2,
@@ -2427,8 +2378,6 @@ const Util = {
   rTypeFromWidgetId,
   rWidgetParts,
   snowman,
-  seededRNG: seededRNG$1,
-  shuffle: shuffle$3,
   split,
   firstNumericalParse: firstNumericalParse$1,
   stringArrayOfSize: stringArrayOfSize$1,
@@ -2456,8 +2405,7 @@ const Util = {
   getSvgUrl: getSvgUrl,
   getDataUrl: getDataUrl,
   textarea,
-  unescapeMathMode: unescapeMathMode$1,
-  random: random$1
+  unescapeMathMode: unescapeMathMode$1
 };
 
 // TODO(LP-11481): Change the primary API we use for logging in Perseus to use
@@ -24369,11 +24317,6 @@ Radio$1.defaultProps = {
   showSolutions: "none"
 };
 
-const {
-  shuffle: shuffle$2,
-  random
-} = Util;
-
 // Transforms the choices for display.
 const _choiceTransform = (widgetOptions, strings, problemNum) => {
   const _maybeRandomize = function _maybeRandomize(array) {
@@ -24384,7 +24327,7 @@ const _choiceTransform = (widgetOptions, strings, problemNum) => {
     // or if rendered within an article. This results in a predictable
     // shuffle order. To avoid this we use a random seed when `problemNum`
     // is `undefined`.
-    return widgetOptions.randomize ? shuffle$2(array, randomSeed != null ? randomSeed : 0) : array;
+    return widgetOptions.randomize ? shuffle(array, randomSeed != null ? randomSeed : 0) : array;
   };
   const _addNoneOfAbove = function _addNoneOfAbove(choices) {
     let noneOfTheAbove = null;
@@ -24614,8 +24557,7 @@ class Categorizer extends React.Component {
     const isMobile = this.props.apiOptions.isMobile;
     let indexedItems = this.props.items.map((item, n) => [item, n]);
     if (this.props.randomizeItems) {
-      // @ts-expect-error - TS4104 - The type 'readonly (string | number)[][]' is 'readonly' and cannot be assigned to the mutable type '(string | number)[][]'. | TS2345 - Argument of type 'number | null | undefined' is not assignable to parameter of type 'number | RNG'.
-      indexedItems = Util.shuffle(indexedItems, this.props.problemNum);
+      indexedItems = shuffle(indexedItems, this.props.problemNum);
     }
     const table = /*#__PURE__*/React.createElement("table", {
       className: "categorizer-table " + css(styles$n.mobileTable)
@@ -24641,9 +24583,7 @@ class Categorizer extends React.Component {
       const uniqueId = self.state.uniqueId + "_" + itemNum;
       return /*#__PURE__*/React.createElement("tr", {
         key: itemNum
-      }, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Renderer
-      // @ts-expect-error - TS2322 - Type 'string | number' is not assignable to type 'string | undefined'.
-      , {
+      }, /*#__PURE__*/React.createElement("td", null, /*#__PURE__*/React.createElement(Renderer, {
         content: item,
         linterContext: this.props.linterContext,
         strings: this.context.strings
@@ -37013,10 +36953,6 @@ const getPromptJSON$9 = (renderProps, userInput) => {
   };
 };
 
-const {
-  shuffle: shuffle$1,
-  seededRNG
-} = Util;
 const HACKY_CSS_CLASSNAME = "perseus-widget-matcher";
 class Matcher extends React.Component {
   constructor(...args) {
@@ -37108,16 +37044,16 @@ class Matcher extends React.Component {
       }, "1")));
     }
 
-    // Use the same random() function to shuffle both columns sequentially
-    const rng = seededRNG(this.props.problemNum);
-    let left;
-    if (!this.props.orderMatters) {
-      // If the order doesn't matter, don't shuffle the left column
-      left = this.props.left;
-    } else {
-      left = shuffle$1(this.props.left, rng, /* ensurePermuted */true);
-    }
-    const right = shuffle$1(this.props.right, rng, /* ensurePermuted */true);
+    /* TODO(LEMS-2841):
+        Once the getMatcherPublicWidgetOptions function gets connected to the
+        widget, we'll need to update this to the line below to only shuffle
+        on the server.
+            const {left, right} = this.props;
+     */
+    const {
+      left,
+      right
+    } = shuffleMatcher(this.props);
     const showLabels = _.any(this.props.labels);
     const constraints = {
       height: _.max([this.state.leftHeight, this.state.rightHeight])
@@ -40893,9 +40829,6 @@ const getPromptJSON$1 = userInput => {
   };
 };
 
-const {
-  shuffle
-} = Util;
 class Sorter extends React.Component {
   constructor(...args) {
     super(...args);
@@ -40947,6 +40880,10 @@ class Sorter extends React.Component {
     return getPromptJSON$1(this.getUserInput());
   }
   render() {
+    // TODO(LEMS-2841): Remove client-side shuffle once receiving public
+    //     options. The correct field will already be shuffled.
+    //     Probably easiest to replace "options" with "this.props.correct" when
+    //     setting up Sortable below. Or use the assignment to rename for clarity.
     const options = shuffle(this.props.correct, this.props.problemNum, /* ensurePermuted */true);
     const {
       apiOptions
@@ -41377,7 +41314,7 @@ const init = function init() {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "54.0.0";
+const libVersion = "54.1.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {