@khanacademy/perseus 42.0.1 → 42.0.3

package/dist/index.js

@@ -19006,13 +19006,13 @@ const getInputNumberRenameMap = json => {
 };
 
 // Convert the user input data keys from input-number to numeric-input
-const convertUserInputNumberData = userInputMap => {
+const convertUserInputNumberData = (userInputMap, renameMap) => {
   const updatedUserInputMap = {
     ...userInputMap
   };
   for (const key of Object.keys(userInputMap)) {
     if (key.includes("input-number")) {
-      const updatedKey = key.replace("input-number", "numeric-input");
+      const updatedKey = renameMap[key];
       updatedUserInputMap[updatedKey] = userInputMap[key];
       delete updatedUserInputMap[key];
     }
@@ -19020,6 +19020,19 @@ const convertUserInputNumberData = userInputMap => {
   return updatedUserInputMap;
 };
 
+// Used to convert InputNumber widgets to NumericInput widgets for scoring
+const convertInputNumberForScoring = (rubric, userInputMap) => {
+  // First we need to create a map of the old input-number keys to the new numeric-input keys
+  // so that we can ensure we update the content, widgets, AND userInput accordingly
+  const renameMap = getInputNumberRenameMap(rubric);
+  const convertedRubric = convertInputNumberJson(rubric, renameMap);
+  const convertedUserData = convertUserInputNumberData(userInputMap, renameMap);
+  return {
+    convertedRubric,
+    convertedUserData
+  };
+};
+
 const widgetRegExes = [/input-number \d+/]; // We can add more regexes here in the future
 
 // This utils in this file are used to modernize our Perseus JSON structure,
@@ -19027,6 +19040,7 @@ const widgetRegExes = [/input-number \d+/]; // We can add more regexes here in t
 // content creators use the Editor Page to update content containing these widgets.
 // Currently, we're only converting input-number to numeric-input,
 // but we can add more conversions here in the future.
+
 // Modernize the json content of a PerseusRenderer object
 // by converting deprecated widgets to their modern equivalents
 const convertDeprecatedWidgets = json => {
@@ -19056,11 +19070,13 @@ const conversionRequired = json => {
   return false;
 };
 
-// Convert the user input data keys for deprecated widgets to their modern equivalents
-const convertUserInputData = userInputMap => {
-  // Currently we're only converting input-number to numeric-input,
-  // But we can add more conversions here in the future
-  return convertUserInputNumberData(userInputMap);
+/**
+ * Convert the deprecated widgets in the rubric and user data to their
+ * modern equivalents for scoring. These need to be updated together
+ * in order to ensure that the widgetKeys match between the rubric and user data.
+ */
+const convertDeprecatedWidgetsForScoring = (rubric, userInputMap) => {
+  return convertInputNumberForScoring(rubric, userInputMap);
 };
 
 // These are all the current widgets that require user-input and are supported for automatic scoring
@@ -19662,12 +19678,19 @@ function scorePerseusItem(perseusRenderData, userInputMap,
 // TODO(LEMS-2461,LEMS-2391): these probably
 // need to be removed before we move this to the server
 strings, locale) {
+  let convertedRenderData = perseusRenderData;
+  let convertedUserInputMap = userInputMap;
+
   // Check if the PerseusRenderer object contains any deprecated widgets that need to be converted
   const mustConvertData = conversionRequired(perseusRenderData);
-  const convertedRenderData = mustConvertData ? convertDeprecatedWidgets(perseusRenderData) // Convert deprecated widgets to their modern equivalents
-  : perseusRenderData;
-  const convertedUserInputMap = mustConvertData ? convertUserInputData(userInputMap) // Convert deprecated user input data keys to their modern equivalents
-  : userInputMap;
+  if (mustConvertData) {
+    const {
+      convertedRubric,
+      convertedUserData
+    } = convertDeprecatedWidgetsForScoring(perseusRenderData, userInputMap);
+    convertedRenderData = convertedRubric;
+    convertedUserInputMap = convertedUserData;
+  }
 
   // There seems to be a chance that PerseusRenderer.widgets might include
   // widget data for widgets that are not in PerseusRenderer.content,
@@ -22798,10 +22821,10 @@ const propsTransform = function (widgetOptions) {
 const propUpgrades$2 = {
   /* c8 ignore next */
   "1": initialProps => {
-    // If the initialProps has a value, it means we're upgrading from
+    // If the initialProps has simplify, it means we're upgrading from
     // input-number to numeric-input. In this case, we need to upgrade
     // the widget options accordingly.
-    if (initialProps.value) {
+    if (initialProps.simplify !== undefined) {
       // If the answerType is not number or percent, we need to provide
       // the answer form for the numeric-input widget
       const provideAnswerForm = initialProps.answerType !== "number" && initialProps.answerType !== "percent";
@@ -45398,7 +45421,7 @@ const init = function () {
 
 // This file is processed by a Rollup plugin (replace) to inject the production
 const libName = "@khanacademy/perseus";
-const libVersion = "42.0.1";
+const libVersion = "42.0.3";
 perseusCore.addLibraryVersionToPerseusDebug(libName, libVersion);
 
 const apiVersion = {
@@ -49600,7 +49623,7 @@ const parseRadioWidget = parseWidget(constant("radio"), object({
   displayCount: optional(any),
   // v0 props
   // `noneOfTheAbove` is still in use (but only set to `false`).
-  noneOfTheAbove: constant(false)
+  noneOfTheAbove: optional(constant(false))
 }));
 
 const parseSorterWidget = parseWidget(constant("sorter"), object({