@khanacademy/perseus 35.0.0 → 36.0.0

package/dist/multi-items/multi-renderer.d.ts

@@ -5,8 +5,7 @@ import type { Item, ContentNode, HintNode, TagsNode } from "./item-types";
 import type { Shape, ArrayShape } from "./shape-types";
 import type { Tree } from "./tree-types";
 import type { TreeMapper, ContentMapper, HintMapper, Path } from "./trees";
-import type { Widget } from "../renderer";
-import type { APIOptions, FilterCriterion, PerseusDependenciesV2 } from "../types";
+import type { APIOptions, FilterCriterion, PerseusDependenciesV2, Widget } from "../types";
 import type { PropsFor } from "@khanacademy/wonder-blocks-core";
 type Hint = any;
 type Score = any;

package/dist/perseus-api.d.ts

@@ -103,10 +103,12 @@ export declare const ApiOptions: {
                 "unlimited-point"?: boolean | undefined;
             } & {
                 "interactive-graph-locked-features-labels"?: boolean | undefined;
+                "locked-figures-aria"?: boolean | undefined;
                 "locked-point-labels"?: boolean | undefined;
                 "locked-line-labels"?: boolean | undefined;
                 "locked-vector-labels"?: boolean | undefined;
                 "locked-ellipse-labels"?: boolean | undefined;
+                "locked-polygon-labels"?: boolean | undefined;
                 "locked-function-labels"?: boolean | undefined;
             }) | undefined;
         } | undefined;

package/dist/perseus-types.d.ts

@@ -120,7 +120,7 @@ export type PerseusImageDetail = {
 };
 export declare const ItemExtras: readonly ["calculator", "chi2Table", "financialCalculatorMonthlyPayment", "financialCalculatorTotalAmount", "financialCalculatorTimeToPayOff", "periodicTable", "periodicTableWithKey", "tTable", "zTable"];
 export type PerseusAnswerArea = Record<(typeof ItemExtras)[number], boolean>;
-type Widget<Type extends string, Options> = {
+type WidgetOptions<Type extends string, Options> = {
     type: Type;
     static?: boolean;
     graded?: boolean;
@@ -129,40 +129,40 @@ type Widget<Type extends string, Options> = {
     key?: number;
     version?: Version;
 };
-export type CategorizerWidget = Widget<'categorizer', PerseusCategorizerWidgetOptions>;
-export type CSProgramWidget = Widget<'cs-program', PerseusCSProgramWidgetOptions>;
-export type DefinitionWidget = Widget<'definition', PerseusDefinitionWidgetOptions>;
-export type DropdownWidget = Widget<'dropdown', PerseusDropdownWidgetOptions>;
-export type ExplanationWidget = Widget<'explanation', PerseusExplanationWidgetOptions>;
-export type ExpressionWidget = Widget<'expression', PerseusExpressionWidgetOptions>;
-export type GradedGroupSetWidget = Widget<'graded-group-set', PerseusGradedGroupSetWidgetOptions>;
-export type GradedGroupWidget = Widget<'graded-group', PerseusGradedGroupWidgetOptions>;
-export type GrapherWidget = Widget<'grapher', PerseusGrapherWidgetOptions>;
-export type GroupWidget = Widget<'group', PerseusGroupWidgetOptions>;
-export type IFrameWidget = Widget<'iframe', PerseusIFrameWidgetOptions>;
-export type ImageWidget = Widget<'image', PerseusImageWidgetOptions>;
-export type InteractionWidget = Widget<'interaction', PerseusInteractionWidgetOptions>;
-export type InteractiveGraphWidget = Widget<'interactive-graph', PerseusInteractiveGraphWidgetOptions>;
-export type LabelImageWidget = Widget<'label-image', PerseusLabelImageWidgetOptions>;
-export type MatcherWidget = Widget<'matcher', PerseusMatcherWidgetOptions>;
-export type MatrixWidget = Widget<'matrix', PerseusMatrixWidgetOptions>;
-export type MeasurerWidget = Widget<'measurer', PerseusMeasurerWidgetOptions>;
-export type NumberLineWidget = Widget<'number-line', PerseusNumberLineWidgetOptions>;
-export type NumericInputWidget = Widget<'numeric-input', PerseusNumericInputWidgetOptions>;
-export type OrdererWidget = Widget<'orderer', PerseusOrdererWidgetOptions>;
-export type PassageRefWidget = Widget<'passage-ref', PerseusPassageRefWidgetOptions>;
-export type PassageWidget = Widget<'passage', PerseusPassageWidgetOptions>;
-export type PhetSimulationWidget = Widget<'phet-simulation', PerseusPhetSimulationWidgetOptions>;
-export type PlotterWidget = Widget<'plotter', PerseusPlotterWidgetOptions>;
-export type PythonProgramWidget = Widget<'python-program', PerseusPythonProgramWidgetOptions>;
-export type RadioWidget = Widget<'radio', PerseusRadioWidgetOptions>;
-export type SorterWidget = Widget<'sorter', PerseusSorterWidgetOptions>;
-export type TableWidget = Widget<'table', PerseusTableWidgetOptions>;
-export type InputNumberWidget = Widget<'input-number', PerseusInputNumberWidgetOptions>;
-export type MoleculeRendererWidget = Widget<'molecule-renderer', PerseusMoleculeRendererWidgetOptions>;
-export type RefTargetWidget = Widget<'passage-ref-target', PerseusPassageRefTargetWidgetOptions>;
-export type VideoWidget = Widget<'video', PerseusVideoWidgetOptions>;
-export type AutoCorrectWidget = Widget<'deprecated-standin', PerseusWidgetOptions>;
+export type CategorizerWidget = WidgetOptions<'categorizer', PerseusCategorizerWidgetOptions>;
+export type CSProgramWidget = WidgetOptions<'cs-program', PerseusCSProgramWidgetOptions>;
+export type DefinitionWidget = WidgetOptions<'definition', PerseusDefinitionWidgetOptions>;
+export type DropdownWidget = WidgetOptions<'dropdown', PerseusDropdownWidgetOptions>;
+export type ExplanationWidget = WidgetOptions<'explanation', PerseusExplanationWidgetOptions>;
+export type ExpressionWidget = WidgetOptions<'expression', PerseusExpressionWidgetOptions>;
+export type GradedGroupSetWidget = WidgetOptions<'graded-group-set', PerseusGradedGroupSetWidgetOptions>;
+export type GradedGroupWidget = WidgetOptions<'graded-group', PerseusGradedGroupWidgetOptions>;
+export type GrapherWidget = WidgetOptions<'grapher', PerseusGrapherWidgetOptions>;
+export type GroupWidget = WidgetOptions<'group', PerseusGroupWidgetOptions>;
+export type IFrameWidget = WidgetOptions<'iframe', PerseusIFrameWidgetOptions>;
+export type ImageWidget = WidgetOptions<'image', PerseusImageWidgetOptions>;
+export type InteractionWidget = WidgetOptions<'interaction', PerseusInteractionWidgetOptions>;
+export type InteractiveGraphWidget = WidgetOptions<'interactive-graph', PerseusInteractiveGraphWidgetOptions>;
+export type LabelImageWidget = WidgetOptions<'label-image', PerseusLabelImageWidgetOptions>;
+export type MatcherWidget = WidgetOptions<'matcher', PerseusMatcherWidgetOptions>;
+export type MatrixWidget = WidgetOptions<'matrix', PerseusMatrixWidgetOptions>;
+export type MeasurerWidget = WidgetOptions<'measurer', PerseusMeasurerWidgetOptions>;
+export type NumberLineWidget = WidgetOptions<'number-line', PerseusNumberLineWidgetOptions>;
+export type NumericInputWidget = WidgetOptions<'numeric-input', PerseusNumericInputWidgetOptions>;
+export type OrdererWidget = WidgetOptions<'orderer', PerseusOrdererWidgetOptions>;
+export type PassageRefWidget = WidgetOptions<'passage-ref', PerseusPassageRefWidgetOptions>;
+export type PassageWidget = WidgetOptions<'passage', PerseusPassageWidgetOptions>;
+export type PhetSimulationWidget = WidgetOptions<'phet-simulation', PerseusPhetSimulationWidgetOptions>;
+export type PlotterWidget = WidgetOptions<'plotter', PerseusPlotterWidgetOptions>;
+export type PythonProgramWidget = WidgetOptions<'python-program', PerseusPythonProgramWidgetOptions>;
+export type RadioWidget = WidgetOptions<'radio', PerseusRadioWidgetOptions>;
+export type SorterWidget = WidgetOptions<'sorter', PerseusSorterWidgetOptions>;
+export type TableWidget = WidgetOptions<'table', PerseusTableWidgetOptions>;
+export type InputNumberWidget = WidgetOptions<'input-number', PerseusInputNumberWidgetOptions>;
+export type MoleculeRendererWidget = WidgetOptions<'molecule-renderer', PerseusMoleculeRendererWidgetOptions>;
+export type RefTargetWidget = WidgetOptions<'passage-ref-target', PerseusPassageRefTargetWidgetOptions>;
+export type VideoWidget = WidgetOptions<'video', PerseusVideoWidgetOptions>;
+export type AutoCorrectWidget = WidgetOptions<'deprecated-standin', PerseusWidgetOptions>;
 export type PerseusWidget = CategorizerWidget | CSProgramWidget | DefinitionWidget | DropdownWidget | ExplanationWidget | ExpressionWidget | GradedGroupSetWidget | GradedGroupWidget | GrapherWidget | GroupWidget | IFrameWidget | ImageWidget | InputNumberWidget | InteractionWidget | InteractiveGraphWidget | LabelImageWidget | MatcherWidget | MatrixWidget | MeasurerWidget | MoleculeRendererWidget | NumberLineWidget | NumericInputWidget | OrdererWidget | PassageRefWidget | PassageWidget | PhetSimulationWidget | PlotterWidget | PythonProgramWidget | RadioWidget | RefTargetWidget | SorterWidget | TableWidget | VideoWidget | AutoCorrectWidget;
 export type PerseusImageBackground = {
     url: string | null | undefined;
@@ -378,6 +378,7 @@ export type LockedPointType = {
     color: LockedFigureColor;
     filled: boolean;
     labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedLineType = {
     type: "line";
@@ -388,12 +389,14 @@ export type LockedLineType = {
     showPoint1: boolean;
     showPoint2: boolean;
     labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedVectorType = {
     type: "vector";
     points: [tail: Coord, tip: Coord];
     color: LockedFigureColor;
     labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedFigureFillType = "none" | "white" | "translucent" | "solid";
 export declare const lockedFigureFillStyles: Record<LockedFigureFillType, number>;
@@ -406,6 +409,7 @@ export type LockedEllipseType = {
     fillStyle: LockedFigureFillType;
     strokeStyle: LockedLineStyle;
     labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedPolygonType = {
     type: "polygon";
@@ -414,6 +418,8 @@ export type LockedPolygonType = {
     showVertices: boolean;
     fillStyle: LockedFigureFillType;
     strokeStyle: LockedLineStyle;
+    labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedFunctionType = {
     type: "function";
@@ -423,6 +429,7 @@ export type LockedFunctionType = {
     directionalAxis: "x" | "y";
     domain?: Interval;
     labels?: LockedLabelType[];
+    ariaLabel?: string;
 };
 export type LockedLabelType = {
     type: "label";

package/dist/renderer.d.ts

@@ -5,7 +5,7 @@ import WidgetContainer from "./widget-container";
 import type { DependenciesContext } from "./dependencies";
 import type { PerseusRenderer, PerseusWidget, PerseusWidgetOptions, PerseusWidgetsMap, ShowSolutions } from "./perseus-types";
 import type { PerseusStrings } from "./strings";
-import type { APIOptions, APIOptionsWithDefaults, FilterCriterion, FocusPath, PerseusScore, WidgetProps } from "./types";
+import type { APIOptions, APIOptionsWithDefaults, FilterCriterion, FocusPath, PerseusScore, SerializedState, Widget, WidgetProps } from "./types";
 import type { UserInput } from "./validation.types";
 import type { KeypadAPI } from "@khanacademy/math-input";
 import type { LinterContextProps } from "@khanacademy/perseus-linter";
@@ -19,37 +19,6 @@ type WidgetState = {
     baseElements?: any;
 };
 type SetWidgetPropsFn = (id: string, newProps: any, cb: () => boolean, silent?: boolean) => void;
-type SerializedState = {
-    [id: string]: any;
-};
-/**
- * The Widget type represents the common API that the Renderer uses to interact
- * with all widgets. All widgets must implement the methods in this API, unless
- * they are marked as optional (?: ...).
- *
- * These methods are called on the widget ref and allow the renderer to
- * communicate with the individual widgets to coordinate actions such as
- * scoring, state serialization/deserialization, and focus management.
- */
-export type Widget = {
-    focus: () => {
-        id: string;
-        path: FocusPath;
-    } | boolean;
-    getDOMNodeForPath: (path: FocusPath) => Element | Text | null;
-    deselectIncorrectSelectedChoices?: () => void;
-    restoreSerializedState: (props: any, callback: () => void) => any;
-    getSerializedState?: () => SerializedState;
-    getGrammarTypeForPath: (path: FocusPath) => string;
-    blurInputPath?: (path: FocusPath) => null;
-    focusInputPath?: (path: FocusPath) => null;
-    getInputPaths?: () => ReadonlyArray<FocusPath>;
-    setInputValue?: (path: FocusPath, newValue: string, focus?: () => unknown) => void;
-    getUserInput?: () => UserInput | null | undefined;
-    simpleValidate?: (options?: any, onOutputError?: (widgetId: any, value: string, message?: string | null | undefined) => unknown | null | undefined) => PerseusScore;
-    showRationalesForCurrentlySelectedChoices?: (options?: any) => void;
-    examples?: () => ReadonlyArray<string>;
-};
 type Props = Partial<React.ContextType<typeof DependenciesContext>> & {
     apiOptions?: APIOptions;
     alwaysUpdate?: boolean;
@@ -214,7 +183,7 @@ declare class Renderer extends React.Component<Props, State> {
     _setCurrentFocus: (path: FocusPath) => void;
     focus: () => boolean | null | undefined;
     getDOMNodeForPath: (path: FocusPath) => Element | Text | null | undefined;
-    getGrammarTypeForPath: (path: FocusPath) => string | null | undefined;
+    getGrammarTypeForPath: (path: FocusPath) => string | undefined;
     getInputPaths: () => ReadonlyArray<FocusPath>;
     focusPath: (path: FocusPath) => void;
     blurPath: (path: FocusPath) => void;

package/dist/server-item-renderer.d.ts

@@ -95,7 +95,6 @@ export declare class ServerItemRenderer extends React.Component<Props, State> im
     render(): React.ReactNode;
 }
 declare const ref: React.ForwardRefExoticComponent<Omit<Pick<SharedRendererProps & OwnProps & HOCProps, keyof OwnProps> & {
-    linterContext?: PerseusLinter.LinterContextProps | undefined;
     apiOptions?: Readonly<{
         isArticle?: boolean | undefined;
         onFocusChange?: ((newFocusPath: FocusPath, oldFocusPath: FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown) | undefined;
@@ -143,15 +142,18 @@ declare const ref: React.ForwardRefExoticComponent<Omit<Pick<SharedRendererProps
                 "unlimited-point"?: boolean | undefined;
             } & {
                 "interactive-graph-locked-features-labels"?: boolean | undefined;
+                "locked-figures-aria"?: boolean | undefined;
                 "locked-point-labels"?: boolean | undefined;
                 "locked-line-labels"?: boolean | undefined;
                 "locked-vector-labels"?: boolean | undefined;
                 "locked-ellipse-labels"?: boolean | undefined;
+                "locked-polygon-labels"?: boolean | undefined;
                 "locked-function-labels"?: boolean | undefined;
             }) | undefined;
         } | undefined;
         onWidgetStartProps?: ((widgets: import("./perseus-types").PerseusWidgetsMap) => void) | undefined;
     }> | undefined;
+    linterContext?: PerseusLinter.LinterContextProps | undefined;
     onRendered?: ((isRendered: boolean) => void) | undefined;
 } & {}, "onRendered"> & React.RefAttributes<ServerItemRenderer>>;
 export default ref;

package/dist/types.d.ts

@@ -1,9 +1,9 @@
 import type { ILogger } from "./logging/log";
 import type { Item } from "./multi-items/item-types";
-import type { Hint, PerseusAnswerArea, PerseusWidget, PerseusWidgetsMap } from "./perseus-types";
+import type { Hint, PerseusAnswerArea, PerseusGraphType, PerseusWidget, PerseusWidgetsMap } from "./perseus-types";
 import type { PerseusStrings } from "./strings";
 import type { SizeClass } from "./util/sizing-utils";
-import type { InteractiveGraphState } from "./widgets/interactive-graphs/types";
+import type { UserInput } from "./validation.types";
 import type { KeypadAPI } from "@khanacademy/math-input";
 import type { AnalyticsEventHandlerFn } from "@khanacademy/perseus-core";
 import type { LinterContextProps } from "@khanacademy/perseus-linter";
@@ -15,9 +15,44 @@ export type Dimensions = {
     height?: number;
 };
 export type DeviceType = "phone" | "tablet" | "desktop";
-export type Widget = any;
+/**
+ * This is the type returned by a widget's `getSerializedState` function (and
+ * provided to the same widget's `restoreSerializedState` function). However,
+ * note that in most cases the widgets do _not_ implement these functions.
+ * In that case, the `Renderer` just returns the widget's render props as the
+ * serialized state.
+ */
+export type SerializedState = Record<string, any>;
+/**
+ * The Widget type represents the common API that the Renderer uses to interact
+ * with all widgets. All widgets must implement the methods in this API, unless
+ * they are marked as optional (?: ...).
+ *
+ * These methods are called on the widget ref and allow the renderer to
+ * communicate with the individual widgets to coordinate actions such as
+ * scoring, state serialization/deserialization, and focus management.
+ */
+export interface Widget {
+    focus?: () => {
+        id: string;
+        path: FocusPath;
+    } | boolean;
+    getDOMNodeForPath?: (path: FocusPath) => Element | Text | null;
+    deselectIncorrectSelectedChoices?: () => void;
+    getSerializedState?: () => SerializedState;
+    restoreSerializedState?: (props: any, callback: () => void) => any;
+    getGrammarTypeForPath?: (path: FocusPath) => string | undefined;
+    blurInputPath?: (path: FocusPath) => void;
+    focusInputPath?: (path: FocusPath) => void;
+    getInputPaths?: () => ReadonlyArray<FocusPath>;
+    setInputValue?: (path: FocusPath, newValue: string, focus?: () => unknown) => void;
+    getUserInput?: () => UserInput | null | undefined;
+    simpleValidate?: (options?: any, onOutputError?: (widgetId: any, value: string, message?: string | null | undefined) => unknown | null | undefined) => PerseusScore;
+    showRationalesForCurrentlySelectedChoices?: (options?: any) => void;
+    examples?: () => ReadonlyArray<string>;
+}
 export type WidgetDict = {
-    [name: string]: Widget;
+    [name: string]: PerseusWidget;
 };
 export type ImageDict = {
     [url: string]: Dimensions;
@@ -63,7 +98,7 @@ export type ChangeHandler = (arg1: {
     currentValue?: string;
     selected?: number;
     plot?: any;
-    graph?: InteractiveGraphState;
+    graph?: PerseusGraphType;
 }, callback?: () => unknown | null | undefined, silent?: boolean) => unknown;
 export type ImageUploader = (file: File, callback: (url: string) => unknown) => unknown;
 export type WidgetSize = "normal" | "small" | "mini";
@@ -75,7 +110,7 @@ type TrackInteractionArgs = {
     correct?: boolean;
 } & Partial<TrackingGradedGroupExtraArguments> & Partial<TrackingSequenceExtraArguments>;
 export declare const MafsGraphTypeFlags: readonly ["angle", "segment", "linear", "linear-system", "ray", "polygon", "circle", "quadratic", "sinusoid", "point", "unlimited-point", "none"];
-export declare const InteractiveGraphLockedFeaturesFlags: readonly ["interactive-graph-locked-features-labels", "locked-point-labels", "locked-line-labels", "locked-vector-labels", "locked-ellipse-labels", "locked-function-labels"];
+export declare const InteractiveGraphLockedFeaturesFlags: readonly ["interactive-graph-locked-features-labels", "locked-figures-aria", "locked-point-labels", "locked-line-labels", "locked-vector-labels", "locked-ellipse-labels", "locked-polygon-labels", "locked-function-labels"];
 /**
  * APIOptions provides different ways to customize the behaviour of Perseus.
  *
@@ -317,7 +352,7 @@ export type TrackingSequenceExtraArguments = {
 export type Alignment = "default" | "block" | "inline-block" | "inline" | "float-left" | "float-right" | "full-width";
 type WidgetOptions = any;
 export type WidgetTransform = (arg1: WidgetOptions, strings: PerseusStrings, problemNumber?: number) => any;
-export type WidgetExports<T extends React.ComponentType<any> = React.ComponentType<any>> = Readonly<{
+export type WidgetExports<T extends React.ComponentType<any> & Widget = React.ComponentType<any>> = Readonly<{
     name: string;
     displayName: string;
     getWidget?: () => T;
@@ -366,7 +401,7 @@ export type WidgetProps<RenderProps, Rubric, TrackingExtraArgs = Empty> = Render
     questionCompleted?: boolean;
     onFocus: (blurPath: FocusPath) => void;
     onBlur: (blurPath: FocusPath) => void;
-    findWidgets: (arg1: FilterCriterion) => ReadonlyArray<Widget>;
+    findWidgets: (criterion: FilterCriterion) => ReadonlyArray<Widget>;
     reviewModeRubric: Rubric;
     onChange: ChangeHandler;
     trackInteraction: (extraData?: TrackingExtraArgs) => void;

package/dist/util.d.ts

@@ -1,7 +1,7 @@
 import * as GraphieUtil from "./util.graphie";
 import type { Range } from "./perseus-types";
 import type { PerseusStrings } from "./strings";
-import type { Widget, PerseusScore } from "./types";
+import type { PerseusScore } from "./types";
 import type { KEScore } from "@khanacademy/perseus-core";
 import type * as React from "react";
 type WordPosition = {
@@ -152,12 +152,6 @@ declare function updateQueryString(uri: string, key: string, value: string): str
  * CC-BY-SA 2.5 license.
  */
 declare function strongEncodeURIComponent(str: string): string;
-/**
- * TODO(somewhatabstract, JIRA-XXXX):
- * This does not appear to be used within webapp. Could be dead code.
- * Need to check with mobile.
- */
-declare function widgetShouldHighlight(widget: Widget): boolean;
 /**
  * If a widget says that it is empty once it is graded.
  * Trying to encapsulate references to the score format.
@@ -225,7 +219,6 @@ declare const Util: {
     readonly parseQueryString: typeof parseQueryString;
     readonly updateQueryString: typeof updateQueryString;
     readonly strongEncodeURIComponent: typeof strongEncodeURIComponent;
-    readonly widgetShouldHighlight: typeof widgetShouldHighlight;
     readonly scoreIsEmpty: typeof scoreIsEmpty;
     readonly touchHandlers: TouchHandlers;
     readonly resetTouchHandlers: typeof resetTouchHandlers;

package/dist/validation.types.d.ts

@@ -1,8 +1,10 @@
 import type { Coord } from "./interactive2/types";
-import type { PerseusCategorizerWidgetOptions, PerseusCSProgramWidgetOptions, PerseusDefinitionWidgetOptions, PerseusDropdownWidgetOptions, PerseusExplanationWidgetOptions, PerseusExpressionWidgetOptions, PerseusGradedGroupSetWidgetOptions, PerseusGradedGroupWidgetOptions, PerseusGrapherWidgetOptions, PerseusGraphType, PerseusIFrameWidgetOptions, PerseusImageWidgetOptions, PerseusInputNumberWidgetOptions, PerseusInteractionWidgetOptions, PerseusLabelImageWidgetOptions, PerseusMatcherWidgetOptions, PerseusMatrixWidgetOptions, PerseusNumberLineWidgetOptions, PerseusNumericInputWidgetOptions, PerseusOrdererWidgetOptions, PerseusPassageRefWidgetOptions, PerseusPassageWidgetOptions, PerseusPlotterWidgetOptions, PerseusRadioWidgetOptions, PerseusSorterWidgetOptions, PerseusTableWidgetOptions, PerseusVideoWidgetOptions } from "./perseus-types";
+import type { PerseusCategorizerWidgetOptions, PerseusCSProgramWidgetOptions, PerseusDefinitionWidgetOptions, PerseusDropdownWidgetOptions, PerseusExplanationWidgetOptions, PerseusExpressionAnswerForm, PerseusGradedGroupSetWidgetOptions, PerseusGradedGroupWidgetOptions, PerseusGrapherWidgetOptions, PerseusGraphType, PerseusIFrameWidgetOptions, PerseusImageWidgetOptions, PerseusInputNumberWidgetOptions, PerseusInteractionWidgetOptions, PerseusLabelImageWidgetOptions, PerseusMatcherWidgetOptions, PerseusMatrixWidgetOptions, PerseusNumberLineWidgetOptions, PerseusNumericInputWidgetOptions, PerseusOrdererWidgetOptions, PerseusPassageRefWidgetOptions, PerseusPassageWidgetOptions, PerseusPlotterWidgetOptions, PerseusRadioWidgetOptions, PerseusSorterWidgetOptions, PerseusTableWidgetOptions, PerseusVideoWidgetOptions } from "./perseus-types";
 import type { InteractiveMarkerType } from "./widgets/label-image/types";
 import type { Relationship } from "./widgets/number-line/number-line";
 export type UserInputStatus = "correct" | "incorrect" | "incomplete";
+export type EmptyUserInput = Empty;
+export type NullUserInput = null;
 export type PerseusCategorizerRubric = PerseusCategorizerWidgetOptions;
 export type PerseusCategorizerUserInput = {
     values: ReadonlyArray<number>;
@@ -13,14 +15,15 @@ export type PerseusCSProgramUserInput = {
     message: string | null;
 };
 export type PerseusDefinitionRubric = PerseusDefinitionWidgetOptions;
-export type PerseusDefinitionUserInput = Empty;
 export type PerseusDropdownRubric = PerseusDropdownWidgetOptions;
 export type PerseusDropdownUserInput = {
     value: number;
 };
 export type PerseusExplanationRubric = PerseusExplanationWidgetOptions;
-export type PerseusExplanationUserInput = Empty;
-export type PerseusExpressionRubric = PerseusExpressionWidgetOptions;
+export type PerseusExpressionRubric = {
+    answerForms: ReadonlyArray<PerseusExpressionAnswerForm>;
+    functions: ReadonlyArray<string>;
+};
 export type PerseusExpressionUserInput = string;
 export type PerseusGradedGroupRubric = PerseusGradedGroupWidgetOptions;
 export type PerseusGradedGroupSetRubric = PerseusGradedGroupSetWidgetOptions;
@@ -40,13 +43,11 @@ export type PerseusIFrameUserInput = {
     message: string | null;
 };
 export type PerseusImageRubric = PerseusImageWidgetOptions;
-export type PerseusImageUserInput = null;
 export type PerseusInputNumberRubric = PerseusInputNumberWidgetOptions;
 export type PerseusInputNumberUserInput = {
     currentValue: string;
 };
 export type PerseusInteractionRubric = PerseusInteractionWidgetOptions;
-export type PerseusInteractionUserInput = Empty;
 export type PerseusInteractiveGraphRubric = {
     correct: PerseusGraphType;
     graph: PerseusGraphType;
@@ -85,11 +86,7 @@ export type PerseusOrdererUserInput = {
     current: ReadonlyArray<string>;
 };
 export type PerseusPassageRubric = PerseusPassageWidgetOptions;
-export type PerseusPassageUserInput = null;
 export type PerseusPassageRefRubric = PerseusPassageRefWidgetOptions;
-export type PerseusPassageRefUserInput = null;
-export type PerseusPassageRefTargetUserInput = null;
-export type PerseusPhetSimulationUserInput = null;
 export type PerseusPlotterRubric = PerseusPlotterWidgetOptions;
 export type PerseusPlotterUserInput = ReadonlyArray<number>;
 export type PerseusRadioRubric = PerseusRadioWidgetOptions;
@@ -108,4 +105,4 @@ export type PerseusSorterUserInput = {
 export type PerseusTableRubric = PerseusTableWidgetOptions;
 export type PerseusTableUserInput = ReadonlyArray<ReadonlyArray<string>>;
 export type PerseusVideoRubric = PerseusVideoWidgetOptions;
-export type UserInput = PerseusCategorizerUserInput | PerseusCSProgramUserInput | PerseusDefinitionUserInput | PerseusDropdownUserInput | PerseusExplanationUserInput | PerseusExpressionUserInput | PerseusGrapherUserInput | PerseusIFrameUserInput | PerseusImageUserInput | PerseusInputNumberUserInput | PerseusInteractionUserInput | PerseusInteractiveGraphUserInput | PerseusLabelImageUserInput | PerseusMatcherUserInput | PerseusMatrixUserInput | PerseusMoleculeUserInput | PerseusNumberLineUserInput | PerseusNumericInputUserInput | PerseusOrdererUserInput | PerseusPlotterUserInput | PerseusRadioUserInput | PerseusSorterUserInput | PerseusTableUserInput;
+export type UserInput = PerseusCategorizerUserInput | PerseusCSProgramUserInput | PerseusDropdownUserInput | PerseusExpressionUserInput | PerseusGrapherUserInput | PerseusIFrameUserInput | PerseusInputNumberUserInput | PerseusInteractiveGraphUserInput | PerseusLabelImageUserInput | PerseusMatcherUserInput | PerseusMatrixUserInput | PerseusMoleculeUserInput | PerseusNumberLineUserInput | PerseusNumericInputUserInput | PerseusOrdererUserInput | PerseusPlotterUserInput | PerseusRadioUserInput | PerseusSorterUserInput | PerseusTableUserInput | EmptyUserInput;

package/dist/widgets/categorizer/categorizer.d.ts

@@ -2,7 +2,7 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusCategorizerWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
-import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusScore, Widget, WidgetProps } from "../../types";
 import type { PerseusCategorizerRubric, PerseusCategorizerUserInput } from "../../validation.types";
 type Props = WidgetProps<RenderProps, PerseusCategorizerRubric> & {
     values: ReadonlyArray<string>;
@@ -16,7 +16,7 @@ type DefaultProps = {
 type State = {
     uniqueId: string;
 };
-export declare class Categorizer extends React.Component<Props, State> {
+export declare class Categorizer extends React.Component<Props, State> implements Widget {
     static contextType: React.Context<{
         strings: PerseusStrings;
         locale: string;

package/dist/widgets/cs-program/cs-program-validator.d.ts

@@ -0,0 +1,3 @@
+import type { PerseusScore } from "../../types";
+import type { PerseusCSProgramUserInput } from "../../validation.types";
+export declare function csProgramValidator(state: PerseusCSProgramUserInput): PerseusScore;

package/dist/widgets/cs-program/cs-program.d.ts

@@ -3,7 +3,7 @@
  */
 import * as React from "react";
 import type { PerseusCSProgramWidgetOptions } from "../../perseus-types";
-import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusScore, Widget, WidgetProps } from "../../types";
 import type { PerseusCSProgramRubric, PerseusCSProgramUserInput, UserInputStatus } from "../../validation.types";
 type RenderProps = PerseusCSProgramWidgetOptions & {
     status: UserInputStatus;
@@ -16,14 +16,15 @@ type DefaultProps = {
     status: Props["status"];
     message: Props["message"];
 };
-declare class CSProgram extends React.Component<Props> {
+declare class CSProgram extends React.Component<Props> implements Widget {
     static defaultProps: DefaultProps;
-    static validate(state: PerseusCSProgramUserInput, rubric: any): PerseusScore;
+    static validate(state: PerseusCSProgramUserInput): PerseusScore;
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleMessageEvent: (arg1: any) => void;
     change: (...args: ReadonlyArray<unknown>) => any;
-    simpleValidate(rubric: any): PerseusScore;
+    getUserInput(): PerseusCSProgramUserInput;
+    simpleValidate(): PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/definition/definition.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusRenderer, PerseusDefinitionWidgetOptions } from "../../perseus-types";
-import type { WidgetProps } from "../../types";
-import type { PerseusDefinitionRubric, PerseusDefinitionUserInput } from "../../validation.types";
+import type { Widget, WidgetProps } from "../../types";
+import type { EmptyUserInput, PerseusDefinitionRubric } from "../../validation.types";
 type RenderProps = PerseusDefinitionWidgetOptions;
 type DefinitionProps = WidgetProps<RenderProps, PerseusDefinitionRubric> & {
     widgets: PerseusRenderer["widgets"];
@@ -11,7 +11,7 @@ type DefaultProps = {
     togglePrompt: string;
     definition: string;
 };
-declare class Definition extends React.Component<DefinitionProps> {
+declare class Definition extends React.Component<DefinitionProps> implements Widget {
     static contextType: React.Context<{
         strings: import("../../strings").PerseusStrings;
         locale: string;
@@ -19,7 +19,7 @@ declare class Definition extends React.Component<DefinitionProps> {
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
     static validate(): import("../../types").PerseusScore;
-    getUserInput(): PerseusDefinitionUserInput;
+    getUserInput(): EmptyUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }

package/dist/widgets/deprecated-standin/index.d.ts

@@ -1,18 +1,17 @@
 import React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
-import type { PerseusScore } from "../../types";
+import type { PerseusScore, Widget } from "../../types";
+import type { EmptyUserInput } from "../../validation.types";
 type Props = any;
-type Rubric = any;
-type UserInput = Empty;
-declare class DeprecatedStandin extends React.Component<Props> {
+declare class DeprecatedStandin extends React.Component<Props> implements Widget {
     static contextType: React.Context<{
         strings: import("../../strings").PerseusStrings;
         locale: string;
     }>;
     context: React.ContextType<typeof PerseusI18nContext>;
-    static validate(userInput: UserInput, rubric: Rubric): PerseusScore;
-    getUserInput: () => UserInput;
-    simpleValidate: (arg1: Rubric) => PerseusScore;
+    static validate(): PerseusScore;
+    getUserInput(): EmptyUserInput;
+    simpleValidate(): PerseusScore;
     render(): React.JSX.Element;
 }
 declare const _default: Readonly<{

package/dist/widgets/dropdown/dropdown.d.ts

@@ -1,5 +1,5 @@
 import * as React from "react";
-import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusScore, Widget, WidgetProps } from "../../types";
 import type { PerseusDropdownRubric, PerseusDropdownUserInput } from "../../validation.types";
 type Props = WidgetProps<RenderProps, PerseusDropdownRubric> & {
     selected: number;
@@ -10,7 +10,7 @@ type DefaultProps = {
     placeholder: Props["placeholder"];
     apiOptions: Props["apiOptions"];
 };
-declare class Dropdown extends React.Component<Props> {
+declare class Dropdown extends React.Component<Props> implements Widget {
     static defaultProps: DefaultProps;
     static validate(userInput: PerseusDropdownUserInput, rubric: PerseusDropdownRubric): PerseusScore;
     focus: () => boolean;

package/dist/widgets/explanation/explanation.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusExplanationWidgetOptions } from "../../perseus-types";
-import type { WidgetProps } from "../../types";
-import type { PerseusExplanationRubric, PerseusExplanationUserInput } from "../../validation.types";
+import type { Widget, WidgetProps } from "../../types";
+import type { EmptyUserInput, PerseusExplanationRubric } from "../../validation.types";
 type RenderProps = PerseusExplanationWidgetOptions;
 type Props = WidgetProps<RenderProps, PerseusExplanationRubric>;
 type DefaultProps = {
@@ -15,7 +15,7 @@ type DefaultProps = {
 type State = {
     expanded: boolean;
 };
-declare class Explanation extends React.Component<Props, State> {
+declare class Explanation extends React.Component<Props, State> implements Widget {
     static contextType: React.Context<{
         strings: import("../../strings").PerseusStrings;
         locale: string;
@@ -29,7 +29,7 @@ declare class Explanation extends React.Component<Props, State> {
     componentWillUnmount(): void;
     change: (arg1: any, arg2: any, arg3: any) => any;
     _onClick: () => void;
-    getUserInput(): PerseusExplanationUserInput;
+    getUserInput(): EmptyUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }