@khanacademy/perseus 34.0.0 → 35.0.0

package/dist/widgets/interaction/interaction.d.ts

@@ -1,10 +1,10 @@
 import * as React from "react";
 import type { Coord } from "../../interactive2/types";
 import type { PerseusInteractionWidgetOptions } from "../../perseus-types";
-import type { PerseusScore, WidgetProps } from "../../types";
+import type { WidgetProps } from "../../types";
+import type { PerseusInteractionRubric, PerseusInteractionUserInput } from "../../validation.types";
 type RenderProps = PerseusInteractionWidgetOptions;
-type Rubric = PerseusInteractionWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusInteractionRubric>;
 type DefaultProps = {
     graph: Props["graph"];
     elements: Props["elements"];
@@ -15,7 +15,7 @@ type State = {
 };
 declare class Interaction extends React.Component<Props, State> {
     static defaultProps: DefaultProps;
-    static validate(state: any, rubric: any): PerseusScore;
+    static validate(): import("../../types").PerseusScore;
     state: State;
     UNSAFE_componentWillReceiveProps(nextProps: Props): void;
     _setupGraphie: (arg1: any, arg2: any) => void;
@@ -24,8 +24,8 @@ declare class Interaction extends React.Component<Props, State> {
     _eval: (arg1: any, arg2: any) => number;
     _extractVars: (arg1: any) => ReadonlyArray<any>;
     change: (arg1: any, arg2: any, arg3: any) => any;
-    getUserInput: () => any;
-    simpleValidate: (arg1: any) => any;
+    getUserInput(): PerseusInteractionUserInput;
+    simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/interactive-graph.d.ts

@@ -1,17 +1,14 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../components/i18n-context";
+import type { StatefulMafsGraphType } from "./interactive-graphs/stateful-mafs-graph";
 import type { QuadraticGraphState } from "./interactive-graphs/types";
 import type { Coord } from "../interactive2/types";
 import type { PerseusGraphType, PerseusGraphTypeAngle, PerseusGraphTypePoint, PerseusGraphTypePolygon, PerseusGraphTypeSegment, PerseusInteractiveGraphWidgetOptions } from "../perseus-types";
-import type { Widget } from "../renderer";
 import type { ChangeHandler, PerseusScore, WidgetProps } from "../types";
 import type { QuadraticCoefficient, Range, SineCoefficient } from "../util/geometry";
+import type { PerseusInteractiveGraphRubric, PerseusInteractiveGraphUserInput } from "../validation.types";
 type RenderProps = PerseusInteractiveGraphWidgetOptions;
-export type Rubric = {
-    correct: PerseusGraphType;
-    graph: PerseusGraphType;
-};
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusInteractiveGraphRubric>;
 type State = any;
 type DefaultProps = {
     labels: Props["labels"];
@@ -101,17 +98,17 @@ declare class LegacyInteractiveGraph extends React.Component<Props, State> {
     addAngleControls: () => void;
     removeAngleControls: () => void;
     toggleShowSides: () => void;
-    getUserInput(): PerseusGraphType;
-    simpleValidate(rubric: Rubric): PerseusScore;
+    getUserInput(): PerseusInteractiveGraphUserInput;
+    simpleValidate(rubric: PerseusInteractiveGraphRubric): PerseusScore;
     focus: () => void;
     render(): React.ReactNode;
 }
 declare class InteractiveGraph extends React.Component<Props, State> {
     legacyGraphRef: React.RefObject<LegacyInteractiveGraph>;
-    mafsRef: React.RefObject<Widget>;
+    mafsRef: React.RefObject<StatefulMafsGraphType>;
     static defaultProps: DefaultProps;
-    getUserInput: Widget["getUserInput"];
-    simpleValidate(rubric: Rubric): PerseusScore;
+    getUserInput(): PerseusInteractiveGraphUserInput;
+    simpleValidate(rubric: PerseusInteractiveGraphRubric): PerseusScore;
     render(): React.JSX.Element;
     static getQuadraticCoefficients(coords: ReadonlyArray<Coord>): QuadraticCoefficient;
     static getSinusoidCoefficients(coords: ReadonlyArray<Coord>): SineCoefficient;
@@ -163,7 +160,7 @@ declare class InteractiveGraph extends React.Component<Props, State> {
     static getRayEquationString(props: Props): string;
     static getPolygonEquationString(props: Props): string;
     static getAngleEquationString(props: Props): string;
-    static validate(userInput: PerseusGraphType, rubric: Rubric, component: any): PerseusScore;
+    static validate(userInput: PerseusGraphType, rubric: PerseusInteractiveGraphRubric, component: any): PerseusScore;
     static getUserInputFromProps(props: Props): PerseusGraphType;
 }
 export declare function shouldUseMafs(mafsFlags: Record<string, boolean> | undefined | boolean, graph: PerseusGraphType): boolean;

package/dist/widgets/interactive-graphs/interactive-graph-question-builder.d.ts

@@ -1,11 +1,18 @@
+import { vec } from "mafs";
 import type { Coord } from "../../interactive2/types";
 import type { CollinearTuple, LockedFigureColor, LockedFigureFillType, LockedLineStyle, PerseusRenderer } from "../../perseus-types";
-import type { Interval, vec } from "mafs";
+import type { Interval } from "mafs";
 export type LockedFunctionOptions = {
     color?: LockedFigureColor;
     strokeStyle?: LockedLineStyle;
     directionalAxis?: "x" | "y";
     domain?: Interval;
+    labels?: LockedFigureLabelOptions[];
+};
+type LockedFigureLabelOptions = {
+    text: string;
+    coord?: Coord;
+    size?: "small" | "medium" | "large";
 };
 export declare function interactiveGraphQuestionBuilder(): InteractiveGraphQuestionBuilder;
 declare class InteractiveGraphQuestionBuilder {
@@ -103,11 +110,7 @@ declare class InteractiveGraphQuestionBuilder {
     addLockedPointAt(x: number, y: number, options?: {
         color?: LockedFigureColor;
         filled?: boolean;
-        labels?: {
-            text: string;
-            coord?: Coord;
-            size?: "small" | "medium" | "large";
-        }[];
+        labels?: LockedFigureLabelOptions[];
     }): InteractiveGraphQuestionBuilder;
     addLockedLine(point1: vec.Vector2, point2: vec.Vector2, options?: {
         kind?: "line" | "ray" | "segment";
@@ -116,13 +119,18 @@ declare class InteractiveGraphQuestionBuilder {
         filled?: [boolean, boolean];
         showPoint1?: boolean;
         showPoint2?: boolean;
+        labels?: LockedFigureLabelOptions[];
+    }): InteractiveGraphQuestionBuilder;
+    addLockedVector(tail: vec.Vector2, tip: vec.Vector2, options?: {
+        color?: LockedFigureColor;
+        labels?: LockedFigureLabelOptions[];
     }): InteractiveGraphQuestionBuilder;
-    addLockedVector(tail: vec.Vector2, tip: vec.Vector2, color?: LockedFigureColor): InteractiveGraphQuestionBuilder;
     addLockedEllipse(center: vec.Vector2, radius: [x: number, y: number], options?: {
         angle?: number;
         color?: LockedFigureColor;
         fillStyle?: LockedFigureFillType;
         strokeStyle?: "solid" | "dashed";
+        labels?: LockedFigureLabelOptions[];
     }): InteractiveGraphQuestionBuilder;
     addLockedPolygon(points: vec.Vector2[], options?: {
         color?: LockedFigureColor;

package/dist/widgets/interactive-graphs/reducer/interactive-graph-action.d.ts

@@ -1,9 +1,12 @@
 import type { InitializeGraphStateParams } from "./initialize-graph-state";
+import type { InteractionMode } from "../types";
 import type { Interval, vec } from "mafs";
-export type InteractiveGraphAction = Reinitialize | MovePointInFigure | MoveLine | MoveAll | MovePoint | MoveCenter | MoveRadiusPoint | ChangeSnapStep | ChangeRange | AddPoint | RemovePoint | FocusPoint | BlurPoint | DeleteIntent | ClickPoint;
+export type InteractiveGraphAction = Reinitialize | MovePointInFigure | MoveLine | MoveAll | MovePoint | MoveCenter | MoveRadiusPoint | ChangeSnapStep | ChangeRange | AddPoint | RemovePoint | FocusPoint | BlurPoint | DeleteIntent | ClickPoint | ChangeInteractionMode | ChangeKeyboardInvitationVisibility;
 export declare const actions: {
     global: {
         deleteIntent: typeof deleteIntent;
+        changeInteractionMode: typeof changeInteractionMode;
+        changeKeyboardInvitationVisibility: typeof changeKeyboardInvitationVisibility;
     };
     angle: {
         movePoint: typeof movePoint;
@@ -88,6 +91,18 @@ export interface ClickPoint {
     index: number;
 }
 declare function clickPoint(index: number): ClickPoint;
+export declare const CHANGE_INTERACTION_MODE = "point-change-interaction-mode";
+export interface ChangeInteractionMode {
+    type: typeof CHANGE_INTERACTION_MODE;
+    mode: InteractionMode;
+}
+declare function changeInteractionMode(mode: InteractionMode): ChangeInteractionMode;
+export declare const CHANGE_KEYBOARD_INVITATION_VISIBILITY = "change-keyboard-interaction-invitation-visibility";
+export interface ChangeKeyboardInvitationVisibility {
+    type: typeof CHANGE_KEYBOARD_INVITATION_VISIBILITY;
+    shouldShow: boolean;
+}
+declare function changeKeyboardInvitationVisibility(shouldShow: boolean): ChangeKeyboardInvitationVisibility;
 export declare const MOVE_ALL = "move-all";
 export interface MoveAll {
     type: typeof MOVE_ALL;

package/dist/widgets/interactive-graphs/stateful-mafs-graph.d.ts

@@ -1,8 +1,8 @@
 import * as React from "react";
 import type { InteractiveGraphProps } from "./types";
 import type { PerseusGraphType } from "../../perseus-types";
-import type { Widget } from "../../renderer";
 import type { APIOptions } from "../../types";
+import type { PerseusInteractiveGraphUserInput } from "../../validation.types";
 export type StatefulMafsGraphProps = {
     flags?: APIOptions["flags"];
     box: [number, number];
@@ -25,4 +25,7 @@ export type StatefulMafsGraphProps = {
     readOnly: boolean;
     static: InteractiveGraphProps["static"];
 };
-export declare const StatefulMafsGraph: React.ForwardRefExoticComponent<StatefulMafsGraphProps & React.RefAttributes<Partial<Widget>>>;
+export type StatefulMafsGraphType = {
+    getUserInput: () => PerseusInteractiveGraphUserInput;
+};
+export declare const StatefulMafsGraph: React.ForwardRefExoticComponent<StatefulMafsGraphProps & React.RefAttributes<StatefulMafsGraphType>>;

package/dist/widgets/interactive-graphs/types.d.ts

@@ -26,6 +26,7 @@ export interface LinearSystemGraphState extends InteractiveGraphStateCommon {
     type: "linear-system";
     coords: PairOfPoints[];
 }
+export type InteractionMode = "mouse" | "keyboard";
 export interface NoneGraphState extends InteractiveGraphStateCommon {
     type: "none";
 }
@@ -35,6 +36,8 @@ export interface PointGraphState extends InteractiveGraphStateCommon {
     numPoints?: number | "unlimited";
     focusedPointIndex: number | null;
     showRemovePointButton: boolean;
+    interactionMode: InteractionMode;
+    showKeyboardInteractionInvitation: boolean;
 }
 export interface RayGraphState extends InteractiveGraphStateCommon {
     type: "ray";

package/dist/widgets/label-image/label-image-validator.d.ts

@@ -0,0 +1,10 @@
+import type { InteractiveMarkerType } from "./types";
+import type { PerseusScore } from "../../types";
+import type { PerseusLabelImageRubric, PerseusLabelImageUserInput } from "../../validation.types";
+type InteractiveMarkerScore = {
+    hasAnswers: boolean;
+    isCorrect: boolean;
+};
+export declare function scoreMarker(marker: InteractiveMarkerType): InteractiveMarkerScore;
+declare function labelImageValidator(state: PerseusLabelImageUserInput, rubric?: PerseusLabelImageRubric): PerseusScore;
+export default labelImageValidator;

package/dist/widgets/label-image/label-image.d.ts

@@ -8,14 +8,12 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import Marker from "./marker";
-import type { InteractiveMarkerType, InteractiveMarkerScore } from "./types";
+import type { InteractiveMarkerType } from "./types";
 import type { DependencyProps } from "../../dependencies";
 import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptions, PerseusScore } from "../../types";
+import type { PerseusLabelImageRubric, PerseusLabelImageUserInput } from "../../validation.types";
 export type PreferredPopoverDirection = "NONE" | "UP" | "DOWN" | "LEFT" | "RIGHT";
-type MarkersState = {
-    markers: ReadonlyArray<InteractiveMarkerType>;
-};
 /**
  * Represents a direction vector.
  * No diagonals allowed.
@@ -60,8 +58,7 @@ export declare class LabelImage extends React.Component<LabelImageProps, LabelIm
     context: React.ContextType<typeof PerseusI18nContext>;
     _markers: Array<Marker | null | undefined>;
     _mounted: boolean;
-    static gradeMarker(marker: InteractiveMarkerType): InteractiveMarkerScore;
-    static validate(state: MarkersState, rubric?: LabelImageProps): PerseusScore;
+    static validate(state: PerseusLabelImageUserInput, rubric?: PerseusLabelImageRubric): PerseusScore;
     /**
      * Test whether point is contained within triangle.
      *
@@ -82,8 +79,8 @@ export declare class LabelImage extends React.Component<LabelImageProps, LabelIm
     constructor(props: LabelImageProps);
     componentDidMount(): void;
     componentWillUnmount(): void;
-    simpleValidate(rubric: LabelImageProps): PerseusScore;
-    getUserInput(): MarkersState;
+    simpleValidate(rubric: PerseusLabelImageRubric): PerseusScore;
+    getUserInput(): PerseusLabelImageUserInput;
     showRationalesForCurrentlySelectedChoices(rubric: LabelImageProps): void;
     handleMarkerChange(index: number, marker: InteractiveMarkerType): void;
     activateMarker(index: number, opened: boolean): void;
@@ -99,7 +96,6 @@ declare const _default: Readonly<{
     getWidget?: (() => React.ForwardRefExoticComponent<Omit<ChangeableProps & Partial<import("../../types").PerseusDependenciesV2> & {
         apiOptions: Readonly<{
             isArticle?: boolean | undefined;
-            onInputError?: ((widgetId: any, value: string, message?: string | null | undefined) => unknown) | undefined;
             onFocusChange?: ((newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown) | undefined;
             GroupMetadataEditor?: React.ComponentType<any> | undefined;
             showAlignmentOptions?: boolean | undefined;
@@ -146,6 +142,10 @@ declare const _default: Readonly<{
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
                     "locked-point-labels"?: boolean | undefined;
+                    "locked-line-labels"?: boolean | undefined;
+                    "locked-vector-labels"?: boolean | undefined;
+                    "locked-ellipse-labels"?: boolean | undefined;
+                    "locked-function-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../..").PerseusWidgetsMap) => void) | undefined;
@@ -164,7 +164,6 @@ declare const _default: Readonly<{
     widget: React.ForwardRefExoticComponent<Omit<ChangeableProps & Partial<import("../../types").PerseusDependenciesV2> & {
         apiOptions: Readonly<{
             isArticle?: boolean | undefined;
-            onInputError?: ((widgetId: any, value: string, message?: string | null | undefined) => unknown) | undefined;
             onFocusChange?: ((newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown) | undefined;
             GroupMetadataEditor?: React.ComponentType<any> | undefined;
             showAlignmentOptions?: boolean | undefined;
@@ -211,6 +210,10 @@ declare const _default: Readonly<{
                 } & {
                     "interactive-graph-locked-features-labels"?: boolean | undefined;
                     "locked-point-labels"?: boolean | undefined;
+                    "locked-line-labels"?: boolean | undefined;
+                    "locked-vector-labels"?: boolean | undefined;
+                    "locked-ellipse-labels"?: boolean | undefined;
+                    "locked-function-labels"?: boolean | undefined;
                 }) | undefined;
             } | undefined;
             onWidgetStartProps?: ((widgets: import("../..").PerseusWidgetsMap) => void) | undefined;

package/dist/widgets/label-image/types.d.ts

@@ -9,7 +9,3 @@ export type InteractiveMarkerType = MarkerType & {
     showCorrectness?: "correct" | "incorrect";
     focused?: boolean;
 };
-export type InteractiveMarkerScore = {
-    hasAnswers: boolean;
-    isCorrect: boolean;
-};

package/dist/widgets/matcher/matcher.d.ts

@@ -3,9 +3,9 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import type { SortableOption } from "../../components/sortable";
 import type { PerseusMatcherWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
+import type { PerseusMatcherRubric, PerseusMatcherUserInput } from "../../validation.types";
 type RenderProps = PerseusMatcherWidgetOptions;
-type Rubric = PerseusMatcherWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusMatcherRubric>;
 type DefaultProps = {
     left: Props["left"];
     right: Props["right"];
@@ -32,10 +32,10 @@ export declare class Matcher extends React.Component<Props, State> {
     changeAndTrack: (arg1: any) => void;
     onMeasureLeft: (arg1: any) => void;
     onMeasureRight: (arg1: any) => void;
-    getUserInput: () => any;
+    getUserInput: () => PerseusMatcherUserInput;
     moveLeftOptionToIndex: (option: SortableOption, index: number) => void;
     moveRightOptionToIndex: (option: SortableOption, index: number) => void;
-    simpleValidate: (arg1: any) => any;
+    simpleValidate(rubric: PerseusMatcherRubric): any;
     render(): React.ReactElement;
 }
 declare const _default: Readonly<{

package/dist/widgets/matrix/matrix.d.ts

@@ -3,8 +3,8 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusMatrixWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { WidgetProps, PerseusScore } from "../../types";
-type Rubric = PerseusMatrixWidgetOptions;
-type ExternalProps = WidgetProps<PerseusMatrixWidgetOptions, Rubric>;
+import type { PerseusMatrixRubric, PerseusMatrixUserInput } from "../../validation.types";
+type ExternalProps = WidgetProps<PerseusMatrixWidgetOptions, PerseusMatrixRubric>;
 type Props = ExternalProps & {
     onChange: (arg1: {
         cursorPosition?: ReadonlyArray<number>;
@@ -32,7 +32,7 @@ declare class Matrix extends React.Component<Props, State> {
     context: React.ContextType<typeof PerseusI18nContext>;
     cursorPosition: [number, number];
     static defaultProps: DefaultProps;
-    static validate(state: any, rubric: any, strings: PerseusStrings): PerseusScore;
+    static validate(state: PerseusMatrixUserInput, rubric: PerseusMatrixRubric, strings: PerseusStrings): PerseusScore;
     state: State;
     componentDidMount(): void;
     getInputPaths: () => ReadonlyArray<ReadonlyArray<string>>;
@@ -46,8 +46,8 @@ declare class Matrix extends React.Component<Props, State> {
     setInputValue: (arg1: any, arg2: any, arg3: any) => void;
     handleKeyDown: (arg1: any, arg2: any, arg3: any) => void;
     onValueChange: (arg1: any, arg2: any, arg3: any, arg4: any) => void;
-    getUserInput: () => any;
-    simpleValidate: (arg1: any) => any;
+    getUserInput(): PerseusMatrixUserInput;
+    simpleValidate(rubric: PerseusMatrixRubric): PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/molecule/molecule.d.ts

@@ -1,6 +1,7 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusMoleculeRendererWidgetOptions } from "../../perseus-types";
+import type { PerseusMoleculeUserInput } from "../../validation.types";
 type MoleculeState = {
     parsedSmiles: any;
     error: string | null;
@@ -31,9 +32,9 @@ type DefaultProps = {
 };
 declare class MoleculeWidget extends React.Component<Props> {
     static defaultProps: DefaultProps;
-    simpleValidate: (arg1: any) => any;
-    getUserInput: () => ReadonlyArray<ReadonlyArray<string>>;
-    validate: (arg1: any, arg2: any) => any;
+    simpleValidate(): import("../../types").PerseusScore;
+    getUserInput(): PerseusMoleculeUserInput;
+    validate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/number-line/number-line.d.ts

@@ -2,6 +2,8 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { ChangeableProps } from "../../mixins/changeable";
 import type { APIOptions } from "../../types";
+import type { PerseusNumberLineRubric, PerseusNumberLineUserInput } from "../../validation.types";
+export type Relationship = "lt" | "gt" | "le" | "ge";
 type Props = ChangeableProps & {
     range: [number, number];
     labelRange: ReadonlyArray<number | null>;
@@ -13,7 +15,7 @@ type Props = ChangeableProps & {
     isTickCtrl: boolean;
     isInequality: boolean;
     numLinePosition: number;
-    rel: "lt" | "gt" | "le" | "ge";
+    rel: Relationship;
     onFocus: (arg1: any) => void;
     onBlur: (arg1: any) => void;
     onChange: (arg1: any, arg2?: () => void | null | undefined) => void;
@@ -69,8 +71,8 @@ declare class NumberLine extends React.Component<Props, State> {
     _getInequalityEndpoint: (arg1: any) => [number, number];
     _renderInequality: (arg1: any) => React.ReactElement;
     _setupGraphie: (arg1: any, arg2: any) => void;
-    getUserInput: () => any;
-    simpleValidate: (arg1: any) => any;
+    getUserInput(): PerseusNumberLineUserInput;
+    simpleValidate(rubric: PerseusNumberLineRubric): any;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/numeric-input/numeric-input-validator.d.ts

@@ -1,6 +1,6 @@
-import type { Rubric, UserInput } from "./numeric-input.types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore } from "../../types";
+import type { PerseusNumericInputRubric, PerseusNumericInputUserInput } from "../../validation.types";
 export declare function maybeParsePercentInput(inputValue: string | number, normalizedAnswerExpected: boolean): string | number;
-declare function numericInputValidator(userInput: UserInput, rubric: Rubric, strings: PerseusStrings): PerseusScore;
+declare function numericInputValidator(userInput: PerseusNumericInputUserInput, rubric: PerseusNumericInputRubric, strings: PerseusStrings): PerseusScore;
 export default numericInputValidator;

package/dist/widgets/numeric-input/numeric-input.d.ts

@@ -2,11 +2,11 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import InputWithExamples from "../../components/input-with-examples";
 import SimpleKeypadInput from "../../components/simple-keypad-input";
-import type { Rubric, UserInput } from "./numeric-input.types";
 import type { PerseusNumericInputWidgetOptions, PerseusNumericInputAnswerForm } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { FocusPath, PerseusScore, WidgetProps } from "../../types";
-type ExternalProps = WidgetProps<PerseusNumericInputWidgetOptions, Rubric>;
+import type { PerseusNumericInputRubric, PerseusNumericInputUserInput } from "../../validation.types";
+type ExternalProps = WidgetProps<PerseusNumericInputWidgetOptions, PerseusNumericInputRubric>;
 type Props = ExternalProps & {
     size: NonNullable<ExternalProps["size"]>;
     rightAlign: NonNullable<ExternalProps["rightAlign"]>;
@@ -38,20 +38,20 @@ export declare class NumericInput extends React.Component<Props, State> {
     context: React.ContextType<typeof PerseusI18nContext>;
     inputRef: SimpleKeypadInput | InputWithExamples | null | undefined;
     static defaultProps: DefaultProps;
-    static getUserInputFromProps(props: Props): UserInput;
-    static getOneCorrectAnswerFromRubric(rubric: Rubric): string | null | undefined;
-    static validate(userInput: UserInput, rubric: Rubric, strings: PerseusStrings): PerseusScore;
+    static getUserInputFromProps(props: Props): PerseusNumericInputUserInput;
+    static getOneCorrectAnswerFromRubric(rubric: PerseusNumericInputRubric): string | null | undefined;
+    static validate(userInput: PerseusNumericInputUserInput, rubric: PerseusNumericInputRubric, strings: PerseusStrings): PerseusScore;
     state: State;
     examples: () => ReadonlyArray<string>;
     shouldShowExamples: () => boolean;
-    simpleValidate: (arg1: Rubric) => PerseusScore;
+    simpleValidate(rubric: PerseusNumericInputRubric): PerseusScore;
     focus: () => boolean;
     focusInputPath: () => void;
     blurInputPath: () => void;
     getInputPaths: () => ReadonlyArray<ReadonlyArray<string>>;
     getGrammarTypeForPath: (arg1: FocusPath) => string;
     setInputValue: (arg1: FocusPath, arg2: string, arg3?: () => unknown | null | undefined) => void;
-    getUserInput: () => UserInput;
+    getUserInput(): PerseusNumericInputUserInput;
     handleChange: (arg1: string, arg2?: () => unknown | null | undefined) => void;
     _handleFocus: () => void;
     _handleBlur: () => void;

package/dist/widgets/orderer/orderer.d.ts

@@ -1,15 +1,15 @@
 import * as React from "react";
 import type { PerseusOrdererWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
+import type { PerseusOrdererRubric, PerseusOrdererUserInput } from "../../validation.types";
 type Position = {
     left: number;
     top: number;
 };
-type Rubric = PerseusOrdererWidgetOptions;
 type RenderProps = PerseusOrdererWidgetOptions & {
     current: any;
 };
-export type OrdererProps = WidgetProps<RenderProps, Rubric>;
+export type OrdererProps = WidgetProps<RenderProps, PerseusOrdererRubric>;
 type OrdererDefaultProps = {
     current: OrdererProps["current"];
     options: OrdererProps["options"];
@@ -43,8 +43,8 @@ declare class Orderer extends React.Component<OrdererProps, OrdererState> {
     findCorrectIndex: (arg1: any, arg2: any) => any;
     isCardInBank: (arg1: any) => boolean;
     setListValues: (arg1: ReadonlyArray<string>) => void;
-    getUserInput: () => any;
-    simpleValidate: (arg1: any) => any;
+    getUserInput(): PerseusOrdererUserInput;
+    simpleValidate(rubric: PerseusOrdererRubric): any;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/passage/passage.d.ts

@@ -4,15 +4,14 @@ import type { ParseState } from "./passage-markdown";
 import type { SerializedHighlightSet } from "../../components/highlighting/types";
 import type { ChangeableProps } from "../../mixins/changeable";
 import type { PerseusPassageWidgetOptions, PerseusWidget } from "../../perseus-types";
-import type { PerseusScore, WidgetProps } from "../../types";
+import type { WidgetProps } from "../../types";
+import type { PerseusPassageRubric, PerseusPassageUserInput } from "../../validation.types";
 import type { SingleASTNode } from "@khanacademy/simple-markdown";
 export declare class LineHeightMeasurer extends React.Component<Record<any, any>> {
     _line: HTMLDivElement | null | undefined;
     measureLineHeight(): number;
     render(): React.ReactNode;
 }
-type UserInput = null;
-type Rubric = PerseusPassageWidgetOptions;
 type RenderProps = {
     passageTitle: PerseusPassageWidgetOptions["passageTitle"];
     passageText: PerseusPassageWidgetOptions["passageText"];
@@ -20,7 +19,7 @@ type RenderProps = {
     showLineNumbers: PerseusPassageWidgetOptions["showLineNumbers"];
 };
 type FindWidgetsCallback = (id: string, widgetInfo: PerseusWidget) => boolean;
-type PassageProps = ChangeableProps & WidgetProps<RenderProps, Rubric> & {
+type PassageProps = ChangeableProps & WidgetProps<RenderProps, PerseusPassageRubric> & {
     findWidgets: (arg1: FindWidgetsCallback) => ReadonlyArray<Passage>;
     highlights: SerializedHighlightSet;
 };
@@ -54,7 +53,7 @@ export declare class Passage extends React.Component<PassageProps, PassageState>
     _stylesAppiedTimer: number;
     static defaultProps: DefaultPassageProps;
     state: PassageState;
-    static validate(state: UserInput, rubric: Rubric): PerseusScore;
+    static validate(): import("../../types").PerseusScore;
     componentDidMount(): void;
     shouldComponentUpdate(nextProps: PassageProps, nextState: PassageState): any | boolean;
     componentDidUpdate(): void;
@@ -94,8 +93,8 @@ export declare class Passage extends React.Component<PassageProps, PassageState>
      *
      * These are misc widget functions used for the widget API
      */
-    getUserInput(): UserInput;
-    simpleValidate(rubric: Rubric): PerseusScore;
+    getUserInput(): PerseusPassageUserInput;
+    simpleValidate(): import("../../types").PerseusScore;
     /**
      * Rendering
      *

package/dist/widgets/passage-ref/passage-ref.d.ts

@@ -1,22 +1,14 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusPassageRefWidgetOptions } from "../../perseus-types";
-import type { ChangeFn, PerseusScore, WidgetProps } from "../../types";
-import type { LinterContextProps } from "@khanacademy/perseus-linter";
-type UserInput = RenderProps & {
-    static: boolean | null | undefined;
-    reviewModeRubric: Rubric;
-    linterContext: LinterContextProps;
-    isLastUsedWidget: boolean;
-    alignment: string | null | undefined;
-};
+import type { ChangeFn, WidgetProps } from "../../types";
+import type { PerseusPassageRefRubric, PerseusPassageRefUserInput } from "../../validation.types";
 type RenderProps = {
     passageNumber: PerseusPassageRefWidgetOptions["passageNumber"];
     referenceNumber: PerseusPassageRefWidgetOptions["referenceNumber"];
     summaryText: PerseusPassageRefWidgetOptions["summaryText"];
 };
-type Rubric = PerseusPassageRefWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusPassageRefRubric>;
 type DefaultProps = {
     passageNumber: Props["passageNumber"];
     referenceNumber: Props["referenceNumber"];
@@ -37,16 +29,16 @@ declare class PassageRef extends React.Component<Props, State> {
     _throttledUpdateRange: () => void;
     static defaultProps: DefaultProps;
     state: State;
-    static validate(userInput: UserInput, rubric: Rubric): PerseusScore;
+    static validate(): import("../../types").PerseusScore;
     componentDidMount(): void;
     shouldComponentUpdate(nextProps: Props, nextState: State): boolean;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
-    getUserInput: () => UserInput;
+    getUserInput(): PerseusPassageRefUserInput;
     change: ChangeFn;
     _deferredUpdateRange: () => void;
     _updateRange: () => void;
-    simpleValidate: (arg1: Rubric) => PerseusScore;
+    simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/passage-ref-target/passage-ref-target.d.ts

@@ -3,6 +3,7 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import * as Changeable from "../../mixins/changeable";
 import type { PerseusPassageRefTargetWidgetOptions } from "../../perseus-types";
 import type { APIOptions } from "../../types";
+import type { PerseusPassageRefTargetUserInput } from "../../validation.types";
 import type { LinterContextProps } from "@khanacademy/perseus-linter";
 type Props = Changeable.ChangeableProps & {
     apiOptions: APIOptions;
@@ -20,10 +21,10 @@ declare class PassageRefTarget extends React.Component<Props> {
     }>;
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
-    static validate(state: any, rubric: any): any;
-    getUserInput: () => any;
+    static validate(): import("../../types").PerseusScore;
+    getUserInput(): PerseusPassageRefTargetUserInput;
     change: (arg1: any, arg2: any, arg3: any) => any;
-    simpleValidate: (arg1: any) => any;
+    simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/phet-simulation/phet-simulation.d.ts

@@ -6,9 +6,9 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusPhetSimulationWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
+import type { PerseusPhetSimulationUserInput } from "../../validation.types";
 type RenderProps = PerseusPhetSimulationWidgetOptions;
 type Props = WidgetProps<RenderProps, PerseusPhetSimulationWidgetOptions>;
-type UserInput = null;
 type State = {
     banner: {
         message: string;
@@ -28,7 +28,7 @@ export declare class PhetSimulation extends React.Component<Props, State> {
     constructor(props: any);
     componentDidMount(): Promise<void>;
     componentDidUpdate(prevProps: any): Promise<void>;
-    getUserInput(): UserInput;
+    getUserInput(): PerseusPhetSimulationUserInput;
     getPhetCompatibleLocale: (arg1: string) => string;
     displayLoadFailure: () => void;
     updateSimState(urlString: string): Promise<void>;