@khanacademy/perseus 49.2.2 → 50.1.0

package/dist/es/index.js

@@ -12,16 +12,17 @@ import React__default, { useContext, useState, useEffect, useRef, createContext,
 import * as ReactDOM from 'react-dom';
 import ReactDOM__default from 'react-dom';
 import _, { debounce as debounce$1 } from 'underscore';
+import { ErrorCodes, KhanAnswerTypes } from '@khanacademy/perseus-score';
 import Clickable from '@khanacademy/wonder-blocks-clickable';
 import { Popover, PopoverContentCore, PopoverContent } from '@khanacademy/wonder-blocks-popover';
 import { color, spacing, font } from '@khanacademy/wonder-blocks-tokens';
 import $ from 'jquery';
 import { v4 } from 'uuid';
-import { PerseusError, Errors, addLibraryVersionToPerseusDebug } from '@khanacademy/perseus-core';
+import { PerseusError, Errors, pluck, mapObject, lockedFigureColors, lockedFigureFillStyles, addLibraryVersionToPerseusDebug, lockedFigureColorNames, plotterPlotTypes, ItemExtras } from '@khanacademy/perseus-core';
 import PropTypes from 'prop-types';
-import { number as number$1, point, vector as vector$1, line } from '@khanacademy/kmath';
 import { entries, UnreachableCaseError, keys } from '@khanacademy/wonder-stuff-core';
 import { CircularSpinner } from '@khanacademy/wonder-blocks-progress-spinner';
+import { point, KhanMath, number as number$1, vector as vector$1, sum as sum$1, line } from '@khanacademy/kmath';
 import SimpleMarkdown from '@khanacademy/simple-markdown';
 import { pureMarkdownRules } from '@khanacademy/pure-markdown';
 import { TextField } from '@khanacademy/wonder-blocks-form';
@@ -57,6 +58,183 @@ function _extends() {
  * The translated strings that are used to render Perseus.
  */
 
+/**
+ * Untranslated strings used in Perseus. To be used by an external
+ * translator to produce translated strings, passed in as `PerseusStrings`.
+ * !! Note: Ensure that all escape sequences are double-escaped. (e.g. `\\text` -> `\\\\text`)
+ */
+const strings = {
+  closeKeypad: "close math keypad",
+  openKeypad: "open math keypad",
+  mathInputBox: "Math input box",
+  removeHighlight: "Remove highlight",
+  addHighlight: "Add highlight",
+  hintPos: "Hint #%(pos)s",
+  errorRendering: "Error rendering: %(error)s",
+  APPROXIMATED_PI_ERROR: "Your answer is close, but you may " + "have approximated pi. Enter your " + "answer as a multiple of pi, like " + "12 pi or " + "2/3 pi",
+  EXTRA_SYMBOLS_ERROR: "We could not understand your " + "answer. Please check your answer for extra " + "text or symbols.",
+  NEEDS_TO_BE_SIMPLFIED_ERROR: "Your answer is almost correct, " + "but it needs to be simplified.",
+  MISSING_PERCENT_ERROR: "Your answer is almost correct, " + "but it is missing a " + "<code>\\\\%</code> at the end.",
+  MULTIPLICATION_SIGN_ERROR: "I'm a computer. I only understand " + "multiplication if you use an asterisk " + "(*) as the multiplication sign.",
+  WRONG_CASE_ERROR: "Your answer includes use of a variable with the wrong case.",
+  WRONG_LETTER_ERROR: "Your answer includes a wrong variable letter.",
+  invalidSelection: "Make sure you select something for every row.",
+  ERROR_TITLE: "Oops!",
+  ERROR_MESSAGE: "Sorry, I don't understand that!",
+  hints: "Hints",
+  getAnotherHint: "Get another hint",
+  deprecatedStandin: "Sorry, this part of the question is no longer available. 😅 Don't worry, you won't be graded on this part. Keep going!",
+  keepTrying: "Keep trying",
+  tryAgain: "Try again",
+  check: "Check",
+  correctExcited: "Correct!",
+  nextQuestion: "Next question",
+  skipToTitle: "Skip to %(title)s",
+  current: "Current",
+  correct: "Correct",
+  correctSelected: "Correct (selected)",
+  correctCrossedOut: "Correct (but you crossed it out)",
+  incorrect: "Incorrect",
+  incorrectSelected: "Incorrect (selected)",
+  hideExplanation: "Hide explanation",
+  explain: "Explain",
+  INVALID_MESSAGE_PREFIX: "We couldn't grade your answer.",
+  DEFAULT_INVALID_MESSAGE_1: "It looks like you left something blank or ",
+  DEFAULT_INVALID_MESSAGE_2: "entered in an invalid answer.",
+  integerExample: "an integer, like $6$",
+  properExample: "a *proper* fraction, like $1/2$ or $6/10$",
+  simplifiedProperExample: "a *simplified proper* fraction, like $3/5$",
+  improperExample: "an *improper* fraction, like $10/7$ or $14/8$",
+  simplifiedImproperExample: "a *simplified improper* fraction, like $7/4$",
+  mixedExample: "a mixed number, like $1\\\\ 3/4$",
+  decimalExample: "an *exact* decimal, like $0.75$",
+  percentExample: "a percent, like $12.34\\\\%$",
+  piExample: "a multiple of pi, like $12$ pi or $2/3$ pi",
+  yourAnswer: "**Your answer should be** ",
+  yourAnswerLabel: "Your answer:",
+  addPoints: "Click to add points",
+  addVertices: "Click to add vertices",
+  tapMultiple: "Tap each dot on the image to select all answers that apply.",
+  tapSingle: "Tap each dot on the image to select an answer.",
+  clickMultiple: "Click each dot on the image to select all answers that apply.",
+  clickSingle: "Click each dot on the image to select an answer.",
+  choices: "Choices:",
+  answers: {
+    one: "%(num)s answer",
+    other: "%(num)s answers"
+  },
+  hideAnswersToggleLabel: "Hide answer choices",
+  moves: {
+    one: "Moves: %(num)s",
+    other: "Moves: %(num)s"
+  },
+  clickTiles: "Click on the tiles to change the lights.",
+  turnOffLights: "You must turn on all of the lights to continue.",
+  fillAllCells: "Make sure you fill in all cells in the matrix.",
+  molecularDrawing: "A molecular structure drawing. SMILES notation: %(content)s",
+  switchDirection: "Switch direction",
+  circleOpen: "Make circle open",
+  circleFilled: "Make circle filled",
+  numDivisions: "Number of divisions:",
+  divisions: "Please make sure the number of divisions is in the range %(divRangeString)s.",
+  lineRange: "lines %(lineRange)s",
+  lineNumber: "line %(lineNumber)s",
+  symbolPassage: "The symbol %(questionSymbol)s indicates that question %(questionNumber)s references this portion of the passage.",
+  symbolQuestion: " The symbol %(sentenceSymbol)s indicates that the following sentence is referenced in a question.",
+  lineLabel: {
+    context: "a label next to a reading passage to denote the line number",
+    message: "Line"
+  },
+  beginningPassage: "Beginning of reading passage.",
+  beginningFootnotes: "Beginning of reading passage footnotes.",
+  endPassage: "End of reading passage.",
+  questionMarker: "[Marker for question %(number)s]",
+  circleMarker: "[Circle marker %(number)s]",
+  sentenceMarker: "[Sentence %(number)s]",
+  dragHandles: "Drag handles to make graph",
+  tapAddPoints: "Tap to add points",
+  false: "False",
+  true: "True",
+  no: "No",
+  yes: "Yes",
+  chooseCorrectNum: "Please choose the correct number of answers.",
+  notNoneOfTheAbove: "'None of the above' may not be selected when other answers are selected.",
+  noneOfTheAbove: "None of the above",
+  chooseNumAnswers: "Choose %(numCorrect)s answers:",
+  chooseAllAnswers: "Choose all answers that apply:",
+  chooseOneAnswer: "Choose 1 answer:",
+  choiceCheckedCorrect: "(Choice %(letter)s, Checked, Correct)",
+  choiceCrossedOutCorrect: "(Choice %(letter)s, Crossed out, Correct)",
+  choiceCorrect: "(Choice %(letter)s, Correct)",
+  choiceCheckedIncorrect: "(Choice %(letter)s, Checked, Incorrect)",
+  choiceCrossedOutIncorrect: "(Choice %(letter)s, Crossed out, Incorrect)",
+  choiceIncorrect: "(Choice %(letter)s, Incorrect)",
+  choiceChecked: "(Choice %(letter)s, Checked)",
+  choiceCrossedOut: "(Choice %(letter)s, Crossed out)",
+  choice: "(Choice %(letter)s)",
+  crossOut: "Cross out",
+  crossOutOption: "Cross out option",
+  crossOutChoice: "Cross out Choice %(letter)s",
+  bringBack: "Bring back",
+  openMenuForChoice: "Open menu for Choice %(letter)s",
+  letters: {
+    context: "This is a list of single-character labels that will appear in front of multiple-choice options. For instance, a multiple-choice question with three options would display (A) first option (B) second option (C) third option. There must be spaces between each of the different characters. The characters will show up next to options in the order that they are listed here. Most multiple choice questions have 5 or fewer options.",
+    message: "A B C D E F G H I J K L M N O P Q R S T U V W X Y Z"
+  },
+  rightArrow: "Reaction arrow pointing to the right.",
+  dontUnderstandUnits: "I couldn't understand those units.",
+  checkSigFigs: "Check your significant figures.",
+  answerNumericallyIncorrect: "That answer is numerically incorrect.",
+  checkUnits: "Check your units.",
+  dontUnderstand: "I don't understand that",
+  loading: "Loading...",
+  videoTranscript: "See video transcript",
+  somethingWrong: "Something went wrong.",
+  videoWrapper: "Khan Academy video wrapper",
+  mathInputTitle: "mathematics keyboard",
+  mathInputDescription: "Use keyboard/mouse to interact with math-based input fields",
+  sin: "sin",
+  cos: "cos",
+  tan: "tan",
+  simulationLoadFail: "Sorry, this simulation cannot load.",
+  simulationLocaleWarning: "Sorry, this simulation isn't available in your language.",
+  selectAnAnswer: "Select an answer",
+  // The following strings are used for interactive graph SR descriptions.
+  addPoint: "Add Point",
+  removePoint: "Remove Point",
+  graphKeyboardPrompt: "Press Shift + Enter to interact with the graph",
+  closePolygon: "Close shape",
+  openPolygon: "Re-open shape",
+  srInteractiveElements: "Interactive elements: %(elements)s",
+  srNoInteractiveElements: "No interactive elements",
+  // TODO(LEMS-2660): The following strings are ones that will need
+  // translation tickets after all interactive graph SR strings have
+  // been finalized. Remove this comment after the tickets have been
+  // created.
+  srPointAtCoordinates: "Point %(num)s at %(x)s comma %(y)s",
+  srCircleGraph: "A circle on a coordinate plane.",
+  srCircleShape: "Circle. The center point is at %(centerX)s comma %(centerY)s.",
+  srCircleRadiusPoint: "Radius point at %(radiusPointX)s comma %(radiusPointY)s.",
+  srCircleRadius: "Circle radius is %(radius)s.",
+  srCircleOuterPoints: "Points on the circle at %(point1X)s comma %(point1Y)s, %(point2X)s comma %(point2Y)s, %(point3X)s comma %(point3Y)s, %(point4X)s comma %(point4Y)s.",
+  srLinearGraph: "A line on a coordinate plane.",
+  srLinearGraphPoints: "The line has two points, point 1 at %(point1X)s comma %(point1Y)s and point 2 at %(point2X)s comma %(point2Y)s.",
+  srLinearGraphSlopeIncreasing: "Its slope increases from left to right.",
+  srLinearGraphSlopeDecreasing: "Its slope decreases from left to right.",
+  srLinearGraphSlopeHorizontal: "Its slope is zero.",
+  srLinearGraphSlopeVertical: "Its slope is undefined.",
+  srLinearGraphXOnlyIntercept: "The line crosses the X-axis at %(xIntercept)s comma 0.",
+  srLinearGraphYOnlyIntercept: "The line crosses the Y-axis at 0 comma %(yIntercept)s.",
+  srLinearGraphBothIntercepts: "The line crosses the X-axis at %(xIntercept)s comma 0 and the Y-axis at 0 comma %(yIntercept)s.",
+  srLinearGraphOriginIntercept: "The line crosses the x and y axes at the graph's origin.",
+  srLinearGrabHandle: "Line from %(point1X)s comma %(point1Y)s to %(point2X)s comma %(point2Y)s.",
+  srAngleSideAtCoordinates: "Point %(point)s, %(side)s at %(x)s comma %(y)s",
+  srAngleVertexAtCoordinatesWithAngleMeasure: "Point 2, vertex at %(x)s comma %(y)s. Angle %(angleMeasure)s degrees",
+  srAngleGraphAriaLabel: "An angle on a coordinate plane.",
+  srAngleGraphAriaDescription: "The angle measure is %(angleMeasure)s degrees with a vertex at %(vertexX)s comma %(vertexY)s, a point on the starting side at %(startingSideX)s comma %(startingSideY)s and a point on the ending side at %(endingSideX)s comma %(endingSideY)s"
+  // The above strings are used for interactive graph SR descriptions.
+};
+
 /**
  * Mock strings for the Perseus package, to be used for tests and Storybook.
  */
@@ -326,6 +504,22 @@ const mockStrings = {
   // The above strings are used for interactive graph SR descriptions.
 };
 
+const errorToString = {
+  [ErrorCodes.MISSING_PERCENT_ERROR]: strings.MISSING_PERCENT_ERROR,
+  [ErrorCodes.NEEDS_TO_BE_SIMPLIFIED_ERROR]: strings.NEEDS_TO_BE_SIMPLFIED_ERROR,
+  [ErrorCodes.APPROXIMATED_PI_ERROR]: strings.APPROXIMATED_PI_ERROR,
+  [ErrorCodes.EXTRA_SYMBOLS_ERROR]: strings.EXTRA_SYMBOLS_ERROR,
+  [ErrorCodes.WRONG_CASE_ERROR]: strings.WRONG_CASE_ERROR,
+  [ErrorCodes.WRONG_LETTER_ERROR]: strings.WRONG_LETTER_ERROR,
+  [ErrorCodes.MULTIPLICATION_SIGN_ERROR]: strings.MULTIPLICATION_SIGN_ERROR
+};
+function mapErrorToString(err) {
+  if (!err) {
+    return err;
+  }
+  return errorToString[err] || err;
+}
+
 /**
  * PerseusI18nContext provides a way to set the strings and locale that are
  * used inside the Perseus package.
@@ -1304,917 +1498,6 @@ const Log = {
   }
 };
 
-const KhanMath = {
-  // Simplify formulas before display
-  cleanMath: function (expr) {
-    return typeof expr === "string" ? expr.replace(/\+\s*-/g, "- ").replace(/-\s*-/g, "+ ").replace(/\^1/g, "") : expr;
-  },
-  // Bound a number by 1e-6 and 1e20 to avoid exponents after toString
-  bound: function (num) {
-    if (num === 0) {
-      return num;
-    }
-    if (num < 0) {
-      return -KhanMath.bound(-num);
-    }
-    return Math.max(1e-6, Math.min(num, 1e20));
-  },
-  factorial: function (x) {
-    if (x <= 1) {
-      return x;
-    }
-    return x * KhanMath.factorial(x - 1);
-  },
-  getGCD: function (a, b) {
-    if (arguments.length > 2) {
-      // TODO(kevinb): rewrite using rest args instead of arguments
-      // eslint-disable-next-line prefer-rest-params
-      const rest = [].slice.call(arguments, 1);
-      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
-      return KhanMath.getGCD(a, KhanMath.getGCD(...rest));
-    }
-    let mod;
-    a = Math.abs(a);
-    b = Math.abs(b);
-    while (b) {
-      mod = a % b;
-      a = b;
-      b = mod;
-    }
-    return a;
-  },
-  getLCM: function (a, b) {
-    if (arguments.length > 2) {
-      // TODO(kevinb): rewrite using rest args instead of arguments
-      // eslint-disable-next-line prefer-rest-params
-      const rest = [].slice.call(arguments, 1);
-      // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
-      return KhanMath.getLCM(a, KhanMath.getLCM(...rest));
-    }
-    return Math.abs(a * b) / KhanMath.getGCD(a, b);
-  },
-  primes: [2, 3, 5, 7, 11, 13, 17, 19, 23, 29, 31, 37, 41, 43, 47, 53, 59, 61, 67, 71, 73, 79, 83, 89, 97],
-  isPrime: function (n) {
-    if (n <= 1) {
-      return false;
-    }
-    if (n < 101) {
-      return !!$.grep(KhanMath.primes, function (p, i) {
-        return Math.abs(p - n) <= 0.5;
-      }).length;
-    }
-    if (n <= 1 || n > 2 && n % 2 === 0) {
-      return false;
-    }
-    for (let i = 3, sqrt = Math.sqrt(n); i <= sqrt; i += 2) {
-      if (n % i === 0) {
-        return false;
-      }
-    }
-    return true;
-  },
-  // @ts-expect-error - TS2366 - Function lacks ending return statement and return type does not include 'undefined'.
-  getPrimeFactorization: function (number) {
-    if (number === 1) {
-      return [];
-    }
-    if (KhanMath.isPrime(number)) {
-      return [number];
-    }
-    const maxf = Math.sqrt(number);
-    for (let f = 2; f <= maxf; f++) {
-      if (number % f === 0) {
-        return $.merge(KhanMath.getPrimeFactorization(f), KhanMath.getPrimeFactorization(number / f));
-      }
-    }
-  },
-  // Round a number to the nearest increment
-  // E.g., if increment = 30 and num = 40, return 30. if increment = 30 and
-  //     num = 45, return 60.
-  roundToNearest: function (increment, num) {
-    return Math.round(num / increment) * increment;
-  },
-  // Round a number to a certain number of decimal places
-  roundTo: function (precision, num) {
-    const factor = Math.pow(10, precision).toFixed(5);
-    // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'number'. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type. | TS2363 - The right-hand side of an arithmetic operation must be of type 'any', 'number', 'bigint' or an enum type.
-    return Math.round((num * factor).toFixed(5)) / factor;
-  },
-  /**
-   * Return a string of num rounded to a fixed precision decimal places,
-   * with an approx symbol if num had to be rounded, and trailing 0s
-   */
-  toFixedApprox: function (num, precision) {
-    // TODO(aria): Make this locale-dependent
-    const fixedStr = num.toFixed(precision);
-    if (number$1.equal(+fixedStr, num)) {
-      return fixedStr;
-    }
-    return "\\approx " + fixedStr;
-  },
-  /**
-   * Return a string of num rounded to precision decimal places, with an
-   * approx symbol if num had to be rounded, but no trailing 0s if it was
-   * not rounded.
-   */
-  roundToApprox: function (num, precision) {
-    const fixed = KhanMath.roundTo(precision, num);
-    if (number$1.equal(fixed, num)) {
-      return String(fixed);
-    }
-    return KhanMath.toFixedApprox(num, precision);
-  },
-  // toFraction(4/8) => [1, 2]
-  // toFraction(0.666) => [333, 500]
-  // toFraction(0.666, 0.001) => [2, 3]
-  //
-  // tolerance can't be bigger than 1, sorry
-  toFraction: function (decimal, tolerance) {
-    if (tolerance == null) {
-      tolerance = Math.pow(2, -46);
-    }
-    if (decimal < 0 || decimal > 1) {
-      let fract = decimal % 1;
-      fract += fract < 0 ? 1 : 0;
-      const nd = KhanMath.toFraction(fract, tolerance);
-      nd[0] += Math.round(decimal - fract) * nd[1];
-      return nd;
-    }
-    if (Math.abs(Math.round(Number(decimal)) - decimal) <= tolerance) {
-      return [Math.round(decimal), 1];
-    }
-    let loN = 0;
-    let loD = 1;
-    let hiN = 1;
-    let hiD = 1;
-    let midN = 1;
-    let midD = 2;
-
-    // eslint-disable-next-line no-constant-condition
-    while (true) {
-      if (Math.abs(Number(midN / midD) - decimal) <= tolerance) {
-        return [midN, midD];
-      }
-      if (midN / midD < decimal) {
-        loN = midN;
-        loD = midD;
-      } else {
-        hiN = midN;
-        hiD = midD;
-      }
-      midN = loN + hiN;
-      midD = loD + hiD;
-    }
-  },
-  // Returns the format (string) of a given numeric string
-  // Note: purposively more inclusive than answer-types' predicate.forms
-  // That is, it is not necessarily true that interpreted input are numeric
-  getNumericFormat: function (text) {
-    text = $.trim(text);
-    text = text.replace(/\u2212/, "-").replace(/([+-])\s+/g, "$1");
-    if (text.match(/^[+-]?\d+$/)) {
-      return "integer";
-    }
-    if (text.match(/^[+-]?\d+\s+\d+\s*\/\s*\d+$/)) {
-      return "mixed";
-    }
-    const fraction = text.match(/^[+-]?(\d+)\s*\/\s*(\d+)$/);
-    if (fraction) {
-      return parseFloat(fraction[1]) > parseFloat(fraction[2]) ? "improper" : "proper";
-    }
-    if (text.replace(/[,. ]/g, "").match(/^\d+$/)) {
-      return "decimal";
-    }
-    if (text.match(/(pi?|\u03c0|t(?:au)?|\u03c4|pau)/)) {
-      return "pi";
-    }
-    return null;
-  },
-  // Returns a string of the number in a specified format
-  toNumericString: function (number, format) {
-    if (number == null) {
-      return "";
-    }
-    if (number === 0) {
-      return "0"; // otherwise it might end up as 0% or 0pi
-    }
-
-    if (format === "percent") {
-      return number * 100 + "%";
-    }
-    if (format === "pi") {
-      const fraction = number$1.toFraction(number / Math.PI);
-      const numerator = Math.abs(fraction[0]);
-      const denominator = fraction[1];
-      if (number$1.isInteger(numerator)) {
-        const sign = number < 0 ? "-" : "";
-        const pi = "\u03C0";
-        return sign + (numerator === 1 ? "" : numerator) + pi + (denominator === 1 ? "" : "/" + denominator);
-      }
-    }
-    if (_(["proper", "improper", "mixed", "fraction"]).contains(format)) {
-      const fraction = number$1.toFraction(number);
-      const numerator = Math.abs(fraction[0]);
-      const denominator = fraction[1];
-      const sign = number < 0 ? "-" : "";
-      if (denominator === 1) {
-        return sign + numerator; // for integers, irrational, d > 1000
-      }
-
-      if (format === "mixed") {
-        const modulus = numerator % denominator;
-        const integer = (numerator - modulus) / denominator;
-        return sign + (integer ? integer + " " : "") + modulus + "/" + denominator;
-      } // otherwise proper, improper, or fraction
-      return sign + numerator + "/" + denominator;
-    }
-
-    // otherwise (decimal, float, long long)
-    return String(number);
-  }
-};
-function sum$1(array) {
-  return array.reduce(add$3, 0);
-}
-function add$3(a, b) {
-  return a + b;
-}
-
-/* eslint-disable no-useless-escape */
-const MAXERROR_EPSILON = Math.pow(2, -42);
-
-// TOOD(kevinb): Figure out how this relates to KEScore in
-// perseus-all-package/types.js and see if there's a way to
-// unify these types.
-/**
- * Answer types
- *
- * Utility for creating answerable questions displayed in exercises
- *
- * Different answer types produce different kinds of input displays, and do
- * different kinds of checking on the solutions.
- *
- * Each of the objects contain two functions, setup and createValidator.
- *
- * The setup function takes a solutionarea and solution, and performs setup
- * within the solutionarea, and then returns an object which contains:
- *
- * answer: a function which, when called, will retrieve the current answer from
- *         the solutionarea, which can then be validated using the validator
- *         function
- * validator: a function returned from the createValidator function (defined
- *            below)
- * solution: the correct answer to the problem
- * showGuess: a function which, when given a guess, shows the guess within the
- *            provided solutionarea
- * showGuessCustom: a function which displays parts of a guess that are not
- *                  within the solutionarea; currently only used for custom
- *                  answers
- *
- * The createValidator function only takes a solution, and it returns a
- * function which can be used to validate an answer.
- *
- * The resulting validator function returns:
- * - true: if the answer is fully correct
- * - false: if the answer is incorrect
- * - "" (the empty string): if no answer has been provided (e.g. the answer box
- *   is left unfilled)
- * - a string: if there is some slight error
- *
- * In most cases, setup and createValidator don't really need the solution DOM
- * element so we have setupFunctional and createValidatorFunctional for them
- * which take only $solution.text() and $solution.data(). This makes it easier
- * to reuse specific answer types.
- *
- * TODO(alpert): Think of a less-absurd name for createValidatorFunctional.
- *
- */
-const KhanAnswerTypes = {
-  /*
-   * predicate answer type
-   *
-   * performs simple predicate-based checking of a numeric solution, with
-   * different kinds of number formats
-   *
-   * Uses the data-forms option on the solution to choose which number formats
-   * are acceptable. Available data-forms:
-   *
-   * - integer:  3
-   * - proper:   3/5
-   * - improper: 5/3
-   * - pi:       3 pi
-   * - log:      log(5)
-   * - percent:  15%
-   * - mixed:    1 1/3
-   * - decimal:  1.7
-   *
-   * The solution should be a predicate of the form:
-   *
-   * function(guess, maxError) {
-   *     return abs(guess - 3) < maxError;
-   * }
-   *
-   */
-  predicate: {
-    defaultForms: "integer, proper, improper, mixed, decimal",
-    createValidatorFunctional: function (predicate, options, strings) {
-      // Extract the options from the given solution object
-      options = _.extend({
-        simplify: "required",
-        ratio: false,
-        forms: KhanAnswerTypes.predicate.defaultForms
-      }, options);
-      let acceptableForms;
-      // this is maintaining backwards compatibility
-      // TODO(merlob) fix all places that depend on this, then delete
-      if (!_.isArray(options.forms)) {
-        acceptableForms = options.forms.split(/\s*,\s*/);
-      } else {
-        acceptableForms = options.forms;
-      }
-
-      // TODO(jack): remove options.inexact in favor of options.maxError
-      if (options.inexact === undefined) {
-        // If we aren't allowing inexact, ensure that we don't have a
-        // large maxError as well.
-        options.maxError = 0;
-      }
-      // Allow a small tolerance on maxError, to avoid numerical
-      // representation issues (2.3 should be correct for a solution of
-      // 2.45 with maxError=0.15).
-      options.maxError = +options.maxError + MAXERROR_EPSILON;
-
-      // If percent is an acceptable form, make sure it's the last one
-      // in the list so we don't prematurely complain about not having
-      // a percent sign when the user entered the correct answer in a
-      // different form (such as a decimal or fraction)
-      if (_.contains(acceptableForms, "percent")) {
-        acceptableForms = _.without(acceptableForms, "percent");
-        acceptableForms.push("percent");
-      }
-
-      // Take text looking like a fraction, and turn it into a number
-      const fractionTransformer = function fractionTransformer(text) {
-        text = text
-        // Replace unicode minus sign with hyphen
-        .replace(/\u2212/, "-")
-        // Remove space after +, -
-        .replace(/([+-])\s+/g, "$1")
-        // Remove leading/trailing whitespace
-        .replace(/(^\s*)|(\s*$)/gi, "");
-
-        // Extract numerator and denominator
-        const match = text.match(/^([+-]?\d+)\s*\/\s*([+-]?\d+)$/);
-        // Fractions are represented as "-\frac{numerator}{denominator}"
-        // in Mobile device input instead of "numerator/denominator" as
-        // in web-browser.
-        const mobileDeviceMatch = text.match(/^([+-]?)\\frac\{([+-]?\d+)\}\{([+-]?\d+)\}$/);
-        const parsedInt = parseInt(text, 10);
-        if (match || mobileDeviceMatch) {
-          let num;
-          let denom;
-          let simplified = true;
-          if (match) {
-            num = parseFloat(match[1]);
-            denom = parseFloat(match[2]);
-          } else {
-            num = parseFloat(mobileDeviceMatch[2]);
-            if (mobileDeviceMatch[1] === "-") {
-              if (num < 0) {
-                simplified = false;
-              }
-              num = -num;
-            }
-            denom = parseFloat(mobileDeviceMatch[3]);
-          }
-          simplified = simplified && denom > 0 && (options.ratio || denom !== 1) && KhanMath.getGCD(num, denom) === 1;
-          return [{
-            value: num / denom,
-            exact: simplified
-          }];
-        }
-        if (!isNaN(parsedInt) && "" + parsedInt === text) {
-          return [{
-            value: parsedInt,
-            exact: true
-          }];
-        }
-        return [];
-      };
-
-      /*
-       * Different forms of numbers
-       *
-       * Each function returns a list of objects of the form:
-       *
-       * {
-       *    value: numerical value,
-       *    exact: true/false
-       * }
-       */
-      const forms = {
-        // integer, which is encompassed by decimal
-        integer: function (text) {
-          // Compare the decimal form to the decimal form rounded to
-          // an integer. Only accept if the user actually entered an
-          // integer.
-          const decimal = forms.decimal(text);
-          const rounded = forms.decimal(text, 1);
-          if (decimal[0].value != null && decimal[0].value === rounded[0].value || decimal[1].value != null && decimal[1].value === rounded[1].value) {
-            return decimal;
-          }
-          return [];
-        },
-        // A proper fraction
-        proper: function (text) {
-          return $.map(fractionTransformer(text), function (o) {
-            // All fractions that are less than 1
-            if (Math.abs(o.value) < 1) {
-              return [o];
-            }
-            return [];
-          });
-        },
-        // an improper fraction
-        improper: function (text) {
-          return $.map(fractionTransformer(text), function (o) {
-            // All fractions that are greater than 1
-            if (Math.abs(o.value) >= 1) {
-              return [o];
-            }
-            return [];
-          });
-        },
-        // pi-like numbers
-        pi: function (text) {
-          let match;
-          let possibilities = [];
-
-          // Replace unicode minus sign with hyphen
-          text = text.replace(/\u2212/, "-");
-
-          // - pi
-          // (Note: we also support \pi (for TeX), p, tau (and \tau,
-          // and t), pau.)
-          if (match = text.match(/^([+-]?)\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)$/i)) {
-            possibilities = [{
-              value: parseFloat(match[1] + "1"),
-              exact: true
-            }];
-
-            // 5 / 6 pi
-          } else if (match = text.match(/^([+-]?\s*\d+\s*(?:\/\s*[+-]?\s*\d+)?)\s*\*?\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)$/i)) {
-            possibilities = fractionTransformer(match[1]);
-
-            // 4 5 / 6 pi
-          } else if (match = text.match(/^([+-]?)\s*(\d+)\s*([+-]?\d+)\s*\/\s*([+-]?\d+)\s*\*?\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)$/i)) {
-            const sign = parseFloat(match[1] + "1");
-            const integ = parseFloat(match[2]);
-            const num = parseFloat(match[3]);
-            const denom = parseFloat(match[4]);
-            const simplified = num < denom && KhanMath.getGCD(num, denom) === 1;
-            possibilities = [{
-              value: sign * (integ + num / denom),
-              exact: simplified
-            }];
-
-            // 5 pi / 6
-          } else if (match = text.match(/^([+-]?\s*\d+)\s*\*?\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)\s*(?:\/\s*([+-]?\s*\d+))?$/i)) {
-            possibilities = fractionTransformer(match[1] + "/" + match[3]);
-
-            // - pi / 4
-          } else if (match = text.match(/^([+-]?)\s*\*?\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)\s*(?:\/\s*([+-]?\d+))?$/i)) {
-            possibilities = fractionTransformer(match[1] + "1/" + match[3]);
-
-            // 0
-          } else if (text === "0") {
-            possibilities = [{
-              value: 0,
-              exact: true
-            }];
-
-            // 0.5 pi (fallback)
-          } else if (match = text.match(/^(.+)\s*\*?\s*(\\?pi|p|\u03c0|\\?tau|t|\u03c4|pau)$/i)) {
-            possibilities = forms.decimal(match[1]);
-          } else {
-            possibilities = _.reduce(KhanAnswerTypes.predicate.defaultForms.split(/\s*,\s*/), function (memo, form) {
-              return memo.concat(forms[form](text));
-            }, []);
-
-            // If the answer is a floating point number that's
-            // near a multiple of pi, mark is as being possibly
-            // an approximation of pi.  We actually check if
-            // it's a plausible approximation of pi/12, since
-            // sometimes the correct answer is like pi/3 or pi/4.
-            // We also say it's a pi-approximation if it involves
-            // x/7 (since 22/7 is an approximation of pi.)
-            // Never mark an integer as being an approximation
-            // of pi.
-            let approximatesPi = false;
-            const number = parseFloat(text);
-            if (!isNaN(number) && number !== parseInt(text)) {
-              const piMult = Math.PI / 12;
-              const roundedNumber = piMult * Math.round(number / piMult);
-              if (Math.abs(number - roundedNumber) < 0.01) {
-                approximatesPi = true;
-              }
-            } else if (text.match(/\/\s*7/)) {
-              approximatesPi = true;
-            }
-            if (approximatesPi) {
-              _.each(possibilities, function (possibility) {
-                possibility.piApprox = true;
-              });
-            }
-            return possibilities;
-          }
-          let multiplier = Math.PI;
-          if (text.match(/\\?tau|t|\u03c4/)) {
-            multiplier = Math.PI * 2;
-          }
-
-          // We're taking an early stand along side xkcd in the
-          // inevitable ti vs. pau debate... http://xkcd.com/1292
-          if (text.match(/pau/)) {
-            multiplier = Math.PI * 1.5;
-          }
-          $.each(possibilities, function (ix, possibility) {
-            possibility.value *= multiplier;
-          });
-          return possibilities;
-        },
-        // Converts '' to 1 and '-' to -1 so you can write "[___] x"
-        // and accept sane things
-        coefficient: function (text) {
-          let possibilities = [];
-
-          // Replace unicode minus sign with hyphen
-          text = text.replace(/\u2212/, "-");
-          if (text === "") {
-            possibilities = [{
-              value: 1,
-              exact: true
-            }];
-          } else if (text === "-") {
-            possibilities = [{
-              value: -1,
-              exact: true
-            }];
-          }
-          return possibilities;
-        },
-        // simple log(c) form
-        log: function (text) {
-          let match;
-          let possibilities = [];
-
-          // Replace unicode minus sign with hyphen
-          text = text.replace(/\u2212/, "-");
-          text = text.replace(/[ \(\)]/g, "");
-          if (match = text.match(/^log\s*(\S+)\s*$/i)) {
-            // @ts-expect-error - TS2322 - Type '{ value: number | undefined; exact: boolean; }[]' is not assignable to type 'never[]'.
-            possibilities = forms.decimal(match[1]);
-          } else if (text === "0") {
-            // @ts-expect-error - TS2322 - Type 'number' is not assignable to type 'never'. | TS2322 - Type 'boolean' is not assignable to type 'never'.
-            possibilities = [{
-              value: 0,
-              exact: true
-            }];
-          }
-          return possibilities;
-        },
-        // Numbers with percent signs
-        percent: function (text) {
-          text = $.trim(text);
-          // store whether or not there is a percent sign
-          let hasPercentSign = false;
-          if (text.indexOf("%") === text.length - 1) {
-            text = $.trim(text.substring(0, text.length - 1));
-            hasPercentSign = true;
-          }
-          const transformed = forms.decimal(text);
-          $.each(transformed, function (ix, t) {
-            t.exact = hasPercentSign;
-            // @ts-expect-error - TS2532 - Object is possibly 'undefined'.
-            t.value = t.value / 100;
-          });
-          return transformed;
-        },
-        // Mixed numbers, like 1 3/4
-        mixed: function (text) {
-          const match = text
-          // Replace unicode minus sign with hyphen
-          .replace(/\u2212/, "-")
-          // Remove space after +, -
-          .replace(/([+-])\s+/g, "$1")
-          // Extract integer, numerator and denominator
-          .match(/^([+-]?)(\d+)\s+(\d+)\s*\/\s*(\d+)$/);
-          if (match) {
-            const sign = parseFloat(match[1] + "1");
-            const integ = parseFloat(match[2]);
-            const num = parseFloat(match[3]);
-            const denom = parseFloat(match[4]);
-            const simplified = num < denom && KhanMath.getGCD(num, denom) === 1;
-            return [{
-              value: sign * (integ + num / denom),
-              exact: simplified
-            }];
-          }
-          return [];
-        },
-        // Decimal numbers -- compare entered text rounded to
-        // 'precision' Reciprical of the precision against the correct
-        // answer. We round to 1/1e10 by default, which is healthily
-        // less than machine epsilon but should be more than any real
-        // decimal answer would use. (The 'integer' answer type uses
-        // precision == 1.)
-        decimal: function (text, precision = 1e10) {
-          const normal = function normal(text) {
-            text = $.trim(text);
-            const match = text
-            // Replace unicode minus sign with hyphen
-            .replace(/\u2212/, "-")
-            // Remove space after +, -
-            .replace(/([+-])\s+/g, "$1")
-            // Extract integer, numerator and denominator. If
-            // commas or spaces are used, they must be in the
-            // "correct" places
-            .match(/^([+-]?(?:\d{1,3}(?:[, ]?\d{3})*\.?|\d{0,3}(?:[, ]?\d{3})*\.(?:\d{3}[, ]?)*\d{1,3}))$/);
-
-            // You can't start a number with `0,`, to prevent us
-            // interpeting '0.342' as correct for '342'
-            const badLeadingZero = text.match(/^0[0,]*,/);
-            if (match && !badLeadingZero) {
-              let x = parseFloat(match[1].replace(/[, ]/g, ""));
-              if (options.inexact === undefined) {
-                x = Math.round(x * precision) / precision;
-              }
-              return x;
-            }
-          };
-          const commas = function commas(text) {
-            text = text.replace(/([\.,])/g, function (_, c) {
-              return c === "." ? "," : ".";
-            });
-            return normal(text);
-          };
-          return [{
-            value: normal(text),
-            exact: true
-          }, {
-            value: commas(text),
-            exact: true
-          }];
-        }
-      };
-
-      // validator function
-      return function (guess) {
-        // The fallback variable is used in place of the answer, if no
-        // answer is provided (i.e. the field is left blank)
-        const fallback = options.fallback != null ? "" + options.fallback : "";
-        guess = $.trim(guess) || fallback;
-        const score = {
-          empty: guess === "",
-          correct: false,
-          message: null,
-          guess: guess
-        };
-
-        // iterate over all the acceptable forms, and if one of the
-        // answers is correct, return true
-        $.each(acceptableForms, function (i, form) {
-          const transformed = forms[form](guess);
-          for (let j = 0, l = transformed.length; j < l; j++) {
-            const val = transformed[j].value;
-            const exact = transformed[j].exact;
-            const piApprox = transformed[j].piApprox;
-            // If a string was returned, and it exactly matches,
-            // return true
-            if (predicate(val, options.maxError)) {
-              // If the exact correct number was returned,
-              // return true
-              if (exact || options.simplify === "optional") {
-                score.correct = true;
-                score.message = options.message || null;
-                // If the answer is correct, don't say it's
-                // empty. This happens, for example, with the
-                // coefficient type where guess === "" but is
-                // interpreted as "1" which is correct.
-                score.empty = false;
-              } else if (form === "percent") {
-                // Otherwise, an error was returned
-                score.empty = true;
-                score.message = strings.MISSING_PERCENT_ERROR;
-              } else {
-                if (options.simplify !== "enforced") {
-                  score.empty = true;
-                }
-                score.message = strings.NEEDS_TO_BE_SIMPLFIED_ERROR;
-              }
-              // The return false below stops the looping of the
-              // callback since predicate check  succeeded.
-              // No more forms to look to verify the user guess.
-              return false;
-            }
-            if (piApprox && predicate(val, Math.abs(val * 0.001))) {
-              score.empty = true;
-              score.message = strings.APPROXIMATED_PI_ERROR;
-            }
-          }
-        });
-        if (score.correct === false) {
-          let interpretedGuess = false;
-          _.each(forms, function (form) {
-            const anyAreNaN = _.any(form(guess), function (t) {
-              return t.value != null && !_.isNaN(t.value);
-            });
-            if (anyAreNaN) {
-              interpretedGuess = true;
-            }
-          });
-          if (!interpretedGuess) {
-            score.empty = true;
-            score.message = strings.EXTRA_SYMBOLS_ERROR;
-            return score;
-          }
-        }
-        return score;
-      };
-    }
-  },
-  /*
-   * number answer type
-   *
-   * wraps the predicate answer type to performs simple number-based checking
-   * of a solution
-   */
-  number: {
-    convertToPredicate: function (correctAnswer, options) {
-      const correctFloat = parseFloat(correctAnswer);
-      return [function (guess, maxError) {
-        return Math.abs(guess - correctFloat) < maxError;
-      }, $.extend({}, options, {
-        type: "predicate"
-      })];
-    },
-    createValidatorFunctional: function (correctAnswer, options, strings) {
-      return KhanAnswerTypes.predicate.createValidatorFunctional(...KhanAnswerTypes.number.convertToPredicate(correctAnswer, options), strings);
-    }
-  },
-  /*
-   * The expression answer type parses a given expression or equation
-   * and semantically compares it to the solution. In addition, instant
-   * feedback is provided by rendering the last answer that fully parsed.
-   *
-   * Parsing options:
-   * functions (e.g. data-functions="f g h")
-   *     A space or comma separated list of single-letter variables that
-   *     should be interpreted as functions. Case sensitive. "e" and "i"
-   *     are reserved.
-   *
-   *     no functions specified: f(x+y) == fx + fy
-   *     with "f" as a function: f(x+y) != fx + fy
-   *
-   * Comparison options:
-   * same-form (e.g. data-same-form)
-   *     If present, the answer must match the solution's structure in
-   *     addition to evaluating the same. Commutativity and excess negation
-   *     are ignored, but all other changes will trigger a rejection. Useful
-   *     for requiring a particular form of an equation, or if the answer
-   *     must be factored.
-   *
-   *     example question:    Factor x^2 + x - 2
-   *     example solution:    (x-1)(x+2)
-   *     accepted answers:    (x-1)(x+2), (x+2)(x-1), ---(-x-2)(-1+x), etc.
-   *     rejected answers:    x^2+x-2, x*x+x-2, x(x+1)-2, (x-1)(x+2)^1, etc.
-   *     rejection message:   Your answer is not in the correct form
-   *
-   * simplify (e.g. data-simplify)
-   *     If present, the answer must be fully expanded and simplified. Use
-   *     carefully - simplification is hard and there may be bugs, or you
-   *     might not agree on the definition of "simplified" used. You will
-   *     get an error if the provided solution is not itself fully expanded
-   *     and simplified.
-   *
-   *     example question:    Simplify ((n*x^5)^5) / (n^(-2)*x^2)^-3
-   *     example solution:    x^31 / n
-   *     accepted answers:    x^31 / n, x^31 / n^1, x^31 * n^(-1), etc.
-   *     rejected answers:    (x^25 * n^5) / (x^(-6) * n^6), etc.
-   *     rejection message:   Your answer is not fully expanded and simplified
-   *
-   * Rendering options:
-   * times (e.g. data-times)
-   *     If present, explicit multiplication (such as between numbers) will
-   *     be rendered with a cross/x symbol (TeX: \times) instead of the usual
-   *     center dot (TeX: \cdot).
-   *
-   *     normal rendering:    2 * 3^x -> 2 \cdot 3^{x}
-   *     but with "times":    2 * 3^x -> 2 \times 3^{x}
-   */
-  expression: {
-    parseSolution: function (solutionString, options) {
-      let solution = KAS.parse(solutionString, options);
-      if (!solution.parsed) {
-        throw new PerseusError("The provided solution (" + solutionString + ") didn't parse.", Errors.InvalidInput);
-      } else if (options.simplified && !solution.expr.isSimplified()) {
-        throw new PerseusError("The provided solution (" + solutionString + ") isn't fully expanded and simplified.", Errors.InvalidInput);
-      } else {
-        solution = solution.expr;
-      }
-      return solution;
-    },
-    createValidatorFunctional: function (solution, options, strings) {
-      return function (guess) {
-        const score = {
-          empty: false,
-          correct: false,
-          message: null,
-          guess: guess,
-          // Setting `ungraded` to true indicates that if the
-          // guess doesn't match any of the solutions, the guess
-          // shouldn't be marked as incorrect; instead, `message`
-          // should be shown to the user. This is different from
-          // setting `empty` to true, since the behavior of `empty`
-          // is that `message` only will be shown if the guess is
-          // graded as empty for every solution.
-          ungraded: false
-        };
-
-        // Don't bother parsing an empty input
-        if (!guess) {
-          // @ts-expect-error - TS2540 - Cannot assign to 'empty' because it is a read-only property.
-          score.empty = true;
-          return score;
-        }
-        const answer = KAS.parse(guess, options);
-
-        // An unsuccessful parse doesn't count as wrong
-        if (!answer.parsed) {
-          // @ts-expect-error - TS2540 - Cannot assign to 'empty' because it is a read-only property.
-          score.empty = true;
-          return score;
-        }
-
-        // Solution will need to be parsed again if we're creating
-        // this from a multiple question type
-        if (typeof solution === "string") {
-          solution = KhanAnswerTypes.expression.parseSolution(solution, options);
-        }
-        const result = KAS.compare(answer.expr, solution, options);
-        if (result.equal) {
-          // Correct answer
-          // @ts-expect-error - TS2540 - Cannot assign to 'correct' because it is a read-only property.
-          score.correct = true;
-        } else if (result.wrongVariableNames || result.wrongVariableCase) {
-          // We don't want to give people an error for getting the
-          // variable names or the variable case wrong.
-          // TODO(aasmund): This should ideally have been handled
-          // under the `result.message` condition, but the
-          // KAS messages currently aren't translatable.
-          // @ts-expect-error - TS2540 - Cannot assign to 'ungraded' because it is a read-only property.
-          score.ungraded = true;
-          // @ts-expect-error - TS2540 - Cannot assign to 'message' because it is a read-only property.
-          score.message = result.wrongVariableCase ? strings.WRONG_CASE_ERROR : strings.WRONG_LETTER_ERROR;
-          // Don't tell the use they're "almost there" in this case, that may not be true and isn't helpful.
-          // @ts-expect-error - TS2339 - Property 'suppressAlmostThere' does not exist on type '{ readonly empty: false; readonly correct: false; readonly message: string | null | undefined; readonly guess: any; readonly ungraded: false; }'.
-          score.suppressAlmostThere = true;
-        } else if (result.message) {
-          // Nearly correct answer
-          // TODO(aasmund): This message also isn't translatable;
-          // need to fix that in KAS
-          // @ts-expect-error - TS2540 - Cannot assign to 'message' because it is a read-only property.
-          score.message = result.message;
-        } else {
-          // Replace x with * and see if it would have been correct
-          // TODO(aasmund): I think this branch is effectively dead,
-          // because the replacement will only work in situations
-          // where the variables are wrong (except if the variable
-          // is x, in which case the replacement won't work either),
-          // which is handled by another branch. When we implement a
-          // more sophisticated variable check, revive this or
-          // remove it completely if it will never come into play.
-          const answerX = KAS.parse(guess.replace(/[xX]/g, "*"), options);
-          if (answerX.parsed) {
-            const resultX = KAS.compare(answerX.expr, solution, options);
-            if (resultX.equal) {
-              // @ts-expect-error - TS2540 - Cannot assign to 'ungraded' because it is a read-only property.
-              score.ungraded = true;
-              // @ts-expect-error - TS2540 - Cannot assign to 'message' because it is a read-only property.
-              score.message = strings.MULTIPLICATION_SIGN_ERROR;
-            } else if (resultX.message) {
-              // TODO(aasmund): I18nize `score.message`
-              // @ts-expect-error - TS2540 - Cannot assign to 'message' because it is a read-only property.
-              score.message = resultX.message + " Also, I'm a computer. I only understand " + "multiplication if you use an " + "asterisk (*) as the multiplication " + "sign.";
-            }
-          }
-        }
-        return score;
-      };
-    }
-  }
-};
-
 /**
  * Checks user input from the expression widget to see if it is scorable.
  *
@@ -2281,7 +1564,7 @@ function scoreExpression(userInput, rubric, strings, locale) {
     return KhanAnswerTypes.expression.createValidatorFunctional(expression.expr, _({}).extend(options, {
       simplify: answer.simplify,
       form: answer.form
-    }), strings);
+    }));
   };
 
   // Find the first answer form that matches the user's input and that
@@ -2956,7 +2239,7 @@ function firstNumericalParse$1(text, strings) {
     simplify: "optional",
     inexact: true,
     forms: "integer, proper, improper, pi, log, mixed, decimal"
-  }, strings);
+  });
   val(text);
   return first;
 }
@@ -14684,54 +13967,6 @@ var MovableLineOptions = {
   }
 };
 
-/**
- * A work-in-progress of _ methods for objects.
- * That is, they take an object as a parameter,
- * and return an object instead of an array.
- *
- * TODO(aria): Move this out of interactive2
- */
-
-/**
- * Does a pluck on keys inside objects in an object
- *
- * Ex:
- * tools = {
- *     translation: {
- *         enabled: true
- *     },
- *     rotation: {
- *         enabled: false
- *     }
- * };
- * pluckObject(tools, "enabled") returns {
- *     translation: true
- *     rotation: false
- * }
- */
-const pluck = function pluck(table, subKey) {
-  return _.object(_.map(table, function (value, key) {
-    return [key, value[subKey]];
-  }));
-};
-
-/**
- * Maps an object to an object
- *
- * > mapObject({a: '1', b: '2'}, (value, key) => {
- *       return value + 1;
- *   });
- * {a: 2, b: 3}
- */
-const mapObject = function mapObject(obj, lambda) {
-  const result = {};
-  Object.keys(obj).forEach(key => {
-    // @ts-expect-error - TS2345 - Argument of type 'string' is not assignable to parameter of type 'K'.
-    result[key] = lambda(obj[key], key);
-  });
-  return result;
-};
-
 /**
  * MovableLine
  */
@@ -18547,7 +17782,7 @@ const inlineNodeTypes = {
 
 // @ts-expect-error - TS2345 - Argument of type '{ readonly columns: { readonly react: (node: any, output: any, state: any) => Element; readonly order: -2; readonly match: any; readonly parse: (capture: any, parse: any, state: any) => any; }; ... 35 more ...; readonly text: TextInOutRule; }' is not assignable to parameter of type 'ParserRules'.
 const builtParser$1 = SimpleMarkdown.parserFor(rules$1);
-const parse$3 = (source, state) => {
+const parse$4 = (source, state) => {
   const paragraphedSource = source + "\n\n";
   return builtParser$1(paragraphedSource, _extends({}, state, {
     inline: false
@@ -18630,14 +17865,14 @@ const getContent = ast => {
  */
 const characterCount = source => {
   // @ts-expect-error - TS2554 - Expected 2 arguments, but got 1.
-  const ast = parse$3(source);
+  const ast = parse$4(source);
   const content = getContent(ast).join("");
   return content.length;
 };
 var PerseusMarkdown = {
   characterCount: characterCount,
   traverseContent: traverseContent,
-  parse: parse$3,
+  parse: parse$4,
   parseInline: inlineParser,
   reactFor: SimpleMarkdown.reactFor,
   ruleOutput: SimpleMarkdown.ruleOutput(rules$1, "react"),
@@ -19019,6 +18254,10 @@ const getWidgetScorer = name => {
   var _widgets$name$scorer, _widgets$name4;
   return (_widgets$name$scorer = (_widgets$name4 = widgets[name]) == null ? void 0 : _widgets$name4.scorer) != null ? _widgets$name$scorer : null;
 };
+const getPublicWidgetOptionsFunction = name => {
+  var _widgets$name$getPubl, _widgets$name5;
+  return (_widgets$name$getPubl = (_widgets$name5 = widgets[name]) == null ? void 0 : _widgets$name5.getPublicWidgetOptions) != null ? _widgets$name$getPubl : i => i;
+};
 const getEditor = name => {
   return _.has(editors, name) ? editors[name] : null;
 };
@@ -19323,6 +18562,7 @@ var widgets$1 = /*#__PURE__*/Object.freeze({
   getWidget: getWidget,
   getWidgetExport: getWidgetExport,
   getWidgetScorer: getWidgetScorer,
+  getPublicWidgetOptionsFunction: getPublicWidgetOptionsFunction,
   getEditor: getEditor,
   getTransform: getTransform,
   getVersion: getVersion,
@@ -21866,7 +21106,7 @@ function scoreInputNumber(userInput, rubric, strings) {
     inexact: rubric.inexact || undefined,
     maxError: rubric.maxError,
     forms: answerTypes[rubric.answerType].forms
-  }, strings);
+  });
 
   // We may have received TeX; try to parse it before grading.
   // If `currentValue` is not TeX, this should be a no-op.
@@ -22204,7 +21444,7 @@ function scoreNumericInput(userInput, rubric, strings) {
       // TODO(merlob) backfill / delete
       maxError: answer.maxError,
       forms: validatorForms
-    }, strings);
+    });
   };
 
   // We may have received TeX; try to parse it before grading.
@@ -24309,7 +23549,7 @@ const CIRCLE_LABEL_STYLE = {
 // TODO(LEMS-2656): remove TS suppression
 // @ts-expect-error: State is not assignable to ParseState
 const builtParser = SimpleMarkdown.parserFor(rules);
-const parse$2 = (source, state) => {
+const parse$3 = (source, state) => {
   // @ts-expect-error - TS2322 - Type 'ParseState | {}' is not assignable to type 'ParseState | null | undefined'.
   state = state || {};
   const paragraphedSource = source + "\n\n";
@@ -24319,7 +23559,7 @@ const parse$2 = (source, state) => {
 // @ts-expect-error - TS2322 - Type 'ReactOutput' is not assignable to type '(arg1: SingleASTNode[]) => ReactElement<any, string | JSXElementConstructor<any>>'.
 const output = SimpleMarkdown.reactFor(SimpleMarkdown.ruleOutput(rules, "react"));
 var PassageMarkdown = {
-  parse: parse$2,
+  parse: parse$3,
   output,
   START_REF_PREFIX,
   END_REF_PREFIX,
@@ -26779,6 +26019,24 @@ const getPromptJSON$n = (renderProps, userInput) => {
   };
 };
 
+/**
+ * For details on the individual options, see the
+ * PerseusCategorizerWidgetOptions type
+ */
+
+/**
+ * Given a PerseusCategorizerWidgetOptions object, return a new object with only
+ * the public options that should be exposed to the client.
+ */
+function getCategorizerPublicWidgetOptions(options) {
+  return {
+    items: options.items,
+    categories: options.categories,
+    randomizeItems: options.randomizeItems,
+    static: options.static
+  };
+}
+
 /**
  * Checks userInput from the categorizer widget to see if the user has selected
  * a category for each item.
@@ -26995,7 +26253,8 @@ var Categorizer$1 = {
   isLintable: true,
   // TODO(LEMS-2656): remove TS suppression
   // @ts-expect-error: Type 'UserInput' is not assignable to type 'PerseusCSProgramUserInput'.
-  scorer: scoreCategorizer
+  scorer: scoreCategorizer,
+  getPublicWidgetOptions: getCategorizerPublicWidgetOptions
 };
 
 /**
@@ -27834,7 +27093,7 @@ class GradedGroup extends React.Component {
         DEFAULT_INVALID_MESSAGE_2
       } = this.context.strings;
       const status = score.type === "points" ? score.total === score.earned ? GRADING_STATUSES.correct : GRADING_STATUSES.incorrect : GRADING_STATUSES.invalid;
-      const message = score.type === "points" ? score.message || "" : score.message ? `${INVALID_MESSAGE_PREFIX} ${score.message}` : `${INVALID_MESSAGE_PREFIX} ${DEFAULT_INVALID_MESSAGE_1}${DEFAULT_INVALID_MESSAGE_2}`;
+      const message = score.type === "points" ? score.message || "" : score.message ? `${INVALID_MESSAGE_PREFIX} ${mapErrorToString(score.message)}` : `${INVALID_MESSAGE_PREFIX} ${DEFAULT_INVALID_MESSAGE_1}${DEFAULT_INVALID_MESSAGE_2}`;
       this.setState({
         status: status,
         message: message,
@@ -28956,6 +28215,9 @@ const typeToButton = type => {
 };
 
 function getCoefficientsByType(data) {
+  if (data.coords == null) {
+    return undefined;
+  }
   if (data.type === "exponential" || data.type === "logarithm") {
     const grader = functionForType(data.type);
     return grader.getCoefficients(data.coords, data.asymptote);
@@ -31710,9 +30972,10 @@ const AxisTicks = () => {
  * @param {number} axisIndex which axis we're getting options for
  */
 const axisOptions = (props, axisIndex) => {
+  const lines = props.markings === "axes" ? false : props.gridStep[axisIndex];
   return {
-    axis: props.markings === "graph",
-    lines: props.gridStep[axisIndex],
+    axis: props.markings === "graph" || props.markings === "axes",
+    lines: lines,
     labels: false
   };
 };
@@ -32294,231 +31557,6 @@ const LegacyGrid = ({
   return null;
 };
 
-/**
- * The Perseus "data schema" file.
- *
- * This file, and the types in it, represents the "data schema" that Perseus
- * uses. The @khanacademy/perseus-editor package edits and produces objects
- * that conform to the types in this file. Similarly, the top-level renderers
- * in @khanacademy/perseus, consume objects that conform to these types.
- *
- * WARNING: This file should not import any types from elsewhere so that it is
- * easy to reason about changes that alter the Perseus schema. This helps
- * ensure that it is not changed accidentally when upgrading a dependant
- * package or other part of Perseus code. Note that TypeScript does type
- * checking via something called "structural typing". This means that as long
- * as the shape of a type matches, the name it goes by doesn't matter. As a
- * result, a `Coord` type that looks like this `[x: number, y: number]` is
- * _identical_, in TypeScript's eyes, to this `Vector2` type `[x: number, y:
- * number]`. Also, with tuples, the labels for each entry is ignored, so `[x:
- * number, y: number]` is compatible with `[min: number, max: number]`. The
- * labels are for humans, not TypeScript. :)
- *
- * If you make changes to types in this file, be very sure that:
- *
- *   a) the changes are backwards compatible. If they are not, old data from
- *      previous versions of the "schema" could become unrenderable, or worse,
- *      introduce hard-to-diagnose bugs.
- *   b) the parsing code (`util/parse-perseus-json/`) is updated to handle
- *      the new format _as well as_ the old format.
- */
-
-// TODO(FEI-4010): Remove `Perseus` prefix for all types here
-
-// Same name as Mafs
-
-/**
- * Our core set of Perseus widgets.
- *
- * This interface is the basis for "registering" all Perseus widget types.
- * There should be one key/value pair for each supported widget. If you create
- * a new widget, an entry should be added to this interface. Note that this
- * only registers the widget options type, you'll also need to register the
- * widget so that it's available at runtime (@see
- * {@link file://./widgets.ts#registerWidget}).
- *
- * Importantly, the key should be the name that is used in widget IDs. For most
- * widgets that is the same as the widget option's `type` field. In cases where
- * a widget has been deprecated and replaced with the deprecated-standin
- * widget, it should be the original widget type!
- *
- * If you define the widget outside of this package, you can still add the new
- * widget to this interface by writing the following in that package that
- * contains the widget. TypeScript will merge that definition of the
- * `PerseusWidgets` with the one defined below.
- *
- * ```typescript
- * declare module "@khanacademy/perseus" {
- *     interface PerseusWidgetTypes {
- *         // A new widget
- *         "new-awesomeness": MyAwesomeNewWidget;
- *
- *         // A deprecated widget
- *         "super-old-widget": DeprecatedStandinWidget;
- *     }
- * }
- *
- * // The new widget's options definition
- * type MyAwesomeNewWidget = WidgetOptions<'new-awesomeness', MyAwesomeNewWidgetOptions>;
- *
- * // The deprecated widget's options definition
- * type SuperOldWidget = WidgetOptions<'super-old-widget', object>;
- * ```
- *
- * This interface can be extended through the magic of TypeScript "Declaration
- * merging". Specifically, we augment this module and extend this interface.
- *
- * @see {@link https://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation}
- */
-
-/**
- * A map of widget IDs to widget options. This is most often used as the type
- * for a set of widgets defined in a `PerseusItem` but can also be useful to
- * represent a function parameter where only `widgets` from a `PerseusItem` are
- * needed. Today Widget IDs are made up of the widget type and an incrementing
- * integer (eg. `interactive-graph 1` or `radio 3`). It is suggested to avoid
- * reading/parsing the widget id to derive any information from it, except in
- * the case of this map.
- *
- * @see {@link PerseusWidgetTypes} additional widgets can be added to this map type
- * by augmenting the PerseusWidgetTypes with new widget types!
- */
-
-/**
- * A "PerseusItem" is a classic Perseus item. It is rendered by the
- * `ServerItemRenderer` and the layout is pre-set.
- *
- * To render more complex Perseus items, see the `Item` type in the multi item
- * area.
- */
-
-/**
- * A "PerseusArticle" is an item that is meant to be rendered as an article.
- * This item is never scored and is rendered by the `ArticleRenderer`.
- */
-
-const ItemExtras = [
-// The user might benefit from using a Scientific Calculator.  Provided on Khan Academy when true
-"calculator",
-// The user might benefit from using a statistics Chi Squared Table like https://people.richland.edu/james/lecture/m170/tbl-chi.html
-"chi2Table",
-// The user might benefit from a monthly payments calculator.  Provided on Khan Academy when true
-"financialCalculatorMonthlyPayment",
-// The user might benefit from a total amount calculator.  Provided on Khan Academy when true
-"financialCalculatorTotalAmount",
-// The user might benefit from a time to pay off calculator.  Provided on Khan Academy when true
-"financialCalculatorTimeToPayOff",
-// The user might benefit from using a Periodic Table of Elements.  Provided on Khan Academy when true
-"periodicTable",
-// The user might benefit from using a Periodic Table of Elements with key.  Provided on Khan Academy when true
-"periodicTableWithKey",
-// The user might benefit from using a statistics T Table like https://www.statisticshowto.com/tables/t-distribution-table/
-"tTable",
-// The user might benefit from using a statistics Z Table like https://www.ztable.net/
-"zTable"];
-
-/**
- * The type representing the common structure of all widget's options. The
- * `Options` generic type represents the widget-specific option data.
- */
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-// prettier-ignore
-
-//prettier-ignore
-
-/**
- * A background image applied to various widgets.
- */
-
-const PerseusExpressionAnswerFormConsidered = ["correct", "wrong", "ungraded"];
-
-// 2D range: xMin, xMax, yMin, yMax
-
-const lockedFigureColorNames = ["blue", "green", "grayH", "purple", "pink", "orange", "red"];
-const lockedFigureColors = {
-  blue: "#3D7586",
-  green: "#447A53",
-  grayH: "#3B3D45",
-  purple: "#594094",
-  pink: "#B25071",
-  red: "#D92916",
-  orange: "#946700"
-};
-const lockedFigureFillStyles = {
-  none: 0,
-  white: 1,
-  translucent: 0.4,
-  solid: 1
-};
-
-// Not associated with a specific figure
-
-const plotterPlotTypes = ["bar", "line", "pic", "histogram", "dotplot"];
-
 function LockedLabel(props) {
   const {
     coord,
@@ -32583,7 +31621,8 @@ const LockedEllipse = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-ellipse",
     "aria-label": hasAria ? ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, /*#__PURE__*/React.createElement(Ellipse, {
     center: center,
     radius: radius,
@@ -32628,7 +31667,8 @@ const LockedFunction = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-function",
     "aria-label": hasAria ? props.ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, directionalAxis === "x" && /*#__PURE__*/React.createElement(Plot$3.OfX, _extends({
     y: x => equation.eval({
       x
@@ -32785,7 +31825,8 @@ const LockedLine = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: kind === "ray" ? "locked-ray" : "locked-line",
     "aria-label": hasAria ? ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, line, showPoint1 && /*#__PURE__*/React.createElement(Point$2, {
     x: point1.coord[X],
     y: point1.coord[Y],
@@ -32821,7 +31862,8 @@ const LockedPoint = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-point",
     "aria-label": hasAria ? ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, /*#__PURE__*/React.createElement(Point$2, {
     x: x,
     y: y,
@@ -32847,7 +31889,8 @@ const LockedPolygon = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-polygon",
     "aria-label": hasAria ? props.ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, /*#__PURE__*/React.createElement(Polygon, {
     points: [...points],
     fillOpacity: lockedFigureFillStyles[fillStyle],
@@ -32881,7 +31924,8 @@ const LockedVector = props => {
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-vector",
     "aria-label": hasAria ? ariaLabel : undefined,
-    "aria-hidden": !hasAria
+    "aria-hidden": !hasAria,
+    role: "img"
   }, /*#__PURE__*/React.createElement(Vector, {
     tail: tail,
     tip: tip,
@@ -34289,7 +33333,9 @@ function renderCircleGraph(state, dispatch) {
       graphState: state,
       dispatch: dispatch
     }),
-    interactiveElementsDescription: null
+    interactiveElementsDescription: /*#__PURE__*/React.createElement(CircleGraphDescription, {
+      state: state
+    })
   };
 }
 function CircleGraph(props) {
@@ -34313,38 +33359,26 @@ function CircleGraph(props) {
   const outerPointsId = id + "-outer-points";
 
   // Aria label strings
-  const circleGraphAriaLabel = strings.srCircleGraph;
-  const circleShapeAriaLabel = strings.srCircleShape({
-    centerX: srFormatNumber(center[0], locale),
-    centerY: srFormatNumber(center[1], locale)
-  });
-  const circleRadiusPointAriaLabel = strings.srCircleRadiusPoint({
-    radiusPointX: srFormatNumber(radiusPoint[0], locale),
-    radiusPointY: srFormatNumber(radiusPoint[1], locale)
-  });
-  const circleRadiusDescription = strings.srCircleRadius({
-    radius
-  });
-  const circleOuterPointsDescription = strings.srCircleOuterPoints({
-    point1X: srFormatNumber(center[0] + radius, locale),
-    point1Y: srFormatNumber(center[1], locale),
-    point2X: srFormatNumber(center[0], locale),
-    point2Y: srFormatNumber(center[1] + radius, locale),
-    point3X: srFormatNumber(center[0] - radius, locale),
-    point3Y: srFormatNumber(center[1], locale),
-    point4X: srFormatNumber(center[0], locale),
-    point4Y: srFormatNumber(center[1] - radius, locale)
+  const {
+    srCircleGraph,
+    srCircleShape,
+    srCircleRadiusPoint,
+    srCircleRadius,
+    srCircleOuterPoints
+  } = describeCircleGraph(graphState, {
+    strings,
+    locale
   });
   return /*#__PURE__*/React.createElement("g", {
     // Outer circle minimal description
-    "aria-label": circleGraphAriaLabel,
+    "aria-label": srCircleGraph,
     "aria-describedby": `${circleId} ${radiusId} ${outerPointsId}`
   }, /*#__PURE__*/React.createElement(MovableCircle, {
     id: circleId
     // Focusable circle aria label reads with every update
     // because of the aria-live property in the circle <g>.
     ,
-    ariaLabel: circleShapeAriaLabel
+    ariaLabel: srCircleShape
     // Aria-describedby describes additional info on focus.
     ,
     ariaDescribedBy: `${radiusId} ${outerPointsId}`,
@@ -34357,7 +33391,7 @@ function CircleGraph(props) {
   }), /*#__PURE__*/React.createElement(MovablePoint$1
   // Radius point aria label reads with every update.
   , {
-    ariaLabel: `${circleRadiusPointAriaLabel} ${circleRadiusDescription}`
+    ariaLabel: `${srCircleRadiusPoint} ${srCircleRadius}`
     // Aria-describedby describes additional info on focus.
     ,
     ariaDescribedBy: `${outerPointsId}`
@@ -34380,12 +33414,12 @@ function CircleGraph(props) {
     style: {
       display: "hidden"
     }
-  }, circleRadiusDescription), /*#__PURE__*/React.createElement("g", {
+  }, srCircleRadius), /*#__PURE__*/React.createElement("g", {
     id: outerPointsId,
     style: {
       display: "hidden"
     }
-  }, circleOuterPointsDescription));
+  }, srCircleOuterPoints));
 }
 function MovableCircle(props) {
   const {
@@ -34472,6 +33506,64 @@ function crossProduct(as, bs) {
   }
   return result;
 }
+function CircleGraphDescription({
+  state
+}) {
+  // The reason that CircleGraphDescription is a component (rather than a
+  // function that returns a string) is because it needs to use a
+  // hook: `usePerseusI18n`.
+  const i18n = usePerseusI18n();
+  const strings = describeCircleGraph(state, i18n);
+  return strings.srCircleInteractiveElement;
+}
+
+// Exported for testing
+function describeCircleGraph(state, i18n) {
+  const {
+    strings,
+    locale
+  } = i18n;
+  const {
+    center,
+    radiusPoint
+  } = state;
+  const radius = getRadius(state);
+
+  // Aria label strings
+  const srCircleGraph = strings.srCircleGraph;
+  const srCircleShape = strings.srCircleShape({
+    centerX: srFormatNumber(center[0], locale),
+    centerY: srFormatNumber(center[1], locale)
+  });
+  const srCircleRadiusPoint = strings.srCircleRadiusPoint({
+    radiusPointX: srFormatNumber(radiusPoint[0], locale),
+    radiusPointY: srFormatNumber(radiusPoint[1], locale)
+  });
+  const srCircleRadius = strings.srCircleRadius({
+    radius
+  });
+  const srCircleOuterPoints = strings.srCircleOuterPoints({
+    point1X: srFormatNumber(center[0] + radius, locale),
+    point1Y: srFormatNumber(center[1], locale),
+    point2X: srFormatNumber(center[0], locale),
+    point2Y: srFormatNumber(center[1] + radius, locale),
+    point3X: srFormatNumber(center[0] - radius, locale),
+    point3Y: srFormatNumber(center[1], locale),
+    point4X: srFormatNumber(center[0], locale),
+    point4Y: srFormatNumber(center[1] - radius, locale)
+  });
+  const srCircleInteractiveElement = strings.srInteractiveElements({
+    elements: [srCircleShape, srCircleRadius].join(" ")
+  });
+  return {
+    srCircleGraph,
+    srCircleShape,
+    srCircleRadiusPoint,
+    srCircleRadius,
+    srCircleOuterPoints,
+    srCircleInteractiveElement
+  };
+}
 
 function renderLinearGraph(state, dispatch) {
   return {
@@ -35462,7 +34554,9 @@ const MafsGraph = props => {
       labels,
       disableKeyboardInteraction: readOnly || !!props.static
     }
-  }, /*#__PURE__*/React.createElement(View, null, /*#__PURE__*/React.createElement(View, {
+  }, /*#__PURE__*/React.createElement(View, {
+    className: "mafs-graph-container"
+  }, /*#__PURE__*/React.createElement(View, {
     className: "mafs-graph",
     style: {
       position: "relative",
@@ -35505,7 +34599,7 @@ const MafsGraph = props => {
       bottom: 0,
       left: 0
     }
-  }, props.markings === "graph" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AxisLabels, null)), /*#__PURE__*/React.createElement(Mafs, {
+  }, (props.markings === "graph" || props.markings === "axes") && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AxisLabels, null)), /*#__PURE__*/React.createElement(Mafs, {
     preserveAspectRatio: false,
     viewBox: {
       x: state.range[X],
@@ -35525,7 +34619,7 @@ const MafsGraph = props => {
     height: height
   })),
   // Only render the axis ticks and arrows if the markings are set to a full "graph"
-  props.markings === "graph" && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AxisTicks, null), /*#__PURE__*/React.createElement(AxisArrows, null)), /*#__PURE__*/React.createElement("svg", nestedSVGAttributes, props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLayer, {
+  (props.markings === "graph" || props.markings === "axes") && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(AxisTicks, null), /*#__PURE__*/React.createElement(AxisArrows, null)), /*#__PURE__*/React.createElement("svg", nestedSVGAttributes, props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLayer, {
     lockedFigures: props.lockedFigures,
     range: state.range
   }))), props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLabelsLayer, {
@@ -41025,7 +40119,7 @@ function scoreMatrix(userInput, rubric, strings) {
         // @ts-expect-error - TS2345 - Argument of type 'number' is not assignable to parameter of type 'string'.
         solution[row][col], {
           simplify: true
-        }, strings);
+        });
         const result = validator(supplied[row][col]);
         if (result.message) {
           // @ts-expect-error - TS2322 - Type 'string' is not assignable to type 'null'.
@@ -42178,10 +41272,10 @@ function parseBondModifier(smiles, ctx) {
   const firstChar = smiles[0];
   const rest = smiles.slice(1);
   if (firstChar === "=") {
-    return parse$1(rest, _mset(ctx, ["bond", "bondType"], "double"));
+    return parse$2(rest, _mset(ctx, ["bond", "bondType"], "double"));
   }
   if (firstChar === "#") {
-    return parse$1(rest, _mset(ctx, ["bond", "bondType"], "triple"));
+    return parse$2(rest, _mset(ctx, ["bond", "bondType"], "triple"));
   }
   throw new ParseError$1("Invalid character: " + firstChar);
 }
@@ -42240,8 +41334,8 @@ function parseParenthesizedExpression(smiles, ctx) {
       idx: newCtx.idx.concat([[inBranchIdx, 0]]),
       parens: newCtx.parens.concat("(")
     });
-    const parenExpr = parse$1(rest, parenCtx);
-    const remainder = parse$1(sliceFromMatchingCloseParen(rest, ["("]), newCtx);
+    const parenExpr = parse$2(rest, parenCtx);
+    const remainder = parse$2(sliceFromMatchingCloseParen(rest, ["("]), newCtx);
     return [parenExpr].concat(remainder);
   }
   if (firstChar === ")") {
@@ -42305,7 +41399,7 @@ function parseAtom(smiles, ctx) {
 
   // increment the atom counter and reset the branch counter
   const newCtx = _mset(ctx, ["idx", ctx.idx.length - 1], [1 + ctx.idx[ctx.idx.length - 1][0], 0]);
-  let restOfMolecule = parse$1(rest, _mset(newCtx, ["bond", "bondType"], "single"));
+  let restOfMolecule = parse$2(rest, _mset(newCtx, ["bond", "bondType"], "single"));
   if (!Array.isArray(restOfMolecule) && !!restOfMolecule) {
     //TODO(colin): fix this awkwardness.
     restOfMolecule = [restOfMolecule];
@@ -42344,7 +41438,7 @@ function isModifierChar(s) {
  *     ParseError: if the input is not valid SMILES or contains features not
  *         yet implemented.
  */
-function parse$1(smiles, ctx) {
+function parse$2(smiles, ctx) {
   if (!validate(smiles)) {
     throw new ParseError$1("Invalid input.");
   }
@@ -42369,7 +41463,7 @@ function parse$1(smiles, ctx) {
   return parseParenthesizedExpression(smiles, ctx);
 }
 var SmilesParser = {
-  parse: parse$1,
+  parse: parse$2,
   ParseError: ParseError$1
 };
 
@@ -42377,7 +41471,7 @@ var SmilesParser = {
 const {
   layout
 } = MoleculeLayout;
-const parse = SmilesParser.parse;
+const parse$1 = SmilesParser.parse;
 const ParseError = SmilesParser.ParseError;
 const borderSize = 30;
 class Molecule extends React.Component {
@@ -42391,7 +41485,7 @@ class Molecule extends React.Component {
       try {
         this.setState({
           // @ts-expect-error - TS2554 - Expected 2 arguments, but got 1.
-          parsedSmiles: parse(smiles),
+          parsedSmiles: parse$1(smiles),
           error: null
         });
       } catch (e) {
@@ -45077,7 +44171,7 @@ function scoreTable(userInput, rubric, strings) {
         const cellSolution = rowSolution[i];
         const validator = createValidator(cellSolution, {
           simplify: true
-        }, strings);
+        });
         const result = validator(cellSupplied);
         if (result.message) {
           message = result.message;
@@ -45501,7 +44595,7 @@ const init = function init() {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "49.2.2";
+const libVersion = "50.1.0";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -47582,6 +46676,69 @@ function all(results, combineFailureDetails = a => a) {
   return success(values);
 }
 
+class ErrorTrackingParseContext {
+  constructor(path) {
+    this.path = path;
+  }
+  failure(expected, badValue) {
+    return failure([{
+      expected: wrapInArray(expected),
+      badValue,
+      path: this.path
+    }]);
+  }
+  forSubtree(key) {
+    return new ErrorTrackingParseContext([...this.path, key]);
+  }
+  success(value) {
+    return success(value);
+  }
+}
+function wrapInArray(a) {
+  return Array.isArray(a) ? a : [a];
+}
+
+function formatPath(path) {
+  return "(root)" + path.map(formatPathSegment).join("");
+}
+function formatPathSegment(segment) {
+  if (typeof segment === "string") {
+    return validIdentifier.test(segment) ? "." + segment : `[${JSON.stringify(segment)}]`;
+  }
+  return `[${segment.toString()}]`;
+}
+const validIdentifier = /^[A-Za-z$_][A-Za-z$_0-9]*$/;
+
+function message(failure) {
+  const expected = conjoin(failure.expected);
+  const path = formatPath(failure.path);
+  const badValue = JSON.stringify(failure.badValue);
+  return `At ${path} -- expected ${expected}, but got ${badValue}`;
+}
+function conjoin(items) {
+  switch (items.length) {
+    // TODO(benchristel): handle 0 if this is reused elsewhere.
+    case 1:
+      return items[0];
+    case 2:
+      return items.join(" or ");
+    default:
+      {
+        const allButLast = items.slice(0, items.length - 1);
+        const last = items[items.length - 1];
+        return allButLast.join(", ") + ", or " + last;
+      }
+  }
+}
+
+function parse(value, parser) {
+  const result = parser(value, new ErrorTrackingParseContext([]));
+  if (isFailure(result)) {
+    return failure(result.detail.map(message).join("; "));
+  }
+  return result;
+}
+
 const any = (rawValue, ctx) => ctx.success(rawValue);
 
 function array(elementParser) {
@@ -47862,7 +47019,6 @@ const parseCSProgramWidget = parseWidget(constant("cs-program"), object({
   })),
   showEditor: boolean,
   showButtons: boolean,
-  width: number,
   height: number,
   static: defaulted(boolean, () => false)
 }));
@@ -48049,25 +47205,6 @@ function migrateV0ToV1(widget) {
 }
 const parseExpressionWidget = versionedWidgetOptions(1, parseExpressionWidgetV1).withMigrationFrom(0, parseExpressionWidgetV0, migrateV0ToV1).parser;
 
-const parsePerseusRenderer = defaulted(object({
-  // TODO(benchristel): content is also defaulted to empty string in
-  // renderer.tsx. See if we can remove one default or the other.
-  content: defaulted(string, () => ""),
-  // This module has an import cycle with parseWidgetsMap, because the
-  // `group` widget can contain another renderer.
-  // The anonymous function below ensures that we don't try to access
-  // parseWidgetsMap before it's defined.
-  widgets: defaulted((rawVal, ctx) => parseWidgetsMap(rawVal, ctx), () => ({})),
-  metadata: optional(array(string)),
-  images: parseImages
-}),
-// Default value
-() => ({
-  content: "",
-  widgets: {},
-  images: {}
-}));
-
 const falseToNull = pipeParsers(constant(false)).then(convert(() => null)).parser;
 const parseGradedGroupWidgetOptions = object({
   title: defaulted(string, () => ""),
@@ -48138,27 +47275,27 @@ const parseGrapherWidget = parseWidget(constant("grapher"), object({
   availableTypes: array(enumeration("absolute_value", "exponential", "linear", "logarithm", "quadratic", "sinusoid", "tangent")),
   correct: discriminatedUnionOn("type").withBranch("absolute_value", object({
     type: constant("absolute_value"),
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).withBranch("exponential", object({
     type: constant("exponential"),
     asymptote: pairOfPoints,
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).withBranch("linear", object({
     type: constant("linear"),
-    coords: defaulted(pairOfPoints, () => [[-5, 5], [5, 5]])
+    coords: nullable(pairOfPoints)
   })).withBranch("logarithm", object({
     type: constant("logarithm"),
     asymptote: pairOfPoints,
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).withBranch("quadratic", object({
     type: constant("quadratic"),
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).withBranch("sinusoid", object({
     type: constant("sinusoid"),
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).withBranch("tangent", object({
     type: constant("tangent"),
-    coords: pairOfPoints
+    coords: nullable(pairOfPoints)
   })).parser,
   graph: object({
     backgroundImage: object({
@@ -48194,13 +47331,13 @@ const parseGroupWidget = parseWidget(constant("group"),
 
 const parseIframeWidget = parseWidget(constant("iframe"), object({
   url: string,
-  settings: array(object({
+  settings: optional(array(object({
     name: string,
     value: string
-  })),
+  }))),
   width: union(number).or(string).parser,
   height: union(number).or(string).parser,
-  allowFullScreen: boolean,
+  allowFullScreen: defaulted(boolean, () => false),
   allowTopNavigation: optional(boolean),
   static: defaulted(boolean, () => false)
 }));
@@ -48273,10 +47410,10 @@ const parseInputNumberWidget = parseWidget(constant("input-number"), object({
 
 const pairOfNumbers$1 = pair(number, number);
 const stringOrEmpty = defaulted(string, () => "");
-const parseFunctionType = constant("function");
+const parseKey = pipeParsers(optional(string)).then(convert(String)).parser;
 const parseFunctionElement = object({
-  type: parseFunctionType,
-  key: string,
+  type: constant("function"),
+  key: parseKey,
   options: object({
     value: string,
     funcName: string,
@@ -48287,10 +47424,9 @@ const parseFunctionElement = object({
     strokeWidth: number
   })
 });
-const parseLabelType = constant("label");
 const parseLabelElement = object({
-  type: parseLabelType,
-  key: string,
+  type: constant("label"),
+  key: parseKey,
   options: object({
     label: string,
     color: string,
@@ -48298,10 +47434,9 @@ const parseLabelElement = object({
     coordY: string
   })
 });
-const parseLineType = constant("line");
 const parseLineElement = object({
-  type: parseLineType,
-  key: string,
+  type: constant("line"),
+  key: parseKey,
   options: object({
     color: string,
     startX: string,
@@ -48313,10 +47448,9 @@ const parseLineElement = object({
     arrows: string
   })
 });
-const parseMovableLineType = constant("movable-line");
 const parseMovableLineElement = object({
-  type: parseMovableLineType,
-  key: string,
+  type: constant("movable-line"),
+  key: parseKey,
   options: object({
     startX: string,
     startY: string,
@@ -48333,10 +47467,9 @@ const parseMovableLineElement = object({
     constraintYMax: string
   })
 });
-const parseMovablePointType = constant("movable-point");
 const parseMovablePointElement = object({
-  type: parseMovablePointType,
-  key: string,
+  type: constant("movable-point"),
+  key: parseKey,
   options: object({
     startX: string,
     startY: string,
@@ -48350,10 +47483,9 @@ const parseMovablePointElement = object({
     constraintYMax: stringOrEmpty
   })
 });
-const parseParametricType = constant("parametric");
 const parseParametricElement = object({
-  type: parseParametricType,
-  key: string,
+  type: constant("parametric"),
+  key: parseKey,
   options: object({
     x: string,
     y: string,
@@ -48364,20 +47496,18 @@ const parseParametricElement = object({
     strokeWidth: number
   })
 });
-const parsePointType = constant("point");
 const parsePointElement = object({
-  type: parsePointType,
-  key: string,
+  type: constant("point"),
+  key: parseKey,
   options: object({
     color: string,
     coordX: string,
     coordY: string
   })
 });
-const parseRectangleType = constant("rectangle");
 const parseRectangleElement = object({
-  type: parseRectangleType,
-  key: string,
+  type: constant("rectangle"),
+  key: parseKey,
   options: object({
     color: string,
     coordX: string,
@@ -48523,8 +47653,8 @@ const parseLockedLineType = object({
   points: pair(parseLockedPointType, parseLockedPointType),
   color: parseLockedFigureColor,
   lineStyle: parseLockedLineStyle,
-  showPoint1: boolean,
-  showPoint2: boolean,
+  showPoint1: defaulted(boolean, () => false),
+  showPoint2: defaulted(boolean, () => false),
   // TODO(benchristel): default labels to empty array?
   labels: optional(array(parseLockedLabelType)),
   ariaLabel: optional(string)
@@ -48571,7 +47701,7 @@ const parseLockedFunctionType = object({
   labels: optional(array(parseLockedLabelType)),
   ariaLabel: optional(string)
 });
-const parseLockedFigure = union(parseLockedPointType).or(parseLockedLineType).or(parseLockedVectorType).or(parseLockedEllipseType).or(parseLockedPolygonType).or(parseLockedFunctionType).or(parseLockedLabelType).parser;
+const parseLockedFigure = discriminatedUnionOn("type").withBranch("point", parseLockedPointType).withBranch("line", parseLockedLineType).withBranch("vector", parseLockedVectorType).withBranch("ellipse", parseLockedEllipseType).withBranch("polygon", parseLockedPolygonType).withBranch("function", parseLockedFunctionType).withBranch("label", parseLockedLabelType).parser;
 const parseInteractiveGraphWidget = parseWidget(constant("interactive-graph"), object({
   step: pairOfNumbers,
   // TODO(benchristel): rather than making gridStep and snapStep
@@ -48639,7 +47769,14 @@ const parseMatrixWidget = parseWidget(defaulted(constant("matrix"), () => "matri
 }));
 
 const parseMeasurerWidget = parseWidget(constant("measurer"), object({
-  image: parsePerseusImageBackground,
+  // The default value for image comes from measurer.tsx.
+  // See parse-perseus-json/README.md for why we want to duplicate the
+  // defaults here.
+  image: defaulted(parsePerseusImageBackground, () => ({
+    url: null,
+    top: 0,
+    left: 0
+  })),
   showProtractor: boolean,
   showRuler: boolean,
   rulerLabel: string,
@@ -48750,9 +47887,15 @@ const parsePlotterWidget = parseWidget(constant("plotter"), object({
   categories: array(string),
   type: enumeration(...plotterPlotTypes),
   maxY: number,
-  scaleY: number,
+  // The default value for scaleY comes from plotter.tsx.
+  // See parse-perseus-json/README.md for why we want to duplicate the
+  // defaults here.
+  scaleY: defaulted(number, () => 1),
   labelInterval: optional(nullable(number)),
-  snapsPerLine: number,
+  // The default value for snapsPerLine comes from plotter.tsx.
+  // See parse-perseus-json/README.md for why we want to duplicate the
+  // defaults here.
+  snapsPerLine: defaulted(number, () => 2),
   starting: array(number),
   correct: array(number),
   picUrl: optional(nullable(string)),
@@ -48829,12 +47972,12 @@ const parseWidgetsMap = (rawValue, ctx) => {
   }
   return ctx.success(widgetsMap);
 };
-const parseWidgetsMapEntry = ([key, widget], widgetMap, ctx) => {
-  const keyComponentsResult = parseWidgetMapKeyComponents(key.split(" "), ctx);
-  if (isFailure(keyComponentsResult)) {
-    return keyComponentsResult;
+const parseWidgetsMapEntry = ([id, widget], widgetMap, ctx) => {
+  const idComponentsResult = parseWidgetIdComponents(id.split(" "), ctx.forSubtree("(widget ID)"));
+  if (isFailure(idComponentsResult)) {
+    return idComponentsResult;
   }
-  const [type, id] = keyComponentsResult.value;
+  const [type, n] = idComponentsResult.value;
   function parseAndAssign(key, parse) {
     const widgetResult = parse(widget, ctx);
     if (isFailure(widgetResult)) {
@@ -48845,88 +47988,88 @@ const parseWidgetsMapEntry = ([key, widget], widgetMap, ctx) => {
   }
   switch (type) {
     case "categorizer":
-      return parseAndAssign(`categorizer ${id}`, parseCategorizerWidget);
+      return parseAndAssign(`categorizer ${n}`, parseCategorizerWidget);
     case "cs-program":
-      return parseAndAssign(`cs-program ${id}`, parseCSProgramWidget);
+      return parseAndAssign(`cs-program ${n}`, parseCSProgramWidget);
     case "definition":
-      return parseAndAssign(`definition ${id}`, parseDefinitionWidget);
+      return parseAndAssign(`definition ${n}`, parseDefinitionWidget);
     case "dropdown":
-      return parseAndAssign(`dropdown ${id}`, parseDropdownWidget);
+      return parseAndAssign(`dropdown ${n}`, parseDropdownWidget);
     case "explanation":
-      return parseAndAssign(`explanation ${id}`, parseExplanationWidget);
+      return parseAndAssign(`explanation ${n}`, parseExplanationWidget);
     case "expression":
-      return parseAndAssign(`expression ${id}`, parseExpressionWidget);
+      return parseAndAssign(`expression ${n}`, parseExpressionWidget);
     case "grapher":
-      return parseAndAssign(`grapher ${id}`, parseGrapherWidget);
+      return parseAndAssign(`grapher ${n}`, parseGrapherWidget);
     case "group":
-      return parseAndAssign(`group ${id}`, parseGroupWidget);
+      return parseAndAssign(`group ${n}`, parseGroupWidget);
     case "graded-group":
-      return parseAndAssign(`graded-group ${id}`, parseGradedGroupWidget);
+      return parseAndAssign(`graded-group ${n}`, parseGradedGroupWidget);
     case "graded-group-set":
-      return parseAndAssign(`graded-group-set ${id}`, parseGradedGroupSetWidget);
+      return parseAndAssign(`graded-group-set ${n}`, parseGradedGroupSetWidget);
     case "iframe":
-      return parseAndAssign(`iframe ${id}`, parseIframeWidget);
+      return parseAndAssign(`iframe ${n}`, parseIframeWidget);
     case "image":
-      return parseAndAssign(`image ${id}`, parseImageWidget);
+      return parseAndAssign(`image ${n}`, parseImageWidget);
     case "input-number":
-      return parseAndAssign(`input-number ${id}`, parseInputNumberWidget);
+      return parseAndAssign(`input-number ${n}`, parseInputNumberWidget);
     case "interaction":
-      return parseAndAssign(`interaction ${id}`, parseInteractionWidget);
+      return parseAndAssign(`interaction ${n}`, parseInteractionWidget);
     case "interactive-graph":
-      return parseAndAssign(`interactive-graph ${id}`, parseInteractiveGraphWidget);
+      return parseAndAssign(`interactive-graph ${n}`, parseInteractiveGraphWidget);
     case "label-image":
-      return parseAndAssign(`label-image ${id}`, parseLabelImageWidget);
+      return parseAndAssign(`label-image ${n}`, parseLabelImageWidget);
     case "matcher":
-      return parseAndAssign(`matcher ${id}`, parseMatcherWidget);
+      return parseAndAssign(`matcher ${n}`, parseMatcherWidget);
     case "matrix":
-      return parseAndAssign(`matrix ${id}`, parseMatrixWidget);
+      return parseAndAssign(`matrix ${n}`, parseMatrixWidget);
     case "measurer":
-      return parseAndAssign(`measurer ${id}`, parseMeasurerWidget);
+      return parseAndAssign(`measurer ${n}`, parseMeasurerWidget);
     case "molecule-renderer":
-      return parseAndAssign(`molecule-renderer ${id}`, parseMoleculeRendererWidget);
+      return parseAndAssign(`molecule-renderer ${n}`, parseMoleculeRendererWidget);
     case "number-line":
-      return parseAndAssign(`number-line ${id}`, parseNumberLineWidget);
+      return parseAndAssign(`number-line ${n}`, parseNumberLineWidget);
     case "numeric-input":
-      return parseAndAssign(`numeric-input ${id}`, parseNumericInputWidget);
+      return parseAndAssign(`numeric-input ${n}`, parseNumericInputWidget);
     case "orderer":
-      return parseAndAssign(`orderer ${id}`, parseOrdererWidget);
+      return parseAndAssign(`orderer ${n}`, parseOrdererWidget);
     case "passage":
-      return parseAndAssign(`passage ${id}`, parsePassageWidget);
+      return parseAndAssign(`passage ${n}`, parsePassageWidget);
     case "passage-ref":
-      return parseAndAssign(`passage-ref ${id}`, parsePassageRefWidget);
+      return parseAndAssign(`passage-ref ${n}`, parsePassageRefWidget);
     case "passage-ref-target":
       // NOTE(benchristel): as of 2024-11-12, passage-ref-target is only
       // used in test content. See:
       // https://www.khanacademy.org/devadmin/content/search?query=widget:passage-ref-target
-      return parseAndAssign(`passage-ref-target ${id}`, any);
+      return parseAndAssign(`passage-ref-target ${n}`, any);
     case "phet-simulation":
-      return parseAndAssign(`phet-simulation ${id}`, parsePhetSimulationWidget);
+      return parseAndAssign(`phet-simulation ${n}`, parsePhetSimulationWidget);
     case "plotter":
-      return parseAndAssign(`plotter ${id}`, parsePlotterWidget);
+      return parseAndAssign(`plotter ${n}`, parsePlotterWidget);
     case "python-program":
-      return parseAndAssign(`python-program ${id}`, parsePythonProgramWidget);
+      return parseAndAssign(`python-program ${n}`, parsePythonProgramWidget);
     case "radio":
-      return parseAndAssign(`radio ${id}`, parseRadioWidget);
+      return parseAndAssign(`radio ${n}`, parseRadioWidget);
     case "sorter":
-      return parseAndAssign(`sorter ${id}`, parseSorterWidget);
+      return parseAndAssign(`sorter ${n}`, parseSorterWidget);
     case "table":
-      return parseAndAssign(`table ${id}`, parseTableWidget);
+      return parseAndAssign(`table ${n}`, parseTableWidget);
     case "video":
-      return parseAndAssign(`video ${id}`, parseVideoWidget);
+      return parseAndAssign(`video ${n}`, parseVideoWidget);
     case "sequence":
       // sequence is a deprecated widget type, and the corresponding
       // widget component no longer exists.
-      return parseAndAssign(`sequence ${id}`, parseDeprecatedWidget);
+      return parseAndAssign(`sequence ${n}`, parseDeprecatedWidget);
     case "lights-puzzle":
-      return parseAndAssign(`lights-puzzle ${id}`, parseDeprecatedWidget);
+      return parseAndAssign(`lights-puzzle ${n}`, parseDeprecatedWidget);
     case "simulator":
-      return parseAndAssign(`simulator ${id}`, parseDeprecatedWidget);
+      return parseAndAssign(`simulator ${n}`, parseDeprecatedWidget);
     case "transformer":
-      return parseAndAssign(`transformer ${id}`, parseDeprecatedWidget);
+      return parseAndAssign(`transformer ${n}`, parseDeprecatedWidget);
     default:
       if (getWidget(type)) {
         // @ts-expect-error - 'type' is not a valid widget type
-        return parseAndAssign(`${type} ${id}`, any);
+        return parseAndAssign(`${type} ${n}`, any);
       }
       return ctx.failure("a valid widget type", type);
   }
@@ -48938,11 +48081,32 @@ const parseDeprecatedWidget = parseWidget(
 object({}));
 const parseStringToPositiveInt = (rawValue, ctx) => {
   if (typeof rawValue !== "string" || !/^[1-9][0-9]*$/.test(rawValue)) {
-    return ctx.failure("numeric string", rawValue);
+    return ctx.failure("a string representing a positive integer", rawValue);
   }
   return ctx.success(+rawValue);
 };
-const parseWidgetMapKeyComponents = pair(string, parseStringToPositiveInt);
+const parseWidgetIdComponents = pair(string, parseStringToPositiveInt);
+
+const parsePerseusRenderer = defaulted(object({
+  // TODO(benchristel): content is also defaulted to empty string in
+  // renderer.tsx. See if we can remove one default or the other.
+  content: defaulted(string, () => ""),
+  // This module has an import cycle with parseWidgetsMap, because the
+  // `group` widget can contain another renderer.
+  // The anonymous function below ensures that we don't try to access
+  // parseWidgetsMap before it's defined.
+  widgets: defaulted((rawVal, ctx) => parseWidgetsMap(rawVal, ctx), () => ({})),
+  metadata: optional(array(string)),
+  images: parseImages
+}),
+// Default value
+() => ({
+  content: "",
+  widgets: {},
+  images: {}
+}));
+
+const parsePerseusArticle = union(parsePerseusRenderer).or(array(parsePerseusRenderer)).parser;
 
 const parseHint = object({
   replace: optional(boolean),
@@ -48953,7 +48117,7 @@ const parseHint = object({
 });
 
 const _excluded = ["type", "options"];
-object({
+const parsePerseusItem$1 = object({
   question: parsePerseusRenderer,
   hints: defaulted(array(parseHint), () => []),
   answerArea: pipeParsers(defaulted(object({}), () => ({}))).then(migrateAnswerArea).then(record(enumeration(...ItemExtras), boolean)).parser,
@@ -48988,6 +48152,7 @@ function migrateAnswerArea(rawValue, ctx) {
  * Why not just use JSON.parse? We want:
  * - To make sure types are correct
  * - To give us a central place to validate/transform output if needed
+ * @deprecated - use parseAndMigratePerseusItem instead
  * @param {string} json - the stringified PerseusItem JSON
  * @returns {PerseusItem} the parsed PerseusItem object
  */
@@ -48999,6 +48164,60 @@ function parsePerseusItem(json) {
   }
   throw new Error("Something went wrong.");
 }
+/**
+ * Parses a PerseusItem from a JSON string, migrates old formats to the latest
+ * schema, and runtime-typechecks the result. Use this to parse assessmentItem
+ * data.
+ *
+ * @returns a {@link Result} of the parsed PerseusItem. If the result is a
+ * failure, it will contain an error message describing where in the tree
+ * parsing failed.
+ * @throws SyntaxError if the argument is not well-formed JSON.
+ */
+function parseAndMigratePerseusItem(json) {
+  throwErrorIfCheatingDetected();
+  const object = JSON.parse(json);
+  const result = parse(object, parsePerseusItem$1);
+  if (isFailure(result)) {
+    return failure({
+      message: result.detail,
+      invalidObject: object
+    });
+  }
+  return result;
+}
+
+/**
+ * Parses a PerseusArticle from a JSON string, migrates old formats to the
+ * latest schema, and runtime-typechecks the result.
+ *
+ * @returns a {@link Result} of the parsed PerseusArticle. If the result is a
+ * failure, it will contain an error message describing where in the tree
+ * parsing failed.
+ * @throws SyntaxError if the argument is not well-formed JSON.
+ */
+function parseAndMigratePerseusArticle(json) {
+  throwErrorIfCheatingDetected();
+  const object = JSON.parse(json);
+  const result = parse(object, parsePerseusArticle);
+  if (isFailure(result)) {
+    return failure({
+      message: result.detail,
+      invalidObject: object
+    });
+  }
+  return result;
+}
+
+/**
+ * Tries to block a cheating vector that relies on monkey-patching JSON.parse.
+ */
+// TODO(LEMS-2331): delete this function once server-side scoring is done.
+function throwErrorIfCheatingDetected() {
+  if (!isRealJSONParse(JSON.parse)) {
+    throw new Error("Something went wrong.");
+  }
+}
 
 const genericPerseusItemData = {
   question: {
@@ -49218,5 +48437,5 @@ const ScoringUtil = {
  * Types
  */
 
-export { ApiOptions, ArticleRenderer, BaseRadio, Categorizer$1 as Categorizer, changeable as Changeable, ClassNames, dependencies as Dependencies, EditorJsonify, Expression, GrapherUtil, Grapher$1 as GrapherWidget, HintRenderer, HintsRenderer, InputNumber$1 as InputNumber, InteractiveGraph$1 as InteractiveGraphWidget, ItemExtras, JiptParagraphs, KhanColors, KhanMath, context as LoadingContext, Log, Matrix$1 as MatrixWidget, NumericInput$1 as NumericInput, PerseusExpressionAnswerFormConsidered, PerseusI18nContext, PerseusI18nContextProvider, PerseusMarkdown, Plotter$1 as PlotterWidget, QUESTION_WIDGETS, Radio, Renderer, ScoringUtil, ref as ServerItemRenderer, Table$1 as TableWidget, Util, denylist as WIDGET_PROP_DENYLIST, widgets$1 as Widgets, addWidget, apiVersion, bodyXsmallBold, components, containerSizeClass, contentHasWidgetType, convertWidgetNameToEnum, displaySigFigs, generateTestCategorizerWidget, generateTestExpressionWidget, generateTestInteractiveGraphWidget, generateTestNumericInputWidget, generateTestPerseusItem, generateTestRadioWidget, genericPerseusItemData, getAngleCoords, getAnswerFromUserInput, getAnswersFromWidgets, getCircleCoords, getClockwiseAngle, getCorrectAnswerForWidgetId, getImagesWithoutAltData, getInteractiveBoxFromSizeClass, getLineCoords, getLinearSystemCoords, getPointCoords, getPolygonCoords, getQuadraticCoords, getSegmentCoords, getSinusoidCoords, getValidWidgetIds, getWidgetFromWidgetMap, getWidgetIdsFromContent, getWidgetIdsFromContentByType, getWidgetTypeByWidgetId, getWidgetsFromWidgetMap, getWidgetsMapFromItemData, iconChevronDown, iconTrash, init, injectWidgets, interactiveSizes$1 as interactiveSizes, isItemRenderableByVersion, isWidgetIdInContent, isWrongAnswerSupported, itemDataVersion, ItemVersion as itemVersion, libVersion, lockedFigureColors, lockedFigureFillStyles, makeSafeUrl, mathOnlyParser, mediaQueries, parseDataFromJSONP, parsePerseusItem, plotterPlotTypes, preprocessTex, registerAllWidgetsForTesting, scorePerseusItem, shouldHaveIndividualAnswer, traverse, usePerseusI18n, violatingWidgets, allWidgets as widgets };
+export { ApiOptions, ArticleRenderer, BaseRadio, Categorizer$1 as Categorizer, changeable as Changeable, ClassNames, dependencies as Dependencies, EditorJsonify, Expression, GrapherUtil, Grapher$1 as GrapherWidget, HintRenderer, HintsRenderer, InputNumber$1 as InputNumber, InteractiveGraph$1 as InteractiveGraphWidget, JiptParagraphs, KhanColors, context as LoadingContext, Log, Matrix$1 as MatrixWidget, NumericInput$1 as NumericInput, PerseusI18nContext, PerseusI18nContextProvider, PerseusMarkdown, Plotter$1 as PlotterWidget, QUESTION_WIDGETS, Radio, Renderer, ScoringUtil, ref as ServerItemRenderer, Table$1 as TableWidget, Util, denylist as WIDGET_PROP_DENYLIST, widgets$1 as Widgets, addWidget, apiVersion, bodyXsmallBold, components, containerSizeClass, contentHasWidgetType, convertWidgetNameToEnum, displaySigFigs, generateTestCategorizerWidget, generateTestExpressionWidget, generateTestInteractiveGraphWidget, generateTestNumericInputWidget, generateTestPerseusItem, generateTestRadioWidget, genericPerseusItemData, getAngleCoords, getAnswerFromUserInput, getAnswersFromWidgets, getCircleCoords, getClockwiseAngle, getCorrectAnswerForWidgetId, getImagesWithoutAltData, getInteractiveBoxFromSizeClass, getLineCoords, getLinearSystemCoords, getPointCoords, getPolygonCoords, getQuadraticCoords, getSegmentCoords, getSinusoidCoords, getValidWidgetIds, getWidgetFromWidgetMap, getWidgetIdsFromContent, getWidgetIdsFromContentByType, getWidgetTypeByWidgetId, getWidgetsFromWidgetMap, getWidgetsMapFromItemData, iconChevronDown, iconTrash, init, injectWidgets, interactiveSizes$1 as interactiveSizes, isFailure, isItemRenderableByVersion, isSuccess, isWidgetIdInContent, isWrongAnswerSupported, itemDataVersion, ItemVersion as itemVersion, libVersion, makeSafeUrl, mathOnlyParser, mediaQueries, parseAndMigratePerseusArticle, parseAndMigratePerseusItem, parseDataFromJSONP, parsePerseusItem, preprocessTex, registerAllWidgetsForTesting, scorePerseusItem, shouldHaveIndividualAnswer, traverse, usePerseusI18n, violatingWidgets, allWidgets as widgets };
 //# sourceMappingURL=index.js.map