@khanacademy/perseus 24.3.0 → 25.0.0

package/dist/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var KAS = require('@khanacademy/kas');
 var mathInput = require('@khanacademy/math-input');
+var perseusCore = require('@khanacademy/perseus-core');
 var PerseusLinter = require('@khanacademy/perseus-linter');
 var wonderBlocksCore = require('@khanacademy/wonder-blocks-core');
 var Tooltip$1 = require('@khanacademy/wonder-blocks-tooltip');
@@ -40,7 +41,6 @@ var Switch = require('@khanacademy/wonder-blocks-switch');
 var Pill = require('@khanacademy/wonder-blocks-pill');
 var reactPopper = require('react-popper');
 var Link = require('@khanacademy/wonder-blocks-link');
-var perseusCore = require('@khanacademy/perseus-core');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -803,52 +803,9 @@ var dependencies = /*#__PURE__*/Object.freeze({
 // TODO(LP-11481): Change the primary API we use for logging in Perseus to use
 // getDependencies() internally... simplify usage to just using a "singleton"
 // which get's the injected logger.
-/**
- * @typedef {Object} Errors utility for referencing the Perseus error taxonomy.
- */
-const Errors = Object.freeze({
-  /**
-   * @property {ErrorKind} Unknown The kind of error is not known.
-   */
-  Unknown: "Unknown",
-  /**
-   * @property {ErrorKind} Internal The error is internal to the executing code.
-   */
-  Internal: "Internal",
-  /**
-   * @property {ErrorKind} InvalidInput There was a problem with the provided
-   * input, such as the wrong format or a null value.
-   */
-  InvalidInput: "InvalidInput",
-  /**
-   * @property {ErrorKind} NotAllowed There was a problem due to the state of
-   * the system not matching the requested operation or input. For example,
-   * trying to create a username that is valid, but is already taken by
-   * another user. Use {@link InvalidInput} instead when the input isn't
-   * valid regardless of the state of the system. Use {@link NotFound} when
-   * the failure is due to not being able to find a resource.
-   */
-  NotAllowed: "NotAllowed",
-  /**
-   * @property {ErrorKind} TransientService There was a problem when making a
-   * request to a service.
-   */
-  TransientService: "TransientService",
-  /**
-   * @property {ErrorKind} Service There was a non-transient problem when
-   * making a request to service.
-   */
-  Service: "Service"
-});
-
-/**
- * @type {ErrorKind} The kind of error being reported
- */
-
 /**
  * Provides logging infrastructure for Perseus
  */
-
 const Log = {
   // Logs a message
   log: (message, extra) => {
@@ -860,16 +817,6 @@ const Log = {
   }
 };
 
-class PerseusError extends Error {
-  kind;
-  metadata;
-  constructor(message, kind, options) {
-    super(message);
-    this.kind = kind;
-    this.metadata = options?.metadata;
-  }
-}
-
 /**
  * These are things that widgets should exclude when serializing themselves.
  *
@@ -973,9 +920,9 @@ const change = function (newPropsOrSinglePropName, propValue, callback) {
     // string propName
     propValue, callback);
   }
-  throw new PerseusError("Invalid types sent to this.change(): " +
+  throw new perseusCore.PerseusError("Invalid types sent to this.change(): " +
   // eslint-disable-next-line prefer-rest-params
-  ___default["default"].toArray(arguments).join() + "\n" + USAGE, Errors.Internal);
+  ___default["default"].toArray(arguments).join() + "\n" + USAGE, perseusCore.Errors.Internal);
 };
 const propTypes = {
   onChange: PropTypes__default["default"].func.isRequired
@@ -2148,9 +2095,9 @@ const KhanAnswerTypes = {
     parseSolution: function (solutionString, options) {
       let solution = KAS__namespace.parse(solutionString, options);
       if (!solution.parsed) {
-        throw new PerseusError("The provided solution (" + solutionString + ") didn't parse.", Errors.InvalidInput);
+        throw new perseusCore.PerseusError("The provided solution (" + solutionString + ") didn't parse.", perseusCore.Errors.InvalidInput);
       } else if (options.simplified && !solution.expr.isSimplified()) {
-        throw new PerseusError("The provided solution (" + solutionString + ") isn't fully expanded and simplified.", Errors.InvalidInput);
+        throw new perseusCore.PerseusError("The provided solution (" + solutionString + ") isn't fully expanded and simplified.", perseusCore.Errors.InvalidInput);
       } else {
         solution = solution.expr;
       }
@@ -2341,7 +2288,7 @@ class Expression extends React__namespace.Component {
       // in the function variables list for the expression.
       if (!expression.parsed) {
         /* c8 ignore next */
-        Log.error("Unable to parse solution answer for expression", Errors.InvalidInput, {
+        Log.error("Unable to parse solution answer for expression", perseusCore.Errors.InvalidInput, {
           loggedMetadata: {
             rubric: JSON.stringify(rubric)
           }
@@ -3032,7 +2979,7 @@ function combineScores(scoreA, scoreB) {
    * The above checks cover all combinations of score type, so if we get here
    * then something is amiss with our inputs.
    */
-  throw new PerseusError("PerseusScore with unknown type encountered", Errors.InvalidInput, {
+  throw new perseusCore.PerseusError("PerseusScore with unknown type encountered", perseusCore.Errors.InvalidInput, {
     metadata: {
       scoreA: JSON.stringify(scoreA),
       scoreB: JSON.stringify(scoreB)
@@ -3062,9 +3009,9 @@ function keScoreFromPerseusScore(score, guess, state) {
       state: state
     };
   }
-  throw new PerseusError(
+  throw new perseusCore.PerseusError(
   // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'never'.
-  "Invalid score type: " + score.type, Errors.InvalidInput, {
+  "Invalid score type: " + score.type, perseusCore.Errors.InvalidInput, {
     metadata: {
       score: JSON.stringify(score),
       guess: JSON.stringify(guess),
@@ -4433,7 +4380,7 @@ const MovableHelperMethods = {
         return memo;
       }
       // Anything else is an error
-      throw new PerseusError("Constraint returned invalid result: " + result, Errors.Internal);
+      throw new perseusCore.PerseusError("Constraint returned invalid result: " + result, perseusCore.Errors.Internal);
     }, current, this);
   },
   /**
@@ -4539,7 +4486,7 @@ const FUNCTION_ARRAY_OPTIONS = ["add", "modify", "draw", "remove", "constraints"
 const InteractiveUtil = {
   assert: function (isTrue, message) {
     if (!isTrue) {
-      throw new PerseusError("Assertion Error" + (message ? ": " + message : ""), Errors.Internal);
+      throw new perseusCore.PerseusError("Assertion Error" + (message ? ": " + message : ""), perseusCore.Errors.Internal);
     }
   },
   /**
@@ -9120,7 +9067,7 @@ class Graphie$1 {
     // TODO(jeremy): This can be removed once we're confident that callers
     // obey the Typescript types.
     if (options.range == null) {
-      throw new PerseusError("range should be specified in graph init", Errors.Internal);
+      throw new perseusCore.PerseusError("range should be specified in graph init", perseusCore.Errors.Internal);
     }
     this.#bounds = new GraphBounds(...options.range);
     this.#drawingTransform = new DrawingTransform(this.raphael, scale, this.bounds());
@@ -13707,7 +13654,7 @@ function MovableAngle(graphie, options) {
 
   // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation. | TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
   if (!this.points || this.points.length !== 3) {
-    throw new PerseusError("MovableAngle requires 3 points", Errors.InvalidInput);
+    throw new perseusCore.PerseusError("MovableAngle requires 3 points", perseusCore.Errors.InvalidInput);
   }
 
   // Handle coordinates that are not MovablePoints (i.e. [2, 4])
@@ -13998,9 +13945,9 @@ function GraphieMovable$1(descriptor) {
   ___default["default"].extend(this, descriptor);
 }
 const abstractMethod = function () {
-  throw new PerseusError("Abstract method! Must be implemented by Graphie Movable" +
+  throw new perseusCore.PerseusError("Abstract method! Must be implemented by Graphie Movable" +
   // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
-  this.constructor.displayName, Errors.NotAllowed);
+  this.constructor.displayName, perseusCore.Errors.NotAllowed);
 };
 ___default["default"].extend(GraphieMovable$1.prototype, {
   movableProps: [],
@@ -14040,7 +13987,7 @@ const createClass = function (spec) {
   const GraphieClass = function (props) {
     // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
     if (!(this instanceof GraphieClass)) {
-      throw new PerseusError("Use createElement or JSX with graphie movables", Errors.NotAllowed);
+      throw new perseusCore.PerseusError("Use createElement or JSX with graphie movables", perseusCore.Errors.NotAllowed);
     }
     // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
     this.props = rewriteProps(props, props.children || []);
@@ -14359,7 +14306,7 @@ class Movable {
         return memo;
       }
       // Anything else is an error
-      throw new PerseusError("Constraint returned invalid result: " + result, Errors.Internal);
+      throw new perseusCore.PerseusError("Constraint returned invalid result: " + result, perseusCore.Errors.Internal);
     }, current);
   }
 
@@ -15709,7 +15656,7 @@ class MovablePoint$4 {
         return memo;
       }
       // Anything else is an error
-      throw new PerseusError("Constraint returned invalid result: " + result, Errors.Internal);
+      throw new perseusCore.PerseusError("Constraint returned invalid result: " + result, perseusCore.Errors.Internal);
     }, current);
   }
 
@@ -16864,7 +16811,7 @@ class Graphie extends React__namespace.Component {
     // would have horrible performance implications. In order to avoid
     // those, we just warn here.
     if (this.props.setup !== prevProps.setup) {
-      Log.error("<Graphie> was given a new setup function. " + "This is a bad idea; please refactor your code to give " + "the same setup function reference to <Graphie> on " + "every render.", Errors.Internal);
+      Log.error("<Graphie> was given a new setup function. " + "This is a bad idea; please refactor your code to give " + "the same setup function reference to <Graphie> on " + "every render.", perseusCore.Errors.Internal);
     }
     if (!deepEq$2(this.props.options, prevProps.options) || !deepEq$2(this.props.box, prevProps.box) || !deepEq$2(this.props.range, prevProps.range)) {
       this._setupGraphie();
@@ -17043,7 +16990,7 @@ class Graphie extends React__namespace.Component {
         // This generally is a bad idea, so warn about it if this
         // is being caused by implicit keys
         if (keyProp == null) {
-          Log.error("Replacing a <Graphie> child with a " + "child of a different type. Please add keys " + "to your <Graphie> children", Errors.Internal);
+          Log.error("Replacing a <Graphie> child with a " + "child of a different type. Please add keys " + "to your <Graphie> children", perseusCore.Errors.Internal);
         }
         prevMovable.remove();
         child.add(graphie);
@@ -17320,7 +17267,7 @@ function getLocalizedDataUrl(url) {
 function getUrlHash(url) {
   const match = url.match(hashRegex);
   if (match == null) {
-    throw new PerseusError("not a valid URL", Errors.InvalidInput);
+    throw new perseusCore.PerseusError("not a valid URL", perseusCore.Errors.InvalidInput);
   }
   return match && match[1];
 }
@@ -17457,7 +17404,7 @@ class SvgImage extends React__namespace.Component {
           // If there is isn't any localized data, fall back to
           // the original, unlocalized data
           retrieveData(Util.getDataUrl(this.props.src), (x, status, error) => {
-            Log.error("Data load failed for svg-image", Errors.Service, {
+            Log.error("Data load failed for svg-image", perseusCore.Errors.Service, {
               cause: error,
               loggedMetadata: {
                 dataUrl: Util.getDataUrl(this.props.src),
@@ -17468,7 +17415,7 @@ class SvgImage extends React__namespace.Component {
         });
       } else {
         retrieveData(Util.getDataUrl(this.props.src), (x, status, error) => {
-          Log.error("Data load failed for svg-image", Errors.Service, {
+          Log.error("Data load failed for svg-image", perseusCore.Errors.Service, {
             cause: error,
             loggedMetadata: {
               dataUrl: Util.getDataUrl(this.props.src),
@@ -17720,7 +17667,7 @@ class SvgImage extends React__namespace.Component {
       } else if (this.state.imageDimensions) {
         box = [this.state.imageDimensions[0] * this.props.scale, this.state.imageDimensions[1] * this.props.scale];
       } else {
-        throw new PerseusError("svg-image has no dimensions", Errors.InvalidInput, {
+        throw new perseusCore.PerseusError("svg-image has no dimensions", perseusCore.Errors.InvalidInput, {
           metadata: {
             src: this.props.src
           }
@@ -18148,7 +18095,7 @@ class ErrorBoundary extends React__namespace.Component {
     // differentiate between the different errors that are thrown, they
     // all end up being grouped as a single Sentry event, which is very
     // unhelpful.
-    "Unhandled Perseus error: " + error.message, Errors.Internal, {
+    "Unhandled Perseus error: " + error.message, perseusCore.Errors.Internal, {
       cause: error,
       loggedMetadata: {
         componentStack: !!info && "componentStack" in info ? info.componentStack : "componentStack not provided",
@@ -19201,7 +19148,7 @@ const replaceWidget = (name, replacementName) => {
   // that doesn't exist at all.
   if (!substituteWidget) {
     const errorMsg = `Failed to replace ${name} with ${replacementName}`;
-    throw new PerseusError(errorMsg, Errors.Internal);
+    throw new perseusCore.PerseusError(errorMsg, perseusCore.Errors.Internal);
   }
   registerWidget(name, substituteWidget);
 };
@@ -19215,7 +19162,7 @@ const replaceDeprecatedWidgets = () => {
 const registerEditors = editorsToRegister => {
   editorsToRegister.forEach(editor => {
     if (!editor.widgetName) {
-      throw new PerseusError(`Editor ${editor.displayName} doesn't have a widgetName property`, Errors.Internal);
+      throw new perseusCore.PerseusError(`Editor ${editor.displayName} doesn't have a widgetName property`, perseusCore.Errors.Internal);
     }
     editors[editor.widgetName] = editor;
   });
@@ -19233,7 +19180,7 @@ const replaceEditor = (name, replacementName) => {
   const substituteEditor = editors[replacementName];
   if (!substituteEditor && Log) {
     const errorMsg = `Failed to replace editor ${name} with ${replacementName}`;
-    Log.error(errorMsg, Errors.Internal);
+    Log.error(errorMsg, perseusCore.Errors.Internal);
     return;
   }
   editors[name] = substituteEditor;
@@ -19307,7 +19254,7 @@ const upgradeWidgetInfoToLatestVersion = oldWidgetInfo => {
   // suspect we have legacy data (potentially unpublished) and we should
   // figure that out before depending solely on types.
   if (!___default["default"].isString(type)) {
-    throw new PerseusError("widget type must be a string, but was: " + type, Errors.Internal);
+    throw new perseusCore.PerseusError("widget type must be a string, but was: " + type, perseusCore.Errors.Internal);
   }
   const widgetExports = widgets[type];
   if (widgetExports == null) {
@@ -19358,7 +19305,7 @@ const upgradeWidgetInfoToLatestVersion = oldWidgetInfo => {
         // This is a Log.error because it is unlikely to be hit in
         // local testing, and a Log.error is slightly less scary in
         // prod than a `throw new Error`
-        Log.error("No upgrade found for widget. Cannot render.", Errors.Internal, {
+        Log.error("No upgrade found for widget. Cannot render.", perseusCore.Errors.Internal, {
           loggedMetadata: {
             type,
             fromMajorVersion: nextVersion - 1,
@@ -19431,7 +19378,7 @@ const getRendererPropsForWidgetInfo = (widgetInfo, strings, problemNum) => {
 };
 const traverseChildWidgets$3 = (widgetInfo, traverseRenderer) => {
   if (!traverseRenderer) {
-    throw new PerseusError("traverseRenderer must be provided, but was not", Errors.Internal);
+    throw new perseusCore.PerseusError("traverseRenderer must be provided, but was not", perseusCore.Errors.Internal);
   }
   if (!widgetInfo || !widgetInfo.type || !widgets[widgetInfo.type]) {
     return widgetInfo;
@@ -19500,12 +19447,12 @@ const validAlignments = ["block", "inline-block", "inline", "float-left", "float
 const validateAlignments = () => {
   ___default["default"].each(widgets, function (widgetInfo) {
     if (widgetInfo.defaultAlignment && !___default["default"].contains(validAlignments, widgetInfo.defaultAlignment)) {
-      throw new PerseusError("Widget '" + widgetInfo.displayName + "' has an invalid defaultAlignment value: " + widgetInfo.defaultAlignment, Errors.InvalidInput);
+      throw new perseusCore.PerseusError("Widget '" + widgetInfo.displayName + "' has an invalid defaultAlignment value: " + widgetInfo.defaultAlignment, perseusCore.Errors.InvalidInput);
     }
     if (widgetInfo.supportedAlignments) {
       const unknownAlignments = ___default["default"].difference(widgetInfo.supportedAlignments, validAlignments);
       if (unknownAlignments.length) {
-        throw new PerseusError("Widget '" + widgetInfo.displayName + "' has an invalid value for supportedAlignments: " + unknownAlignments.join(" "), Errors.InvalidInput);
+        throw new perseusCore.PerseusError("Widget '" + widgetInfo.displayName + "' has an invalid value for supportedAlignments: " + unknownAlignments.join(" "), perseusCore.Errors.InvalidInput);
       }
     }
   });
@@ -20131,7 +20078,7 @@ class Renderer extends React__namespace.Component {
 
     // If the two lists of IDs match (ignoring order)
     if (serializedWidgetIds.length !== widgetPropIds.length || ___default["default"].intersection(serializedWidgetIds, widgetPropIds).length !== serializedWidgetIds.length) {
-      Log.error("Refusing to restore bad serialized state:", Errors.Internal, {
+      Log.error("Refusing to restore bad serialized state:", perseusCore.Errors.Internal, {
         loggedMetadata: {
           serializedState: JSON.stringify(serializedState),
           currentProps: JSON.stringify(this.state.widgetProps)
@@ -20289,7 +20236,7 @@ class Renderer extends React__namespace.Component {
     return function (id) {
       let focusPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
       if (!___default["default"].isArray(focusPath)) {
-        throw new PerseusError("widget props.onFocus focusPath must be an Array, " + "but was" + JSON.stringify(focusPath), Errors.Internal);
+        throw new perseusCore.PerseusError("widget props.onFocus focusPath must be an Array, " + "but was" + JSON.stringify(focusPath), perseusCore.Errors.Internal);
       }
       _this2._setCurrentFocus([id].concat(focusPath));
     };
@@ -20773,7 +20720,7 @@ class Renderer extends React__namespace.Component {
         // object return value.
         // The result of focus was a {path, id} object itself
         path = [id].concat(focusResult.path || []);
-        Log.error("Renderer received a focus result of type 'object' " + "instead of the expected type 'boolean'", Errors.Internal, {
+        Log.error("Renderer received a focus result of type 'object' " + "instead of the expected type 'boolean'", perseusCore.Errors.Internal, {
           loggedMetadata: {
             focusResult: JSON.stringify(focusResult),
             currentProps: JSON.stringify(this.state.widgetProps)
@@ -28723,7 +28670,44 @@ function inset(amount, box) {
   return [trim(amount[X], box[X]), trim(amount[Y], box[Y])];
 }
 
+// [L]inear Int[erp]olation: gets the weighted average of two values `a` and
+// `b`, with the given `fraction` specifying how much weight `a` and `b` get:
+// - if `fraction` is 0, `lerp` returns `a`.
+// - if `fraction` is 0.5, `lerp` returns the average of `a` and `b`.
+// - if `fraction` is 1, `lerp` returns `b`.
+function lerp(a, b, fraction) {
+  return (b - a) * clamp(fraction, 0, 1) + a;
+}
+
+// Determines whether two line segments have exactly one intersection point.
+// The segments are treated as "open" - that is, not inclusive of their
+// endpoints.
+// Algorithm from https://stackoverflow.com/a/24392281/7347484
+const segmentsIntersect = (_ref, _ref2) => {
+  let [[a, b], [c, d]] = _ref;
+  let [[p, q], [r, s]] = _ref2;
+  const determinant = (c - a) * (s - q) - (r - p) * (d - b);
+  if (determinant === 0) {
+    return false;
+  } else {
+    const lambda = ((s - q) * (r - a) + (p - r) * (s - b)) / determinant;
+    const gamma = ((b - d) * (r - a) + (c - a) * (s - b)) / determinant;
+    return 0 < lambda && lambda < 1 && 0 < gamma && gamma < 1;
+  }
+};
+
 // This file contains helper functions for working with angles.
+
+function convertDegreesToRadians(degrees) {
+  return degrees / 180 * Math.PI;
+}
+
+// Returns a value between -180 and 180, inclusive. The angle is measured
+// between the positive x-axis and the given vector.
+function calculateAngleInDegrees(_ref) {
+  let [x, y] = _ref;
+  return Math.atan2(y, x) * 180 / Math.PI;
+}
 function polar(r, th) {
   if (typeof r === "number") {
     r = [r, r];
@@ -29061,52 +29045,6 @@ function Arrowhead(props) {
   })));
 }
 
-function calculateAngleInDegrees(_ref) {
-  let [x, y] = _ref;
-  return Math.atan2(y, x) * 180 / Math.PI;
-}
-
-/**
- * Given a ray and a rectangular box, find the point where the ray intersects
- * the edge of the box. Assumes the `initialPoint` is inside the box.
- * @param initialPoint - The starting point of the ray.
- * @param throughPoint - A point that the ray passes through. Must be different from initialPoint.
- * @param box - The box with which to intersect the ray, in the form [[xMin, xMax], [yMin, yMax]]
- */
-const getIntersectionOfRayWithBox = (initialPoint, throughPoint, box) => {
-  const [[xMin, xMax], [yMin, yMax]] = box;
-  const [aX, aY] = initialPoint;
-  const [bX, bY] = throughPoint;
-  const yDiff = bY - aY;
-  const xDiff = bX - aX;
-  const slope = yDiff / xDiff;
-  const inverseSlope = 1 / slope;
-  const xExtreme = xDiff < 0 ? xMin : xMax;
-  const yExtreme = yDiff < 0 ? yMin : yMax;
-  const yAtXExtreme = aY + (xExtreme - aX) * slope;
-  const xAtYExtreme = aX + (yExtreme - aY) * inverseSlope;
-  switch (true) {
-    // does the ray exit the graph bounding box via the left or right edge?
-    case isBetween(yAtXExtreme, yMin, yMax):
-      return [xExtreme, yAtXExtreme];
-
-    // does the ray exit the graph bounding box via the top or bottom edge?
-    case isBetween(xAtYExtreme, xMin, xMax):
-      return [xAtYExtreme, yExtreme];
-    default:
-      return [xExtreme, yExtreme];
-  }
-};
-const getLines = points => {
-  return points.map((point, i) => {
-    const next = points[(i + 1) % points.length];
-    return [point, next];
-  });
-};
-function isBetween(x, low, high) {
-  return x >= low && x <= high;
-}
-
 function SVGLine(props) {
   const {
     start,
@@ -29152,6 +29090,41 @@ function Vector(props) {
   }));
 }
 
+/**
+ * Given a ray and a rectangular box, find the point where the ray intersects
+ * the edge of the box. Assumes the `initialPoint` is inside the box.
+ * @param initialPoint - The starting point of the ray.
+ * @param throughPoint - A point that the ray passes through. Must be different from initialPoint.
+ * @param box - The box with which to intersect the ray, in the form [[xMin, xMax], [yMin, yMax]]
+ */
+const getIntersectionOfRayWithBox = (initialPoint, throughPoint, box) => {
+  const [[xMin, xMax], [yMin, yMax]] = box;
+  const [aX, aY] = initialPoint;
+  const [bX, bY] = throughPoint;
+  const yDiff = bY - aY;
+  const xDiff = bX - aX;
+  const slope = yDiff / xDiff;
+  const inverseSlope = 1 / slope;
+  const xExtreme = xDiff < 0 ? xMin : xMax;
+  const yExtreme = yDiff < 0 ? yMin : yMax;
+  const yAtXExtreme = aY + (xExtreme - aX) * slope;
+  const xAtYExtreme = aX + (yExtreme - aY) * inverseSlope;
+  switch (true) {
+    // does the ray exit the graph bounding box via the left or right edge?
+    case isBetween(yAtXExtreme, yMin, yMax):
+      return [xExtreme, yAtXExtreme];
+
+    // does the ray exit the graph bounding box via the top or bottom edge?
+    case isBetween(xAtYExtreme, xMin, xMax):
+      return [xAtYExtreme, yExtreme];
+    default:
+      return [xExtreme, yExtreme];
+  }
+};
+function isBetween(x, low, high) {
+  return x >= low && x <= high;
+}
+
 const LockedLine = props => {
   const {
     color,
@@ -29611,10 +29584,7 @@ const MovablePointView = /*#__PURE__*/React.forwardRef((props, hitboxRef) => {
   })?.[0] ?? "blue";
   const pointClasses = `movable-point ${dragging ? "movable-point--dragging" : ""} ${focusClass(focusBehavior)}`;
   const [[x, y]] = useTransformVectorsToPixels(point);
-
-  // TODO(benchristel): destructure range in one line
-  const [xMin, xMax] = range[X];
-  const [yMin, yMax] = range[Y];
+  const [[xMin, xMax], [yMin, yMax]] = range;
   const [[verticalStartX]] = useTransformVectorsToPixels([xMin, 0]);
   const [[verticalEndX]] = useTransformVectorsToPixels([xMax, 0]);
   const [[_, horizontalStartY]] = useTransformVectorsToPixels([0, yMin]);
@@ -30201,26 +30171,11 @@ const shouldDrawArcOutside = (midpoint, vertex, range, polygonLines) => {
   // Create a ray from the midpoint (inside angle) to the edge of the range
   const rangeIntersectionPoint = getIntersectionOfRayWithBox(midpoint, vertex, range);
   let lineIntersectionCount = 0;
-  polygonLines.forEach(line => linesIntersect([vertex, rangeIntersectionPoint], line) && lineIntersectionCount++);
+  polygonLines.forEach(line => segmentsIntersect([vertex, rangeIntersectionPoint], line) && lineIntersectionCount++);
 
   // If the number of intersections is even, the angle is inside the polygon
   return !isEven(lineIntersectionCount);
 };
-
-// https://stackoverflow.com/a/24392281/7347484
-// The "intersects" function in geometry doesn't seem to work for this use case
-const linesIntersect = (_ref5, _ref6) => {
-  let [[a, b], [c, d]] = _ref5;
-  let [[p, q], [r, s]] = _ref6;
-  const determinant = (c - a) * (s - q) - (r - p) * (d - b);
-  if (determinant === 0) {
-    return false;
-  } else {
-    const lambda = ((s - q) * (r - a) + (p - r) * (s - b)) / determinant;
-    const gamma = ((b - d) * (r - a) + (c - a) * (s - b)) / determinant;
-    return 0 < lambda && lambda < 1 && 0 < gamma && gamma < 1;
-  }
-};
 const isEven = n => n % 2 === 0;
 
 // This function calculates the bisector point of an angle formed by two points
@@ -30414,6 +30369,12 @@ const PolygonGraph = props => {
     onMove: destination => dispatch(movePoint(i, destination))
   })));
 };
+function getLines(points) {
+  return points.map((point, i) => {
+    const next = points[(i + 1) % points.length];
+    return [point, next];
+  });
+}
 
 function getGradableGraph(state, initialGraph) {
   if (!state.hasBeenInteractedWith) {
@@ -30803,12 +30764,8 @@ const AxisTickLabels = () => {
     tickStep,
     range
   } = graphConfig;
-
-  // TODO(benchristel): use destructuring here
-  const [xMin, xMax] = range[X];
-  const [yMin, yMax] = range[Y];
-  const yTickStep = tickStep[Y];
-  const xTickStep = tickStep[X];
+  const [[xMin, xMax], [yMin, yMax]] = range;
+  const [xTickStep, yTickStep] = tickStep;
   const yGridTicks = generateTickLocations$1(yTickStep, yMin, yMax);
   const xGridTicks = generateTickLocations$1(xTickStep, xMin, xMax);
   return /*#__PURE__*/React__namespace.createElement("div", {
@@ -31192,12 +31149,8 @@ const AxisTicks = () => {
     width,
     height
   };
-
-  // TODO(benchristel): destructure these in one line
-  const [xMin, xMax] = range[X];
-  const [yMin, yMax] = range[Y];
-  const yTickStep = tickStep[Y];
-  const xTickStep = tickStep[X];
+  const [[xMin, xMax], [yMin, yMax]] = range;
+  const [xTickStep, yTickStep] = tickStep;
   const yGridTicks = generateTickLocations(yTickStep, yMin, yMax);
   const xGridTicks = generateTickLocations(xTickStep, xMin, xMax);
   return /*#__PURE__*/React__namespace.createElement("g", {
@@ -31734,7 +31687,7 @@ const PropCheckBox = createReactClass__default["default"]({
       return !___default["default"].has(this.DEFAULT_PROPS, localPropName);
     }, this);
     if (!propName) {
-      throw new PerseusError("Attempted to create a PropCheckBox with no prop!", Errors.InvalidInput);
+      throw new perseusCore.PerseusError("Attempted to create a PropCheckBox with no prop!", perseusCore.Errors.InvalidInput);
     }
     return propName;
   },
@@ -31927,7 +31880,7 @@ function Protractor() {
 function RotationArrow() {
   const radius = 175;
   const angleDeg = 10;
-  const angleRad = degreesToRadians(angleDeg);
+  const angleRad = convertDegreesToRadians(angleDeg);
   const endX = radius * (1 - Math.cos(angleRad));
   const endY = radius * -Math.sin(angleRad);
   const rotationArrow = pathBuilder().move(0, 0).circularArc(radius, endX, endY, {
@@ -32006,17 +31959,135 @@ function useDraggablePx(args) {
   });
 }
 
-// [L]inear Int[erp]olation: gets the weighted average of two values `a` and
-// `b`, with the given `fraction` specifying how much weight `a` and `b` get:
-// - if `fraction` is 0, `lerp` returns `a`.
-// - if `fraction` is 0.5, `lerp` returns the average of `a` and `b`.
-// - if `fraction` is 1, `lerp` returns `b`.
-function lerp(a, b, fraction) {
-  return (b - a) * fraction + a;
-}
-function degreesToRadians(degrees) {
-  return degrees / 180 * Math.PI;
-}
+const MafsGraph = props => {
+  const {
+    state,
+    dispatch,
+    labels
+  } = props;
+  const [width, height] = props.box;
+  const tickStep = props.step;
+  return /*#__PURE__*/React__namespace.createElement(GraphConfigContext.Provider, {
+    value: {
+      range: state.range,
+      snapStep: state.snapStep,
+      markings: props.markings,
+      tickStep: tickStep,
+      gridStep: props.gridStep,
+      showTooltips: !!props.showTooltips,
+      graphDimensionsInPixels: props.box,
+      width,
+      height,
+      labels
+    }
+  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    className: "mafs-graph",
+    style: {
+      width,
+      height,
+      position: "relative",
+      padding: "25px 25px 0 0",
+      boxSizing: "content-box",
+      marginLeft: "20px",
+      marginBottom: "20px"
+    }
+  }, /*#__PURE__*/React__namespace.createElement(LegacyGrid, {
+    box: props.box,
+    backgroundImage: props.backgroundImage
+  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
+    style: {
+      position: "absolute",
+      bottom: 0,
+      left: 0
+    }
+  }, props.markings === "graph" && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(AxisLabels, null), /*#__PURE__*/React__namespace.createElement(AxisTickLabels, null)), /*#__PURE__*/React__namespace.createElement(mafs.Mafs, {
+    preserveAspectRatio: false,
+    viewBox: {
+      x: state.range[X],
+      y: state.range[Y],
+      padding: 0
+    },
+    pan: false,
+    zoom: false,
+    width: width,
+    height: height
+  }, /*#__PURE__*/React__namespace.createElement(SvgDefs, null), /*#__PURE__*/React__namespace.createElement(Grid, {
+    tickStep: props.step,
+    gridStep: props.gridStep,
+    range: state.range,
+    containerSizeClass: props.containerSizeClass,
+    markings: props.markings
+  }), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
+    lockedFigures: props.lockedFigures,
+    range: state.range
+  }), "/* Protractor */", props.showProtractor && /*#__PURE__*/React__namespace.createElement(Protractor, null), renderGraph({
+    state,
+    dispatch
+  })))));
+};
+const renderGraph = props => {
+  const {
+    state,
+    dispatch
+  } = props;
+  const {
+    type
+  } = state;
+  switch (type) {
+    case "angle":
+      return /*#__PURE__*/React__namespace.createElement(AngleGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "segment":
+      return /*#__PURE__*/React__namespace.createElement(SegmentGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "linear-system":
+      return /*#__PURE__*/React__namespace.createElement(LinearSystemGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "linear":
+      return /*#__PURE__*/React__namespace.createElement(LinearGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "ray":
+      return /*#__PURE__*/React__namespace.createElement(RayGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "polygon":
+      return /*#__PURE__*/React__namespace.createElement(PolygonGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "point":
+      return /*#__PURE__*/React__namespace.createElement(PointGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "circle":
+      return /*#__PURE__*/React__namespace.createElement(CircleGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "quadratic":
+      return /*#__PURE__*/React__namespace.createElement(QuadraticGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    case "sinusoid":
+      return /*#__PURE__*/React__namespace.createElement(SinusoidGraph, {
+        graphState: state,
+        dispatch: dispatch
+      });
+    default:
+      return new wonderStuffCore.UnreachableCaseError(type);
+  }
+};
 
 function initializeGraphState(params) {
   const {
@@ -32968,70 +33039,6 @@ function setAtIndex(args) {
   return copy;
 }
 
-const renderGraph = props => {
-  const {
-    state,
-    dispatch
-  } = props;
-  const {
-    type
-  } = state;
-  switch (type) {
-    case "angle":
-      return /*#__PURE__*/React__namespace.createElement(AngleGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "segment":
-      return /*#__PURE__*/React__namespace.createElement(SegmentGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "linear-system":
-      return /*#__PURE__*/React__namespace.createElement(LinearSystemGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "linear":
-      return /*#__PURE__*/React__namespace.createElement(LinearGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "ray":
-      return /*#__PURE__*/React__namespace.createElement(RayGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "polygon":
-      return /*#__PURE__*/React__namespace.createElement(PolygonGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "point":
-      return /*#__PURE__*/React__namespace.createElement(PointGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "circle":
-      return /*#__PURE__*/React__namespace.createElement(CircleGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "quadratic":
-      return /*#__PURE__*/React__namespace.createElement(QuadraticGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    case "sinusoid":
-      return /*#__PURE__*/React__namespace.createElement(SinusoidGraph, {
-        graphState: state,
-        dispatch: dispatch
-      });
-    default:
-      return new wonderStuffCore.UnreachableCaseError(type);
-  }
-};
-
 // Rather than be tightly bound to how data was structured in
 // the legacy interactive graph, this lets us store state
 // however we want and we just transform it before handing it off
@@ -33101,72 +33108,6 @@ const StatefulMafsGraph = /*#__PURE__*/React__namespace.forwardRef((props, ref)
     dispatch: dispatch
   }));
 });
-const MafsGraph = props => {
-  const {
-    state,
-    dispatch,
-    labels
-  } = props;
-  const [width, height] = props.box;
-  const tickStep = props.step;
-  return /*#__PURE__*/React__namespace.createElement(GraphConfigContext.Provider, {
-    value: {
-      range: state.range,
-      snapStep: state.snapStep,
-      markings: props.markings,
-      tickStep: tickStep,
-      gridStep: props.gridStep,
-      showTooltips: !!props.showTooltips,
-      graphDimensionsInPixels: props.box,
-      width,
-      height,
-      labels
-    }
-  }, /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    className: "mafs-graph",
-    style: {
-      width,
-      height,
-      position: "relative",
-      padding: "25px 25px 0 0",
-      boxSizing: "content-box",
-      marginLeft: "20px",
-      marginBottom: "20px"
-    }
-  }, /*#__PURE__*/React__namespace.createElement(LegacyGrid, {
-    box: props.box,
-    backgroundImage: props.backgroundImage
-  }), /*#__PURE__*/React__namespace.createElement(wonderBlocksCore.View, {
-    style: {
-      position: "absolute",
-      bottom: 0,
-      left: 0
-    }
-  }, props.markings === "graph" && /*#__PURE__*/React__namespace.createElement(React__namespace.Fragment, null, /*#__PURE__*/React__namespace.createElement(AxisLabels, null), /*#__PURE__*/React__namespace.createElement(AxisTickLabels, null)), /*#__PURE__*/React__namespace.createElement(mafs.Mafs, {
-    preserveAspectRatio: false,
-    viewBox: {
-      x: state.range[X],
-      y: state.range[Y],
-      padding: 0
-    },
-    pan: false,
-    zoom: false,
-    width: width,
-    height: height
-  }, /*#__PURE__*/React__namespace.createElement(SvgDefs, null), /*#__PURE__*/React__namespace.createElement(Grid, {
-    tickStep: props.step,
-    gridStep: props.gridStep,
-    range: state.range,
-    containerSizeClass: props.containerSizeClass,
-    markings: props.markings
-  }), props.lockedFigures && /*#__PURE__*/React__namespace.createElement(GraphLockedLayer, {
-    lockedFigures: props.lockedFigures,
-    range: state.range
-  }), "/* Protractor */", props.showProtractor && /*#__PURE__*/React__namespace.createElement(Protractor, null), renderGraph({
-    state,
-    dispatch
-  })))));
-};
 
 const {
   DeprecationMixin
@@ -33215,7 +33156,7 @@ const _isClickToAddPoints = props => {
   return props.graph.type === "point" && props.graph.numPoints === UNLIMITED || props.graph.type === "polygon" && props.graph.numSides === UNLIMITED;
 };
 const makeInvalidTypeError = (functionName, graphType) => {
-  return new PerseusError(`${functionName} called but current graph type is not a '${graphType}'`, Errors.NotAllowed, {
+  return new perseusCore.PerseusError(`${functionName} called but current graph type is not a '${graphType}'`, perseusCore.Errors.NotAllowed, {
     metadata: {
       graphType
     }
@@ -33314,7 +33255,7 @@ class LegacyInteractiveGraph extends React__namespace.Component {
     // This function should only be called when this.isClickToAddPoints()
     // is true
     if (!this.isClickToAddPoints()) {
-      throw new PerseusError("handleAddPointsClick should not be registered" + "when isClickToAddPoints() is false", Errors.NotAllowed);
+      throw new perseusCore.PerseusError("handleAddPointsClick should not be registered" + "when isClickToAddPoints() is false", perseusCore.Errors.NotAllowed);
     }
     if (!this.isCoordInTrash(coord)) {
       let point;
@@ -34452,7 +34393,7 @@ class InteractiveGraph extends React__namespace.Component {
     if (this.legacyGraphRef.current) {
       return this.legacyGraphRef.current.getUserInput();
     }
-    throw new PerseusError("Cannot getUserInput from a graph that has never rendered", Errors.NotAllowed);
+    throw new perseusCore.PerseusError("Cannot getUserInput from a graph that has never rendered", perseusCore.Errors.NotAllowed);
   };
   simpleValidate(rubric) {
     return InteractiveGraph.validate(this.getUserInput?.(), rubric, this);
@@ -40178,7 +40119,7 @@ class Card extends React__namespace.Component {
     // Event handlers should be unbound before component unmounting, but
     // just in case...
     if (this.mouseMoveUpBound) {
-      Log.error("Removing an element with bound event handlers.", Errors.Internal);
+      Log.error("Removing an element with bound event handlers.", perseusCore.Errors.Internal);
       this.unbindMouseMoveUp();
       Util.resetTouchHandlers();
     }
@@ -40999,7 +40940,7 @@ function deserializeHighlight(serializedHighlight, wordRanges) {
   } = serializedHighlight.range;
   const firstWord = wordRanges[firstWordIndex];
   if (!firstWord) {
-    throw new PerseusError(`first word index ${firstWord} is out of bounds: ` + `must be 0–${wordRanges.length - 1} inclusive`, Errors.InvalidInput, {
+    throw new perseusCore.PerseusError(`first word index ${firstWord} is out of bounds: ` + `must be 0–${wordRanges.length - 1} inclusive`, perseusCore.Errors.InvalidInput, {
       metadata: {
         firstWord,
         wordRanges: JSON.stringify(wordRanges)
@@ -41008,7 +40949,7 @@ function deserializeHighlight(serializedHighlight, wordRanges) {
   }
   const lastWord = wordRanges[lastWordIndex];
   if (!lastWord) {
-    throw new PerseusError(`last word index ${lastWord} is out of bounds: ` + `must be 0–${wordRanges.length - 1} inclusive`, Errors.InvalidInput, {
+    throw new perseusCore.PerseusError(`last word index ${lastWord} is out of bounds: ` + `must be 0–${wordRanges.length - 1} inclusive`, perseusCore.Errors.InvalidInput, {
       metadata: {
         lastWord,
         wordRanges: JSON.stringify(wordRanges)
@@ -41761,7 +41702,7 @@ class WordIndexer extends React__namespace.PureComponent {
   _getWordRanges() {
     const container = this._container;
     if (!container) {
-      throw new PerseusError("invariant violation: `this._container` is not defined, but " + "this method is only called after mount/update", Errors.NotAllowed);
+      throw new perseusCore.PerseusError("invariant violation: `this._container` is not defined, but " + "this method is only called after mount/update", perseusCore.Errors.NotAllowed);
     }
 
     // Create a TreeWalker that visits text nodes and element nodes.
@@ -42227,6 +42168,7 @@ const rules = {
       }, /*#__PURE__*/React__namespace.createElement("span", {
         style: SQUARE_LABEL_STYLE
       }, node.content)), /*#__PURE__*/React__namespace.createElement(AltText, {
+        key: "alt-text",
         id: "questionMarker",
         number: node.content
       }), node.space ? "\u00A0" : null];
@@ -42251,6 +42193,7 @@ const rules = {
       }, /*#__PURE__*/React__namespace.createElement("span", {
         style: CIRCLE_LABEL_STYLE
       }, node.content)), /*#__PURE__*/React__namespace.createElement(AltText, {
+        key: "alt-text",
         id: "circleMarker",
         number: node.content
       }), node.space ? "\u00A0" : null];
@@ -42274,6 +42217,7 @@ const rules = {
         className: "perseus-passage-bracket-label",
         "aria-hidden": "true"
       }, "[", node.content, "]"), /*#__PURE__*/React__namespace.createElement(AltText, {
+        key: "alt-text",
         id: "sentenceMarker",
         number: node.content
       }), node.space ? "\u00A0" : null];
@@ -45283,7 +45227,7 @@ const init = function (options) {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "24.3.0";
+const libVersion = "25.0.0";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -46659,9 +46603,9 @@ tree, shape, path, mappers
     // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
     const array = tree;
     if (!Array.isArray(array)) {
-      throw new PerseusError(`Invalid object of type "${typeof array}" found at path ` +
+      throw new perseusCore.PerseusError(`Invalid object of type "${typeof array}" found at path ` +
       // @ts-expect-error - TS2769 - No overload matches this call.
-      `${["<root>"].concat(path).join(".")}. Expected array.`, Errors.Internal);
+      `${["<root>"].concat(path).join(".")}. Expected array.`, perseusCore.Errors.Internal);
     }
     const elementShape = shape.elementShape;
     // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
@@ -46671,30 +46615,30 @@ tree, shape, path, mappers
   if (shape.type === "object") {
     const object = tree;
     if (object && typeof object !== "object") {
-      throw new PerseusError(`Invalid object of type "${typeof object}" found at ` +
+      throw new perseusCore.PerseusError(`Invalid object of type "${typeof object}" found at ` +
       // @ts-expect-error - TS2769 - No overload matches this call.
-      `path ${["<root>"].concat(path).join(".")}. Expected ` + `"object" type.`, Errors.InvalidInput);
+      `path ${["<root>"].concat(path).join(".")}. Expected ` + `"object" type.`, perseusCore.Errors.InvalidInput);
     }
     const valueShapes = shape.shape;
     if (!valueShapes) {
-      throw new PerseusError(`Unexpected shape ${JSON.stringify(shape)} at path ` +
+      throw new perseusCore.PerseusError(`Unexpected shape ${JSON.stringify(shape)} at path ` +
       // @ts-expect-error - TS2769 - No overload matches this call.
-      `${["<root>"].concat(path).join(".")}.`, Errors.InvalidInput);
+      `${["<root>"].concat(path).join(".")}.`, perseusCore.Errors.InvalidInput);
     }
     const newObject = {};
     Object.keys(valueShapes).forEach(key => {
       if (!(key in object)) {
-        throw new PerseusError(`Key "${key}" is missing from shape at path ` +
+        throw new perseusCore.PerseusError(`Key "${key}" is missing from shape at path ` +
         // @ts-expect-error - TS2769 - No overload matches this call.
-        `${["<root>"].concat(path).join(".")}.`, Errors.InvalidInput);
+        `${["<root>"].concat(path).join(".")}.`, perseusCore.Errors.InvalidInput);
       }
       newObject[key] = mapTree(object[key], valueShapes[key], path.concat(key), mappers);
     });
     return newObject;
   }
-  throw new PerseusError(
+  throw new perseusCore.PerseusError(
   // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'never'.
-  `unexpected shape type ${shape.type}`, Errors.InvalidInput);
+  `unexpected shape type ${shape.type}`, perseusCore.Errors.InvalidInput);
 }
 
 /**
@@ -46746,9 +46690,9 @@ function buildEmptyItemTreeForShape(shape) {
     });
     return object;
   }
-  throw new PerseusError(
+  throw new perseusCore.PerseusError(
   // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'never'.
-  `unexpected shape type ${shape.type}`, Errors.InvalidInput);
+  `unexpected shape type ${shape.type}`, perseusCore.Errors.InvalidInput);
 }
 
 /**
@@ -46823,7 +46767,7 @@ function inferItemTreeShape(node) {
     });
     return shapes.shape(valueShapes);
   }
-  throw new PerseusError(`unexpected multi-item node ${JSON.stringify(node)}`, Errors.InvalidInput);
+  throw new perseusCore.PerseusError(`unexpected multi-item node ${JSON.stringify(node)}`, perseusCore.Errors.InvalidInput);
 }
 
 /**
@@ -46901,7 +46845,7 @@ class MultiRenderer extends React__namespace.Component {
         renderError: null
       };
     } catch (e) {
-      Log.error("Error building tree state", Errors.Internal, {
+      Log.error("Error building tree state", perseusCore.Errors.Internal, {
         cause: e
       });
       return {
@@ -47265,9 +47209,9 @@ function buildTreePropTypeForShape(shape) {
     });
     return PropTypes__default["default"].shape(propTypeShape);
   }
-  throw new PerseusError(
+  throw new perseusCore.PerseusError(
   // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'never'.
-  `unexpected shape type ${shape.type}`, Errors.InvalidInput);
+  `unexpected shape type ${shape.type}`, perseusCore.Errors.InvalidInput);
 }
 
 /**
@@ -47390,7 +47334,7 @@ const isRendererContentRenderableBy = function (rendererOptions, rendererContent
 };
 const isItemRenderableByVersion = function (itemData, rendererContentVersion) {
   if (itemData == null || rendererContentVersion == null) {
-    throw new PerseusError("missing parameter to Perseus.isRenderable.item", Errors.InvalidInput);
+    throw new perseusCore.PerseusError("missing parameter to Perseus.isRenderable.item", perseusCore.Errors.InvalidInput);
   }
   if (itemData._multi) {
     const shape = inferItemShape$1(itemData);
@@ -48311,7 +48255,6 @@ exports.DashPicker = DashPicker;
 exports.Dependencies = dependencies;
 exports.EditorJsonify = EditorJsonify;
 exports.ElementContainer = ElementContainer;
-exports.Errors = Errors;
 exports.Expression = Expression;
 exports.GrapherUtil = util;
 exports.GrapherWidget = Grapher$1;
@@ -48328,7 +48271,6 @@ exports.Log = Log;
 exports.MatrixWidget = Matrix$1;
 exports.MultiItems = MultiItems;
 exports.NumericInput = NumericInput$1;
-exports.PerseusError = PerseusError;
 exports.PerseusExpressionAnswerFormConsidered = PerseusExpressionAnswerFormConsidered;
 exports.PerseusI18nContext = PerseusI18nContext;
 exports.PerseusI18nContextProvider = PerseusI18nContextProvider;