@mathscan/math-exercise-engine 1.0.5 → 1.0.7

package/dist/index.js

@@ -29,6 +29,12 @@ const AST_TYPES = {
   TEXT_BLOCK: "TextBlock",
   /** Line containing inline elements */
   LINE_BLOCK: "LineBlock",
+  /** Table layout block */
+  TABLE_BLOCK: "TableBlock",
+  /** Row within a table */
+  TABLE_ROW: "TableRow",
+  /** Cell within a table row */
+  TABLE_CELL: "TableCell",
   // ═══════════════════════════════════════════════════════════════════════════
   // Tools
   // ═══════════════════════════════════════════════════════════════════════════
@@ -73,6 +79,12 @@ const JSON_TYPES = {
   GROUP: "group",
   /** Operator symbol */
   OPERATOR: "operator",
+  /** Table layout block */
+  TABLE: "table",
+  /** Row within a table */
+  TABLE_ROW: "table-row",
+  /** Cell within a table */
+  TABLE_CELL: "table-cell",
   // ═══════════════════════════════════════════════════════════════════════════
   // Widget Types
   // ═══════════════════════════════════════════════════════════════════════════
@@ -164,6 +176,18 @@ const NUMERIC_INPUT = chevrotain.createToken({
   name: "NUMERIC_INPUT",
   pattern: /NUMERIC_INPUT/
 });
+const TABLE = chevrotain.createToken({
+  name: "TABLE",
+  pattern: /TABLE/
+});
+const ROW = chevrotain.createToken({
+  name: "ROW",
+  pattern: /ROW/
+});
+const CELL = chevrotain.createToken({
+  name: "CELL",
+  pattern: /CELL/
+});
 const NumberLiteral = chevrotain.createToken({
   name: "NumberLiteral",
   pattern: /-?\d+(\.\d+)?/
@@ -231,9 +255,17 @@ const Comma = chevrotain.createToken({
   name: "Comma",
   pattern: /,/
 });
+const LBrace = chevrotain.createToken({
+  name: "LBrace",
+  pattern: /\{/
+});
+const RBrace = chevrotain.createToken({
+  name: "RBrace",
+  pattern: /\}/
+});
 const FreeText = chevrotain.createToken({
   name: "FreeText",
-  pattern: /(?:[^A-Z\n\r \t+\-−×*÷/=<>?()\[\],]|(?![A-Z_]+\[)[A-Z])+/,
+  pattern: /(?:[^A-Z\n\r \t+\-−×*÷/=<>?()\[\],{}]|(?![A-Z_]+[\[{])[A-Z])+/,
   line_breaks: false
 });
 const allTokens = [
@@ -257,6 +289,9 @@ const allTokens = [
   WIDGET_ANSWER,
   W_N_I,
   NUMERIC_INPUT,
+  TABLE,
+  ROW,
+  CELL,
   // Literals
   NumberLiteral,
   StringLiteral,
@@ -277,6 +312,8 @@ const allTokens = [
   LBracket,
   RBracket,
   Comma,
+  LBrace,
+  RBrace,
   // FreeText - LAST (fallback for natural text)
   FreeText
 ];
@@ -371,7 +408,7 @@ class MathExerciseParser extends chevrotain.CstParser {
         this.SUBRULE(this.question);
       });
       this.MANY2(() => {
-        this.SUBRULE(this.line);
+        this.SUBRULE(this.contentBlock);
       });
       this.MANY3(() => {
         this.SUBRULE(this.tool);
@@ -396,6 +433,116 @@ class MathExerciseParser extends chevrotain.CstParser {
         ]);
       });
     });
+    this.contentBlock = this.RULE("contentBlock", () => {
+      this.OR([
+        {
+          GATE: this.BACKTRACK(this.table),
+          ALT: () => this.SUBRULE(this.table)
+        },
+        { ALT: () => this.SUBRULE(this.line) }
+      ]);
+    });
+    this.table = this.RULE("table", () => {
+      this.MANY(() => {
+        this.OR2([
+          { ALT: () => this.CONSUME(Space) },
+          { ALT: () => this.CONSUME(Newline) }
+        ]);
+      });
+      this.CONSUME(TABLE);
+      this.CONSUME(LBracket);
+      this.SUBRULE(this.parameterList);
+      this.CONSUME(RBracket);
+      this.MANY2(() => {
+        this.OR3([
+          { ALT: () => this.CONSUME2(Space) },
+          { ALT: () => this.CONSUME2(Newline) }
+        ]);
+      });
+      this.CONSUME(LBrace);
+      this.MANY3(() => {
+        this.OR4([
+          { ALT: () => this.CONSUME3(Space) },
+          { ALT: () => this.CONSUME3(Newline) }
+        ]);
+      });
+      this.AT_LEAST_ONE(() => {
+        this.SUBRULE(this.row);
+      });
+      this.CONSUME(RBrace);
+      this.MANY4(() => {
+        this.OR5([
+          { ALT: () => this.CONSUME4(Newline) },
+          { ALT: () => this.CONSUME4(Space) }
+        ]);
+      });
+    });
+    this.row = this.RULE("row", () => {
+      this.MANY(() => {
+        this.OR([
+          { ALT: () => this.CONSUME(Space) },
+          { ALT: () => this.CONSUME(Newline) }
+        ]);
+      });
+      this.CONSUME(ROW);
+      this.MANY2(() => {
+        this.OR2([
+          { ALT: () => this.CONSUME2(Space) },
+          { ALT: () => this.CONSUME2(Newline) }
+        ]);
+      });
+      this.CONSUME(LBrace);
+      this.MANY3(() => {
+        this.OR3([
+          { ALT: () => this.CONSUME3(Space) },
+          { ALT: () => this.CONSUME3(Newline) }
+        ]);
+      });
+      this.AT_LEAST_ONE(() => {
+        this.SUBRULE(this.cell);
+      });
+      this.CONSUME(RBrace);
+      this.MANY4(() => {
+        this.OR4([
+          { ALT: () => this.CONSUME4(Space) },
+          { ALT: () => this.CONSUME4(Newline) }
+        ]);
+      });
+    });
+    this.cell = this.RULE("cell", () => {
+      this.MANY(() => {
+        this.OR([
+          { ALT: () => this.CONSUME(Space) },
+          { ALT: () => this.CONSUME(Newline) }
+        ]);
+      });
+      this.CONSUME(CELL);
+      this.OPTION(() => {
+        this.CONSUME(LBracket);
+        this.SUBRULE(this.parameterList);
+        this.CONSUME(RBracket);
+      });
+      this.MANY2(() => {
+        this.OR2([
+          { ALT: () => this.CONSUME2(Space) },
+          { ALT: () => this.CONSUME2(Newline) }
+        ]);
+      });
+      this.CONSUME(LBrace);
+      this.MANY3(() => {
+        this.OR3([
+          { ALT: () => this.SUBRULE(this.inlineElement) },
+          { ALT: () => this.CONSUME3(Newline) }
+        ]);
+      });
+      this.CONSUME(RBrace);
+      this.MANY4(() => {
+        this.OR4([
+          { ALT: () => this.CONSUME4(Space) },
+          { ALT: () => this.CONSUME4(Newline) }
+        ]);
+      });
+    });
     this.line = this.RULE("line", () => {
       this.MANY(() => {
         this.CONSUME(Space);
@@ -733,6 +880,40 @@ function isTextBlock(value) {
 function isLineBlock(value) {
   return LineBlockSchema.safeParse(value).success;
 }
+const TableCellSchema = zod.z.object({
+  type: zod.z.literal(AST_TYPES.TABLE_CELL),
+  colspan: zod.z.number().int().positive().optional(),
+  inlines: zod.z.array(InlineNodeSchema)
+});
+function createTableCell(inlines, colspan) {
+  return TableCellSchema.parse({
+    type: AST_TYPES.TABLE_CELL,
+    colspan,
+    inlines
+  });
+}
+const TableRowSchema = zod.z.object({
+  type: zod.z.literal(AST_TYPES.TABLE_ROW),
+  cells: zod.z.array(TableCellSchema).min(1)
+});
+function createTableRow(cells) {
+  return TableRowSchema.parse({
+    type: AST_TYPES.TABLE_ROW,
+    cells
+  });
+}
+const TableBlockSchema = zod.z.object({
+  type: zod.z.literal(AST_TYPES.TABLE_BLOCK),
+  cols: zod.z.number().int().positive(),
+  rows: zod.z.array(TableRowSchema).min(1)
+});
+function createTableBlock(cols, rows) {
+  return TableBlockSchema.parse({
+    type: AST_TYPES.TABLE_BLOCK,
+    cols,
+    rows
+  });
+}
 const DragOptionsToolSchema = zod.z.object({
   type: zod.z.literal(AST_TYPES.DRAG_OPTIONS),
   options: zod.z.array(zod.z.string()).min(1)
@@ -799,10 +980,11 @@ function isExpressionValidation(value) {
 function isValidationNode(value) {
   return ValidationNodeSchema.safeParse(value).success;
 }
+const ContentBlockSchema = zod.z.union([LineBlockSchema, TableBlockSchema]);
 const ExerciseDocumentSchema = zod.z.object({
   type: zod.z.literal(AST_TYPES.EXERCISE_DOCUMENT),
   question: TextBlockSchema.optional(),
-  lines: zod.z.array(LineBlockSchema),
+  lines: zod.z.array(ContentBlockSchema),
   tools: zod.z.array(ToolNodeSchema).optional(),
   validation: ValidationNodeSchema
 });
@@ -829,10 +1011,10 @@ class NaturalDSLVisitor extends BaseCstVisitor {
   // ═══════════════════════════════════════════════════════════════════════════
   exerciseDocument(ctx) {
     const question = ctx.question ? this.visit(ctx.question) : void 0;
-    const lines = ctx.line ? ctx.line.map((l) => this.visit(l)) : [];
+    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);
-    return createExerciseDocument(question, lines, validation, tools);
+    return createExerciseDocument(question, contentBlocks, validation, tools);
   }
   // ═══════════════════════════════════════════════════════════════════════════
   // Question Block
@@ -843,6 +1025,33 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     return createTextBlock(value);
   }
   // ═══════════════════════════════════════════════════════════════════════════
+  // Content Block
+  // ═══════════════════════════════════════════════════════════════════════════
+  contentBlock(ctx) {
+    if (ctx.table) return this.visit(ctx.table);
+    if (ctx.line) return this.visit(ctx.line);
+    throw new Error("Unknown content block");
+  }
+  // ═══════════════════════════════════════════════════════════════════════════
+  // Table Block
+  // ═══════════════════════════════════════════════════════════════════════════
+  table(ctx) {
+    const params = this.visit(ctx.parameterList);
+    const cols = params.cols;
+    const rows = ctx.row.map((r) => this.visit(r));
+    return createTableBlock(cols, rows);
+  }
+  row(ctx) {
+    const cells = ctx.cell.map((c) => this.visit(c));
+    return createTableRow(cells);
+  }
+  cell(ctx) {
+    const params = ctx.parameterList ? this.visit(ctx.parameterList) : {};
+    const colspan = params.colspan;
+    const inlines = ctx.inlineElement ? ctx.inlineElement.map((elem) => this.visit(elem)) : [];
+    return createTableCell(inlines, colspan);
+  }
+  // ═══════════════════════════════════════════════════════════════════════════
   // Line Block
   // ═══════════════════════════════════════════════════════════════════════════
   line(ctx) {
@@ -1114,6 +1323,10 @@ const BoldTextSchema = zod.z.object({
   value: zod.z.string(),
   highlight: zod.z.tuple([zod.z.number(), zod.z.number()]).optional()
 });
+const SpaceItemSchema = zod.z.object({
+  id: zod.z.string(),
+  type: zod.z.literal(JSON_TYPES.SPACE)
+});
 const LinebreakSchema = zod.z.object({
   id: zod.z.string(),
   type: zod.z.literal(JSON_TYPES.LINEBREAK)
@@ -1132,9 +1345,11 @@ const LayoutItemSchema = zod.z.lazy(
     HighlightedTextSchema,
     ColorTextSchema,
     BoldTextSchema,
+    SpaceItemSchema,
     LinebreakSchema,
     GroupItemSchema,
-    OperatorItemSchema
+    OperatorItemSchema,
+    TableItemSchema
   ])
 );
 const GroupItemSchema = zod.z.object({
@@ -1142,6 +1357,23 @@ const GroupItemSchema = zod.z.object({
   type: zod.z.literal(JSON_TYPES.GROUP),
   items: zod.z.array(LayoutItemSchema)
 });
+const TableCellItemSchema = zod.z.object({
+  id: zod.z.string(),
+  type: zod.z.literal(JSON_TYPES.TABLE_CELL),
+  colspan: zod.z.number().int().positive().optional(),
+  items: zod.z.array(LayoutItemSchema)
+});
+const TableRowItemSchema = zod.z.object({
+  id: zod.z.string(),
+  type: zod.z.literal(JSON_TYPES.TABLE_ROW),
+  cells: zod.z.array(TableCellItemSchema)
+});
+const TableItemSchema = zod.z.object({
+  id: zod.z.string(),
+  type: zod.z.literal(JSON_TYPES.TABLE),
+  cols: zod.z.number().int().positive(),
+  rows: zod.z.array(TableRowItemSchema)
+});
 const StringInputJSONSchema = zod.z.object({
   type: zod.z.literal(JSON_TYPES.INLINE_INPUT),
   inputType: zod.z.literal(INPUT_TYPES.STRING),
@@ -1220,6 +1452,9 @@ function isColorText(item) {
 function isBoldText(item) {
   return item.type === JSON_TYPES.BOLD_TEXT;
 }
+function isSpaceItem(item) {
+  return item.type === JSON_TYPES.SPACE;
+}
 function isLinebreak(item) {
   return item.type === JSON_TYPES.LINEBREAK;
 }
@@ -1229,6 +1464,15 @@ function isGroupItem(item) {
 function isOperatorItem(item) {
   return item.type === JSON_TYPES.OPERATOR;
 }
+function isTableItem(item) {
+  return item.type === JSON_TYPES.TABLE;
+}
+function isTableRowItem(item) {
+  return item.type === JSON_TYPES.TABLE_ROW;
+}
+function isTableCellItem(item) {
+  return item.type === JSON_TYPES.TABLE_CELL;
+}
 function isInlineInputJSON(widget) {
   return widget.type === JSON_TYPES.INLINE_INPUT;
 }
@@ -1259,31 +1503,34 @@ function toJSON(ast) {
       value: ast.question.value
     });
   }
-  for (const line of ast.lines) {
-    const lineItems = transformLine(line, idGenerator);
-    layout.push(...lineItems);
+  for (const block of ast.lines) {
+    if (block.type === AST_TYPES.TABLE_BLOCK) {
+      layout.push(transformTable(block, idGenerator));
+    } else {
+      const lineItems = transformLine(block, idGenerator);
+      layout.push(...lineItems);
+    }
   }
   const widgets = {};
   const answers = {};
-  for (const line of ast.lines) {
-    for (const inline of line.inlines) {
-      if (inline.type === AST_TYPES.INLINE_INPUT) {
-        if (inline.inputType === INPUT_TYPES.STRING) {
-          widgets[inline.name] = {
-            type: JSON_TYPES.INLINE_INPUT,
-            inputType: INPUT_TYPES.STRING,
-            length: inline.length
-          };
-        } else {
-          widgets[inline.name] = {
-            type: JSON_TYPES.INLINE_INPUT,
-            inputType: INPUT_TYPES.NUMERIC,
-            digits: inline.digits
-          };
-        }
-        if (inline.answer !== void 0) {
-          answers[inline.name] = inline.answer;
-        }
+  const allInlines = collectAllInlines(ast.lines);
+  for (const inline of allInlines) {
+    if (inline.type === AST_TYPES.INLINE_INPUT) {
+      if (inline.inputType === INPUT_TYPES.STRING) {
+        widgets[inline.name] = {
+          type: JSON_TYPES.INLINE_INPUT,
+          inputType: INPUT_TYPES.STRING,
+          length: inline.length
+        };
+      } else {
+        widgets[inline.name] = {
+          type: JSON_TYPES.INLINE_INPUT,
+          inputType: INPUT_TYPES.NUMERIC,
+          digits: inline.digits
+        };
+      }
+      if (inline.answer !== void 0) {
+        answers[inline.name] = inline.answer;
       }
     }
   }
@@ -1312,6 +1559,48 @@ function toJSON(ast) {
     validation
   };
 }
+function collectAllInlines(blocks) {
+  const result = [];
+  for (const block of blocks) {
+    if (block.type === AST_TYPES.LINE_BLOCK) {
+      result.push(...block.inlines);
+    } else if (block.type === AST_TYPES.TABLE_BLOCK) {
+      for (const row of block.rows) {
+        for (const cell of row.cells) {
+          result.push(...cell.inlines);
+        }
+      }
+    }
+  }
+  return result;
+}
+function transformTable(table, idGenerator) {
+  const rows = table.rows.map((row) => {
+    const cells = row.cells.map((cell) => {
+      const items = cell.inlines.map((inline) => transformInline(inline, idGenerator));
+      const cellItem = {
+        id: idGenerator.generate(JSON_TYPES.TABLE_CELL),
+        type: JSON_TYPES.TABLE_CELL,
+        items
+      };
+      if (cell.colspan !== void 0) {
+        cellItem.colspan = cell.colspan;
+      }
+      return cellItem;
+    });
+    return {
+      id: idGenerator.generate(JSON_TYPES.TABLE_ROW),
+      type: JSON_TYPES.TABLE_ROW,
+      cells
+    };
+  });
+  return {
+    id: idGenerator.generate(JSON_TYPES.TABLE),
+    type: JSON_TYPES.TABLE,
+    cols: table.cols,
+    rows
+  };
+}
 function transformLine(line, idGenerator) {
   const items = [];
   for (const inline of line.inlines) {
@@ -5983,7 +6272,7 @@ function itemContainsLatin(item) {
   return false;
 }
 function isTextItem(item) {
-  return item.type === JSON_TYPES.TEXT || item.type === JSON_TYPES.HIGHLIGHTED_TEXT || item.type === JSON_TYPES.OPERATOR || item.type === JSON_TYPES.SPACE || item.type === JSON_TYPES.GROUP;
+  return item.type === JSON_TYPES.TEXT || item.type === JSON_TYPES.HIGHLIGHTED_TEXT || item.type === JSON_TYPES.BOLD_TEXT || item.type === JSON_TYPES.COLOR_TEXT || item.type === JSON_TYPES.OPERATOR || item.type === JSON_TYPES.SPACE || item.type === JSON_TYPES.GROUP;
 }
 function groupLineItems(items) {
   const groups = [];
@@ -6098,6 +6387,27 @@ const LayoutRenderer = ({
         },
         subItem.id
       )) });
+    case JSON_TYPES.TABLE:
+      return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "exercise-table-container", children: /* @__PURE__ */ jsxRuntime.jsx("table", { className: "exercise-table", children: /* @__PURE__ */ jsxRuntime.jsx("tbody", { children: item.rows.map((row) => /* @__PURE__ */ jsxRuntime.jsx("tr", { className: "exercise-table-row", children: row.cells.map((cell) => /* @__PURE__ */ jsxRuntime.jsx(
+        "td",
+        {
+          className: "exercise-table-cell",
+          colSpan: cell.colspan || 1,
+          children: cell.items.map((subItem) => /* @__PURE__ */ jsxRuntime.jsx(
+            LayoutRenderer,
+            {
+              item: subItem,
+              widgets,
+              values,
+              droppedInputs,
+              onChange,
+              onInputFocus
+            },
+            subItem.id
+          ))
+        },
+        cell.id
+      )) }, row.id)) }) }) });
     default:
       return null;
   }
@@ -6171,6 +6481,20 @@ const ExerciseRenderer = React.forwardRef(({
         });
         continue;
       }
+      if (item.type === JSON_TYPES.TABLE) {
+        if (currentGroup.length > 0) {
+          const hasArabic = currentGroup.some((item2) => itemContainsArabic(item2));
+          const subGroups = groupLineItems(currentGroup);
+          groups.push({ items: currentGroup, hasArabic, subGroups });
+          currentGroup = [];
+        }
+        groups.push({
+          items: [item],
+          hasArabic: false,
+          subGroups: []
+        });
+        continue;
+      }
       if (item.type === JSON_TYPES.LINEBREAK) {
         if (currentGroup.length > 0) {
           const hasArabic = currentGroup.some((item2) => itemContainsArabic(item2));
@@ -38293,6 +38617,7 @@ exports.BoldTextInlineSchema = BoldTextInlineSchema;
 exports.BoldTextSchema = BoldTextSchema;
 exports.ColorTextInlineSchema = ColorTextInlineSchema;
 exports.ColorTextSchema = ColorTextSchema;
+exports.ContentBlockSchema = ContentBlockSchema;
 exports.DragOptionsJSONSchema = DragOptionsJSONSchema;
 exports.DragOptionsToolSchema = DragOptionsToolSchema;
 exports.EngineError = EngineError;
@@ -38322,6 +38647,10 @@ exports.ParseError = ParseError;
 exports.QuestionTextSchema = QuestionTextSchema;
 exports.SimpleValidationSchema = SimpleValidationSchema;
 exports.SpaceInlineSchema = SpaceInlineSchema;
+exports.SpaceItemSchema = SpaceItemSchema;
+exports.TableCellItemSchema = TableCellItemSchema;
+exports.TableItemSchema = TableItemSchema;
+exports.TableRowItemSchema = TableRowItemSchema;
 exports.TextBlockSchema = TextBlockSchema;
 exports.TextItemSchema = TextItemSchema;
 exports.ToolNodeSchema = ToolNodeSchema;
@@ -38372,6 +38701,10 @@ exports.isOperatorItem = isOperatorItem;
 exports.isQuestionText = isQuestionText;
 exports.isSimpleValidation = isSimpleValidation;
 exports.isSpace = isSpace;
+exports.isSpaceItem = isSpaceItem;
+exports.isTableCellItem = isTableCellItem;
+exports.isTableItem = isTableItem;
+exports.isTableRowItem = isTableRowItem;
 exports.isTextBlock = isTextBlock;
 exports.isTextItem = isTextItem$1;
 exports.isToolNode = isToolNode;