Orderer: Extract validation out of scoring

.changeset/sharp-radios-burn.md

@@ -0,0 +1,5 @@
+---
+"@khanacademy/perseus": minor
+---
+
+Split out validation function for the `orderer` widget. This can be used to check if the user has ordered at least one option, confirming the question is ready to be scored.

packages/perseus/src/widgets/orderer/score-orderer.test.ts

@@ -6,7 +6,7 @@ import type {
     PerseusOrdererUserInput,
 } from "../../validation.types";
 
-describe("ordererValiator", () => {
+describe("scoreOrderer", () => {
     it("is correct when the userInput is in the same order and is the same length as the rubric's correctOption content items", () => {
         // Arrange
         const rubric: PerseusOrdererRubric =
@@ -56,20 +56,4 @@ describe("ordererValiator", () => {
         // assert
         expect(result).toHaveBeenAnsweredIncorrectly();
     });
-
-    it("is invalid when the when the user has not started ordering the options and current is empty", () => {
-        // Arrange
-        const rubric: PerseusOrdererRubric =
-            question1.widgets["orderer 1"].options;
-
-        const userInput: PerseusOrdererUserInput = {
-            current: [],
-        };
-
-        // Act
-        const result = scoreOrderer(userInput, rubric);
-
-        // assert
-        expect(result).toHaveInvalidInput();
-    });
 });

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

@@ -1,5 +1,7 @@
 import _ from "underscore";
 
+import {validateOrderer} from "./validate-orderer";
+
 import type {PerseusScore} from "../../types";
 import type {
     PerseusOrdererRubric,
@@ -10,16 +12,14 @@ export function scoreOrderer(
     userInput: PerseusOrdererUserInput,
     rubric: PerseusOrdererRubric,
 ): PerseusScore {
-    if (userInput.current.length === 0) {
-        return {
-            type: "invalid",
-            message: null,
-        };
+    const validateError = validateOrderer(userInput);
+    if (validateError) {
+        return validateError;
     }
 
     const correct = _.isEqual(
         userInput.current,
-        _.pluck(rubric.correctOptions, "content"),
+        rubric.correctOptions.map((option) => option.content),
     );
 
     return {

packages/perseus/src/widgets/orderer/validate-orderer.test.ts

@@ -0,0 +1,31 @@
+import {validateOrderer} from "./validate-orderer";
+
+import type {PerseusOrdererUserInput} from "../../validation.types";
+
+describe("validateOrderer", () => {
+    it("is invalid when the user has not started ordering the options and current is empty", () => {
+        // Arrange
+        const userInput: PerseusOrdererUserInput = {
+            current: [],
+        };
+
+        // Act
+        const result = validateOrderer(userInput);
+
+        // Assert
+        expect(result).toHaveInvalidInput();
+    });
+
+    it("is null when the user has started ordering the options and current has at least one option", () => {
+        // Arrange
+        const userInput: PerseusOrdererUserInput = {
+            current: ["$10.9$"],
+        };
+
+        // Act
+        const result = validateOrderer(userInput);
+
+        // Assert
+        expect(result).toBeNull();
+    });
+});

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

@@ -0,0 +1,15 @@
+import type {PerseusScore} from "../../types";
+import type {PerseusOrdererUserInput} from "../../validation.types";
+
+export function validateOrderer(
+    userInput: PerseusOrdererUserInput,
+): Extract<PerseusScore, {type: "invalid"}> | null {
+    if (userInput.current.length === 0) {
+        return {
+            type: "invalid",
+            message: null,
+        };
+    }
+
+    return null;
+}