@khanacademy/perseus 34.0.0 → 35.0.0

package/dist/widgets/plotter/plotter.d.ts

@@ -1,10 +1,10 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusPlotterWidgetOptions } from "../../perseus-types";
-import type { WidgetProps } from "../../types";
-type Rubric = PerseusPlotterWidgetOptions;
+import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusPlotterRubric, PerseusPlotterUserInput } from "../../validation.types";
 type RenderProps = PerseusPlotterWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric> & {
+type Props = WidgetProps<RenderProps, PerseusPlotterRubric> & {
     labelInterval: NonNullable<PerseusPlotterWidgetOptions["labelInterval"]>;
     picSize: NonNullable<PerseusPlotterWidgetOptions["picSize"]>;
 };
@@ -67,8 +67,8 @@ export declare class Plotter extends React.Component<Props, State> {
     setPicHeight: (arg1: number, arg2: number) => void;
     changeAndTrack: (arg1: any) => void;
     drawPicHeights: (arg1: any, arg2: any) => void;
-    getUserInput: () => any;
-    simpleValidate: (arg1: any) => any;
+    getUserInput(): PerseusPlotterUserInput;
+    simpleValidate(rubric: PerseusPlotterRubric): PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/radio/radio-component.d.ts

@@ -4,6 +4,7 @@ import type { FocusFunction } from "./base-radio";
 import type { PerseusRadioChoice, PerseusRadioWidgetOptions, ShowSolutions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
 import type { PerseusScore, WidgetProps, ChoiceState } from "../../types";
+import type { PerseusRadioRubric, PerseusRadioUserInput } from "../../validation.types";
 export type RenderProps = {
     numCorrect: number;
     hasNoneOfTheAbove?: boolean;
@@ -16,15 +17,7 @@ export type RenderProps = {
     choiceStates?: ReadonlyArray<ChoiceState>;
     values?: ReadonlyArray<boolean>;
 };
-type UserInput = {
-    countChoices?: boolean;
-    choicesSelected: ReadonlyArray<boolean>;
-    numCorrect?: number;
-    noneOfTheAboveIndex?: number | null | undefined;
-    noneOfTheAboveSelected?: boolean;
-};
-type Rubric = PerseusRadioWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusRadioRubric>;
 type DefaultProps = Required<Pick<Props, "choices" | "multipleSelect" | "countChoices" | "deselectEnabled" | "linterContext" | "showSolutions">>;
 export type RadioChoiceWithMetadata = PerseusRadioChoice & {
     originalIndex: number;
@@ -38,8 +31,8 @@ declare class Radio extends React.Component<Props> {
     context: React.ContextType<typeof PerseusI18nContext>;
     focusFunction: FocusFunction;
     static defaultProps: DefaultProps;
-    static validate(userInput: UserInput, rubric: Rubric, strings: PerseusStrings): PerseusScore;
-    static getUserInputFromProps(props: Props): UserInput;
+    static validate(userInput: PerseusRadioUserInput, rubric: PerseusRadioRubric, strings: PerseusStrings): PerseusScore;
+    static getUserInputFromProps(props: Props): PerseusRadioUserInput;
     componentDidUpdate(prevProps: Props): void;
     _renderRenderer: (content?: string) => React.ReactElement;
     focus(choiceIndex?: number | null): boolean;
@@ -48,8 +41,8 @@ declare class Radio extends React.Component<Props> {
         checked: ReadonlyArray<boolean>;
         crossedOut: ReadonlyArray<boolean>;
     }>) => void;
-    getUserInput: () => UserInput;
-    simpleValidate: (arg1: PerseusRadioWidgetOptions) => PerseusScore;
+    getUserInput(): PerseusRadioUserInput;
+    simpleValidate(rubric: PerseusRadioRubric): PerseusScore;
     /**
      * Turn on rationale display for the currently selected choices. Note that
      * this leaves rationales on for choices that are already showing

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

@@ -0,0 +1,5 @@
+import type { PerseusStrings } from "../../strings";
+import type { PerseusScore } from "../../types";
+import type { PerseusRadioRubric, PerseusRadioUserInput } from "../../validation.types";
+declare function radioValidator(userInput: PerseusRadioUserInput, rubric: PerseusRadioRubric, strings: PerseusStrings): PerseusScore;
+export default radioValidator;

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

@@ -0,0 +1,4 @@
+import type { PerseusScore } from "../../types";
+import type { PerseusSorterRubric, PerseusSorterUserInput } from "../../validation.types";
+declare function sorterValidator(userInput: PerseusSorterUserInput, rubric: PerseusSorterRubric): PerseusScore;
+export default sorterValidator;

package/dist/widgets/sorter/sorter.d.ts

@@ -1,10 +1,10 @@
 import * as React from "react";
 import type { SortableOption } from "../../components/sortable";
 import type { PerseusSorterWidgetOptions } from "../../perseus-types";
-import type { WidgetProps } from "../../types";
+import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusSorterRubric, PerseusSorterUserInput } from "../../validation.types";
 type RenderProps = PerseusSorterWidgetOptions;
-type Rubric = PerseusSorterWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric>;
+type Props = WidgetProps<RenderProps, PerseusSorterRubric>;
 type DefaultProps = {
     correct: Props["correct"];
     layout: Props["layout"];
@@ -19,16 +19,14 @@ type State = {
 declare class Sorter extends React.Component<Props, State> {
     _isMounted: boolean;
     static defaultProps: DefaultProps;
-    static validate(state: any, rubric: any): any;
-    state: any;
+    static validate(userInput: PerseusSorterUserInput, rubric: PerseusSorterRubric): PerseusScore;
+    state: State;
     componentDidMount(): void;
     componentWillUnmount(): void;
     handleChange: (arg1: React.ChangeEvent<HTMLInputElement>) => void;
-    getUserInput: () => {
-        options: any;
-    };
+    getUserInput(): PerseusSorterUserInput;
     moveOptionToIndex: (option: SortableOption, index: number) => void;
-    simpleValidate: (arg1: any) => any;
+    simpleValidate(rubric: PerseusSorterRubric): PerseusScore;
     render(): React.ReactNode;
 }
 declare const _default: Readonly<{

package/dist/widgets/table/table.d.ts

@@ -3,13 +3,13 @@ import { PerseusI18nContext } from "../../components/i18n-context";
 import type { ChangeableProps } from "../../mixins/changeable";
 import type { PerseusTableWidgetOptions } from "../../perseus-types";
 import type { PerseusStrings } from "../../strings";
-import type { WidgetProps } from "../../types";
+import type { PerseusScore, WidgetProps } from "../../types";
+import type { PerseusTableRubric, PerseusTableUserInput } from "../../validation.types";
 type RenderProps = PerseusTableWidgetOptions & {
     editableHeaders: boolean;
     Editor: any;
 };
-type Rubric = PerseusTableWidgetOptions;
-type Props = ChangeableProps & WidgetProps<RenderProps, Rubric>;
+type Props = ChangeableProps & WidgetProps<RenderProps, PerseusTableRubric>;
 type DefaultProps = {
     apiOptions: Props["apiOptions"];
     headers: Props["headers"];
@@ -28,10 +28,10 @@ declare class Table extends React.Component<Props> {
     static defaultProps: DefaultProps;
     _getRows: () => number;
     _getColumns: () => number;
-    getUserInput: () => any;
+    getUserInput(): PerseusTableUserInput;
     onValueChange: (arg1: any, arg2: any, arg3: any) => void;
     onHeaderChange: (arg1: number, arg2: any) => void;
-    simpleValidate: (arg1: any) => any;
+    simpleValidate(rubric: PerseusTableWidgetOptions): PerseusScore;
     _handleFocus: (arg1: any) => void;
     _handleBlur: (arg1: any) => void;
     focus: () => boolean;

package/dist/widgets/video/video.d.ts

@@ -4,11 +4,10 @@
 import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusVideoWidgetOptions } from "../../perseus-types";
-import type { PerseusScore, WidgetProps } from "../../types";
-type UserInput = null;
-type Rubric = PerseusVideoWidgetOptions;
+import type { WidgetProps } from "../../types";
+import type { PerseusVideoRubric } from "../../validation.types";
 type RenderProps = PerseusVideoWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric> & {
+type Props = WidgetProps<RenderProps, PerseusVideoRubric> & {
     alignment: string;
 };
 /**
@@ -25,9 +24,9 @@ declare class Video extends React.Component<Props> {
      * Points for videos are tallied by the embedded video itself, in the case
      * of Khan Academy videos.
      */
-    static validate(userInput: UserInput, rubric: Rubric): PerseusScore;
+    static validate(): import("../../types").PerseusScore;
     getUserInput: () => undefined | null | undefined;
-    simpleValidate: (arg1: Rubric) => PerseusScore;
+    simpleValidate(): import("../../types").PerseusScore;
     change: (...args: ReadonlyArray<unknown>) => any;
     render(): React.ReactNode;
 }

package/package.json

@@ -3,7 +3,7 @@
     "description": "Core Perseus API (includes renderers and widgets)",
     "author": "Khan Academy",
     "license": "MIT",
-    "version": "34.0.0",
+    "version": "35.0.0",
     "publishConfig": {
         "access": "public"
     },

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

@@ -1,5 +0,0 @@
-import type { PerseusDropdownWidgetOptions } from "../../perseus-types";
-export type Rubric = PerseusDropdownWidgetOptions;
-export type UserInput = {
-    value: number;
-};

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

@@ -1,5 +0,0 @@
-import type { PerseusNumericInputWidgetOptions } from "../../perseus-types";
-export type UserInput = {
-    currentValue: string;
-};
-export type Rubric = PerseusNumericInputWidgetOptions;