Reorder parsers for cleaner PR diff

Khan · Nov 23, 2024 · 527be33 · 527be33
1 parent 1c25052
commit 527be33
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/packages/perseus/src/util/parse-perseus-json/perseus-parsers/expression-widget.ts b/packages/perseus/src/util/parse-perseus-json/perseus-parsers/expression-widget.ts
@@ -36,17 +36,14 @@ const parseAnswerForm: Parser<PerseusExpressionAnswerForm> = object({
     ).parser,
 });
 
-const parseExpressionWidgetV0 = parseWidgetWithVersion(
-    optional(object({major: constant(0), minor: number})),
+const parseExpressionWidgetLatest: Parser<ExpressionWidget> = parseWidget(
     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",
@@ -59,17 +56,20 @@ const parseExpressionWidgetV0 = parseWidgetWithVersion(
             ),
         ),
         buttonsVisible: optional(enumeration("always", "never", "focused")),
-    })
+    }),
 );
 
-const parseExpressionWidgetLatest: Parser<ExpressionWidget> = parseWidget(
+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",
@@ -82,8 +82,8 @@ const parseExpressionWidgetLatest: Parser<ExpressionWidget> = parseWidget(
             ),
         ),
         buttonsVisible: optional(enumeration("always", "never", "focused")),
-    })
-)
+    }),
+);
 
 function migrateV0ToLatest(widget: ParsedValue<typeof parseExpressionWidgetV0>, ctx: ParseContext): ParseResult<ExpressionWidget> {
     const {options} = widget;