@khanacademy/perseus-score 1.1.0 → 2.0.0

package/dist/es/index.js

@@ -12545,13 +12545,13 @@ function validateCategorizer(userInput, validationData) {
   return null;
 }
 
-function scoreCategorizer(userInput, scoringData) {
-  const validationError = validateCategorizer(userInput, scoringData);
+function scoreCategorizer(userInput, rubric) {
+  const validationError = validateCategorizer(userInput, rubric);
   if (validationError) {
     return validationError;
   }
   let allCorrect = true;
-  scoringData.values.forEach((value, i) => {
+  rubric.values.forEach((value, i) => {
     if (userInput.values[i] !== value) {
       allCorrect = false;
     }
@@ -12564,24 +12564,23 @@ function scoreCategorizer(userInput, scoringData) {
   };
 }
 
-// TODO: merge this with scoreIframe, it's the same code
-function scoreCSProgram(state) {
+function scoreCSProgram(userInput) {
   // The CS program can tell us whether it's correct or incorrect,
   // and pass an optional message
-  if (state.status === "correct") {
+  if (userInput.status === "correct") {
     return {
       type: "points",
       earned: 1,
       total: 1,
-      message: state.message || null
+      message: userInput.message || null
     };
   }
-  if (state.status === "incorrect") {
+  if (userInput.status === "incorrect") {
     return {
       type: "points",
       earned: 0,
       total: 1,
-      message: state.message || null
+      message: userInput.message || null
     };
   }
   return {
@@ -12654,9 +12653,7 @@ function validateExpression(userInput) {
  *   show the user an error. TODO(joel) - what error?
  * - Otherwise, pass through the resulting points and message.
  */
-function scoreExpression(userInput, rubric,
-// TODO: remove strings as a param for scorers
-strings, locale) {
+function scoreExpression(userInput, rubric, locale) {
   const validationError = validateExpression(userInput);
   if (validationError) {
     return validationError;
@@ -12676,7 +12673,11 @@ strings, locale) {
     // in the function variables list for the expression.
     if (!expression.parsed) {
       /* c8 ignore next */
-      throw new PerseusError("Unable to parse solution answer for expression", Errors.InvalidInput);
+      throw new PerseusError("Unable to parse solution answer for expression", Errors.InvalidInput, {
+        metadata: {
+          rubric: JSON.stringify(rubric)
+        }
+      });
     }
     return KhanAnswerTypes.expression.createValidatorFunctional(expression.expr, _({}).extend(options, {
       simplify: answer.simplify,
@@ -13070,49 +13071,57 @@ function scoreInteractiveGraph(userInput, rubric) {
   };
 }
 
+function validateLabelImage(userInput) {
+  let numAnswered = 0;
+  for (let i = 0; i < userInput.markers.length; i++) {
+    const userSelection = userInput.markers[i].selected;
+    if (userSelection && userSelection.length > 0) {
+      numAnswered++;
+    }
+  }
+  // We expect all question markers to be answered before grading.
+  if (numAnswered !== userInput.markers.length) {
+    return {
+      type: "invalid",
+      message: null
+    };
+  }
+  return null;
+}
+
 // Question state for marker as result of user selected answers.
 
-function scoreLabelImageMarker(marker) {
+function scoreLabelImageMarker(userInput, rubric) {
   const score = {
     hasAnswers: false,
     isCorrect: false
   };
-  if (marker.selected && marker.selected.length > 0) {
+  if (userInput && userInput.length > 0) {
     score.hasAnswers = true;
   }
-  if (marker.answers.length > 0) {
-    if (marker.selected && marker.selected.length === marker.answers.length) {
+  if (rubric.length > 0) {
+    if (userInput && userInput.length === rubric.length) {
       // All correct answers are selected by the user.
-      score.isCorrect = marker.selected.every(choice => marker.answers.includes(choice));
+      score.isCorrect = userInput.every(choice => rubric.includes(choice));
     }
-  } else if (!marker.selected || marker.selected.length === 0) {
+  } else if (!userInput || userInput.length === 0) {
     // Correct as no answers should be selected by the user.
     score.isCorrect = true;
   }
   return score;
 }
-
-// TODO(LEMS-2440): May need to pull answers out of PerseusLabelImageWidgetOptions[markers] for the rubric
 function scoreLabelImage(userInput, rubric) {
-  let numAnswered = 0;
+  const validationError = validateLabelImage(userInput);
+  if (validationError) {
+    return validationError;
+  }
   let numCorrect = 0;
-  for (const marker of userInput.markers) {
-    const score = scoreLabelImageMarker(marker);
-    if (score.hasAnswers) {
-      numAnswered++;
-    }
+  for (let i = 0; i < userInput.markers.length; i++) {
+    const score = scoreLabelImageMarker(userInput.markers[i].selected, rubric.markers[i].answers);
     if (score.isCorrect) {
       numCorrect++;
     }
   }
-
-  // We expect all question markers to be answered before grading.
-  if (numAnswered !== userInput.markers.length) {
-    return {
-      type: "invalid",
-      message: null
-    };
-  }
   return {
     type: "points",
     // Markers with no expected answers are graded as correct if user
@@ -13123,8 +13132,8 @@ function scoreLabelImage(userInput, rubric) {
   };
 }
 
-function scoreMatcher(state, rubric) {
-  const correct = _.isEqual(state.left, rubric.left) && _.isEqual(state.right, rubric.right);
+function scoreMatcher(userInput, rubric) {
+  const correct = _.isEqual(userInput.left, rubric.left) && _.isEqual(userInput.right, rubric.right);
   return {
     type: "points",
     earned: correct ? 1 : 0,
@@ -13141,7 +13150,7 @@ function scoreMatcher(state, rubric) {
  *
  * @see `scoreMatrix()` for more details.
  */
-function validateMatrix(userInput, validationData) {
+function validateMatrix(userInput) {
   const supplied = userInput.answers;
   const suppliedSize = getMatrixSize(supplied);
   for (let row = 0; row < suppliedSize[0]; row++) {
@@ -13158,9 +13167,9 @@ function validateMatrix(userInput, validationData) {
 }
 
 function scoreMatrix(userInput, rubric) {
-  const validationResult = validateMatrix(userInput);
-  if (validationResult != null) {
-    return validationResult;
+  const validationError = validateMatrix(userInput);
+  if (validationError != null) {
+    return validationError;
   }
   const solution = rubric.answers;
   const supplied = userInput.answers;
@@ -13225,16 +13234,16 @@ function validateNumberLine(userInput) {
   return null;
 }
 
-function scoreNumberLine(userInput, scoringData) {
+function scoreNumberLine(userInput, rubric) {
   const validationError = validateNumberLine(userInput);
   if (validationError) {
     return validationError;
   }
-  const range = scoringData.range;
-  const start = scoringData.initialX != null ? scoringData.initialX : range[0];
-  const startRel = scoringData.isInequality ? "ge" : "eq";
-  const correctRel = scoringData.correctRel || "eq";
-  const correctPos = number.equal(userInput.numLinePosition, scoringData.correctX || 0);
+  const range = rubric.range;
+  const start = rubric.initialX != null ? rubric.initialX : range[0];
+  const startRel = rubric.isInequality ? "ge" : "eq";
+  const correctRel = rubric.correctRel || "eq";
+  const correctPos = number.equal(userInput.numLinePosition, rubric.correctX || 0);
   if (correctPos && correctRel === userInput.rel) {
     return {
       type: "points",
@@ -13548,9 +13557,9 @@ function validateOrderer(userInput) {
 }
 
 function scoreOrderer(userInput, rubric) {
-  const validateError = validateOrderer(userInput);
-  if (validateError) {
-    return validateError;
+  const validationError = validateOrderer(userInput);
+  if (validationError) {
+    return validationError;
   }
   const correct = _.isEqual(userInput.current, rubric.correctOptions.map(option => option.content));
   return {
@@ -13577,14 +13586,14 @@ function validatePlotter(userInput, validationData) {
   return null;
 }
 
-function scorePlotter(userInput, scoringData) {
-  const validationError = validatePlotter(userInput, scoringData);
+function scorePlotter(userInput, rubric) {
+  const validationError = validatePlotter(userInput, rubric);
   if (validationError) {
     return validationError;
   }
   return {
     type: "points",
-    earned: approximateDeepEqual(userInput, scoringData.correct) ? 1 : 0,
+    earned: approximateDeepEqual(userInput, rubric.correct) ? 1 : 0,
     total: 1,
     message: null
   };
@@ -13836,5 +13845,5 @@ function scoreInputNumber(userInput, rubric) {
   };
 }
 
-export { ErrorCodes, KhanAnswerTypes, inputNumberAnswerTypes, scoreCSProgram, scoreCategorizer, scoreDropdown, scoreExpression, scoreGrapher, scoreIframe, scoreInputNumber, scoreInteractiveGraph, scoreLabelImage, scoreLabelImageMarker, scoreMatcher, scoreMatrix, scoreNumberLine, scoreNumericInput, scoreOrderer, scorePlotter, scoreRadio, scoreSorter, scoreTable };
+export { ErrorCodes, KhanAnswerTypes, inputNumberAnswerTypes, scoreCSProgram, scoreCategorizer, scoreDropdown, scoreExpression, scoreGrapher, scoreIframe, scoreInputNumber, scoreInteractiveGraph, scoreLabelImage, scoreLabelImageMarker, scoreMatcher, scoreMatrix, scoreNumberLine, scoreNumericInput, scoreOrderer, scorePlotter, scoreRadio, scoreSorter, scoreTable, validateCategorizer, validateDropdown, validateExpression, validateMatrix, validateNumberLine, validateOrderer, validatePlotter, validateRadio, validateSorter, validateTable };
 //# sourceMappingURL=index.js.map