@khanacademy/perseus 34.1.0 → 35.1.1

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

@@ -5,14 +5,13 @@ import type { SerializedHighlightSet } from "../../components/highlighting/types
 import type { ChangeableProps } from "../../mixins/changeable";
 import type { PerseusPassageWidgetOptions, PerseusWidget } from "../../perseus-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;
 };
@@ -94,7 +93,7 @@ export declare class Passage extends React.Component<PassageProps, PassageState>
      *
      * These are misc widget functions used for the widget API
      */
-    getUserInput(): UserInput;
+    getUserInput(): PerseusPassageUserInput;
     simpleValidate(): import("../../types").PerseusScore;
     /**
      * Rendering

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

@@ -2,21 +2,13 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusPassageRefWidgetOptions } from "../../perseus-types";
 import type { ChangeFn, 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 { 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"];
@@ -42,7 +34,7 @@ declare class PassageRef extends React.Component<Props, State> {
     shouldComponentUpdate(nextProps: Props, nextState: State): boolean;
     componentDidUpdate(): void;
     componentWillUnmount(): void;
-    getUserInput: () => UserInput;
+    getUserInput(): PerseusPassageRefUserInput;
     change: ChangeFn;
     _deferredUpdateRange: () => void;
     _updateRange: () => void;

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;
@@ -21,7 +22,7 @@ declare class PassageRefTarget extends React.Component<Props> {
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
     static validate(): import("../../types").PerseusScore;
-    getUserInput: () => any;
+    getUserInput(): PerseusPassageRefTargetUserInput;
     change: (arg1: any, arg2: any, arg3: any) => any;
     simpleValidate(): import("../../types").PerseusScore;
     render(): React.ReactNode;

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>;

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

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

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"]>;
 };
@@ -38,6 +38,7 @@ export declare class Plotter extends React.Component<Props, State> {
     graphie: any;
     static defaultProps: DefaultProps;
     state: State;
+    static validate(userInput: PerseusPlotterUserInput, rubric: PerseusPlotterRubric): PerseusScore;
     componentDidMount(): void;
     UNSAFE_componentWillReceiveProps(nextProps: Props): void;
     componentDidUpdate(prevProps: Props, prevState: State): void;
@@ -67,8 +68,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-validator.d.ts

@@ -0,0 +1,5 @@
+import type { PerseusStrings } from "../../strings";
+import type { PerseusScore } from "../../types";
+import type { PerseusTableRubric, PerseusTableUserInput } from "../../validation.types";
+declare function tableValidator(state: PerseusTableUserInput, rubric: PerseusTableRubric, strings: PerseusStrings): PerseusScore;
+export default tableValidator;

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"];
@@ -26,12 +26,13 @@ declare class Table extends React.Component<Props> {
     }>;
     context: React.ContextType<typeof PerseusI18nContext>;
     static defaultProps: DefaultProps;
+    static validate(state: PerseusTableUserInput, rubric: PerseusTableRubric, strings: PerseusStrings): PerseusScore;
     _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

@@ -5,9 +5,9 @@ import * as React from "react";
 import { PerseusI18nContext } from "../../components/i18n-context";
 import type { PerseusVideoWidgetOptions } from "../../perseus-types";
 import type { WidgetProps } from "../../types";
-type Rubric = PerseusVideoWidgetOptions;
+import type { PerseusVideoRubric } from "../../validation.types";
 type RenderProps = PerseusVideoWidgetOptions;
-type Props = WidgetProps<RenderProps, Rubric> & {
+type Props = WidgetProps<RenderProps, PerseusVideoRubric> & {
     alignment: string;
 };
 /**

package/package.json

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

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

@@ -1,5 +0,0 @@
-import type { PerseusCategorizerWidgetOptions } from "../../perseus-types";
-export type UserInput = {
-    values: ReadonlyArray<number>;
-};
-export type Rubric = PerseusCategorizerWidgetOptions;

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/input-number/input-number.types.d.ts

@@ -1,2 +0,0 @@
-import type { PerseusInputNumberWidgetOptions } from "@khanacademy/perseus";
-export type Rubric = PerseusInputNumberWidgetOptions;

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;