@khanacademy/perseus 7.2.1 → 9.0.0

package/src/item-renderer.tsx

@@ -6,6 +6,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import _ from "underscore";
 
+import {DependenciesContext} from "./dependencies";
 import HintsRenderer from "./hints-renderer";
 import Objective from "./interactive2/objective_";
 import ProvideKeypad from "./mixins/provide-keypad";
@@ -16,7 +17,12 @@ import reactRender from "./util/react-render";
 
 import type {KeypadProps} from "./mixins/provide-keypad";
 import type {PerseusItem} from "./perseus-types";
-import type {APIOptions, FocusPath, LinterContextProps} from "./types";
+import type {
+    APIOptions,
+    FocusPath,
+    LinterContextProps,
+    PerseusDependenciesV2,
+} from "./types";
 import type {KEScore} from "@khanacademy/perseus-core";
 
 const {mapObject} = Objective;
@@ -46,6 +52,8 @@ type Props = // These props are used by the ProvideKeypad mixin.
         savedState: any;
         linterContext: LinterContextProps;
         legacyPerseusLint?: ReadonlyArray<string>;
+
+        dependencies: PerseusDependenciesV2;
     };
 
 type DefaultProps = {
@@ -73,7 +81,7 @@ type SerializedState = {
 };
 
 class ItemRenderer extends React.Component<Props, State> {
-    // @ts-expect-error [FEI-5003] - TS2564 - Property 'questionRenderer' has no initializer and is not definitely assigned in the constructor.
+    // @ts-expect-error - TS2564 - Property 'questionRenderer' has no initializer and is not definitely assigned in the constructor.
     questionRenderer: Renderer;
     hintsRenderer: React.ElementRef<typeof HintsRenderer> | null | undefined;
     _currentFocus: FocusPath;
@@ -176,54 +184,60 @@ class ItemRenderer extends React.Component<Props, State> {
         // strangeness instead of relying on React's normal render() method.
         // TODO(alpert): Figure out how to clean this up somehow
         reactRender(
-            <Renderer
-                ref={(node) => {
-                    if (!node) {
-                        return;
-                    }
-                    this.questionRenderer = node;
-
-                    // NOTE(jeremy): Why don't we just pass this into the
-                    // renderer as a prop?
-                    const {answerableCallback} = apiOptions;
-                    if (answerableCallback) {
-                        const isAnswerable =
-                            this.questionRenderer.emptyWidgets().length === 0;
-                        answerableCallback(isAnswerable);
-                    }
-                }}
-                keypadElement={this.keypadElement()}
-                problemNum={this.props.problemNum}
-                onInteractWithWidget={this.handleInteractWithWidget}
-                highlightedWidgets={this.state.questionHighlightedWidgets}
-                apiOptions={apiOptions}
-                questionCompleted={this.state.questionCompleted}
-                reviewMode={this.props.reviewMode}
-                savedState={this.props.savedState}
-                linterContext={PerseusLinter.pushContextStack(
-                    this.props.linterContext,
-                    "question",
-                )}
-                {...this.props.item.question}
-                legacyPerseusLint={this.props.legacyPerseusLint}
-            />,
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'Element' is not assignable to parameter of type 'HTMLElement'.
+            <DependenciesContext.Provider value={this.props.dependencies}>
+                <Renderer
+                    ref={(node) => {
+                        if (!node) {
+                            return;
+                        }
+                        this.questionRenderer = node;
+
+                        // NOTE(jeremy): Why don't we just pass this into the
+                        // renderer as a prop?
+                        const {answerableCallback} = apiOptions;
+                        if (answerableCallback) {
+                            const isAnswerable =
+                                this.questionRenderer.emptyWidgets().length ===
+                                0;
+                            answerableCallback(isAnswerable);
+                        }
+                    }}
+                    keypadElement={this.keypadElement()}
+                    problemNum={this.props.problemNum}
+                    onInteractWithWidget={this.handleInteractWithWidget}
+                    highlightedWidgets={this.state.questionHighlightedWidgets}
+                    apiOptions={apiOptions}
+                    questionCompleted={this.state.questionCompleted}
+                    reviewMode={this.props.reviewMode}
+                    savedState={this.props.savedState}
+                    linterContext={PerseusLinter.pushContextStack(
+                        this.props.linterContext,
+                        "question",
+                    )}
+                    {...this.props.item.question}
+                    legacyPerseusLint={this.props.legacyPerseusLint}
+                />
+            </DependenciesContext.Provider>,
+            // @ts-expect-error - TS2345 - Argument of type 'Element' is not assignable to parameter of type 'HTMLElement'.
             workArea,
         );
 
         reactRender(
-            <HintsRenderer
-                ref={(node) => (this.hintsRenderer = node)}
-                hints={this.props.item.hints}
-                hintsVisible={this.state.hintsVisible}
-                // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
-                apiOptions={apiOptions}
-                linterContext={PerseusLinter.pushContextStack(
-                    this.props.linterContext,
-                    "hints",
-                )}
-            />,
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'Element' is not assignable to parameter of type 'HTMLElement'.
+            <DependenciesContext.Provider value={this.props.dependencies}>
+                <HintsRenderer
+                    ref={(node) => (this.hintsRenderer = node)}
+                    hints={this.props.item.hints}
+                    hintsVisible={this.state.hintsVisible}
+                    // @ts-expect-error - TS2769 - No overload matches this call.
+                    apiOptions={apiOptions}
+                    linterContext={PerseusLinter.pushContextStack(
+                        this.props.linterContext,
+                        "hints",
+                    )}
+                />
+            </DependenciesContext.Provider>,
+
+            // @ts-expect-error - TS2345 - Argument of type 'Element' is not assignable to parameter of type 'HTMLElement'.
             hintsArea,
         );
 
@@ -460,7 +474,7 @@ class ItemRenderer extends React.Component<Props, State> {
         const qScore = this.questionRenderer.scoreWidgets();
         const qGuess = this.questionRenderer.getUserInputForWidgets();
         const state = this.questionRenderer.getSerializedState();
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'Partial<Record<string, KEScore>>' is not assignable to type '{ [id: string]: KEScore; }'. | TS2345 - Argument of type '{ [widgetId: string]: PerseusScore; }' is not assignable to parameter of type 'Partial<Record<string, { type: "invalid"; message?: string | null | undefined; suppressAlmostThere?: boolean | null | undefined; }>>'.
+        // @ts-expect-error - TS2322 - Type 'Partial<Record<string, KEScore>>' is not assignable to type '{ [id: string]: KEScore; }'. | TS2345 - Argument of type '{ [widgetId: string]: PerseusScore; }' is not assignable to parameter of type 'Partial<Record<string, { type: "invalid"; message?: string | null | undefined; suppressAlmostThere?: boolean | null | undefined; }>>'.
         return mapObject(qScore, (score, id) => {
             return Util.keScoreFromPerseusScore(score, qGuess[id], state[id]);
         });
@@ -504,7 +518,11 @@ class ItemRenderer extends React.Component<Props, State> {
     }
 
     render(): React.ReactNode {
-        return <div />;
+        return (
+            <DependenciesContext.Provider value={this.props.dependencies}>
+                <div />
+            </DependenciesContext.Provider>
+        );
     }
 }
 

package/src/mixins/changeable.ts

@@ -92,7 +92,7 @@ export const change: ChangeFn = function (
         // Called with an object of multiple props to change
         callback = propValue;
         return _changeMultiple(
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             this,
             newPropsOrSinglePropName, // object newProps
             callback,
@@ -101,7 +101,7 @@ export const change: ChangeFn = function (
     if (typeof newPropsOrSinglePropName === "string") {
         // Called with a string propName of a single prop to change
         return _changeSingle(
-            // @ts-expect-error [FEI-5003] - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
+            // @ts-expect-error - TS2683 - 'this' implicitly has type 'any' because it does not have a type annotation.
             this,
             newPropsOrSinglePropName, // string propName
             propValue,

package/src/mixins/editor-jsonify.ts

@@ -5,7 +5,7 @@ import WIDGET_PROP_DENYLIST from "./widget-prop-denylist";
 const EditorJsonify = {
     serialize: function (): any {
         // Omit props that get passed to all widgets
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly serialize: () => any; }'.
+        // @ts-expect-error - TS2339 - Property 'props' does not exist on type '{ readonly serialize: () => any; }'.
         return _.omit(this.props, WIDGET_PROP_DENYLIST);
     },
 } as const;

package/src/mixins/provide-keypad.tsx

@@ -12,13 +12,13 @@
  */
 
 import {MobileKeypad} from "@khanacademy/math-input";
-import PropTypes from "prop-types";
 import * as React from "react";
 import ReactDOM from "react-dom";
 
 import reactRender from "../util/react-render";
 
 import type {APIOptions} from "../types";
+import type {KeypadAPI} from "@khanacademy/math-input";
 import type {CSSProperties} from "aphrodite";
 
 export type KeypadProps = {
@@ -34,48 +34,44 @@ export type KeypadApiOptions = {
     nativeKeypadProxy: any;
 };
 
+// This represents the shape of any component that uses this ProvideKeypad
+// mixin.
+type KeypadMixinHostComponent = {
+    _keypadContainer?: HTMLDivElement | null;
+    props: {
+        apiOptions: APIOptions;
+        blur?: () => void;
+    };
+    state: {
+        keypadElement: any | null;
+    };
+};
+
 // NOTE: This is not a real component.  It's a collection of methods used to
 // create and manage a Keypad instances.
 // TODO(LP-10789): replace this with a React Context object to pass information
 // between Perseus and the Keypad.
 const ProvideKeypad = {
-    propTypes: {
-        apiOptions: PropTypes.shape({
-            customKeypad: PropTypes.bool,
-            nativeKeypadProxy: PropTypes.func,
-        }),
-        // An Aphrodite style object, to be applied to the keypad container.
-        // Note that, given our awkward structure of injecting the keypad, this
-        // style won't be applied or updated dynamically. Rather, it will only
-        // be applied in `componentDidMount`.
-        keypadStyle: PropTypes.any,
-    },
-
-    getInitialState(): {
+    getInitialState(this: KeypadMixinHostComponent): {
         keypadElement: any | null;
     } {
         const _this = this;
-        let keypadElement = null;
+        let keypadElement: KeypadAPI | null = null;
         if (
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             _this.props.apiOptions &&
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             _this.props.apiOptions.customKeypad &&
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             _this.props.apiOptions.nativeKeypadProxy
         ) {
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             keypadElement = _this.props.apiOptions.nativeKeypadProxy(
-                // @ts-expect-error [FEI-5003] - TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'. | TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
+                // @ts-expect-error - TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'. | TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                 () => _this.blur && _this.blur(),
             );
         }
         return {keypadElement};
     },
 
-    componentDidMount() {
+    componentDidMount(this: KeypadMixinHostComponent) {
         const _this = this;
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
         const apiOptions: APIOptions = _this.props.apiOptions;
 
         if (
@@ -86,9 +82,7 @@ const ProvideKeypad = {
             // TODO(charlie): Render this and the wrapped component in the same
             // React tree. We may also want to add this keypad asynchronously
             // or on-demand in the future.
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             _this._keypadContainer = document.createElement("div");
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             document.body?.appendChild(_this._keypadContainer);
 
             reactRender(
@@ -97,49 +91,41 @@ const ProvideKeypad = {
                         // NOTE(kevinb): The reason why this setState works is
                         // b/c we're calling it manually from item-renderer.jsx
                         // and we're manually setting the 'this' by using 'call'
-                        // @ts-expect-error [FEI-5003] - TS2339 - Property 'setState' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
+                        // @ts-expect-error - TS2339 - Property 'setState' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                         _this.setState({
                             keypadElement: element,
                         });
                     }}
                     onDismiss={() => {
-                        // @ts-expect-error [FEI-5003] - TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'. | TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
+                        // @ts-expect-error - TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'. | TS2339 - Property 'blur' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                         _this.blur && _this.blur();
                     }}
-                    // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
+                    // @ts-expect-error - TS2339 - Property 'props' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                     style={_this.props.keypadStyle}
                     useV2Keypad={apiOptions.useV2Keypad}
                 />,
-                // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                 _this._keypadContainer,
             );
         }
     },
 
-    componentWillUnmount() {
+    componentWillUnmount(this: KeypadMixinHostComponent) {
         const _this = this;
-        // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
         if (_this._keypadContainer) {
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             ReactDOM.unmountComponentAtNode(_this._keypadContainer);
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             if (_this._keypadContainer.parentNode) {
                 // Note ChildNode.remove() isn't available in older Android
                 // webviews.
-                // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                 _this._keypadContainer.parentNode.removeChild(
-                    // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
                     _this._keypadContainer,
                 );
             }
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_keypadContainer' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
             _this._keypadContainer = null;
         }
     },
 
-    keypadElement(): any {
+    keypadElement(this: KeypadMixinHostComponent): any {
         const _this = this;
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'state' does not exist on type '{ readonly propTypes: { readonly apiOptions: React.PropType<{ customKeypad?: boolean | undefined; nativeKeypadProxy?: ((...a: readonly any[]) => unknown) | undefined; }>; readonly keypadStyle: Requireable<any>; }; readonly getInitialState: () => { ...; }; readonly componentDidMount: () => void; readonly componentWil...'.
         return _this.state.keypadElement;
     },
 } as const;

package/src/mixins/widget-jsonify-deprecated.ts

@@ -9,7 +9,7 @@ import WIDGET_PROP_DENYLIST from "./widget-prop-denylist";
 const WidgetJsonifyDeprecated = {
     getUserInput: function (): any {
         // Omit props that get passed to all widgets
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'props' does not exist on type '{ readonly getUserInput: () => any; readonly getUserInputFromProps: (props: any) => any; }'.
+        // @ts-expect-error - TS2339 - Property 'props' does not exist on type '{ readonly getUserInput: () => any; readonly getUserInputFromProps: (props: any) => any; }'.
         return _.omit(this.props, WIDGET_PROP_DENYLIST);
     },
 

package/src/multi-items/__tests__/items.test.ts

@@ -217,7 +217,7 @@ const item: Item = treeToItem({
 describe("findContentNodesInItem", () => {
     it("calls the callback for each content node in the item", () => {
         const contents = [];
-        // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'ContentNode' is not assignable to parameter of type 'never'.
+        // @ts-expect-error - TS2345 - Argument of type 'ContentNode' is not assignable to parameter of type 'never'.
         findContentNodesInItem(item, shape, (c) => contents.push(c));
         contents.sort();
         expect([

package/src/multi-items/__tests__/multi-renderer.test.tsx

@@ -4,7 +4,10 @@ import userEvent from "@testing-library/user-event";
 import * as React from "react";
 import "@testing-library/jest-dom"; // Imports custom mathers
 
-import {testDependencies} from "../../../../../testing/test-dependencies";
+import {
+    testDependencies,
+    testDependenciesV2,
+} from "../../../../../testing/test-dependencies";
 import MockWidgetExport from "../../__tests__/mock-widget";
 import * as Dependencies from "../../dependencies";
 import {registerAllWidgetsForTesting} from "../../util/register-all-widgets-for-testing";
@@ -50,6 +53,7 @@ const renderSimpleQuestion = (question: Item) => {
                 item={question}
                 shape={simpleQuestionShape}
                 ref={(r) => (renderer = r)}
+                dependencies={testDependenciesV2}
             >
                 {({renderers}) => <SimpleLayout renderers={renderers} />}
             </MultiRenderer>
@@ -69,7 +73,7 @@ const renderSimpleQuestion = (question: Item) => {
 const _findWidgets = (
     renderer: MultiRenderer,
     filterCriterion: FilterCriterion,
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 ): Tree<
     ReadonlyArray<Widget | null | undefined>,
     ReadonlyArray<Widget | null | undefined>,
@@ -119,6 +123,7 @@ describe("multi-item renderer", () => {
                 <MultiRenderer
                     item={question1}
                     shape={shapes.shape({broken: shapes.content})}
+                    dependencies={testDependenciesV2}
                 >
                     {({renderers}) => {
                         return <div />;
@@ -144,7 +149,7 @@ describe("multi-item renderer", () => {
             userEvent.paste(screen.getByRole("textbox"), "+42"); // Correct
 
             // Act
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_getSerializedState' does not exist on type 'never'.
+            // @ts-expect-error - TS2339 - Property '_getSerializedState' does not exist on type 'never'.
             const state = renderer._getSerializedState(null);
 
             // Assert
@@ -277,7 +282,7 @@ describe("multi-item renderer", () => {
             userEvent.paste(screen.getByRole("textbox"), "99");
 
             // Act
-            // @ts-expect-error [FEI-5003] - TS2339 - Property '_getSerializedState' does not exist on type 'never'.
+            // @ts-expect-error - TS2339 - Property '_getSerializedState' does not exist on type 'never'.
             const state = renderer._getSerializedState({
                 blurb: "last blurb",
                 hints: ["uno", "dos" /* intentionally not passing a third */],
@@ -528,7 +533,7 @@ describe("multi-item renderer", () => {
             } as const;
 
             // Act
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'restoreSerializedState' does not exist on type 'never'.
+            // @ts-expect-error - TS2339 - Property 'restoreSerializedState' does not exist on type 'never'.
             renderer.restoreSerializedState(state);
 
             // Assert
@@ -546,7 +551,7 @@ describe("multi-item renderer", () => {
             const callback = jest.fn();
 
             // Act
-            // @ts-expect-error [FEI-5003] - TS2339 - Property 'restoreSerializedState' does not exist on type 'never'.
+            // @ts-expect-error - TS2339 - Property 'restoreSerializedState' does not exist on type 'never'.
             renderer.restoreSerializedState(
                 {
                     blurb: {"mock-widget 1": 1},
@@ -594,7 +599,7 @@ describe("multi-item renderer", () => {
         userEvent.paste(screen.getByRole("textbox"), "-42"); // Correct
 
         // Act
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'getScores' does not exist on type 'never'.
+        // @ts-expect-error - TS2339 - Property 'getScores' does not exist on type 'never'.
         const score = renderer.getScores();
 
         // Assert
@@ -756,7 +761,7 @@ describe("multi-item renderer", () => {
         userEvent.paste(screen.getByRole("textbox"), "-42"); // Correct
 
         // Act
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'score' does not exist on type 'never'.
+        // @ts-expect-error - TS2339 - Property 'score' does not exist on type 'never'.
         const score = renderer.score();
 
         // Assert

package/src/multi-items/__tests__/trees.test.ts

@@ -66,7 +66,7 @@ describe("buildMapper", () => {
     it("calls the content mapper for each of the content nodes", () => {
         const calledWith = [];
         buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'never'.
+            // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'never'.
             .setContentMapper((c) => calledWith.push(c))
             .mapTree(tree, shape);
         calledWith.sort();
@@ -83,7 +83,7 @@ describe("buildMapper", () => {
     it("calls the hint mapper for each of the hint nodes", () => {
         const calledWith = [];
         buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'never'.
+            // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'never'.
             .setHintMapper((h) => calledWith.push(h))
             .mapTree(tree, shape);
         calledWith.sort();
@@ -110,9 +110,9 @@ describe("buildMapper", () => {
             TagsNode,
             string
         > = buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setContentMapper((c) => `mapped content: ${c.content || "<none>"}`)
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setHintMapper((h) => `mapped hint: ${h.content || "<none>"}`)
             .setTagsMapper((t) => `mapped tags: ${t.join(", ")}`);
         const result = mapper.mapTree(tree, shape);
@@ -188,7 +188,7 @@ describe("buildMapper", () => {
 
         const tree = {a: {b: {c: content(1)}}} as const;
 
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
+        // @ts-expect-error - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
         const mapper: TreeMapper<
             ContentNode,
             string | null | undefined,
@@ -212,7 +212,7 @@ describe("buildMapper", () => {
             array(array(content(2)), array(content(3), content(4))),
         );
 
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
+        // @ts-expect-error - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
         const mapper: TreeMapper<
             ContentNode,
             string | null | undefined,
@@ -234,7 +234,7 @@ describe("buildMapper", () => {
 
         const tree = array(array(), array(content(1)), array());
 
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
+        // @ts-expect-error - TS2322 - Type 'TreeMapperJustForLeaves<ContentNode, string | null | undefined, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
         const mapper: TreeMapper<
             ContentNode,
             string | null | undefined,
@@ -258,7 +258,7 @@ describe("buildMapper", () => {
 
         let wasCalled = false;
         let callArgs: Record<string, any> = {};
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'TreeMapperForLeavesAndCollections<unknown, any, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
+        // @ts-expect-error - TS2322 - Type 'TreeMapperForLeavesAndCollections<unknown, any, unknown, unknown, unknown, unknown>' is not assignable to type 'TreeMapper<ContentNode, string | null | undefined, HintNode, HintNode, TagsNode, TagsNode>'.
         const mapper: TreeMapper<
             ContentNode,
             string | null | undefined,
@@ -267,7 +267,7 @@ describe("buildMapper", () => {
             TagsNode,
             TagsNode
         > = buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setContentMapper((c) => c.content)
             .setArrayMapper((mappedArray, originalArray, shape, path) => {
                 wasCalled = true;
@@ -288,11 +288,11 @@ describe("buildMapper", () => {
 
     it("uses the array mapper return value to construct the new tree", () => {
         const mapper = buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setContentMapper((c) => c.content)
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setHintMapper((h) => h.content)
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setTagsMapper((t) => t.join(", "))
             .setArrayMapper((mappedArray, originalArray, shape, path) => {
                 return mappedArray.map((child) => `${String(child)} in array`);

package/src/multi-items/item-types.ts

@@ -37,10 +37,10 @@ export type HintNode = {
 };
 export type TagsNode = ReadonlyArray<string>;
 
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+// @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
 export type ItemArrayNode = ArrayNode<ContentNode, HintNode, TagsNode>;
 export type ItemObjectNode = ObjectNode<ContentNode, HintNode, TagsNode>;
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 export type ItemTree = Tree<ContentNode, HintNode, TagsNode>;
 
 // TODO(jeremy): I think we could refine this root type for multi items. Right

package/src/multi-items/items.ts

@@ -66,7 +66,7 @@ export function buildEmptyItemTreeForShape(shape: Shape): ItemTree {
         return object;
     }
     throw new PerseusError(
-        // @ts-expect-error [FEI-5003] - TS2339 - Property 'type' does not exist on type 'never'.
+        // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'never'.
         `unexpected shape type ${shape.type}`,
         Errors.InvalidInput,
     );