@khanacademy/perseus 7.2.1 → 8.0.0

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

@@ -69,7 +69,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>,
@@ -144,7 +144,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 +277,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 +528,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 +546,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 +594,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 +756,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,
     );

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

@@ -62,7 +62,7 @@ type SerializedState = any; // TODO(mdr)
 
 type RendererProps = JSX.LibraryManagedAttributes<
     typeof Renderer,
-    // @ts-expect-error [FEI-5003] - TS2344 - Type 'typeof Renderer' does not satisfy the constraint 'keyof IntrinsicElements | JSXElementConstructor<any>'.
+    // @ts-expect-error - TS2344 - Type 'typeof Renderer' does not satisfy the constraint 'keyof IntrinsicElements | JSXElementConstructor<any>'.
     React.ComponentProps<typeof Renderer>
 >;
 
@@ -82,7 +82,7 @@ type HintRendererData = {
     hint: Hint;
 };
 type RendererData = ContentRendererData | HintRendererData;
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 type RendererDataTree = Tree<ContentRendererData, HintRendererData, null>;
 
 /**
@@ -93,11 +93,11 @@ type RendererDataTree = Tree<ContentRendererData, HintRendererData, null>;
  * really helping us out as I now have to suppress this rather than
  * get value from the type. :(
  */
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 type RendererTree = Tree<ContentRendererElement, HintRendererElement, null>;
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 type ScoreTree = Tree<Score, null, null>;
-// @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 type SerializedStateTree = Tree<SerializedState, null, null>;
 
 type Props = {
@@ -141,17 +141,17 @@ class MultiRenderer extends React.Component<Props, State> {
         super(props);
 
         this.rendererDataTreeMapper = buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'ContentNode'.
+            // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'ContentNode'.
             .setContentMapper((c, _, p) => this._makeContentRendererData(c, p))
-            // @ts-expect-error [FEI-5003] - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'HintNode'.
+            // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'HintNode'.
             .setHintMapper((h) => this._makeHintRendererData(h))
             .setTagsMapper((t) => null);
 
-        // @ts-expect-error [FEI-5003] - TS2322 - Type 'TreeMapperForLeavesAndCollections<unknown, any, unknown, any, unknown, unknown>' is not assignable to type 'TreeMapper<ContentRendererData, ContentRendererElement, HintRendererData, HintRendererElement, null, null>'.
+        // @ts-expect-error - TS2322 - Type 'TreeMapperForLeavesAndCollections<unknown, any, unknown, any, unknown, unknown>' is not assignable to type 'TreeMapper<ContentRendererData, ContentRendererElement, HintRendererData, HintRendererElement, null, null>'.
         this.getRenderersMapper = buildMapper()
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setContentMapper((c) => c.makeRenderer())
-            // @ts-expect-error [FEI-5003] - TS2571 - Object is of type 'unknown'.
+            // @ts-expect-error - TS2571 - Object is of type 'unknown'.
             .setHintMapper((h) => h.makeRenderer())
             .setArrayMapper((renderers, data, shape) =>
                 this._annotateRendererArray(
@@ -264,7 +264,7 @@ class MultiRenderer extends React.Component<Props, State> {
              * if this spread is including undocumented props so mapping
              * one to one could introduce a bug. Need to work out the exact
              * type for ContentNode and then fix this.
-             */ // @ts-expect-error [FEI-5003] - TS2322 - Type '{ ref: (e: any) => any; findExternalWidgets: (criterion: any) => readonly (Widget | null | undefined)[]; serializedState: any; onSerializedStateUpdated: (state: any) => void; __type: "content" | "item"; ... 9 more ...; reviewMode?: boolean | ... 1 more ... | undefined; }' is not assignable to type 'InexactPartial<Pick<Readonly<Props> & Readonly<{ children?: ReactNode; }>, "content" | "images" | "onRender" | "linterContext" | "widgets" | "alwaysUpdate" | ... 6 more ... | "serializedState">>'.
+             */ // @ts-expect-error - TS2322 - Type '{ ref: (e: any) => any; findExternalWidgets: (criterion: any) => readonly (Widget | null | undefined)[]; serializedState: any; onSerializedStateUpdated: (state: any) => void; __type: "content" | "item"; ... 9 more ...; reviewMode?: boolean | ... 1 more ... | undefined; }' is not assignable to type 'InexactPartial<Pick<Readonly<Props> & Readonly<{ children?: ReactNode; }>, "content" | "images" | "onRender" | "linterContext" | "widgets" | "alwaysUpdate" | ... 6 more ... | "serializedState">>'.
             <Renderer
                 {...this._getRendererProps()}
                 {...content}
@@ -306,7 +306,7 @@ class MultiRenderer extends React.Component<Props, State> {
             makeRenderer: () => (
                 <HintsRenderer
                     {...this._getRendererProps()}
-                    // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                    // @ts-expect-error - TS2769 - No overload matches this call.
                     findExternalWidgets={findExternalWidgets}
                     hints={[hint]}
                 />
@@ -361,7 +361,7 @@ class MultiRenderer extends React.Component<Props, State> {
         // eslint-disable-next-line no-restricted-syntax
         leafMapper: ContentMapper<RendererData, O> &
             HintMapper<RendererData, O>,
-        // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+        // @ts-expect-error - TS2315 - Type 'Tree' is not generic.
     ): Tree<O, O, null> | null | undefined {
         const {rendererDataTree} = this.state;
 
@@ -506,7 +506,7 @@ class MultiRenderer extends React.Component<Props, State> {
             (renderers as any).firstN = (n: any) => (
                 <HintsRenderer
                     {...this._getRendererProps()}
-                    // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                    // @ts-expect-error - TS2769 - No overload matches this call.
                     findExternalWidgets={
                         hintRendererDatas[0]
                             ? hintRendererDatas[0].findExternalWidgets

package/src/multi-items/prop-type-builders.ts

@@ -39,7 +39,7 @@ export function shapePropType(...args: ReadonlyArray<any>): any {
         }).isRequired,
     ]);
 
-    // @ts-expect-error [FEI-5003] - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
+    // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
     return itemShape(...args);
 }
 
@@ -99,7 +99,7 @@ function buildTreePropTypeForShape(shape: Shape): any {
         return PropTypes.shape(propTypeShape);
     }
     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,
     );

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

@@ -23,10 +23,10 @@
 
 // TODO(jeremy): We lost "arrayness" in D69450. It'd be nice to restore that
 // because right now ArrayNode doesn't add anything.
-// @ts-expect-error [FEI-5003] - TS2456 - Type alias 'ArrayNode' circularly references itself. | TS2315 - Type 'Tree' is not generic.
+// @ts-expect-error - TS2456 - Type alias 'ArrayNode' circularly references itself. | TS2315 - Type 'Tree' is not generic.
 export type ArrayNode<C, H, T> = Tree<C, H, T>;
 export type ObjectNode<C, H, T> = {
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic.
     [k: string]: Tree<C, H, T>;
 };
 
@@ -37,11 +37,11 @@ export type ObjectNode<C, H, T> = {
  * in order to ensure that TypeScript can track its refinement and appropriate use.
  * It's messy.
  */
-// @ts-expect-error [FEI-5003] - TS2456 - Type alias 'Tree' circularly references itself. | TS2315 - Type 'ArrayNode' is not generic.
+// @ts-expect-error - TS2456 - Type alias 'Tree' circularly references itself. | TS2315 - Type 'ArrayNode' is not generic.
 export type Tree<C, H, T> =
     | C
     | H
     | T
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+    // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
     | ArrayNode<C, H, T>
     | ObjectNode<C, H, T>;

package/src/multi-items/trees.ts

@@ -98,13 +98,13 @@ export type ContentMapper<CI, CO> = (
 export type HintMapper<HI, HO> = (hint: HI, shape: HintShape, path: Path) => HO;
 export type TagsMapper<TI, TO> = (tag: TI, shape: TagsShape, path: Path) => TO;
 export type ArrayMapper<CI, CO, HI, HO, TI, TO> = (
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+    // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
     mappedArray: ArrayNode<CO, HO, TO>,
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+    // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
     originalArray: ArrayNode<CI, HI, TI>,
     shape: ArrayShape,
     path: Path,
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+    // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
 ) => ArrayNode<CO, HO, TO>;
 
 /**
@@ -120,7 +120,7 @@ export interface TreeMapper<CI, CO, HI, HO, TI, TO> {
     hint: HintMapper<HI, HO>;
     tags: TagsMapper<TI, TO>;
     array: ArrayMapper<CI, CO, HI, HO, TI, TO>;
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
     mapTree(tree: Tree<CI, HI, TI>, shape: Shape): Tree<CO, HO, TO>;
 }
 
@@ -196,7 +196,7 @@ class TreeMapperJustForLeaves<CI, CO, HI, HO, TI, TO> {
         );
     }
 
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
     mapTree(tree: Tree<CI, HI, TI>, shape: Shape): Tree<CO, HO, TO> {
         return mapTree(tree, shape, [], this);
     }
@@ -235,7 +235,7 @@ class TreeMapperForLeavesAndCollections<CI, CO, HI, HO, TI, TO> {
         );
     }
 
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic. | TS2315 - Type 'Tree' is not generic.
     mapTree(tree: Tree<CI, HI, TI>, shape: Shape): Tree<CO, HO, TO> {
         return mapTree(tree, shape, [], this);
     }
@@ -251,7 +251,7 @@ function identity<T>(x: T): T {
  * `setHintMapper`, `setTagMapper`, and `setArrayMapper` to specify
  * transformations for the individual node types.
  */
-// @ts-expect-error [FEI-5003] - TS2300 - Duplicate identifier 'C'. | TS2300 - Duplicate identifier 'H'. | TS2300 - Duplicate identifier 'T'.
+// @ts-expect-error - TS2300 - Duplicate identifier 'C'. | TS2300 - Duplicate identifier 'H'. | TS2300 - Duplicate identifier 'T'.
 export function buildMapper<C, C, H, H, T, T>(): TreeMapperJustForLeaves<
     C,
     C,
@@ -268,12 +268,12 @@ export function buildMapper<C, C, H, H, T, T>(): TreeMapperJustForLeaves<
  * TreeMapper to each node, and return the resulting tree.
  */
 function mapTree<CI, CO, HI, HO, TI, TO>(
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic.
     tree: Tree<CI, HI, TI>,
     shape: Shape,
     path: Path,
     mappers: TreeMapper<CI, CO, HI, HO, TI, TO>,
-    // @ts-expect-error [FEI-5003] - TS2315 - Type 'Tree' is not generic.
+    // @ts-expect-error - TS2315 - Type 'Tree' is not generic.
 ): Tree<CO, HO, TO> {
     // We trust the shape of the multi-item to match the shape provided at
     // runtime. Therefore, in each shape branch, we cast the node to `any` and
@@ -291,20 +291,20 @@ function mapTree<CI, CO, HI, HO, TI, TO>(
         return mappers.tags(tags, shape, path);
     }
     if (shape.type === "array") {
-        // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+        // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
         const array: ArrayNode<CI, HI, TI> = tree as any;
 
         if (!Array.isArray(array)) {
             throw new PerseusError(
                 `Invalid object of type "${typeof array}" found at path ` +
-                    // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                    // @ts-expect-error - TS2769 - No overload matches this call.
                     `${["<root>"].concat(path).join(".")}. Expected array.`,
                 Errors.Internal,
             );
         }
 
         const elementShape = shape.elementShape;
-        // @ts-expect-error [FEI-5003] - TS2315 - Type 'ArrayNode' is not generic.
+        // @ts-expect-error - TS2315 - Type 'ArrayNode' is not generic.
         const mappedElements: ArrayNode<CO, HO, TO> = array.map((inner, i) =>
             mapTree(inner, elementShape, path.concat(i), mappers),
         );
@@ -316,7 +316,7 @@ function mapTree<CI, CO, HI, HO, TI, TO>(
         if (object && typeof object !== "object") {
             throw new PerseusError(
                 `Invalid object of type "${typeof object}" found at ` +
-                    // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                    // @ts-expect-error - TS2769 - No overload matches this call.
                     `path ${["<root>"].concat(path).join(".")}. Expected ` +
                     `"object" type.`,
                 Errors.InvalidInput,
@@ -327,7 +327,7 @@ function mapTree<CI, CO, HI, HO, TI, TO>(
         if (!valueShapes) {
             throw new PerseusError(
                 `Unexpected shape ${JSON.stringify(shape)} at path ` +
-                    // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                    // @ts-expect-error - TS2769 - No overload matches this call.
                     `${["<root>"].concat(path).join(".")}.`,
                 Errors.InvalidInput,
             );
@@ -337,7 +337,7 @@ function mapTree<CI, CO, HI, HO, TI, TO>(
             if (!(key in object)) {
                 throw new PerseusError(
                     `Key "${key}" is missing from shape at path ` +
-                        // @ts-expect-error [FEI-5003] - TS2769 - No overload matches this call.
+                        // @ts-expect-error - TS2769 - No overload matches this call.
                         `${["<root>"].concat(path).join(".")}.`,
                     Errors.InvalidInput,
                 );
@@ -353,7 +353,7 @@ function mapTree<CI, CO, HI, HO, TI, TO>(
         return newObject;
     }
     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,
     );