@mathscan/math-exercise-engine 1.0.9 → 1.0.11

package/dist/index.mjs

@@ -437,13 +437,16 @@ class MathExerciseParser extends CstParser {
       this.OPTION(() => {
         this.SUBRULE(this.question);
       });
-      this.MANY2(() => {
-        this.SUBRULE(this.contentBlock);
+      this.MANY2({
+        GATE: this.BACKTRACK(this.contentBlock),
+        DEF: () => this.SUBRULE(this.contentBlock)
       });
       this.MANY3(() => {
         this.SUBRULE(this.tool);
       });
-      this.SUBRULE(this.validation);
+      this.OPTION2(() => {
+        this.SUBRULE(this.validation);
+      });
       this.MANY4(() => {
         this.OR2([
           { ALT: () => this.CONSUME2(Newline) },
@@ -664,7 +667,7 @@ class MathExerciseParser extends CstParser {
       this.MANY2(() => {
         this.CONSUME2(Space);
       });
-      this.AT_LEAST_ONE2(() => {
+      this.MANY3(() => {
         this.CONSUME(Newline);
       });
     });
@@ -1201,7 +1204,7 @@ const ExerciseDocumentSchema = z.object({
   question: TextBlockSchema.optional(),
   lines: z.array(ContentBlockSchema),
   tools: z.array(ToolNodeSchema).optional(),
-  validation: ValidationNodeSchema
+  validation: ValidationNodeSchema.optional()
 });
 function createExerciseDocument(question, lines, validation, tools) {
   return ExerciseDocumentSchema.parse({
@@ -1228,7 +1231,7 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     const question = ctx.question ? this.visit(ctx.question) : void 0;
     const contentBlocks = ctx.contentBlock ? ctx.contentBlock.map((cb) => this.visit(cb)) : [];
     const tools = ctx.tool ? ctx.tool.map((t) => this.visit(t)) : [];
-    const validation = this.visit(ctx.validation);
+    const validation = ctx.validation ? this.visit(ctx.validation) : void 0;
     return createExerciseDocument(question, contentBlocks, validation, tools);
   }
   // ═══════════════════════════════════════════════════════════════════════════
@@ -1693,7 +1696,7 @@ const ExerciseJSONSchema = z.object({
   id: z.string().optional(),
   layout: z.array(LayoutItemSchema),
   widgets: z.record(WidgetJSONSchema),
-  validation: ValidationJSONSchema,
+  validation: ValidationJSONSchema.optional(),
   meta: ExerciseMetaSchema.optional()
 });
 function validateExerciseJSON(data) {
@@ -1850,13 +1853,12 @@ function toJSON(ast) {
       }
     }
   }
-  const validation = transformValidation(ast.validation, answers, widgets);
   return {
     version: "2.0",
     // Natural DSL version
     layout,
     widgets,
-    validation
+    ...ast.validation ? { validation: transformValidation(ast.validation, answers, widgets) } : {}
   };
 }
 function collectAllInlines(blocks) {
@@ -2327,11 +2329,18 @@ function findValidCombination(expression, ranges) {
   return null;
 }
 function validate(exercise, userInputs) {
-  switch (exercise.validation.mode) {
+  if (!exercise.validation) {
+    return {
+      isCorrect: true,
+      details: {}
+    };
+  }
+  const validatedExercise = exercise;
+  switch (validatedExercise.validation.mode) {
     case VALIDATION_MODES.SIMPLE:
-      return validateSimple(exercise, userInputs);
+      return validateSimple(validatedExercise, userInputs);
     case VALIDATION_MODES.EXPRESSION:
-      return validateExpression(exercise, userInputs);
+      return validateExpression(validatedExercise, userInputs);
     default:
       return {
         isCorrect: false,
@@ -2342,6 +2351,9 @@ function validate(exercise, userInputs) {
 }
 function getMissingInputs(exercise, userInputs) {
   const missing = [];
+  if (!exercise.validation) {
+    return missing;
+  }
   if (exercise.validation.mode === VALIDATION_MODES.SIMPLE && exercise.validation.answers) {
     for (const widgetId of Object.keys(exercise.validation.answers)) {
       if (!(widgetId in userInputs) || userInputs[widgetId] === "") {