@khanacademy/perseus 34.1.0 → 35.0.0

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

@@ -2,10 +2,9 @@ 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";
 type RenderProps = PerseusDefinitionWidgetOptions;
-type Rubric = PerseusDefinitionWidgetOptions;
-type UserInput = Empty;
-type DefinitionProps = WidgetProps<RenderProps, Rubric> & {
+type DefinitionProps = WidgetProps<RenderProps, PerseusDefinitionRubric> & {
     widgets: PerseusRenderer["widgets"];
 };
 type DefaultProps = {
@@ -20,7 +19,7 @@ declare class Definition extends React.Component<DefinitionProps> {
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
     static validate(): import("../../types").PerseusScore;
-    getUserInput: () => UserInput;
+    getUserInput(): PerseusDefinitionUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }

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

@@ -1,4 +1,4 @@
-import type { Rubric, UserInput } from "./dropdown.types";
 import type { PerseusScore } from "../../types";
-declare function dropdownValidator(userInput: UserInput, rubric: Rubric): PerseusScore;
+import type { PerseusDropdownRubric, PerseusDropdownUserInput } from "../../validation.types";
+declare function dropdownValidator(userInput: PerseusDropdownUserInput, rubric: PerseusDropdownRubric): PerseusScore;
 export default dropdownValidator;

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

@@ -1,7 +1,7 @@
 import * as React from "react";
-import type { Rubric, UserInput } from "./dropdown.types";
 import type { PerseusScore, WidgetProps } from "../../types";
-type Props = WidgetProps<RenderProps, Rubric> & {
+import type { PerseusDropdownRubric, PerseusDropdownUserInput } from "../../validation.types";
+type Props = WidgetProps<RenderProps, PerseusDropdownRubric> & {
     selected: number;
 };
 type DefaultProps = {
@@ -12,12 +12,12 @@ type DefaultProps = {
 };
 declare class Dropdown extends React.Component<Props> {
     static defaultProps: DefaultProps;
-    static validate(userInput: UserInput, rubric: Rubric): PerseusScore;
+    static validate(userInput: PerseusDropdownUserInput, rubric: PerseusDropdownRubric): PerseusScore;
     focus: () => boolean;
     _handleChangeEvent: (arg1: React.ChangeEvent<HTMLInputElement>) => void;
     _handleChange: (arg1: number) => void;
-    getUserInput: () => UserInput;
-    simpleValidate: (arg1: Rubric) => PerseusScore;
+    getUserInput(): PerseusDropdownUserInput;
+    simpleValidate(rubric: PerseusDropdownRubric): PerseusScore;
     render(): React.ReactNode;
 }
 type RenderProps = {

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

@@ -2,8 +2,9 @@ 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";
 type RenderProps = PerseusExplanationWidgetOptions;
-type Props = WidgetProps<RenderProps, PerseusExplanationWidgetOptions>;
+type Props = WidgetProps<RenderProps, PerseusExplanationRubric>;
 type DefaultProps = {
     showPrompt: Props["showPrompt"];
     hidePrompt: Props["hidePrompt"];
@@ -28,7 +29,7 @@ declare class Explanation extends React.Component<Props, State> {
     componentWillUnmount(): void;
     change: (arg1: any, arg2: any, arg3: any) => any;
     _onClick: () => void;
-    getUserInput: () => Empty;
+    getUserInput(): PerseusExplanationUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }

package/dist/widgets/expression/expression-validator.d.ts

@@ -1,5 +1,5 @@
-import type { Rubric, OnInputErrorFunctionType } from "./expression.types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore } from "../../types";
-declare function expressionValidator(userInput: string, rubric: Rubric, onInputError: OnInputErrorFunctionType | undefined, strings: PerseusStrings, locale: string): PerseusScore;
+import type { PerseusExpressionRubric, PerseusExpressionUserInput } from "../../validation.types";
+declare function expressionValidator(userInput: PerseusExpressionUserInput, rubric: PerseusExpressionRubric, strings: PerseusStrings, locale: string): PerseusScore;
 export default expressionValidator;

package/dist/widgets/expression/expression.d.ts

@@ -1,10 +1,10 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
-import type { Rubric, OnInputErrorFunctionType } from "./expression.types";
 import type { DependenciesContext } from "../../dependencies";
 import type { PerseusExpressionWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusExpressionRubric, PerseusExpressionUserInput } from "../../validation.types";
 import type { Keys as Key, KeypadConfiguration } from "@khanacademy/math-input";
 type InputPath = ReadonlyArray<string>;
 type RenderProps = {
@@ -16,7 +16,7 @@ type RenderProps = {
     ariaLabel: PerseusExpressionWidgetOptions["ariaLabel"];
     keypadConfiguration: ReturnType<typeof keypadConfigurationForProps>;
 };
-type ExternalProps = WidgetProps<RenderProps, Rubric>;
+type ExternalProps = WidgetProps<RenderProps, PerseusExpressionRubric>;
 export type Props = ExternalProps & Partial<React.ContextType<typeof DependenciesContext>> & {
     apiOptions: NonNullable<ExternalProps["apiOptions"]>;
     buttonSets: NonNullable<ExternalProps["buttonSets"]>;
@@ -52,9 +52,9 @@ export declare class Expression extends React.Component<Props, ExpressionState>
     context: React.ContextType<typeof PerseusI18nContext>;
     _textareaId: string;
     _isMounted: boolean;
-    static validate(userInput: string, rubric: Rubric, onInputError: OnInputErrorFunctionType | undefined, strings: PerseusStrings, locale: string): PerseusScore;
-    static getUserInputFromProps(props: Props): string;
-    static getOneCorrectAnswerFromRubric(rubric: Rubric): string | null | undefined;
+    static validate(userInput: PerseusExpressionUserInput, rubric: PerseusExpressionRubric, strings: PerseusStrings, locale: string): PerseusScore;
+    static getUserInputFromProps(props: Props): PerseusExpressionUserInput;
+    static getOneCorrectAnswerFromRubric(rubric: PerseusExpressionRubric): string | null | undefined;
     static defaultProps: DefaultProps;
     displayName: string;
     state: ExpressionState;
@@ -62,10 +62,10 @@ export declare class Expression extends React.Component<Props, ExpressionState>
     componentDidUpdate: (prevProps: Props) => void;
     componentWillUnmount: () => void;
     _handleMouseDown: () => void;
-    simpleValidate: (rubric: Rubric & {
+    simpleValidate: (rubric: PerseusExpressionRubric & {
         scoring?: boolean;
-    }, onInputError: OnInputErrorFunctionType) => PerseusScore;
-    getUserInput: () => string;
+    }) => PerseusScore;
+    getUserInput(): PerseusExpressionUserInput;
     change: (...args: any) => any | undefined;
     parse: (value: string, props: Props) => any;
     changeAndTrack: (e: any, cb: () => void) => void;
@@ -102,7 +102,6 @@ declare const _default: Readonly<{
         problemNum: number | null | undefined;
         apiOptions: Readonly<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;
@@ -150,6 +149,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -165,7 +167,6 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
@@ -184,7 +185,6 @@ declare const _default: Readonly<{
     } & Partial<import("../../types").PerseusDependenciesV2> & {
         apiOptions: Readonly<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;
@@ -232,6 +232,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -247,7 +250,6 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
@@ -261,12 +263,13 @@ declare const _default: Readonly<{
         visibleLabel: string | undefined;
         ariaLabel: string | undefined;
         value: string;
-    }, "ariaLabel" | "trackInteraction" | "static" | "onChange" | "analytics" | "problemNum" | "questionCompleted" | "keypadElement" | "alignment" | "buttonsVisible" | "containerSizeClass" | "widgetId" | "findWidgets" | "visibleLabel" | "keypadConfiguration" | "reviewModeRubric" | "isLastUsedWidget"> & {
+    }, "ariaLabel" | "trackInteraction" | "static" | "onChange" | "analytics" | "keypadElement" | "containerSizeClass" | "widgetId" | "problemNum" | "questionCompleted" | "findWidgets" | "alignment" | "buttonsVisible" | "visibleLabel" | "keypadConfiguration" | "reviewModeRubric" | "isLastUsedWidget"> & {
         value?: string | undefined;
         linterContext?: import("@khanacademy/perseus-linter").LinterContextProps | undefined;
+        onFocus?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
+        onBlur?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
         apiOptions?: Readonly<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;
@@ -314,6 +317,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -329,14 +335,11 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
         }> | undefined;
         buttonSets?: import("../../perseus-types").LegacyButtonSets | undefined;
-        onFocus?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
-        onBlur?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
         functions?: readonly string[] | undefined;
         times?: boolean | undefined;
     } & {}, "analytics"> & React.RefAttributes<Expression>>) | undefined;
@@ -347,7 +350,6 @@ declare const _default: Readonly<{
         problemNum: number | null | undefined;
         apiOptions: Readonly<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;
@@ -395,6 +397,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -410,7 +415,6 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
@@ -429,7 +433,6 @@ declare const _default: Readonly<{
     } & Partial<import("../../types").PerseusDependenciesV2> & {
         apiOptions: Readonly<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;
@@ -477,6 +480,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -492,7 +498,6 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
@@ -506,12 +511,13 @@ declare const _default: Readonly<{
         visibleLabel: string | undefined;
         ariaLabel: string | undefined;
         value: string;
-    }, "ariaLabel" | "trackInteraction" | "static" | "onChange" | "analytics" | "problemNum" | "questionCompleted" | "keypadElement" | "alignment" | "buttonsVisible" | "containerSizeClass" | "widgetId" | "findWidgets" | "visibleLabel" | "keypadConfiguration" | "reviewModeRubric" | "isLastUsedWidget"> & {
+    }, "ariaLabel" | "trackInteraction" | "static" | "onChange" | "analytics" | "keypadElement" | "containerSizeClass" | "widgetId" | "problemNum" | "questionCompleted" | "findWidgets" | "alignment" | "buttonsVisible" | "visibleLabel" | "keypadConfiguration" | "reviewModeRubric" | "isLastUsedWidget"> & {
         value?: string | undefined;
         linterContext?: import("@khanacademy/perseus-linter").LinterContextProps | undefined;
+        onFocus?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
+        onBlur?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
         apiOptions?: Readonly<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;
@@ -559,6 +565,9 @@ 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("../../perseus-types").PerseusWidgetsMap) => void) | undefined;
@@ -574,14 +583,11 @@ declare const _default: Readonly<{
             isArticle: NonNullable<boolean | undefined>;
             isMobile: NonNullable<boolean | undefined>;
             onFocusChange: (newFocusPath: import("../../types").FocusPath, oldFocusPath: import("../../types").FocusPath, keypadHeight?: number | undefined, focusedElement?: HTMLElement | undefined) => unknown;
-            onInputError: (widgetId: any, value: string, message?: string | null | undefined) => unknown;
             readOnly: NonNullable<boolean | undefined>;
             setDrawingAreaAvailable: (arg1: boolean) => unknown;
             showAlignmentOptions: NonNullable<boolean | undefined>;
         }> | undefined;
         buttonSets?: import("../../perseus-types").LegacyButtonSets | undefined;
-        onFocus?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
-        onBlur?: ((blurPath: import("../../types").FocusPath) => void) | undefined;
         functions?: readonly string[] | undefined;
         times?: boolean | undefined;
     } & {}, "analytics"> & React.RefAttributes<Expression>>;

package/dist/widgets/expression/expression.types.d.ts

@@ -1,3 +1,2 @@
 import type { PerseusExpressionWidgetOptions } from "../../perseus-types";
 export type Rubric = PerseusExpressionWidgetOptions;
-export type OnInputErrorFunctionType = (arg1?: any, arg2?: any, arg3?: any) => boolean | null | undefined;

package/dist/widgets/graded-group/graded-group.d.ts

@@ -3,15 +3,15 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import type { ANSWER_BAR_STATES } from "./graded-group-answer-bar";
 import type { PerseusGradedGroupWidgetOptions } from "../../perseus-types";
 import type { TrackingGradedGroupExtraArguments, WidgetProps } from "../../types";
+import type { PerseusGradedGroupRubric } from "../../validation.types";
 declare const GRADING_STATUSES: {
     readonly ungraded: "ungraded";
     readonly correct: "correct";
     readonly incorrect: "incorrect";
     readonly invalid: "invalid";
 };
-type Rubric = PerseusGradedGroupWidgetOptions;
 type RenderProps = PerseusGradedGroupWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric, TrackingGradedGroupExtraArguments> & {
+type Props = WidgetProps<RenderProps, PerseusGradedGroupRubric, TrackingGradedGroupExtraArguments> & {
     inGradedGroupSet?: boolean;
     onNextQuestion?: () => unknown;
 };

package/dist/widgets/graded-group-set/graded-group-set.d.ts

@@ -3,9 +3,9 @@ import * as Changeable from "../../mixins/changeable";
 import { GradedGroup } from "../graded-group/graded-group";
 import type { PerseusGradedGroupSetWidgetOptions } from "../../perseus-types";
 import type { FocusPath, WidgetProps } from "../../types";
+import type { PerseusGradedGroupSetRubric } from "../../validation.types";
 type RenderProps = PerseusGradedGroupSetWidgetOptions;
-type Rubric = PerseusGradedGroupSetWidgetOptions;
-type Props = Changeable.ChangeableProps & WidgetProps<RenderProps, Rubric> & {
+type Props = Changeable.ChangeableProps & WidgetProps<RenderProps, PerseusGradedGroupSetRubric> & {
     trackInteraction: () => void;
 };
 type DefaultProps = {

package/dist/widgets/grapher/grapher.d.ts

@@ -4,15 +4,14 @@ import type { Coord } from "../../interactive2/types";
 import type { PerseusGrapherWidgetOptions } from "../../perseus-types";
 import type { PerseusScore, WidgetProps } from "../../types";
 import type { GridDimensions } from "../../util";
+import type { PerseusGrapherRubric, PerseusGrapherUserInput } from "../../validation.types";
 import type { PropsFor } from "@khanacademy/wonder-blocks-core";
-type UserInput = any;
 type RenderProps = {
     availableTypes: PerseusGrapherWidgetOptions["availableTypes"];
     graph: PerseusGrapherWidgetOptions["graph"];
     plot?: any;
 };
-type Rubric = PerseusGrapherWidgetOptions;
-type ExternalProps = WidgetProps<RenderProps, Rubric>;
+type ExternalProps = WidgetProps<RenderProps, PerseusGrapherRubric>;
 type Props = ExternalProps & {
     plot: NonNullable<RenderProps["plot"]>;
     markings: "graph" | "grid" | "none";
@@ -24,8 +23,8 @@ declare class Grapher extends React.Component<Props> {
     horizHairline: any;
     vertHairline: any;
     static defaultProps: DefaultProps;
-    static validate(state: UserInput, rubric: Rubric): PerseusScore;
-    static getUserInputFromProps(props: Props): UserInput;
+    static validate(state: PerseusGrapherUserInput, rubric: PerseusGrapherRubric): PerseusScore;
+    static getUserInputFromProps(props: Props): PerseusGrapherUserInput;
     handlePlotChanges: (arg1: any) => any;
     handleActiveTypeChange: (arg1: any) => any;
     _getGridConfig(options: Props["graph"] & {
@@ -36,8 +35,8 @@ declare class Grapher extends React.Component<Props> {
     _setupGraphie: (arg1: any, arg2: any) => void;
     showHairlines: (arg1: Coord) => void;
     hideHairlines: () => void;
-    simpleValidate(rubric: Rubric): PerseusScore;
-    getUserInput(): UserInput;
+    simpleValidate(rubric: PerseusGrapherRubric): PerseusScore;
+    getUserInput(): PerseusGrapherUserInput;
     focus(): void;
     render(): React.ReactNode;
 }

package/dist/widgets/group/group.d.ts

@@ -3,6 +3,7 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import Renderer from "../../renderer";
 import type { PerseusGroupWidgetOptions } from "../../perseus-types";
 import type { ChangeFn, FocusPath, PerseusScore, WidgetProps } from "../../types";
+import type { UserInput } from "../../validation.types";
 type Rubric = PerseusGroupWidgetOptions;
 type RenderProps = PerseusGroupWidgetOptions;
 type Props = WidgetProps<RenderProps, Rubric>;
@@ -22,10 +23,10 @@ declare class Group extends React.Component<Props> {
     static defaultProps: DefaultProps;
     componentDidMount(): void;
     change: ChangeFn;
-    getUserInput: () => any;
+    getUserInput(): ReadonlyArray<UserInput | null | undefined> | undefined;
     getSerializedState: () => any;
     restoreSerializedState: (arg1: any, arg2: any) => null;
-    simpleValidate: (arg1: Rubric) => PerseusScore | null | undefined;
+    simpleValidate(): PerseusScore | null | undefined;
     getInputPaths: () => ReadonlyArray<FocusPath> | null | undefined;
     setInputValue: (arg1: FocusPath, arg2: string, arg3: () => unknown) => void;
     focus: () => boolean | null | undefined;

package/dist/widgets/iframe/iframe.d.ts

@@ -9,19 +9,14 @@
 import * as React from "react";
 import type { PerseusIFrameWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
-type Status = "correct" | "incorrect" | "incomplete";
-type UserInput = {
-    status: Status;
-    message: string | null;
-};
+import type { PerseusIFrameRubric, PerseusIFrameUserInput, UserInputStatus } from "../../validation.types";
 type RenderProps = PerseusIFrameWidgetOptions & {
-    status: Status;
+    status: UserInputStatus;
     message: string | null;
     width: string;
     height: string;
 };
-export type Rubric = PerseusIFrameWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusIFrameRubric>;
 type DefaultProps = {
     status: Props["status"];
     message: Props["message"];
@@ -32,7 +27,7 @@ declare class Iframe extends React.Component<Props> {
     static defaultProps: DefaultProps;
     componentDidMount(): void;
     componentWillUnmount(): void;
-    getUserInput(): UserInput;
+    getUserInput(): PerseusIFrameUserInput;
     handleMessageEvent: (arg1: any) => void;
     change: (...args: ReadonlyArray<unknown>) => any;
     simpleValidate: (arg1: any) => any;

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

@@ -2,10 +2,9 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusImageWidgetOptions } from "../../perseus-types";
 import type { ChangeFn, WidgetProps } from "../../types";
+import type { PerseusImageRubric, PerseusImageUserInput } from "../../validation.types";
 type RenderProps = PerseusImageWidgetOptions;
-type Rubric = PerseusImageWidgetOptions;
-type UserInput = null;
-type ExternalProps = WidgetProps<RenderProps, Rubric>;
+type ExternalProps = WidgetProps<RenderProps, PerseusImageRubric>;
 type Props = ExternalProps & {
     alignment: NonNullable<ExternalProps["alignment"]>;
     title: NonNullable<ExternalProps["title"]>;
@@ -37,7 +36,7 @@ declare class ImageWidget extends React.Component<Props> {
     static defaultProps: DefaultProps;
     static validate(): import("../../types").PerseusScore;
     change: ChangeFn;
-    getUserInput: () => UserInput;
+    getUserInput(): PerseusImageUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     focus: () => void;
     render(): React.ReactNode;

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

@@ -1,6 +1,6 @@
-import type { Rubric } from "./input-number.types";
 import type { PerseusStrings } from "../../strings";
-import type { APIOptions, PerseusScore } from "@khanacademy/perseus";
+import type { PerseusInputNumberRubric } from "../../validation.types";
+import type { PerseusScore } from "@khanacademy/perseus";
 export declare const answerTypes: {
     readonly number: {
         readonly name: "Numbers";
@@ -37,5 +37,5 @@ export declare const answerTypes: {
 };
 declare function inputNumberValidator(state: {
     currentValue: string;
-}, rubric: Rubric, strings: PerseusStrings, onInputError?: APIOptions["onInputError"]): PerseusScore;
+}, rubric: PerseusInputNumberRubric, strings: PerseusStrings): PerseusScore;
 export default inputNumberValidator;

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

@@ -1,26 +1,23 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
-import type { Rubric } from "./input-number.types";
 import type { PerseusInputNumberWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
-import type { APIOptions, Path, PerseusScore, WidgetProps } from "../../types";
-type UserInput = {
-    currentValue: string;
-};
+import type { Path, PerseusScore, WidgetProps } from "../../types";
+import type { PerseusInputNumberRubric, PerseusInputNumberUserInput } from "../../validation.types";
 type RenderProps = {
     simplify: PerseusInputNumberWidgetOptions["simplify"];
     size: PerseusInputNumberWidgetOptions["size"];
     answerType: PerseusInputNumberWidgetOptions["answerType"];
     rightAlign: PerseusInputNumberWidgetOptions["rightAlign"];
 };
-type ExternalProps = WidgetProps<RenderProps, Rubric>;
+type ExternalProps = WidgetProps<RenderProps, PerseusInputNumberRubric>;
 type Props = ExternalProps & {
     apiOptions: NonNullable<ExternalProps["apiOptions"]>;
     linterContext: NonNullable<ExternalProps["linterContext"]>;
     rightAlign: NonNullable<ExternalProps["rightAlign"]>;
     size: NonNullable<ExternalProps["size"]>;
     currentValue: string;
-    answerType: NonNullable<Rubric["answerType"]>;
+    answerType: NonNullable<PerseusInputNumberRubric["answerType"]>;
 };
 type DefaultProps = {
     answerType: Props["answerType"];
@@ -39,7 +36,7 @@ declare class InputNumber extends React.Component<Props> {
     static defaultProps: DefaultProps;
     static validate(state: {
         currentValue: string;
-    }, rubric: Rubric, strings: PerseusStrings, onInputError?: APIOptions["onInputError"]): PerseusScore;
+    }, rubric: PerseusInputNumberRubric, strings: PerseusStrings): PerseusScore;
     static getUserInputFromProps(props: Props): {
         currentValue: string;
     };
@@ -54,8 +51,8 @@ declare class InputNumber extends React.Component<Props> {
     getInputPaths: () => ReadonlyArray<Path>;
     getGrammarTypeForPath: (arg1: Path) => string;
     setInputValue: (arg1: Path, arg2: string, arg3: () => void) => void;
-    getUserInput: () => UserInput;
-    simpleValidate: (rubric: Rubric, onInputError?: APIOptions["onInputError"]) => PerseusScore;
+    getUserInput(): PerseusInputNumberUserInput;
+    simpleValidate(rubric: PerseusInputNumberRubric): PerseusScore;
     examples: () => ReadonlyArray<string>;
     render(): React.ReactNode;
 }

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

@@ -2,9 +2,9 @@ import * as React from "react";
 import type { Coord } from "../../interactive2/types";
 import type { PerseusInteractionWidgetOptions } from "../../perseus-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"];
@@ -24,7 +24,7 @@ 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;
+    getUserInput(): PerseusInteractionUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;
 }

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;