Migrate expression widget to latest version in PerseusItem parser

.changeset/yellow-ducks-march.md

@@ -0,0 +1,5 @@
+---
+"@khanacademy/perseus": patch
+---
+
+Internal: Migrate expression widget options to the latest version in parseAndTypecheckPerseusItem (not yet used in production).

packages/perseus/src/util/parse-perseus-json/perseus-parsers/expression-widget.test.ts

@@ -0,0 +1,76 @@
+import {parse} from "../parse";
+import {failure, success} from "../result";
+
+import {parseExpressionWidget} from "./expression-widget";
+
+describe("parseExpressionWidget", () => {
+    it("migrates v0 options to v1", () => {
+        const widget = {
+            type: "expression",
+            graded: true,
+            options: {
+                value: "the value",
+                form: false,
+                simplify: false,
+                times: false,
+                buttonsVisible: "never",
+                buttonSets: ["basic"],
+                functions: ["f", "g", "h"],
+            },
+            version: {
+                major: 0,
+                minor: 1,
+            },
+        };
+
+        expect(parse(widget, parseExpressionWidget)).toEqual(
+            success({
+                type: "expression",
+                graded: true,
+                static: undefined,
+                key: undefined,
+                alignment: undefined,
+                options: {
+                    times: false,
+                    ariaLabel: undefined,
+                    visibleLabel: undefined,
+                    buttonsVisible: "never",
+                    buttonSets: ["basic"],
+                    functions: ["f", "g", "h"],
+                    answerForms: [
+                        {
+                            considered: "correct",
+                            form: false,
+                            simplify: false,
+                            value: "the value",
+                        },
+                    ],
+                },
+                version: {
+                    major: 1,
+                    minor: 0,
+                },
+            }),
+        );
+    });
+
+    it("rejects a widget with unrecognized version", () => {
+        const widget = {
+            type: "expression",
+            version: {
+                major: -1,
+                minor: 0,
+            },
+            graded: true,
+            options: {},
+        };
+
+        expect(parse(widget, parseExpressionWidget)).toEqual(
+            failure(
+                expect.stringContaining(
+                    "At (root).version.major -- expected 0, but got -1",
+                ),
+            ),
+        );
+    });
+});

packages/perseus/src/util/parse-perseus-json/perseus-parsers/expression-widget.ts

@@ -1,3 +1,4 @@
+import ExpressionWidgetModule from "../../../widgets/expression/expression";
 import {
     array,
     boolean,
@@ -11,13 +12,18 @@ import {
     union,
 } from "../general-purpose-parsers";
 
-import {parseWidget} from "./widget";
+import {parseWidgetWithVersion} from "./widget";
 
 import type {
     ExpressionWidget,
     PerseusExpressionAnswerForm,
 } from "../../../perseus-types";
-import type {Parser} from "../parser-types";
+import type {
+    ParseContext,
+    ParsedValue,
+    Parser,
+    ParseResult,
+} from "../parser-types";
 
 const parseAnswerForm: Parser<PerseusExpressionAnswerForm> = object({
     value: string,
@@ -29,14 +35,42 @@ const parseAnswerForm: Parser<PerseusExpressionAnswerForm> = object({
     ).parser,
 });
 
-export const parseExpressionWidget: Parser<ExpressionWidget> = parseWidget(
+const parseExpressionWidgetV1: Parser<ExpressionWidget> =
+    parseWidgetWithVersion(
+        object({major: constant(1), minor: number}),
+        constant("expression"),
+        object({
+            answerForms: array(parseAnswerForm),
+            functions: array(string),
+            times: boolean,
+            visibleLabel: optional(string),
+            ariaLabel: optional(string),
+            buttonSets: array(
+                enumeration(
+                    "basic",
+                    "basic+div",
+                    "trig",
+                    "prealgebra",
+                    "logarithms",
+                    "basic relations",
+                    "advanced relations",
+                ),
+            ),
+            buttonsVisible: optional(enumeration("always", "never", "focused")),
+        }),
+    );
+
+const parseExpressionWidgetV0 = parseWidgetWithVersion(
+    optional(object({major: constant(0), minor: number})),
     constant("expression"),
     object({
-        answerForms: array(parseAnswerForm),
         functions: array(string),
         times: boolean,
         visibleLabel: optional(string),
         ariaLabel: optional(string),
+        form: boolean,
+        simplify: boolean,
+        value: string,
         buttonSets: array(
             enumeration(
                 "basic",
@@ -51,3 +85,35 @@ export const parseExpressionWidget: Parser<ExpressionWidget> = parseWidget(
         buttonsVisible: optional(enumeration("always", "never", "focused")),
     }),
 );
+
+function migrateV0ToV1(
+    widget: ParsedValue<typeof parseExpressionWidgetV0>,
+    ctx: ParseContext,
+): ParseResult<ExpressionWidget> {
+    const {options} = widget;
+    return ctx.success({
+        ...widget,
+        version: ExpressionWidgetModule.version,
+        options: {
+            times: options.times,
+            buttonSets: options.buttonSets,
+            functions: options.functions,
+            buttonsVisible: options.buttonsVisible,
+            visibleLabel: options.visibleLabel,
+            ariaLabel: options.ariaLabel,
+
+            answerForms: [
+                {
+                    considered: "correct",
+                    form: options.form,
+                    simplify: options.simplify,
+                    value: options.value,
+                },
+            ],
+        },
+    });
+}
+
+export const parseExpressionWidget: Parser<ExpressionWidget> = union(
+    parseExpressionWidgetV1,
+).or(pipeParsers(parseExpressionWidgetV0).then(migrateV0ToV1).parser).parser;

packages/perseus/src/util/parse-perseus-json/perseus-parsers/widget.ts

@@ -28,3 +28,23 @@ export function parseWidget<Type extends string, Options>(
         ),
     });
 }
+
+export function parseWidgetWithVersion<
+    Version extends {major: number; minor: number} | undefined,
+    Type extends string,
+    Options,
+>(
+    parseVersion: Parser<Version>,
+    parseType: Parser<Type>,
+    parseOptions: Parser<Options>,
+): Parser<WidgetOptions<Type, Options>> {
+    return object({
+        type: parseType,
+        static: optional(boolean),
+        graded: optional(boolean),
+        alignment: optional(string),
+        options: parseOptions,
+        key: optional(number),
+        version: parseVersion,
+    });
+}

packages/perseus/src/util/parse-perseus-json/perseus-parsers/widgets-map.test.ts

@@ -134,7 +134,7 @@ describe("parseWidgetsMap", () => {
         const widgetsMap: unknown = {
             "expression 1": {
                 type: "expression",
-                version: {major: 0, minor: 0},
+                version: {major: 1, minor: 0},
                 options: {
                     answerForms: [],
                     buttonSets: [],