Rename usages of rubric to scoringData

packages/perseus/src/renderer.tsx

@@ -556,7 +556,7 @@ class Renderer
         const apiOptions = this.getApiOptions();
         const widgetProps = this.state.widgetProps[widgetId] || {};
 
-        // The widget needs access to its "rubric" at all times when in review
+        // The widget needs access to its "scoring data" at all times when in review
         // mode (which is really just part of its widget info).
         const widgetInfo = this.state.widgetInfo[widgetId];
         const reviewModeRubric =

packages/perseus/src/validation.types.ts

@@ -287,7 +287,7 @@ export interface ValidationDataTypes {
     categorizer: PerseusCategorizerValidationData;
     // "cs-program": PerseusCSProgramValidationData;
     // definition: PerseusDefinitionValidationData;
-    // dropdown: PerseusDropdownRubric;
+    // dropdown: PerseusDropdownValidationData;
     // explanation: PerseusExplanationValidationData;
     // expression: PerseusExpressionValidationData;
     // grapher: PerseusGrapherValidationData;

packages/perseus/src/widgets/expression/score-expression.ts

@@ -65,7 +65,7 @@ function scoreExpression(
             Log.error(
                 "Unable to parse solution answer for expression",
                 Errors.InvalidInput,
-                {loggedMetadata: {rubric: JSON.stringify(scoringData)}},
+                {loggedMetadata: {scoringData: JSON.stringify(scoringData)}},
             );
             return null;
         }

packages/perseus/src/widgets/expression/validate-expression.ts

@@ -4,7 +4,7 @@ import type {PerseusExpressionUserInput} from "../../validation.types";
 /**
  * Checks user input from the expression widget to see if it is scorable.
  *
- * Note: Most of the expression widget's validation requires the Rubric because
+ * Note: Most of the expression widget's validation requires the ScoringData because
  * of its use of KhanAnswerTypes as a core part of scoring.
  *
  * @see `scoreExpression()` for more details.

packages/perseus/src/widgets/input-number/input-number.tsx

@@ -288,13 +288,15 @@ export default {
     // @ts-expect-error: Type 'UserInput' is not assignable to type 'PerseusInputNumberUserInput'.
     scorer: scoreInputNumber,
 
-    getOneCorrectAnswerFromScoringData(rubric: any): string | null | undefined {
-        if (rubric.value == null) {
+    getOneCorrectAnswerFromScoringData(
+        scoringData: any,
+    ): string | null | undefined {
+        if (scoringData.value == null) {
             return;
         }
-        let answerString = String(rubric.value);
-        if (rubric.inexact && rubric.maxError) {
-            answerString += " \u00B1 " + rubric.maxError;
+        let answerString = String(scoringData.value);
+        if (scoringData.inexact && scoringData.maxError) {
+            answerString += " \u00B1 " + scoringData.maxError;
         }
         return answerString;
     },

packages/perseus/src/widgets/input-number/score-input-number.test.ts

@@ -6,7 +6,7 @@ import type {PerseusInputNumberScoringData} from "../../validation.types";
 
 describe("scoreInputNumber", () => {
     it("scores correct answer correctly", () => {
-        const rubric: PerseusInputNumberScoringData = {
+        const scoringData: PerseusInputNumberScoringData = {
             maxError: 0.1,
             inexact: false,
             value: 1,
@@ -18,13 +18,13 @@ describe("scoreInputNumber", () => {
             currentValue: "1",
         } as const;
 
-        const score = scoreInputNumber(useInput, rubric, mockStrings);
+        const score = scoreInputNumber(useInput, scoringData, mockStrings);
 
         expect(score).toHaveBeenAnsweredCorrectly();
     });
 
     it("scores incorrect answer correctly", () => {
-        const rubric: PerseusInputNumberScoringData = {
+        const scoringData: PerseusInputNumberScoringData = {
             maxError: 0.1,
             inexact: false,
             value: 1,
@@ -36,13 +36,13 @@ describe("scoreInputNumber", () => {
             currentValue: "2",
         } as const;
 
-        const score = scoreInputNumber(useInput, rubric, mockStrings);
+        const score = scoreInputNumber(useInput, scoringData, mockStrings);
 
         expect(score).toHaveBeenAnsweredIncorrectly();
     });
 
     it("shows as invalid with a nonsense answer", () => {
-        const rubric: PerseusInputNumberScoringData = {
+        const scoringData: PerseusInputNumberScoringData = {
             maxError: 0.1,
             inexact: false,
             value: 1,
@@ -54,7 +54,7 @@ describe("scoreInputNumber", () => {
             currentValue: "sadasdfas",
         } as const;
 
-        const score = scoreInputNumber(useInput, rubric, mockStrings);
+        const score = scoreInputNumber(useInput, scoringData, mockStrings);
 
         expect(score).toHaveInvalidInput(
             "We could not understand your answer. Please check your answer for extra text or symbols.",
@@ -68,7 +68,7 @@ describe("scoreInputNumber", () => {
     // important to the test.
     // https://khanacademy.atlassian.net/browse/LC-691
     it("doesn't default to validating pi", () => {
-        const rubric: PerseusInputNumberScoringData = {
+        const scoringData: PerseusInputNumberScoringData = {
             maxError: 0.1,
             inexact: false,
             value: 241.90263432641407,
@@ -82,7 +82,7 @@ describe("scoreInputNumber", () => {
             currentValue: "241.91",
         } as const;
 
-        const score = scoreInputNumber(userInput, rubric, mockStrings);
+        const score = scoreInputNumber(userInput, scoringData, mockStrings);
 
         expect(score.message).not.toBe(
             "Your answer is close, but yyou may " +
@@ -95,7 +95,7 @@ describe("scoreInputNumber", () => {
     });
 
     it("validates against pi if provided in answerType", () => {
-        const rubric: PerseusInputNumberScoringData = {
+        const scoringData: PerseusInputNumberScoringData = {
             maxError: 0.1,
             inexact: false,
             value: 241.90263432641407,
@@ -107,7 +107,7 @@ describe("scoreInputNumber", () => {
             currentValue: "77 pi",
         } as const;
 
-        const score = scoreInputNumber(userInput, rubric, mockStrings);
+        const score = scoreInputNumber(userInput, scoringData, mockStrings);
 
         expect(score).toHaveBeenAnsweredCorrectly();
     });

packages/perseus/src/widgets/input-number/score-input-number.ts

@@ -47,24 +47,24 @@ export const answerTypes = {
 
 function scoreInputNumber(
     userInput: PerseusInputNumberUserInput,
-    rubric: PerseusInputNumberScoringData,
+    scoringData: PerseusInputNumberScoringData,
     strings: PerseusStrings,
 ): PerseusScore {
-    if (rubric.answerType == null) {
-        rubric.answerType = "number";
+    if (scoringData.answerType == null) {
+        scoringData.answerType = "number";
     }
 
     // note(matthewc): this will get immediately parsed again by
     // `KhanAnswerTypes.number.convertToPredicate`, but a string is
     // expected here
-    const stringValue = `${rubric.value}`;
+    const stringValue = `${scoringData.value}`;
     const val = KhanAnswerTypes.number.createValidatorFunctional(
         stringValue,
         {
-            simplify: rubric.simplify,
-            inexact: rubric.inexact || undefined,
-            maxError: rubric.maxError,
-            forms: answerTypes[rubric.answerType].forms,
+            simplify: scoringData.simplify,
+            inexact: scoringData.inexact || undefined,
+            maxError: scoringData.maxError,
+            forms: answerTypes[scoringData.answerType].forms,
         },
         strings,
     );

packages/perseus/src/widgets/numeric-input/numeric-input.test.ts

@@ -166,7 +166,7 @@ describe("static function getOneCorrectAnswerFromScoringData", () => {
         );
     });
 
-    it("can get one correct answer from a rubric with multiple answers", () => {
+    it("can get one correct answer from scoring data with multiple answers", () => {
         const widget = multipleAnswersWithDecimals.widgets["numeric-input 1"];
         const widgetOptions = widget && widget.options;
         const answers: ReadonlyArray<any> =
@@ -180,7 +180,7 @@ describe("static function getOneCorrectAnswerFromScoringData", () => {
         expect(singleAnswer).toBe("12.2");
     });
 
-    it("can get one correct answer from a rubric with one answer", () => {
+    it("can get one correct answer from scoring data with one answer", () => {
         const widget = question1.widgets["numeric-input 1"];
         const widgetOptions = widget && widget.options;
         const answers: ReadonlyArray<any> =
@@ -193,7 +193,7 @@ describe("static function getOneCorrectAnswerFromScoringData", () => {
         expect(singleAnswer).toBe("1252");
     });
 
-    it("can not get a correct answer from a rubric with no answer", () => {
+    it("can not get a correct answer from scoring data with no answer", () => {
         const answers: Array<never> = [];
         const singleAnswer =
             NumericInputWidgetExport.getOneCorrectAnswerFromScoringData?.({

packages/perseus/src/widgets/numeric-input/numeric-input.tsx

@@ -382,7 +382,7 @@ export default {
     scorer: scoreNumericInput,
 
     // TODO(LEMS-2656): remove TS suppression
-    // @ts-expect-error: Type 'Rubric' is not assignable to type 'PerseusNumericInputRubric'
+    // @ts-expect-error: Type 'ScoringData' is not assignable to type 'PerseusNumericInputScoringData'
     getOneCorrectAnswerFromScoringData(
         scoringData: PerseusNumericInputScoringData,
     ): string | null | undefined {

packages/perseus/src/widgets/numeric-input/score-numeric-input.test.ts

@@ -14,7 +14,7 @@ describe("scoreNumericInput", () => {
     });
 
     it("is correct when input is empty but answer is 1 and coefficient: true", () => {
-        const rubric: PerseusNumericInputScoringData = {
+        const scoringData: PerseusNumericInputScoringData = {
             answers: [
                 {
                     value: 1,
@@ -34,7 +34,7 @@ describe("scoreNumericInput", () => {
             currentValue: "",
         };
 
-        const score = scoreNumericInput(userInput, rubric, mockStrings);
+        const score = scoreNumericInput(userInput, scoringData, mockStrings);
 
         expect(score).toHaveBeenAnsweredCorrectly();
     });

packages/perseus/src/widgets/radio/__tests__/radio.test.ts

@@ -953,7 +953,7 @@ describe("Radio Widget", () => {
         /**
          * (LEMS-2435) We want to be sure that we're able to score shuffled
          * Radio widgets outside of the component which means `getUserInput`
-         * should return the same order that the rubric provides
+         * should return the same order that the scoring data provides
          */
         it("can be scored correctly when shuffled", async () => {
             // Arrange
@@ -966,8 +966,8 @@ describe("Radio Widget", () => {
 
             const userInput =
                 renderer.getUserInput()[0] as PerseusRadioUserInput;
-            const rubric = shuffledQuestion.widgets["radio 1"].options;
-            const widgetScore = scoreRadio(userInput, rubric, mockStrings);
+            const scoringData = shuffledQuestion.widgets["radio 1"].options;
+            const widgetScore = scoreRadio(userInput, scoringData, mockStrings);
             const rendererScore = scorePerseusItemTesting(
                 shuffledQuestion,
                 renderer.getUserInputMap(),
@@ -981,7 +981,7 @@ describe("Radio Widget", () => {
         /**
          * (LEMS-2435) We want to be sure that we're able to score shuffled
          * Radio widgets outside of the component which means `getUserInput`
-         * should return the same order that the rubric provides
+         * should return the same order that the scoring data provides
          */
         it("can be scored incorrectly when shuffled", async () => {
             // Arrange
@@ -994,8 +994,8 @@ describe("Radio Widget", () => {
 
             const userInput =
                 renderer.getUserInput()[0] as PerseusRadioUserInput;
-            const rubric = shuffledQuestion.widgets["radio 1"].options;
-            const widgetScore = scoreRadio(userInput, rubric, mockStrings);
+            const scoringData = shuffledQuestion.widgets["radio 1"].options;
+            const widgetScore = scoreRadio(userInput, scoringData, mockStrings);
             const rendererScore = scorePerseusItemTesting(
                 shuffledQuestion,
                 renderer.getUserInputMap(),
@@ -1009,7 +1009,7 @@ describe("Radio Widget", () => {
         /**
          * (LEMS-2435) We want to be sure that we're able to score shuffled
          * Radio widgets outside of the component which means `getUserInput`
-         * should return the same order that the rubric provides
+         * should return the same order that the scoring data provides
          */
         it("can be scored correctly when shuffled with none of the above", async () => {
             // Arrange
@@ -1022,8 +1022,8 @@ describe("Radio Widget", () => {
 
             const userInput =
                 renderer.getUserInput()[0] as PerseusRadioUserInput;
-            const rubric = shuffledNoneQuestion.widgets["radio 1"].options;
-            const widgetScore = scoreRadio(userInput, rubric, mockStrings);
+            const scoringData = shuffledNoneQuestion.widgets["radio 1"].options;
+            const widgetScore = scoreRadio(userInput, scoringData, mockStrings);
             const rendererScore = scorePerseusItemTesting(
                 shuffledNoneQuestion,
                 renderer.getUserInputMap(),
@@ -1037,7 +1037,7 @@ describe("Radio Widget", () => {
         /**
          * (LEMS-2435) We want to be sure that we're able to score shuffled
          * Radio widgets outside of the component which means `getUserInput`
-         * should return the same order that the rubric provides
+         * should return the same order that the scoring data provides
          */
         it("can be scored incorrectly when shuffled with none of the above", async () => {
             // Arrange
@@ -1050,8 +1050,8 @@ describe("Radio Widget", () => {
 
             const userInput =
                 renderer.getUserInput()[0] as PerseusRadioUserInput;
-            const rubric = shuffledNoneQuestion.widgets["radio 1"].options;
-            const widgetScore = scoreRadio(userInput, rubric, mockStrings);
+            const scoringData = shuffledNoneQuestion.widgets["radio 1"].options;
+            const widgetScore = scoreRadio(userInput, scoringData, mockStrings);
             const rendererScore = scorePerseusItemTesting(
                 shuffledQuestion,
                 renderer.getUserInputMap(),

packages/perseus/src/widgets/radio/radio-component.tsx

@@ -268,12 +268,12 @@ class Radio extends React.Component<Props> implements Widget {
      */
     showRationalesForCurrentlySelectedChoices: (
         arg1: PerseusRadioWidgetOptions,
-    ) => void = (rubric) => {
+    ) => void = (scoringData) => {
         const {choiceStates} = this.props;
         if (choiceStates) {
             const score = scoreRadio(
                 this.getUserInput(),
-                rubric,
+                scoringData,
                 this.context.strings,
             );
             const widgetCorrect =
@@ -417,7 +417,7 @@ class Radio extends React.Component<Props> implements Widget {
                     // Current versions of the radio widget always pass in the
                     // "correct" value through the choices. Old serialized state
                     // for radio widgets doesn't have this though, so we have to
-                    // pull the correctness out of the review mode rubric. This
+                    // pull the correctness out of the review mode scoring data. This
                     // only works because all of the places we use
                     // `restoreSerializedState()` also turn on reviewMode, but is
                     // fine for now.