@khanacademy/perseus 49.2.0 → 49.2.2

package/dist/es/index.js

@@ -44,21 +44,13 @@ import cornersOutIcon from '@phosphor-icons/core/regular/corners-out.svg';
 import Link from '@khanacademy/wonder-blocks-link';
 
 function _extends() {
-  _extends = Object.assign || function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
-
-    return target;
-  };
-
-  return _extends.apply(this, arguments);
+    return n;
+  }, _extends.apply(null, arguments);
 }
 
 /**
@@ -4508,17 +4500,14 @@ const InteractiveUtil = {
   }
 };
 
-function _classPrivateFieldBase(receiver, privateKey) {
-  if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) {
-    throw new TypeError("attempted to use private field on non-instance");
-  }
-
-  return receiver;
+function _classPrivateFieldBase(e, t) {
+  if (!{}.hasOwnProperty.call(e, t)) throw new TypeError("attempted to use private field on non-instance");
+  return e;
 }
 
 var id = 0;
-function _classPrivateFieldKey(name) {
-  return "__private_" + id++ + "_" + name;
+function _classPrivateFieldKey(e) {
+  return "__private_" + id++ + "_" + e;
 }
 
 /*!
@@ -21145,19 +21134,14 @@ TextInput.defaultProps = {
   disabled: false
 };
 
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  var sourceKeys = Object.keys(source);
-  var key, i;
-
-  for (i = 0; i < sourceKeys.length; i++) {
-    key = sourceKeys[i];
-    if (excluded.indexOf(key) >= 0) continue;
-    target[key] = source[key];
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.includes(n)) continue;
+    t[n] = r[n];
   }
-
-  return target;
+  return t;
 }
 
 const _excluded$7 = ["position", "visibility", "left", "top"];
@@ -32370,7 +32354,7 @@ const LegacyGrid = ({
  *         "new-awesomeness": MyAwesomeNewWidget;
  *
  *         // A deprecated widget
- *         "super-old-widget": AutoCorrectWidget;
+ *         "super-old-widget": DeprecatedStandinWidget;
  *     }
  * }
  *
@@ -32564,46 +32548,28 @@ function LockedLabel(props) {
 
 function GraphLockedLabelsLayer(props) {
   const {
-    flags,
     lockedFigures
   } = props;
   return lockedFigures.map((figure, i) => {
-    var _flags$mafs, _flags$mafs2, _flags$mafs3, _flags$mafs4, _flags$mafs5, _flags$mafs6;
+    var _figure$labels, _figure$points$0$labe, _figure$points$1$labe;
     if (figure.type === "label") {
       return /*#__PURE__*/React.createElement(LockedLabel, _extends({
         key: `label-${i}`
       }, figure));
     }
-    if (
-    // Point flag + point type
-    flags != null && (_flags$mafs = flags["mafs"]) != null && _flags$mafs["locked-point-labels"] && figure.type === "point" ||
-    // Line flag + line type
-    flags != null && (_flags$mafs2 = flags["mafs"]) != null && _flags$mafs2["locked-line-labels"] && figure.type === "line" ||
-    // Vector flag + vector type
-    flags != null && (_flags$mafs3 = flags["mafs"]) != null && _flags$mafs3["locked-vector-labels"] && figure.type === "vector" ||
-    // Ellipse flag + ellipse type
-    flags != null && (_flags$mafs4 = flags["mafs"]) != null && _flags$mafs4["locked-ellipse-labels"] && figure.type === "ellipse" ||
-    // Polygon flag + polygon type
-    flags != null && (_flags$mafs5 = flags["mafs"]) != null && _flags$mafs5["locked-polygon-labels"] && figure.type === "polygon" ||
-    // Function flag + function type
-    flags != null && (_flags$mafs6 = flags["mafs"]) != null && _flags$mafs6["locked-function-labels"] && figure.type === "function") {
-      var _figure$labels, _figure$points$0$labe, _figure$points$1$labe;
-      return /*#__PURE__*/React.createElement(React.Fragment, {
-        key: i
-      }, (_figure$labels = figure.labels) == null ? void 0 : _figure$labels.map((label, j) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
-        key: `${i}-label-${j}`
-      }, label))), figure.type === "line" && /*#__PURE__*/React.createElement(React.Fragment, null, (_figure$points$0$labe = figure.points[0].labels) == null ? void 0 : _figure$points$0$labe.map((label, k) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
-        key: `locked-figure-${i}-point-1-label-${k}`
-      }, label))), (_figure$points$1$labe = figure.points[1].labels) == null ? void 0 : _figure$points$1$labe.map((label, k) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
-        key: `locked-figure-${i}-point-2-label-${k}`
-      }, label)))));
-    }
-    return null;
+    return /*#__PURE__*/React.createElement(React.Fragment, {
+      key: i
+    }, (_figure$labels = figure.labels) == null ? void 0 : _figure$labels.map((label, j) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
+      key: `${i}-label-${j}`
+    }, label))), figure.type === "line" && /*#__PURE__*/React.createElement(React.Fragment, null, (_figure$points$0$labe = figure.points[0].labels) == null ? void 0 : _figure$points$0$labe.map((label, k) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
+      key: `locked-figure-${i}-point-1-label-${k}`
+    }, label))), (_figure$points$1$labe = figure.points[1].labels) == null ? void 0 : _figure$points$1$labe.map((label, k) => /*#__PURE__*/React.createElement(LockedLabel, _extends({
+      key: `locked-figure-${i}-point-2-label-${k}`
+    }, label)))));
   });
 }
 
 const LockedEllipse = props => {
-  var _flags$mafs;
   const {
     center,
     radius,
@@ -32611,10 +32577,9 @@ const LockedEllipse = props => {
     color: color$1,
     fillStyle,
     strokeStyle,
-    ariaLabel,
-    flags
+    ariaLabel
   } = props;
-  const hasAria = ariaLabel && (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-figures-aria"]);
+  const hasAria = !!ariaLabel;
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-ellipse",
     "aria-label": hasAria ? ariaLabel : undefined,
@@ -32639,7 +32604,6 @@ const LockedEllipse = props => {
 };
 
 const LockedFunction = props => {
-  var _props$flags;
   const [equation, setEquation] = useState();
   const {
     color,
@@ -32652,7 +32616,7 @@ const LockedFunction = props => {
     style: strokeStyle,
     domain
   };
-  const hasAria = props.ariaLabel && ((_props$flags = props.flags) == null || (_props$flags = _props$flags["mafs"]) == null ? void 0 : _props$flags["locked-figures-aria"]);
+  const hasAria = !!props.ariaLabel;
   useEffect(() => {
     // Parsing the equation in a "useEffect" hook saves about 2ms each frame
     //    when the learner is interacting with the graph (i.e. moving points).
@@ -32768,7 +32732,6 @@ function getArrayWithoutDuplicates(array) {
 }
 
 const LockedLine = props => {
-  var _flags$mafs;
   const {
     color: color$1,
     lineStyle,
@@ -32777,11 +32740,10 @@ const LockedLine = props => {
     showPoint1,
     showPoint2,
     ariaLabel,
-    flags,
     range
   } = props;
   const [point1, point2] = points;
-  const hasAria = ariaLabel && (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-figures-aria"]);
+  const hasAria = !!ariaLabel;
   let line;
   if (kind === "ray") {
     // Rays extend to the end of the graph in one direction.
@@ -32848,16 +32810,14 @@ const LockedLine = props => {
 };
 
 const LockedPoint = props => {
-  var _flags$mafs;
   const {
-    flags,
     color: color$1,
     coord,
     filled,
     ariaLabel
   } = props;
   const [x, y] = coord;
-  const hasAria = ariaLabel && (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-figures-aria"]);
+  const hasAria = !!ariaLabel;
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-point",
     "aria-label": hasAria ? ariaLabel : undefined,
@@ -32876,7 +32836,6 @@ const LockedPoint = props => {
 };
 
 const LockedPolygon = props => {
-  var _props$flags;
   const {
     points,
     color: color$1,
@@ -32884,7 +32843,7 @@ const LockedPolygon = props => {
     fillStyle,
     strokeStyle
   } = props;
-  const hasAria = props.ariaLabel && ((_props$flags = props.flags) == null || (_props$flags = _props$flags["mafs"]) == null ? void 0 : _props$flags["locked-figures-aria"]);
+  const hasAria = !!props.ariaLabel;
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-polygon",
     "aria-label": hasAria ? props.ariaLabel : undefined,
@@ -32912,15 +32871,13 @@ const LockedPolygon = props => {
 };
 
 const LockedVector = props => {
-  var _flags$mafs;
   const {
     color,
     points,
-    ariaLabel,
-    flags
+    ariaLabel
   } = props;
   const [tail, tip] = points;
-  const hasAria = ariaLabel && (flags == null || (_flags$mafs = flags["mafs"]) == null ? void 0 : _flags$mafs["locked-figures-aria"]);
+  const hasAria = !!ariaLabel;
   return /*#__PURE__*/React.createElement("g", {
     className: "locked-vector",
     "aria-label": hasAria ? ariaLabel : undefined,
@@ -32934,7 +32891,6 @@ const LockedVector = props => {
 
 const GraphLockedLayer = props => {
   const {
-    flags,
     lockedFigures
   } = props;
   return /*#__PURE__*/React.createElement(React.Fragment, null, lockedFigures.map((figure, index) => {
@@ -32942,40 +32898,28 @@ const GraphLockedLayer = props => {
       case "point":
         return /*#__PURE__*/React.createElement(LockedPoint, _extends({
           key: `point-${index}`
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "line":
         return /*#__PURE__*/React.createElement(LockedLine, _extends({
           key: `line-${index}`,
           range: props.range
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "vector":
         return /*#__PURE__*/React.createElement(LockedVector, _extends({
           key: `vector-${index}`
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "ellipse":
         return /*#__PURE__*/React.createElement(LockedEllipse, _extends({
           key: `ellipse-${index}`
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "polygon":
         return /*#__PURE__*/React.createElement(LockedPolygon, _extends({
           key: `polygon-${index}`
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "function":
         return /*#__PURE__*/React.createElement(LockedFunction, _extends({
           key: `function-${index}`
-        }, figure, {
-          flags: flags
-        }));
+        }, figure));
       case "label":
         // This is rendered outside the SVG element, since
         // TeX cannot be rendered inside an SVG.
@@ -35446,7 +35390,6 @@ function useDraggablePx(args) {
  * - Interactive Graph Elements
  */
 const MafsGraph = props => {
-  var _props$flags;
   const {
     state,
     dispatch,
@@ -35583,11 +35526,9 @@ const MafsGraph = props => {
   })),
   // 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, {
-    flags: props.flags,
     lockedFigures: props.lockedFigures,
     range: state.range
-  }))), ((_props$flags = props.flags) == null || (_props$flags = _props$flags["mafs"]) == null ? void 0 : _props$flags["interactive-graph-locked-features-labels"]) && props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLabelsLayer, {
-    flags: props.flags,
+  }))), props.lockedFigures && /*#__PURE__*/React.createElement(GraphLockedLabelsLayer, {
     lockedFigures: props.lockedFigures
   }), /*#__PURE__*/React.createElement(View, {
     style: {
@@ -45560,7 +45501,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.0";
+const libVersion = "49.2.2";
 addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -47845,10 +47786,10 @@ class UnionBuilder {
     this.parser = parser;
   }
   or(newBranch) {
-    return new UnionBuilder(either$1(this.parser, newBranch));
+    return new UnionBuilder(either(this.parser, newBranch));
   }
 }
-function either$1(parseA, parseB) {
+function either(parseA, parseB) {
   return (rawValue, ctx) => {
     const resultA = parseA(rawValue, ctx);
     if (isSuccess(resultA)) {
@@ -47901,9 +47842,9 @@ function parseWidgetWithVersion(parseVersion, parseType, parseOptions) {
 const parseCategorizerWidget = parseWidget(constant("categorizer"), object({
   items: array(string),
   categories: array(string),
-  randomizeItems: boolean,
+  randomizeItems: defaulted(boolean, () => false),
   static: defaulted(boolean, () => false),
-  values: array(number),
+  values: array(defaulted(number, () => 0)),
   highlightLint: optional(boolean),
   linterContext: optional(object({
     contentType: string,
@@ -47923,7 +47864,7 @@ const parseCSProgramWidget = parseWidget(constant("cs-program"), object({
   showButtons: boolean,
   width: number,
   height: number,
-  static: boolean
+  static: defaulted(boolean, () => false)
 }));
 
 const parseDefinitionWidget = parseWidget(constant("definition"), object({
@@ -47933,7 +47874,7 @@ const parseDefinitionWidget = parseWidget(constant("definition"), object({
 }));
 
 const parseDropdownWidget = parseWidget(constant("dropdown"), object({
-  placeholder: string,
+  placeholder: defaulted(string, () => ""),
   ariaLabel: optional(string),
   visibleLabel: optional(string),
   static: defaulted(boolean, () => false),
@@ -47966,60 +47907,63 @@ function convert(f) {
  * data does not match any of the versions.
  *
  * @example
- * const parseOptions = versionedWidgetOptions(parseOptionsV3)
- *     .withMigrationFrom(parseOptionsV2, migrateV2ToV3)
- *     .withMigrationFrom(parseOptionsV1, migrateV1ToV2)
- *     .withMigrationFrom(parseOptionsV0, migrateV0ToV1)
+ * const parseOptions = versionedWidgetOptions(3, parseOptionsV3)
+ *     .withMigrationFrom(2, parseOptionsV2, migrateV2ToV3)
+ *     .withMigrationFrom(1, parseOptionsV1, migrateV1ToV2)
+ *     .withMigrationFrom(0, parseOptionsV0, migrateV0ToV1)
  *     .parser;
  *
+ * @param latestMajorVersion the latest major version of the widget options.
  * @param parseLatest a {@link Parser} for the latest version of the widget
- * options. This should check version.major and fail if it's not the latest
- * version.
+ * options.
  * @returns a builder object, to which migrations from earlier versions can be
  * added. Migrations must be added in "reverse chronological" order as in the
  * example above.
  */
-function versionedWidgetOptions(parseLatest) {
-  return new VersionedWidgetOptionsParserBuilder(parseLatest, latest => latest);
+function versionedWidgetOptions(latestMajorVersion, parseLatest) {
+  return new VersionedWidgetOptionsParserBuilder(latestMajorVersion, parseLatest, latest => latest, (raw, ctx) => ctx.failure("widget options with a known version number", raw));
 }
 class VersionedWidgetOptionsParserBuilder {
-  constructor(parser, migrate) {
-    this.parser = parser;
-    this.migrate = migrate;
+  constructor(majorVersion, parseThisVersion, migrateToLatest, parseOtherVersions) {
+    this.parser = void 0;
+    this.migrateToLatest = migrateToLatest;
+    this.parseOtherVersions = parseOtherVersions;
+    const parseThisVersionAndMigrateToLatest = pipeParsers(parseThisVersion).then(convert(this.migrateToLatest)).parser;
+    this.parser = (raw, ctx) => {
+      if (!isObject(raw)) {
+        return ctx.failure("object", raw);
+      }
+      const versionParseResult = parseVersionedObject(raw, ctx);
+      if (isFailure(versionParseResult)) {
+        return versionParseResult;
+      }
+      if (versionParseResult.value.version.major !== majorVersion) {
+        return this.parseOtherVersions(raw, ctx);
+      }
+      return parseThisVersionAndMigrateToLatest(raw, ctx);
+    };
   }
 
   /**
    * Add a migration from an old version of the widget options.
-   *
-   * @returns a VersionedWidgetOptionsParserBuilder whose `parser` function
-   * is capable of migrating the old version to the latest version. The parser
-   * will always return the latest version of the widget options on a
-   * successful parse.
-   * @param parseOldVersion should be a {@link Parser} for the old options
-   * type. It should fail if version.major isn't correct.
-   * @param migrateToNextVersion should migrate the `Old` data to the
-   * `Migratable` version of the current VersionedWidgetOptionsParserBuilder.
-   * Usually, this means migrating to the next major version.
    */
-  withMigrationFrom(parseOldVersion, migrateToNextVersion) {
-    const parseLatestVersion = this.parser;
-    const migrateToLatest = old => this.migrate(migrateToNextVersion(old));
-    return new VersionedWidgetOptionsParserBuilder((raw, ctx) => {
-      const resultOfParsingLatest = parseLatestVersion(raw, ctx);
-      if (isSuccess(resultOfParsingLatest)) {
-        return resultOfParsingLatest;
-      }
-      const resultOfParsingOld = parseOldVersion(raw, ctx);
-      if (isSuccess(resultOfParsingOld)) {
-        return success(migrateToLatest(resultOfParsingOld.value));
-      }
-
-      // If we're here, neither parse succeeded. Return the failure.
-      return resultOfParsingOld;
-    }, migrateToLatest);
+  withMigrationFrom(majorVersion, parseOldVersion, migrateToNextVersion) {
+    const parseOtherVersions = this.parser;
+    const migrateToLatest = old => this.migrateToLatest(migrateToNextVersion(old));
+    return new VersionedWidgetOptionsParserBuilder(majorVersion, parseOldVersion, migrateToLatest, parseOtherVersions);
   }
 }
+const parseVersionedObject = object({
+  version: defaulted(object({
+    major: number,
+    minor: number
+  }), () => ({
+    major: 0,
+    minor: 0
+  }))
+});
 
+const stringOrNumberOrNullOrUndefined = union(string).or(number).or(constant(null)).or(constant(undefined)).parser;
 const parsePossiblyInvalidAnswerForm = object({
   // `value` is the possibly invalid part of this. It should always be a
   // string, but some answer forms don't have it. The Expression widget
@@ -48028,7 +47972,7 @@ const parsePossiblyInvalidAnswerForm = object({
   form: defaulted(boolean, () => false),
   simplify: defaulted(boolean, () => false),
   considered: enumeration("correct", "wrong", "ungraded"),
-  key: pipeParsers(optional(union(string).or(number).parser)).then((key, ctx) => ctx.success(String(key))).parser
+  key: pipeParsers(stringOrNumberOrNullOrUndefined).then(convert(String)).parser
 });
 function removeInvalidAnswerForms(possiblyInvalid) {
   const valid = [];
@@ -48045,6 +47989,11 @@ function removeInvalidAnswerForms(possiblyInvalid) {
   }
   return valid;
 }
+
+// NOTE(benchristel): I copied the default buttonSets from
+// expression.tsx. See the parse-perseus-json/README.md for
+// an explanation of why we want to duplicate the default here.
+const parseButtonSets = defaulted(array(enumeration("basic", "basic+div", "trig", "prealgebra", "logarithms", "basic relations", "advanced relations")), () => ["basic", "trig", "prealgebra", "logarithms"]);
 const version1 = object({
   major: constant(1),
   minor: number
@@ -48055,7 +48004,7 @@ const parseExpressionWidgetV1 = parseWidgetWithVersion(version1, constant("expre
   times: boolean,
   visibleLabel: optional(string),
   ariaLabel: optional(string),
-  buttonSets: array(enumeration("basic", "basic+div", "trig", "prealgebra", "logarithms", "basic relations", "advanced relations")),
+  buttonSets: parseButtonSets,
   buttonsVisible: optional(enumeration("always", "never", "focused"))
 }));
 const version0 = optional(object({
@@ -48070,7 +48019,7 @@ const parseExpressionWidgetV0 = parseWidgetWithVersion(version0, constant("expre
   form: boolean,
   simplify: boolean,
   value: string,
-  buttonSets: array(enumeration("basic", "basic+div", "trig", "prealgebra", "logarithms", "basic relations", "advanced relations")),
+  buttonSets: parseButtonSets,
   buttonsVisible: optional(enumeration("always", "never", "focused"))
 }));
 function migrateV0ToV1(widget) {
@@ -48098,7 +48047,7 @@ function migrateV0ToV1(widget) {
     }
   });
 }
-const parseExpressionWidget = versionedWidgetOptions(parseExpressionWidgetV1).withMigrationFrom(parseExpressionWidgetV0, migrateV0ToV1).parser;
+const parseExpressionWidget = versionedWidgetOptions(1, parseExpressionWidgetV1).withMigrationFrom(0, parseExpressionWidgetV0, migrateV0ToV1).parser;
 
 const parsePerseusRenderer = defaulted(object({
   // TODO(benchristel): content is also defaulted to empty string in
@@ -48119,13 +48068,14 @@ const parsePerseusRenderer = defaulted(object({
   images: {}
 }));
 
+const falseToNull = pipeParsers(constant(false)).then(convert(() => null)).parser;
 const parseGradedGroupWidgetOptions = object({
   title: defaulted(string, () => ""),
   hasHint: optional(nullable(boolean)),
   // This module has an import cycle with parsePerseusRenderer.
   // The anonymous function below ensures that we don't try to access
   // parsePerseusRenderer before it's defined.
-  hint: optional(nullable((rawVal, ctx) => parsePerseusRenderer(rawVal, ctx))),
+  hint: union(falseToNull).or(constant(null)).or(constant(undefined)).or((rawVal, ctx) => parsePerseusRenderer(rawVal, ctx)).parser,
   content: string,
   // This module has an import cycle with parseWidgetsMap.
   // The anonymous function below ensures that we don't try to access
@@ -48144,28 +48094,41 @@ const parseGradedGroupSetWidget = parseWidget(constant("graded-group-set"), obje
   gradedGroups: array(parseGradedGroupWidgetOptions)
 }));
 
-// discriminatedUnion() should be preferred over union() when parsing a
-// discriminated union type, because discriminatedUnion() produces more
-// understandable failure messages. It takes the discriminant as the source of
-// truth for which variant is to be parsed, and expects the other data to match
-// that variant.
-function discriminatedUnion(narrow, parseVariant) {
-  return new DiscriminatedUnionBuilder(pipeParsers(narrow).then(parseVariant).parser);
+/**
+ * discriminatedUnion() should be preferred over union() when parsing a
+ * discriminated union type, because discriminatedUnion() produces more
+ * understandable failure messages. It takes the discriminant as the source of
+ * truth for which variant is to be parsed, and expects the other data to match
+ * that variant.
+ */
+function discriminatedUnionOn(discriminantKey) {
+  const noMoreBranches = (raw, ctx) => {
+    if (!isObject(raw)) {
+      return ctx.failure("object", raw);
+    }
+    return ctx.forSubtree(discriminantKey).failure("a valid value", raw[discriminantKey]);
+  };
+  return new DiscriminatedUnionBuilder(discriminantKey, noMoreBranches);
 }
 class DiscriminatedUnionBuilder {
-  constructor(parser) {
+  constructor(discriminantKey, parser) {
+    this.discriminantKey = discriminantKey;
     this.parser = parser;
   }
-  or(narrow, parseVariant) {
-    return new DiscriminatedUnionBuilder(either(narrow, parseVariant, this.parser));
+  withBranch(discriminantValue, parseNewVariant) {
+    const parseNewBranch = discriminatedUnionBranch(this.discriminantKey, discriminantValue, parseNewVariant, this.parser);
+    return new DiscriminatedUnionBuilder(this.discriminantKey, parseNewBranch);
   }
 }
-function either(narrowToA, parseA, parseB) {
-  return (rawValue, ctx) => {
-    if (isSuccess(narrowToA(rawValue, ctx))) {
-      return parseA(rawValue, ctx);
+function discriminatedUnionBranch(discriminantKey, discriminantValue, parseVariant, parseOtherBranches) {
+  return (raw, ctx) => {
+    if (!isObject(raw)) {
+      return ctx.failure("object", raw);
     }
-    return parseB(rawValue, ctx);
+    if (raw[discriminantKey] === discriminantValue) {
+      return parseVariant(raw, ctx);
+    }
+    return parseOtherBranches(raw, ctx);
   };
 }
 
@@ -48173,41 +48136,27 @@ const pairOfNumbers$3 = pair(number, number);
 const pairOfPoints = pair(pairOfNumbers$3, pairOfNumbers$3);
 const parseGrapherWidget = parseWidget(constant("grapher"), object({
   availableTypes: array(enumeration("absolute_value", "exponential", "linear", "logarithm", "quadratic", "sinusoid", "tangent")),
-  correct: discriminatedUnion(object({
-    type: constant("absolute_value")
-  }), object({
+  correct: discriminatedUnionOn("type").withBranch("absolute_value", object({
     type: constant("absolute_value"),
     coords: pairOfPoints
-  })).or(object({
-    type: constant("exponential")
-  }), object({
+  })).withBranch("exponential", object({
     type: constant("exponential"),
     asymptote: pairOfPoints,
     coords: pairOfPoints
-  })).or(object({
-    type: constant("linear")
-  }), object({
+  })).withBranch("linear", object({
     type: constant("linear"),
-    coords: pairOfPoints
-  })).or(object({
-    type: constant("logarithm")
-  }), object({
+    coords: defaulted(pairOfPoints, () => [[-5, 5], [5, 5]])
+  })).withBranch("logarithm", object({
     type: constant("logarithm"),
     asymptote: pairOfPoints,
     coords: pairOfPoints
-  })).or(object({
-    type: constant("quadratic")
-  }), object({
+  })).withBranch("quadratic", object({
     type: constant("quadratic"),
     coords: pairOfPoints
-  })).or(object({
-    type: constant("sinusoid")
-  }), object({
+  })).withBranch("sinusoid", object({
     type: constant("sinusoid"),
     coords: pairOfPoints
-  })).or(object({
-    type: constant("tangent")
-  }), object({
+  })).withBranch("tangent", object({
     type: constant("tangent"),
     coords: pairOfPoints
   })).parser,
@@ -48455,23 +48404,7 @@ const parseInteractionWidget = parseWidget(constant("interaction"), object({
     rulerTicks: optional(number),
     tickStep: pairOfNumbers$1
   }),
-  elements: array(discriminatedUnion(object({
-    type: parseFunctionType
-  }), parseFunctionElement).or(object({
-    type: parseLabelType
-  }), parseLabelElement).or(object({
-    type: parseLineType
-  }), parseLineElement).or(object({
-    type: parseMovableLineType
-  }), parseMovableLineElement).or(object({
-    type: parseMovablePointType
-  }), parseMovablePointElement).or(object({
-    type: parseParametricType
-  }), parseParametricElement).or(object({
-    type: parsePointType
-  }), parsePointElement).or(object({
-    type: parseRectangleType
-  }), parseRectangleElement).parser)
+  elements: array(discriminatedUnionOn("type").withBranch("function", parseFunctionElement).withBranch("label", parseLabelElement).withBranch("line", parseLineElement).withBranch("movable-line", parseMovableLineElement).withBranch("movable-point", parseMovablePointElement).withBranch("parametric", parseParametricElement).withBranch("point", parsePointElement).withBranch("rectangle", parseRectangleElement).parser)
 }));
 
 // Used to represent 2-D points and ranges
@@ -48529,7 +48462,7 @@ const parsePerseusGraphTypePolygon = object({
   showAngles: optional(boolean),
   showSides: optional(boolean),
   snapTo: optional(enumeration("grid", "angles", "sides")),
-  match: optional(enumeration("similar", "congruent", "approx")),
+  match: optional(enumeration("similar", "congruent", "approx", "exact")),
   startCoords: optional(array(pairOfNumbers)),
   // TODO: remove coord? it's legacy.
   coord: optional(pairOfNumbers)
@@ -48564,7 +48497,7 @@ const parsePerseusGraphTypeSinusoid = object({
   // TODO: remove coord? it's legacy.
   coord: optional(pairOfNumbers)
 });
-const parsePerseusGraphType = union(parsePerseusGraphTypeAngle).or(parsePerseusGraphTypeAngle).or(parsePerseusGraphTypeCircle).or(parsePerseusGraphTypeLinear).or(parsePerseusGraphTypeLinearSystem).or(parsePerseusGraphTypeNone).or(parsePerseusGraphTypePoint).or(parsePerseusGraphTypePolygon).or(parsePerseusGraphTypeQuadratic).or(parsePerseusGraphTypeRay).or(parsePerseusGraphTypeSegment).or(parsePerseusGraphTypeSinusoid).parser;
+const parsePerseusGraphType = discriminatedUnionOn("type").withBranch("angle", parsePerseusGraphTypeAngle).withBranch("circle", parsePerseusGraphTypeCircle).withBranch("linear", parsePerseusGraphTypeLinear).withBranch("linear-system", parsePerseusGraphTypeLinearSystem).withBranch("none", parsePerseusGraphTypeNone).withBranch("point", parsePerseusGraphTypePoint).withBranch("polygon", parsePerseusGraphTypePolygon).withBranch("quadratic", parsePerseusGraphTypeQuadratic).withBranch("ray", parsePerseusGraphTypeRay).withBranch("segment", parsePerseusGraphTypeSegment).withBranch("sinusoid", parsePerseusGraphTypeSinusoid).parser;
 const parseLockedFigureColor = enumeration(...lockedFigureColorNames);
 const parseLockedFigureFillType = enumeration("none", "white", "translucent", "solid");
 const parseLockedLineStyle = enumeration("solid", "dashed");
@@ -48683,7 +48616,7 @@ const parseLabelImageWidget = parseWidget(constant("label-image"), object({
   })),
   hideChoicesFromInstructions: boolean,
   multipleAnswers: boolean,
-  static: boolean
+  static: defaulted(boolean, () => false)
 }));
 
 const parseMatcherWidget = parseWidget(constant("matcher"), object({
@@ -48694,7 +48627,8 @@ const parseMatcherWidget = parseWidget(constant("matcher"), object({
   padding: boolean
 }));
 
-const numeric = pipeParsers(union(number).or(string).parser).then(stringToNumber).parser;
+const numberOrString = union(number).or(string).parser;
+const numeric = pipeParsers(defaulted(numberOrString, () => NaN)).then(stringToNumber).parser;
 const parseMatrixWidget = parseWidget(defaulted(constant("matrix"), () => "matrix"), object({
   prefix: optional(string),
   suffix: optional(string),
@@ -48713,7 +48647,8 @@ const parseMeasurerWidget = parseWidget(constant("measurer"), object({
   rulerPixels: number,
   rulerLength: number,
   box: pair(number, number),
-  static: boolean
+  // TODO(benchristel): static is not used. Remove it?
+  static: defaulted(boolean, () => false)
 }));
 
 const parseMoleculeRendererWidget = parseWidget(constant("molecule-renderer"), object({
@@ -48722,9 +48657,10 @@ const parseMoleculeRendererWidget = parseWidget(constant("molecule-renderer"), o
   smiles: optional(string)
 }));
 
+const emptyStringToNull = pipeParsers(constant("")).then(convert(() => null)).parser;
 const parseNumberLineWidget = parseWidget(constant("number-line"), object({
   range: array(number),
-  labelRange: array(nullable(number)),
+  labelRange: array(nullable(union(number).or(emptyStringToNull).parser)),
   labelStyle: string,
   labelTicks: boolean,
   isTickCtrl: optional(nullable(boolean)),
@@ -48736,10 +48672,10 @@ const parseNumberLineWidget = parseWidget(constant("number-line"), object({
   snapDivisions: defaulted(number, () => 2),
   tickStep: optional(nullable(number)),
   correctRel: optional(nullable(string)),
-  correctX: number,
+  correctX: nullable(number),
   initialX: optional(nullable(number)),
   showTooltip: optional(boolean),
-  static: boolean
+  static: defaulted(boolean, () => false)
 }));
 
 const parseMathFormat = enumeration("integer", "mixed", "improper", "proper", "decimal", "percent", "pi");
@@ -48754,14 +48690,14 @@ const parseNumericInputWidget = parseWidget(constant("numeric-input"), object({
     answerForms: optional(array(parseMathFormat)),
     strict: boolean,
     maxError: optional(nullable(number)),
-    // TODO(benchristel): simplify should never be `true`, but we
+    // TODO(benchristel): simplify should never be a boolean, but we
     // have some content where it is anyway. If we ever backfill
     // the data, we should simplify `simplify`.
-    simplify: optional(nullable(union(string).or(pipeParsers(constant(true)).then(convert(String)).parser).parser))
+    simplify: optional(nullable(union(string).or(pipeParsers(boolean).then(convert(String)).parser).parser))
   })),
   labelText: optional(string),
   size: string,
-  coefficient: boolean,
+  coefficient: defaulted(boolean, () => false),
   rightAlign: optional(boolean),
   static: defaulted(boolean, () => false),
   answerForms: optional(array(object({
@@ -48797,9 +48733,9 @@ const parsePassageRefWidget = parseWidget(constant("passage-ref"), object({
 }));
 
 const parsePassageWidget = parseWidget(constant("passage"), object({
-  footnotes: string,
+  footnotes: defaulted(string, () => ""),
   passageText: string,
-  passageTitle: string,
+  passageTitle: defaulted(string, () => ""),
   showLineNumbers: boolean,
   static: defaulted(boolean, () => false)
 }));
@@ -48983,6 +48919,10 @@ const parseWidgetsMapEntry = ([key, widget], widgetMap, ctx) => {
       return parseAndAssign(`sequence ${id}`, parseDeprecatedWidget);
     case "lights-puzzle":
       return parseAndAssign(`lights-puzzle ${id}`, parseDeprecatedWidget);
+    case "simulator":
+      return parseAndAssign(`simulator ${id}`, parseDeprecatedWidget);
+    case "transformer":
+      return parseAndAssign(`transformer ${id}`, parseDeprecatedWidget);
     default:
       if (getWidget(type)) {
         // @ts-expect-error - 'type' is not a valid widget type