From d7d4833852b417857cee226d319438497fd68f14 Mon Sep 17 00:00:00 2001
From: Sarah Third <sarahthird@gmail.com>
Date: Fri, 22 Nov 2024 10:47:20 -0800
Subject: [PATCH] Revert "Expose a way to get user input from
 ServerItemRenderer (#1753)"

This reverts commit c1ba55fc0247e16d9a78558721969382ee6992f8.
---
 dev/flipbook.tsx                              | 11 +---
 .../src/components/__tests__/sorter.test.tsx  | 12 ++--
 packages/perseus/src/index.ts                 |  2 -
 packages/perseus/src/renderer-util.test.ts    | 51 +--------------
 packages/perseus/src/renderer-util.ts         | 31 +--------
 packages/perseus/src/renderer.tsx             | 38 ++++++-----
 packages/perseus/src/server-item-renderer.tsx | 64 ++-----------------
 packages/perseus/src/types.ts                 |  5 --
 .../widgets/categorizer/categorizer.test.ts   | 18 ++----
 .../src/widgets/definition/definition.test.ts |  7 +-
 .../__tests__/deprecated-standin.test.ts      |  7 +-
 .../widgets/expression/expression.test.tsx    | 18 ++----
 .../perseus/src/widgets/group/group.test.tsx  |  8 +--
 packages/perseus/src/widgets/group/group.tsx  |  2 -
 .../src/widgets/matcher/matcher.test.tsx      | 12 +++-
 .../perseus/src/widgets/matrix/matrix.test.ts |  4 ++
 .../passage/__tests__/passage.test.tsx        |  9 +--
 testing/renderer-with-debug-ui.tsx            | 11 +---
 18 files changed, 76 insertions(+), 234 deletions(-)

diff --git a/dev/flipbook.tsx b/dev/flipbook.tsx
index ea05772598..f6dde1281c 100644
--- a/dev/flipbook.tsx
+++ b/dev/flipbook.tsx
@@ -18,7 +18,6 @@ import {useEffect, useMemo, useReducer, useRef, useState} from "react";
 
 import {Renderer} from "../packages/perseus/src";
 import {SvgImage} from "../packages/perseus/src/components";
-import {scorePerseusItem} from "../packages/perseus/src/renderer-util";
 import {mockStrings} from "../packages/perseus/src/strings";
 import {isCorrect} from "../packages/perseus/src/util";
 import {trueForAllMafsSupportedGraphTypes} from "../packages/perseus/src/widgets/interactive-graphs/mafs-supported-graph-types";
@@ -320,15 +319,7 @@ function GradableRenderer(props: QuestionRendererProps) {
                 leftContent={
                     <Button
                         onClick={() => {
-                            if (rendererRef.current) {
-                                const score = scorePerseusItem(
-                                    question,
-                                    rendererRef.current.getUserInputMap(),
-                                    mockStrings,
-                                    "en",
-                                );
-                                setScore(score);
-                            }
+                            setScore(rendererRef.current?.score());
                             clearScoreTimeout.set();
                         }}
                     >
diff --git a/packages/perseus/src/components/__tests__/sorter.test.tsx b/packages/perseus/src/components/__tests__/sorter.test.tsx
index 2101d87ff8..467bbe43d2 100644
--- a/packages/perseus/src/components/__tests__/sorter.test.tsx
+++ b/packages/perseus/src/components/__tests__/sorter.test.tsx
@@ -76,13 +76,15 @@ describe("sorter widget", () => {
         const {renderer} = renderQuestion(question1, apiOptions);
         const sorter = renderer.findWidgets("sorter 1")[0];
 
-        // Act
         // Put the options in the correct order
+
         ["$0.005$ kilograms", "$15$ grams", "$55$ grams"].forEach((option) => {
             act(() => sorter.moveOptionToIndex(option, 3));
         });
+        // Act
+        renderer.guessAndScore();
 
-        // Assert
+        // assert
         expect(renderer).toHaveBeenAnsweredCorrectly();
     });
     it("can be answered incorrectly", () => {
@@ -93,7 +95,6 @@ describe("sorter widget", () => {
         const {renderer} = renderQuestion(question1, apiOptions);
         const sorter = renderer.findWidgets("sorter 1")[0];
 
-        // Act
         // Put the options in the reverse order
         ["$0.005$ kilograms", "$15$ grams", "$55$ grams"].forEach(
             (option, index) => {
@@ -101,7 +102,10 @@ describe("sorter widget", () => {
             },
         );
 
-        // Assert
+        // Act
+        renderer.guessAndScore();
+
+        // assert
         expect(renderer).toHaveBeenAnsweredIncorrectly();
     });
 });
diff --git a/packages/perseus/src/index.ts b/packages/perseus/src/index.ts
index 35600885ae..08bf9e6fd5 100644
--- a/packages/perseus/src/index.ts
+++ b/packages/perseus/src/index.ts
@@ -18,7 +18,6 @@ export {default as ServerItemRenderer} from "./server-item-renderer";
 export {default as HintsRenderer} from "./hints-renderer";
 export {default as HintRenderer} from "./hint-renderer";
 export {default as Renderer} from "./renderer";
-export {scorePerseusItem} from "./renderer-util";
 
 /**
  * Widgets
@@ -228,7 +227,6 @@ export type {
     PerseusWidgetsMap,
     MultiItem,
 } from "./perseus-types";
-export type {UserInputMap} from "./validation.types";
 export type {Coord} from "./interactive2/types";
 export type {MarkerType} from "./widgets/label-image/types";
 
diff --git a/packages/perseus/src/renderer-util.test.ts b/packages/perseus/src/renderer-util.test.ts
index d307626f89..a9e80c78b7 100644
--- a/packages/perseus/src/renderer-util.test.ts
+++ b/packages/perseus/src/renderer-util.test.ts
@@ -1,19 +1,9 @@
-import {screen} from "@testing-library/react";
-import {userEvent as userEventLib} from "@testing-library/user-event";
-
-import {
-    emptyWidgetsFunctional,
-    scorePerseusItem,
-    scoreWidgetsFunctional,
-} from "./renderer-util";
+import {emptyWidgetsFunctional, scoreWidgetsFunctional} from "./renderer-util";
 import {mockStrings} from "./strings";
 import {registerAllWidgetsForTesting} from "./util/register-all-widgets-for-testing";
-import {renderQuestion} from "./widgets/__testutils__/renderQuestion";
-import {question1} from "./widgets/group/group.testdata";
 
 import type {DropdownWidget, PerseusWidgetsMap} from "./perseus-types";
 import type {UserInputMap} from "./validation.types";
-import type {UserEvent} from "@testing-library/user-event";
 
 const testDropdownWidget: DropdownWidget = {
     type: "dropdown",
@@ -479,42 +469,3 @@ describe("scoreWidgetsFunctional", () => {
         expect(result["group 1"]).toHaveBeenAnsweredIncorrectly();
     });
 });
-
-describe("scorePerseusItem", () => {
-    let userEvent: UserEvent;
-    beforeEach(() => {
-        userEvent = userEventLib.setup({
-            advanceTimers: jest.advanceTimersByTime,
-        });
-    });
-
-    it("should return score from contained Renderer", async () => {
-        // Arrange
-        const {renderer} = renderQuestion(question1);
-        // Answer all widgets correctly
-        await userEvent.click(screen.getAllByRole("radio")[4]);
-        // Note(jeremy): If we don't tab away from the radio button in this
-        // test, it seems like the userEvent typing doesn't land in the first
-        // text field.
-        await userEvent.tab();
-        await userEvent.type(
-            screen.getByRole("textbox", {name: /nearest ten/}),
-            "230",
-        );
-        await userEvent.type(
-            screen.getByRole("textbox", {name: /nearest hundred/}),
-            "200",
-        );
-        const userInput = renderer.getUserInputMap();
-        const score = scorePerseusItem(question1, userInput, mockStrings, "en");
-
-        // Assert
-        expect(score).toHaveBeenAnsweredCorrectly();
-        expect(score).toEqual({
-            earned: 3,
-            message: null,
-            total: 3,
-            type: "points",
-        });
-    });
-});
diff --git a/packages/perseus/src/renderer-util.ts b/packages/perseus/src/renderer-util.ts
index 36b18db795..ccc423afdc 100644
--- a/packages/perseus/src/renderer-util.ts
+++ b/packages/perseus/src/renderer-util.ts
@@ -1,8 +1,7 @@
 import Util from "./util";
-import {getWidgetIdsFromContent} from "./widget-type-utils";
 import {getWidgetScorer} from "./widgets";
 
-import type {PerseusRenderer, PerseusWidgetsMap} from "./perseus-types";
+import type {PerseusWidgetsMap} from "./perseus-types";
 import type {PerseusStrings} from "./strings";
 import type {PerseusScore} from "./types";
 import type {UserInput, UserInputMap} from "./validation.types";
@@ -51,35 +50,11 @@ export function emptyWidgetsFunctional(
     });
 }
 
-// TODO: combine scorePerseusItem with scoreWidgetsFunctional
-// once scorePerseusItem is the only one calling scoreWidgetsFunctional
-export function scorePerseusItem(
-    perseusRenderData: PerseusRenderer,
-    userInputMap: UserInputMap,
-    // TODO(LEMS-2461,LEMS-2391): these probably
-    // need to be removed before we move this to the server
-    strings: PerseusStrings,
-    locale: string,
-): PerseusScore {
-    // There seems to be a chance that PerseusRenderer.widgets might include
-    // widget data for widgets that are not in PerseusRenderer.content,
-    // so this checks that the widgets are being used before scoring them
-    const usedWidgetIds = getWidgetIdsFromContent(perseusRenderData.content);
-    const scores = scoreWidgetsFunctional(
-        perseusRenderData.widgets,
-        usedWidgetIds,
-        userInputMap,
-        strings,
-        locale,
-    );
-    return Util.flattenScores(scores);
-}
-
 export function scoreWidgetsFunctional(
     widgets: PerseusWidgetsMap,
     // This is a port of old code, I'm not sure why
     // we need widgetIds vs the keys of the widgets object
-    widgetIds: ReadonlyArray<string>,
+    widgetIds: Array<string>,
     userInputMap: UserInputMap,
     strings: PerseusStrings,
     locale: string,
@@ -104,7 +79,7 @@ export function scoreWidgetsFunctional(
         if (widget.type === "group") {
             const scores = scoreWidgetsFunctional(
                 widget.options.widgets,
-                getWidgetIdsFromContent(widget.options.content),
+                Object.keys(widget.options.widgets),
                 userInputMap[id] as UserInputMap,
                 strings,
                 locale,
diff --git a/packages/perseus/src/renderer.tsx b/packages/perseus/src/renderer.tsx
index afb6f46591..41e383a641 100644
--- a/packages/perseus/src/renderer.tsx
+++ b/packages/perseus/src/renderer.tsx
@@ -1124,7 +1124,7 @@ class Renderer
             // /cry(aria)
             this._foundTextNodes = true;
 
-            if (this.widgetIds.includes(node.id)) {
+            if (_.contains(this.widgetIds, node.id)) {
                 // We don't want to render a duplicate widget key/ref,
                 // as this causes problems with react (for obvious
                 // reasons). Instead we just notify the
@@ -1510,7 +1510,7 @@ class Renderer
 
     getInputPaths: () => ReadonlyArray<FocusPath> = () => {
         const inputPaths: Array<FocusPath> = [];
-        this.widgetIds.forEach((widgetId: string) => {
+        _.each(this.widgetIds, (widgetId: string) => {
             const widget = this.getWidgetInstance(widgetId);
             if (widget && widget.getInputPaths) {
                 // Grab all input paths and add widgetID to the front
@@ -1518,7 +1518,7 @@ class Renderer
                 // Prefix paths with their widgetID and add to collective
                 // list of paths.
                 // @ts-expect-error - TS2345 - Argument of type '(inputPath: string) => void' is not assignable to parameter of type 'CollectionIterator<FocusPath, void, readonly FocusPath[]>'.
-                widgetInputPaths.forEach((inputPath: string) => {
+                _.each(widgetInputPaths, (inputPath: string) => {
                     const relativeInputPath = [widgetId].concat(inputPath);
                     inputPaths.push(relativeInputPath);
                 });
@@ -1742,42 +1742,46 @@ class Renderer
     }
 
     /**
-     * Scores the content.
-     *
-     * @deprecated use scorePerseusItem
+     * Returns an object mapping from widget ID to perseus-style score.
+     * The keys of this object are the values of the array returned
+     * from `getWidgetIds`.
      */
-    score(): PerseusScore {
-        const scores = scoreWidgetsFunctional(
+    scoreWidgets(): {[widgetId: string]: PerseusScore} {
+        return scoreWidgetsFunctional(
             this.state.widgetInfo,
             this.widgetIds,
             this.getUserInputMap(),
             this.props.strings,
             this.context.locale,
         );
-        const combinedScore = Util.flattenScores(scores);
-        return combinedScore;
     }
 
     /**
-     * @deprecated use scorePerseusItem
+     * Grades the content.
      */
-    guessAndScore: () => [UserInputArray, PerseusScore] = () => {
+    score(): PerseusScore {
+        const scores = this.scoreWidgets();
+        const combinedScore = Util.flattenScores(scores);
+        return combinedScore;
+    }
+
+    guessAndScore(): [UserInputArray, PerseusScore] {
         const totalGuess = this.getUserInput();
         const totalScore = this.score();
 
         return [totalGuess, totalScore];
-    };
+    }
 
     examples: () => ReadonlyArray<string> | null | undefined = () => {
         const widgetIds = this.widgetIds;
-        const examples = widgetIds
-            .map((widgetId) => {
+        const examples = _.compact(
+            _.map(widgetIds, (widgetId) => {
                 const widget = this.getWidgetInstance(widgetId);
                 return widget != null && widget.examples
                     ? widget.examples()
                     : null;
-            })
-            .filter(Boolean);
+            }),
+        );
 
         // no widgets with examples
         if (!examples.length) {
diff --git a/packages/perseus/src/server-item-renderer.tsx b/packages/perseus/src/server-item-renderer.tsx
index 53e600779b..ad470a8d21 100644
--- a/packages/perseus/src/server-item-renderer.tsx
+++ b/packages/perseus/src/server-item-renderer.tsx
@@ -19,7 +19,6 @@ import HintsRenderer from "./hints-renderer";
 import LoadingContext from "./loading-context";
 import {ApiOptions} from "./perseus-api";
 import Renderer from "./renderer";
-import {scorePerseusItem} from "./renderer-util";
 import Util from "./util";
 
 import type {PerseusItem, ShowSolutions} from "./perseus-types";
@@ -28,7 +27,6 @@ import type {
     PerseusDependenciesV2,
     SharedRendererProps,
 } from "./types";
-import type {UserInputArray, UserInputMap} from "./validation.types";
 import type {
     GetPromptJSONInterface,
     RendererPromptJSON,
@@ -44,7 +42,6 @@ import type {PropsFor} from "@khanacademy/wonder-blocks-core";
 type OwnProps = {
     hintsVisible?: number;
     item: PerseusItem;
-    score?: KEScore | null;
     problemNum?: number;
     reviewMode?: boolean;
     keypadElement?: KeypadAPI | null | undefined;
@@ -63,23 +60,10 @@ type DefaultProps = Required<
 >;
 
 type State = {
-    /**
-     * questionCompleted is used to signal that a learner has attempted
-     * the exercise. This is used when widgets want to show things like
-     * rationale or partial correctness.
-     */
     questionCompleted: boolean;
-    /**
-     * As far as I can tell, this is used to highlight empty widgets
-     * after a learner has clicked the "check" button. I don't think this could
-     * still be used though, because the "check" button is disabled while there
-     * are empty widgets.
-     */
-    questionHighlightedWidgets: ReadonlyArray<string>;
-    /**
-     * Keeps track of whether each asset (SvgImage or TeX) rendered by
-     * the questionRenderer has finished loading or rendering.
-     */
+    questionHighlightedWidgets: ReadonlyArray<any>;
+    // Keeps track of whether each asset (SvgImage or TeX) rendered by
+    // the questionRenderer has finished loading or rendering.
     assetStatuses: {
         [assetKey: string]: boolean;
     };
@@ -155,16 +139,6 @@ export class ServerItemRenderer
                 this.props.onRendered(true);
             }
         }
-
-        if (this.props.score && this.props.score !== prevProps.score) {
-            const emptyQuestionAreaWidgets =
-                this.questionRenderer.emptyWidgets();
-
-            this.setState({
-                questionCompleted: this.props.score.correct,
-                questionHighlightedWidgets: emptyQuestionAreaWidgets,
-            });
-        }
     }
 
     componentWillUnmount() {
@@ -331,42 +305,18 @@ export class ServerItemRenderer
         return this.questionRenderer.getPromptJSON();
     }
 
-    /**
-     * Returns an array of the widget `.getUserInput()` results
-     *
-     * TODO: can we remove this? Seems to be just for backwards
-     * compatibility with old Perseus Chrome logging
-     * @deprecated use getUserInput
-     */
-    getUserInputLegacy(): UserInputArray {
-        return this.questionRenderer.getUserInput();
-    }
-
-    /**
-     * Returns an object of the widget `.getUserInput()` results
-     */
-    getUserInput(): UserInputMap {
-        return this.questionRenderer.getUserInputMap();
-    }
-
     /**
      * Grades the item.
-     *
-     * @deprecated use scorePerseusItem
      */
     scoreInput(): KEScore {
-        const guess = this.getUserInput();
-        const score = scorePerseusItem(
-            this.props.item.question,
-            guess,
-            this.context.strings,
-            this.context.locale,
-        );
+        const guessAndScore = this.questionRenderer.guessAndScore();
+        const guess = guessAndScore[0];
+        const score = guessAndScore[1];
 
         // Continue to include an empty guess for the now defunct answer area.
         // TODO(alex): Check whether we rely on the format here for
         //             analyzing ProblemLogs. If not, remove this layer.
-        const maxCompatGuess = [this.questionRenderer.getUserInput(), []];
+        const maxCompatGuess = [guess, []];
 
         const keScore = Util.keScoreFromPerseusScore(
             score,
diff --git a/packages/perseus/src/types.ts b/packages/perseus/src/types.ts
index 6cc7f2babc..ec8da5f961 100644
--- a/packages/perseus/src/types.ts
+++ b/packages/perseus/src/types.ts
@@ -666,11 +666,6 @@ export type WidgetProps<
     problemNum: number | null | undefined;
     apiOptions: APIOptionsWithDefaults;
     keypadElement?: any;
-    /**
-     * questionCompleted is used to signal that a learner has attempted
-     * the exercise. This is used when widgets want to show things like
-     * rationale or partial correctness.
-     */
     questionCompleted?: boolean;
     onFocus: (blurPath: FocusPath) => void;
     onBlur: (blurPath: FocusPath) => void;
diff --git a/packages/perseus/src/widgets/categorizer/categorizer.test.ts b/packages/perseus/src/widgets/categorizer/categorizer.test.ts
index 96517d76a1..d428a3b779 100644
--- a/packages/perseus/src/widgets/categorizer/categorizer.test.ts
+++ b/packages/perseus/src/widgets/categorizer/categorizer.test.ts
@@ -3,8 +3,6 @@ import {userEvent as userEventLib} from "@testing-library/user-event";
 
 import {testDependencies} from "../../../../../testing/test-dependencies";
 import * as Dependencies from "../../dependencies";
-import {scorePerseusItem} from "../../renderer-util";
-import {mockStrings} from "../../strings";
 import {renderQuestion} from "../__testutils__/renderQuestion";
 
 import {Categorizer} from "./categorizer";
@@ -59,12 +57,7 @@ describe("categorizer widget", () => {
         const {renderer} = renderQuestion(question1, apiOptions);
 
         // Act
-        const score = scorePerseusItem(
-            question1,
-            renderer.getUserInputMap(),
-            mockStrings,
-            "en",
-        );
+        const [_, score] = renderer.guessAndScore();
 
         // Assert
         expect(score).toMatchInlineSnapshot(`
@@ -83,12 +76,7 @@ describe("categorizer widget", () => {
         await userEvent.click(firstItem);
 
         // act
-        const score = scorePerseusItem(
-            question1,
-            renderer.getUserInputMap(),
-            mockStrings,
-            "en",
-        );
+        const [_, score] = renderer.guessAndScore();
 
         // assert
         expect(score).toMatchInlineSnapshot(`
@@ -123,6 +111,8 @@ describe("categorizer widget", () => {
             })[1],
         );
 
+        renderer.guessAndScore();
+
         // assert
         expect(renderer).toHaveBeenAnsweredCorrectly();
     });
diff --git a/packages/perseus/src/widgets/definition/definition.test.ts b/packages/perseus/src/widgets/definition/definition.test.ts
index d1fccca161..261ba43d1a 100644
--- a/packages/perseus/src/widgets/definition/definition.test.ts
+++ b/packages/perseus/src/widgets/definition/definition.test.ts
@@ -123,11 +123,14 @@ describe("Definition widget", () => {
     });
 
     it("should not affect answerable", () => {
-        // Arrange / Act
+        // Arrange
         const {renderer} = renderQuestion(question);
 
+        // Act
+        const result = renderer.scoreWidgets();
+
         // Assert
-        expect(renderer).toHaveBeenAnsweredCorrectly({
+        expect(result["definition 1"]).toHaveBeenAnsweredCorrectly({
             shouldHavePoints: false,
         });
     });
diff --git a/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts b/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts
index 3aa8b98c69..93604de822 100644
--- a/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts
+++ b/packages/perseus/src/widgets/deprecated-standin/__tests__/deprecated-standin.test.ts
@@ -41,10 +41,13 @@ describe("Deprecated Standin widget", () => {
     });
 
     it("should be scorable and always give points", () => {
-        // Arrange / Act
+        // Arrange
         const {renderer} = renderQuestion(question);
 
+        // Act
+        const result = renderer.scoreWidgets();
+
         // Assert
-        expect(renderer).toHaveBeenAnsweredCorrectly();
+        expect(result["widget 1"]).toHaveBeenAnsweredCorrectly();
     });
 });
diff --git a/packages/perseus/src/widgets/expression/expression.test.tsx b/packages/perseus/src/widgets/expression/expression.test.tsx
index 1ec58e0c1f..be8d76b63c 100644
--- a/packages/perseus/src/widgets/expression/expression.test.tsx
+++ b/packages/perseus/src/widgets/expression/expression.test.tsx
@@ -7,8 +7,6 @@ import {
     testDependenciesV2,
 } from "../../../../../testing/test-dependencies";
 import * as Dependencies from "../../dependencies";
-import {scorePerseusItem} from "../../renderer-util";
-import {mockStrings} from "../../strings";
 import {renderQuestion} from "../__testutils__/renderQuestion";
 
 import ExpressionWidgetExport from "./expression";
@@ -446,12 +444,7 @@ describe("Expression Widget", function () {
                 renderer.setInputValue(["expression 1"], "123-x", () => {}),
             );
             act(() => jest.runOnlyPendingTimers());
-            const score = scorePerseusItem(
-                expressionItem2.question,
-                renderer.getUserInputMap(),
-                mockStrings,
-                "en",
-            );
+            const score = renderer.guessAndScore()[1];
 
             // Assert
             expect(score.type).toBe("points");
@@ -471,12 +464,7 @@ describe("Expression Widget", function () {
             act(() => jest.runOnlyPendingTimers());
 
             // act
-            const score = scorePerseusItem(
-                expressionItem2.question,
-                renderer.getUserInputMap(),
-                mockStrings,
-                "en",
-            );
+            const score = renderer.score();
 
             // Assert
             // Score.total doesn't exist if the input is invalid
@@ -507,6 +495,7 @@ describe("Expression Widget", function () {
             act(() => jest.runOnlyPendingTimers());
             act(() => screen.getByRole("textbox").blur());
             act(() => jest.runOnlyPendingTimers());
+            renderer.guessAndScore();
 
             // Assert
             await waitFor(() =>
@@ -525,6 +514,7 @@ describe("Expression Widget", function () {
             act(() => expression.insert("sen(x)"));
             act(() => jest.runOnlyPendingTimers());
             act(() => screen.getByRole("textbox").blur());
+            renderer.guessAndScore();
 
             // Assert
             expect(screen.queryByText("Oops!")).toBeNull();
diff --git a/packages/perseus/src/widgets/group/group.test.tsx b/packages/perseus/src/widgets/group/group.test.tsx
index 7f090d3e46..b4d1316bfb 100644
--- a/packages/perseus/src/widgets/group/group.test.tsx
+++ b/packages/perseus/src/widgets/group/group.test.tsx
@@ -8,7 +8,6 @@ import * as Perseus from "@khanacademy/perseus";
 
 import {testDependencies} from "../../../../../testing/test-dependencies";
 import * as Dependencies from "../../dependencies";
-import {scorePerseusItem} from "../../renderer-util";
 import {mockStrings} from "../../strings";
 import {traverse} from "../../traversal";
 import {renderQuestion} from "../__testutils__/renderQuestion";
@@ -414,13 +413,10 @@ describe("group widget", () => {
             screen.getByRole("textbox", {name: /nearest hundred/}),
             "200",
         );
-
-        const guess = renderer.getUserInputMap();
-        const score = scorePerseusItem(question1, guess, mockStrings, "en");
-        const guessAndScore = [renderer.getUserInput(), score];
+        const guessAndScore = renderer.guessAndScore();
 
         // Assert
-        expect(score).toHaveBeenAnsweredCorrectly();
+        expect(guessAndScore[1]).toHaveBeenAnsweredCorrectly();
         expect(guessAndScore).toMatchInlineSnapshot(`
             [
               [
diff --git a/packages/perseus/src/widgets/group/group.tsx b/packages/perseus/src/widgets/group/group.tsx
index 6df7646007..8affeafdb4 100644
--- a/packages/perseus/src/widgets/group/group.tsx
+++ b/packages/perseus/src/widgets/group/group.tsx
@@ -154,8 +154,6 @@ class Group extends React.Component<Props> implements Widget {
             }
         };
 
-        // TODO(LEMS-2391): replace this when there's a separate check
-        // for valid/invalid state
         const score = this.rendererRef?.score();
         const isValid = score && score.type !== "invalid";
         const isInvalid = score && score.type === "invalid";
diff --git a/packages/perseus/src/widgets/matcher/matcher.test.tsx b/packages/perseus/src/widgets/matcher/matcher.test.tsx
index c583ad1490..61872ecc16 100644
--- a/packages/perseus/src/widgets/matcher/matcher.test.tsx
+++ b/packages/perseus/src/widgets/matcher/matcher.test.tsx
@@ -105,7 +105,6 @@ describe("matcher widget", () => {
         const {renderer} = renderQuestion(question1, apiOptions);
         await wait();
 
-        // Act
         const matcher: Matcher = renderer.findWidgets("matcher 1")[0];
 
         // Put the right options in the correct order by repeatedly moving
@@ -120,6 +119,9 @@ describe("matcher widget", () => {
             act(() => matcher.moveRightOptionToIndex(option, 4));
         });
 
+        // Act
+        renderer.guessAndScore();
+
         // assert
         expect(renderer).toHaveBeenAnsweredCorrectly();
     });
@@ -132,7 +134,6 @@ describe("matcher widget", () => {
         const {renderer} = renderQuestion(question1, apiOptions);
         await wait();
 
-        // Act
         const matcher: Matcher = renderer.findWidgets("matcher 1")[0];
 
         // Put the left options in reverse order
@@ -146,6 +147,9 @@ describe("matcher widget", () => {
             matcher.moveLeftOptionToIndex(option, 0);
         });
 
+        // Act
+        renderer.guessAndScore();
+
         // Assert
         expect(renderer).toHaveBeenAnsweredIncorrectly();
     });
@@ -160,12 +164,14 @@ describe("matcher widget", () => {
             },
         });
 
-        // Act
         const apiOptions: APIOptions = {
             isMobile: false,
         };
         const {renderer} = renderQuestion(question1, apiOptions);
 
+        // Act
+        renderer.guessAndScore();
+
         // Assert
         expect(renderer).toHaveBeenAnsweredIncorrectly();
     });
diff --git a/packages/perseus/src/widgets/matrix/matrix.test.ts b/packages/perseus/src/widgets/matrix/matrix.test.ts
index 27eee1a180..05aebbdcad 100644
--- a/packages/perseus/src/widgets/matrix/matrix.test.ts
+++ b/packages/perseus/src/widgets/matrix/matrix.test.ts
@@ -62,6 +62,8 @@ describe("matrix widget", () => {
             await userEvent.type(textboxes[i], correctAnswers[i].toString());
         }
 
+        renderer.guessAndScore();
+
         // assert
         expect(renderer).toHaveBeenAnsweredCorrectly();
     });
@@ -79,6 +81,8 @@ describe("matrix widget", () => {
             await userEvent.type(textboxes[i], "1");
         }
 
+        renderer.guessAndScore();
+
         // Assert
         expect(renderer).toHaveBeenAnsweredIncorrectly();
     });
diff --git a/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx b/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx
index f34a76d644..fd3026773d 100644
--- a/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx
+++ b/packages/perseus/src/widgets/passage/__tests__/passage.test.tsx
@@ -5,8 +5,6 @@ import React from "react";
 import {testDependencies} from "../../../../../../testing/test-dependencies";
 import * as Dependencies from "../../../dependencies";
 import {ApiOptions} from "../../../perseus-api";
-import {scorePerseusItem} from "../../../renderer-util";
-import {mockStrings} from "../../../strings";
 import {renderQuestion} from "../../__testutils__/renderQuestion";
 import PassageWidgetExport, {LineHeightMeasurer} from "../passage";
 
@@ -135,12 +133,7 @@ describe("passage widget", () => {
         act(() => jest.runOnlyPendingTimers());
 
         // Act
-        const score = scorePerseusItem(
-            question2,
-            renderer.getUserInputMap(),
-            mockStrings,
-            "en",
-        );
+        const score = renderer.score();
 
         // Assert
         expect(score).toMatchInlineSnapshot(`
diff --git a/testing/renderer-with-debug-ui.tsx b/testing/renderer-with-debug-ui.tsx
index e66ec3493b..322d81422f 100644
--- a/testing/renderer-with-debug-ui.tsx
+++ b/testing/renderer-with-debug-ui.tsx
@@ -10,8 +10,6 @@ import * as React from "react";
 import ReactJson from "react-json-view";
 
 import {Renderer, usePerseusI18n} from "../packages/perseus/src/index";
-import {scorePerseusItem} from "../packages/perseus/src/renderer-util";
-import {mockStrings} from "../packages/perseus/src/strings";
 import {registerAllWidgetsForTesting} from "../packages/perseus/src/util/register-all-widgets-for-testing";
 
 import SideBySide from "./side-by-side";
@@ -82,14 +80,7 @@ export const RendererWithDebugUI = ({
                                 if (!ref.current) {
                                     return;
                                 }
-                                const guess = ref.current.getUserInputMap();
-                                const score = scorePerseusItem(
-                                    question,
-                                    ref.current.getUserInputMap(),
-                                    mockStrings,
-                                    "en",
-                                );
-                                setState([guess, score]);
+                                setState(ref.current.guessAndScore());
                             }}
                         >
                             Check