Move validation types from perseus to perseus-score

packages/perseus-core/src/index.ts

@@ -3,6 +3,9 @@ export type {
     KEScore,
     KeypadContextRendererInterface,
     RendererInterface,
+    MarkerType,
+    InteractiveMarkerType,
+    Relationship,
 } from "./types";
 export type {ErrorKind} from "./error/errors";
 

packages/perseus-core/src/types.ts

@@ -27,3 +27,29 @@ export type KEScore = {
     guess: any;
     state: any;
 };
+
+// TODO: should these be part of data-schema?
+// Base marker, with the props that are set by the editor.
+export type MarkerType = {
+    // The list of correct answers expected for the marker.
+    answers: ReadonlyArray<string>;
+    // The marker title or description.
+    label: string;
+    // The marker coordinates on the question image as percent of image size.
+    x: number;
+    y: number;
+};
+
+// TODO: should these be part of data-schema?
+// Additional props that are set when user interacts with the marker.
+export type InteractiveMarkerType = MarkerType & {
+    // The user selected list of answers, used to grade the question.
+    selected?: ReadonlyArray<string>;
+    // Reveal the correctness state of the user selected answers for the marker.
+    showCorrectness?: "correct" | "incorrect";
+    focused?: boolean;
+};
+
+// TODO: should these be part of data-schema?
+// Used for NumberLine
+export type Relationship = "lt" | "gt" | "le" | "ge";

packages/perseus-editor/src/widgets/__stories__/label-image-editor.stories.tsx

@@ -4,7 +4,7 @@ import * as React from "react";
 
 import LabelImageEditor from "../label-image-editor";
 
-import type {MarkerType} from "@khanacademy/perseus";
+import type {MarkerType} from "@khanacademy/perseus-core";
 
 type StoryArgs = Record<any, any>;
 

packages/perseus-editor/src/widgets/label-image-editor.tsx

@@ -17,7 +17,7 @@ import Behavior from "./label-image/behavior";
 import QuestionMarkers from "./label-image/question-markers";
 import SelectImage from "./label-image/select-image";
 
-import type {MarkerType} from "@khanacademy/perseus";
+import type {MarkerType} from "@khanacademy/perseus-core";
 
 type Props = {
     // List of answer choices to label question image with.

packages/perseus-editor/src/widgets/label-image/__stories__/question-markers.stories.tsx

@@ -3,7 +3,7 @@ import * as React from "react";
 
 import QuestionMarkers from "../question-markers";
 
-import type {MarkerType} from "@khanacademy/perseus";
+import type {MarkerType} from "@khanacademy/perseus-core";
 
 type StoryArgs = Record<any, any>;
 

packages/perseus-editor/src/widgets/label-image/marker.tsx

@@ -14,7 +14,7 @@ import Option, {OptionGroup} from "../../components/dropdown-option";
 import FormWrappedTextField from "../../components/form-wrapped-text-field";
 import {gray17, gray85, gray98} from "../../styles/global-colors";
 
-import type {MarkerType} from "@khanacademy/perseus";
+import type {MarkerType} from "@khanacademy/perseus-core";
 
 type Props = MarkerType & {
     // The list of possible answer choices.

packages/perseus-editor/src/widgets/label-image/question-markers.tsx

@@ -11,7 +11,7 @@ import {gray17, gray68} from "../../styles/global-colors";
 
 import Marker from "./marker";
 
-import type {MarkerType} from "@khanacademy/perseus";
+import type {MarkerType} from "@khanacademy/perseus-core";
 
 type Props = {
     // The list of possible answers in a specific order.

packages/perseus-score/src/index.ts

@@ -1,3 +1,4 @@
 export {default as KhanAnswerTypes} from "./util/answer-types";
 export type {Score} from "./util/answer-types";
 export {default as ErrorCodes} from "./error-codes";
+export type * from "./validation.types";

packages/perseus/src/validation.types.ts → packages/perseus-score/src/validation.types.ts

@@ -28,8 +28,6 @@
  * ```
  */
 
-import type {InteractiveMarkerType} from "./widgets/label-image/types";
-import type {Relationship} from "./widgets/number-line/number-line";
 import type {
     GrapherAnswerTypes,
     PerseusDropdownChoice,
@@ -44,6 +42,8 @@ import type {
     PerseusOrdererWidgetOptions,
     PerseusRadioChoice,
     PerseusGraphCorrectType,
+    InteractiveMarkerType,
+    Relationship,
 } from "@khanacademy/perseus-core";
 
 export type UserInputStatus = "correct" | "incorrect" | "incomplete";

packages/perseus/src/__tests__/renderer-api.test.tsx

@@ -21,7 +21,7 @@ import mockWidget1Item from "./test-items/mock-widget-1-item";
 import mockWidget2Item from "./test-items/mock-widget-2-item";
 import tableItem from "./test-items/table-item";
 
-import type {PerseusMockWidgetUserInput} from "../validation.types";
+import type {PerseusMockWidgetUserInput} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 const itemWidget = mockWidget1Item;

packages/perseus/src/index.ts

@@ -197,10 +197,8 @@ export type {
 } from "./types";
 export type {ParsedValue} from "./util";
 export type {Result, Success, Failure} from "./util/parse-perseus-json/result";
-export type {UserInputMap} from "./validation.types";
 export type {Coord} from "./interactive2/types";
 export type {Coords} from "./widgets/grapher/grapher-types";
-export type {MarkerType} from "./widgets/label-image/types";
 export type {
     RendererPromptJSON,
     WidgetPromptJSON,

packages/perseus/src/renderer-util.test.ts

@@ -17,12 +17,12 @@ import {registerAllWidgetsForTesting} from "./util/register-all-widgets-for-test
 import {renderQuestion} from "./widgets/__testutils__/renderQuestion";
 import {question1} from "./widgets/group/group.testdata";
 
-import type {UserInputMap} from "./validation.types";
 import type {
     DropdownWidget,
     ExpressionWidget,
     PerseusWidgetsMap,
 } from "@khanacademy/perseus-core";
+import type {UserInputMap} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 function getTestDropdownWidget(): DropdownWidget {

packages/perseus/src/renderer-util.ts

@@ -6,11 +6,11 @@ import {getWidgetScorer, upgradeWidgetInfoToLatestVersion} from "./widgets";
 
 import type {PerseusStrings} from "./strings";
 import type {PerseusScore} from "./types";
-import type {UserInput, UserInputMap} from "./validation.types";
 import type {
     PerseusRenderer,
     PerseusWidgetsMap,
 } from "@khanacademy/perseus-core";
+import type {UserInput, UserInputMap} from "@khanacademy/perseus-score";
 
 export function getUpgradedWidgetOptions(
     oldWidgetOptions: PerseusWidgetsMap,

packages/perseus/src/renderer.tsx

@@ -48,7 +48,6 @@ import type {
     Widget,
     WidgetProps,
 } from "./types";
-import type {UserInputArray, UserInputMap} from "./validation.types";
 import type {
     GetPromptJSONInterface,
     RendererPromptJSON,
@@ -62,6 +61,7 @@ import type {
     ShowSolutions,
 } from "@khanacademy/perseus-core";
 import type {LinterContextProps} from "@khanacademy/perseus-linter";
+import type {UserInputArray, UserInputMap} from "@khanacademy/perseus-score";
 
 import "./styles/perseus-renderer.less";
 

packages/perseus/src/server-item-renderer.tsx

@@ -26,7 +26,6 @@ import type {
     PerseusDependenciesV2,
     SharedRendererProps,
 } from "./types";
-import type {UserInputArray, UserInputMap} from "./validation.types";
 import type {
     GetPromptJSONInterface,
     RendererPromptJSON,
@@ -39,6 +38,7 @@ import type {
     RendererInterface,
     KEScore,
 } from "@khanacademy/perseus-core";
+import type {UserInputArray, UserInputMap} from "@khanacademy/perseus-score";
 import type {PropsFor} from "@khanacademy/wonder-blocks-core";
 
 type OwnProps = {

packages/perseus/src/types.ts

@@ -1,12 +1,6 @@
 import type {ILogger} from "./logging/log";
 import type {PerseusStrings} from "./strings";
 import type {SizeClass} from "./util/sizing-utils";
-import type {
-    Rubric,
-    UserInput,
-    UserInputArray,
-    UserInputMap,
-} from "./validation.types";
 import type {WidgetPromptJSON} from "./widget-ai-utils/prompt-types";
 import type {KeypadAPI} from "@khanacademy/math-input";
 import type {
@@ -18,6 +12,12 @@ import type {
     AnalyticsEventHandlerFn,
 } from "@khanacademy/perseus-core";
 import type {LinterContextProps} from "@khanacademy/perseus-linter";
+import type {
+    Rubric,
+    UserInput,
+    UserInputArray,
+    UserInputMap,
+} from "@khanacademy/perseus-score";
 import type {Result} from "@khanacademy/wonder-blocks-data";
 import type * as React from "react";
 

packages/perseus/src/util/scoring.ts

@@ -1,8 +1,8 @@
 import {Errors, PerseusError} from "@khanacademy/perseus-core";
 
 import type {PerseusScore} from "../types";
-import type {UserInputArray} from "../validation.types";
 import type {KEScore} from "@khanacademy/perseus-core";
+import type {UserInputArray} from "@khanacademy/perseus-score";
 
 const noScore: PerseusScore = {
     type: "points",

packages/perseus/src/util/test-utils.ts

@@ -2,7 +2,6 @@ import {scorePerseusItem} from "../renderer-util";
 import {mockStrings} from "../strings";
 
 import type {PerseusScore} from "../types";
-import type {UserInputMap} from "../validation.types";
 import type {
     CategorizerWidget,
     ExpressionWidget,
@@ -12,6 +11,7 @@ import type {
     PerseusRenderer,
     RadioWidget,
 } from "@khanacademy/perseus-core";
+import type {UserInputMap} from "@khanacademy/perseus-score";
 
 export const genericPerseusItemData: PerseusItem = {
     question: {

packages/perseus/src/widget-ai-utils/categorizer/categorizer-ai-utils.test.ts

@@ -7,8 +7,8 @@ import {renderQuestion} from "../../widgets/__testutils__/renderQuestion";
 
 import {getPromptJSON} from "./categorizer-ai-utils";
 
-import type {PerseusCategorizerUserInput} from "../../validation.types";
 import type {PerseusRenderer} from "@khanacademy/perseus-core";
+import type {PerseusCategorizerUserInput} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 const randomizedQuestion: PerseusRenderer = {

packages/perseus/src/widget-ai-utils/categorizer/categorizer-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusCategorizerUserInput} from "../../validation.types";
 import type categorizer from "../../widgets/categorizer/categorizer";
+import type {PerseusCategorizerUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type CategorizerPromptJSON = {

packages/perseus/src/widget-ai-utils/dropdown/dropdown-ai-utils.test.ts

@@ -5,8 +5,8 @@ import {renderQuestion} from "../../widgets/__testutils__/renderQuestion";
 
 import {getPromptJSON} from "./dropdown-ai-utils";
 
-import type {PerseusDropdownUserInput} from "../../validation.types";
 import type {PerseusRenderer} from "@khanacademy/perseus-core";
+import type {PerseusDropdownUserInput} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 const question1: PerseusRenderer = {

packages/perseus/src/widget-ai-utils/dropdown/dropdown-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusDropdownUserInput} from "../../validation.types";
 import type dropdown from "../../widgets/dropdown/dropdown";
+import type {PerseusDropdownUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type DropdownPromptJSON = {

packages/perseus/src/widget-ai-utils/expression/expression-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusExpressionUserInput} from "../../validation.types";
 import type expression from "../../widgets/expression/expression";
+import type {PerseusExpressionUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type ExpressionPromptJSON = {

packages/perseus/src/widget-ai-utils/grapher/grapher-ai-utils.ts

@@ -1,6 +1,6 @@
-import type {PerseusGrapherUserInput} from "../../validation.types";
 import type grapher from "../../widgets/grapher/grapher";
 import type {GrapherAnswerTypes} from "@khanacademy/perseus-core";
+import type {PerseusGrapherUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type GrapherPromptJSON = {

packages/perseus/src/widget-ai-utils/input-number/input-number-ai-utils.test.ts

@@ -5,11 +5,11 @@ import {renderQuestion} from "../../widgets/__testutils__/renderQuestion";
 
 import {getPromptJSON} from "./input-number-ai-utils";
 
-import type {PerseusInputNumberUserInput} from "../../validation.types";
 import type {
     InputNumberWidget,
     PerseusRenderer,
 } from "@khanacademy/perseus-core";
+import type {PerseusInputNumberUserInput} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 const question: PerseusRenderer = {

packages/perseus/src/widget-ai-utils/input-number/input-number-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusInputNumberUserInput} from "../../validation.types";
 import type inputNumber from "../../widgets/input-number/input-number";
+import type {PerseusInputNumberUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type InputNumberPromptJSON = {

packages/perseus/src/widget-ai-utils/label-image/label-image-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusLabelImageUserInput} from "../../validation.types";
 import type labelImage from "../../widgets/label-image/label-image";
+import type {PerseusLabelImageUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 type BaseMarker = {

packages/perseus/src/widget-ai-utils/matcher/matcher-ai-utils.test.tsx

@@ -7,8 +7,8 @@ import {renderQuestion} from "../../widgets/__testutils__/renderQuestion";
 
 import {getPromptJSON} from "./matcher-ai-utils";
 
-import type {PerseusMatcherUserInput} from "../../validation.types";
 import type {PerseusRenderer} from "@khanacademy/perseus-core";
+import type {PerseusMatcherUserInput} from "@khanacademy/perseus-score";
 
 const question1: PerseusRenderer = {
     content:

packages/perseus/src/widget-ai-utils/matcher/matcher-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusMatcherUserInput} from "../../validation.types";
 import type matcher from "../../widgets/matcher/matcher";
+import type {PerseusMatcherUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type MatcherPromptJSON = {

packages/perseus/src/widget-ai-utils/matrix/matrix-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusMatrixUserInput} from "../../validation.types";
 import type matrix from "../../widgets/matrix/matrix";
+import type {PerseusMatrixUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type MatrixPromptJSON = {

packages/perseus/src/widget-ai-utils/mock-widget/prompt-utils.test.ts

@@ -1,6 +1,6 @@
 import {getPromptJSON} from "./prompt-utils";
 
-import type {PerseusMockWidgetUserInput} from "../../validation.types";
+import type {PerseusMockWidgetUserInput} from "@khanacademy/perseus-score";
 
 describe("InputNumber getPromptJSON", () => {
     it("it returns JSON with the expected format and fields", () => {

packages/perseus/src/widget-ai-utils/mock-widget/prompt-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusMockWidgetUserInput} from "../../validation.types";
 import type mockWidget from "../../widgets/mock-widgets/mock-widget";
+import type {PerseusMockWidgetUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type MockWidgetPromptJSON = {

packages/perseus/src/widget-ai-utils/number-line/number-line-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusNumberLineUserInput} from "../../validation.types";
 import type numberLine from "../../widgets/number-line/number-line";
+import type {PerseusNumberLineUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type NumberLinePromptJSON = {

packages/perseus/src/widget-ai-utils/numeric-input/prompt-utils.test.ts

@@ -1,6 +1,6 @@
 import {getPromptJSON} from "./prompt-utils";
 
-import type {PerseusNumericInputUserInput} from "../../validation.types";
+import type {PerseusNumericInputUserInput} from "@khanacademy/perseus-score";
 
 describe("NumericInput getPromptJSON", () => {
     it("it returns JSON with the expected format and fields", () => {

packages/perseus/src/widget-ai-utils/numeric-input/prompt-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusNumericInputUserInput} from "../../validation.types";
 import type numericInput from "../../widgets/numeric-input/numeric-input";
+import type {PerseusNumericInputUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type NumericInputPromptJSON = {

packages/perseus/src/widget-ai-utils/orderer/orderer-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusOrdererUserInput} from "../../validation.types";
 import type orderer from "../../widgets/orderer/orderer";
+import type {PerseusOrdererUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type OrdererPromptJSON = {

packages/perseus/src/widget-ai-utils/radio/radio-ai-utils.test.ts

@@ -7,8 +7,8 @@ import {renderQuestion} from "../../widgets/__testutils__/renderQuestion";
 
 import {getPromptJSON} from "./radio-ai-utils";
 
-import type {PerseusRadioUserInput} from "../../validation.types";
 import type {PerseusRenderer, RadioWidget} from "@khanacademy/perseus-core";
+import type {PerseusRadioUserInput} from "@khanacademy/perseus-score";
 import type {UserEvent} from "@testing-library/user-event";
 
 const shuffledQuestion: PerseusRenderer = {

packages/perseus/src/widget-ai-utils/radio/radio-ai-utils.ts

@@ -1,5 +1,5 @@
-import type {PerseusRadioUserInput} from "../../validation.types";
 import type radio from "../../widgets/radio/radio";
+import type {PerseusRadioUserInput} from "@khanacademy/perseus-score";
 import type React from "react";
 
 export type BasicOption = {