@mathscan/math-exercise-engine 1.1.10 → 1.1.12

package/dist/index.js

@@ -3755,635 +3755,6 @@ function isProtractorWidget(widget) {
 function isSetSquareWidget(widget) {
   return widget.type === JSON_TYPES.SET_SQUARE;
 }
-class LayoutIdGenerator {
-  constructor() {
-    this.counter = 0;
-  }
-  reset() {
-    this.counter = 0;
-  }
-  generate(type) {
-    return `${type}_${++this.counter}`;
-  }
-}
-function toJSON(ast) {
-  const idGenerator = new LayoutIdGenerator();
-  const widgets = {};
-  const answers = {};
-  const allInlines = collectAllInlines(ast.lines);
-  const inlineDragIds = /* @__PURE__ */ new Map();
-  {
-    let counter = 0;
-    for (const inline of allInlines) {
-      if (inline.type === AST_TYPES.INLINE_DRAG_OPTION) {
-        inlineDragIds.set(inline, `${INLINE_DRAG_OPT_PREFIX}${counter++}`);
-      }
-    }
-  }
-  const layout = [];
-  if (ast.question) {
-    layout.push({
-      id: idGenerator.generate(JSON_TYPES.QUESTION_TEXT),
-      type: JSON_TYPES.QUESTION_TEXT,
-      value: ast.question.value
-    });
-  }
-  for (const block of ast.lines) {
-    if (block.type === AST_TYPES.TABLE_BLOCK) {
-      layout.push(transformTable(block, idGenerator, inlineDragIds));
-    } else if (block.type === AST_TYPES.NUMBER_LINE_BLOCK) {
-      const nlItem = transformNumberLine(block, idGenerator, inlineDragIds);
-      layout.push(nlItem);
-      if (nlItem.counter?.answer !== void 0) {
-        answers[nlItem.counter.id] = nlItem.counter.answer;
-      }
-      for (const cursor of nlItem.cursors ?? []) {
-        answers[cursor.id] = cursor.answer;
-      }
-    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
-      const matcherBlock = block;
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: matcherBlock.name
-      });
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
-        type: JSON_TYPES.LINEBREAK
-      });
-    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
-      const pmBlock = block;
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: pmBlock.name
-      });
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
-        type: JSON_TYPES.LINEBREAK
-      });
-    } else if (block.type === AST_TYPES.VERTICAL_OPERATION_BLOCK) {
-      layout.push(transformVerticalOperation(block, idGenerator));
-    } else if (block.type === AST_TYPES.RADIO_OPTIONS) {
-      const radioBlock = block;
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: radioBlock.name
-      });
-      layout.push({
-        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
-        type: JSON_TYPES.LINEBREAK
-      });
-    } else {
-      const lineItems = transformLine(block, idGenerator, inlineDragIds);
-      layout.push(...lineItems);
-    }
-  }
-  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,
-          placeholder: inline.placeholder
-        };
-      } else {
-        widgets[inline.name] = {
-          type: JSON_TYPES.INLINE_INPUT,
-          inputType: INPUT_TYPES.NUMERIC,
-          digits: inline.digits,
-          placeholder: inline.placeholder
-        };
-      }
-      if (inline.answer !== void 0) {
-        answers[inline.name] = inline.answer;
-      }
-    } else if (inline.type === AST_TYPES.CLOCK && inline.mode === "interactive") {
-      answers[inline.name] = inline.answer;
-    }
-    if (inline.type === AST_TYPES.FRACTION) {
-      widgets[inline.name] = {
-        type: JSON_TYPES.FRACTION,
-        numerator: inline.numerator ?? null,
-        denominator: inline.denominator ?? null,
-        simplified: inline.simplified ?? true,
-        placeholder: inline.placeholder
-      };
-      if (inline.answer !== void 0) {
-        answers[inline.name] = inline.answer;
-      }
-    }
-    if (inline.type === AST_TYPES.INLINE_DRAG_OPTION) {
-      const widgetId = inlineDragIds.get(inline);
-      widgets[widgetId] = {
-        type: JSON_TYPES.INLINE_DRAG_OPTION,
-        value: inline.value
-      };
-    }
-    if (inline.type === AST_TYPES.VISUAL_FRACTION) {
-      const answerArr = inline.answer ?? [];
-      widgets[inline.name] = {
-        type: JSON_TYPES.VISUAL_FRACTION,
-        shape: inline.shape,
-        divisions: inline.divisions,
-        filled: inline.filled ?? [],
-        answer: answerArr,
-        ...inline.orientation !== void 0 && { orientation: inline.orientation },
-        ...inline.label !== void 0 && { label: inline.label },
-        ...inline.size !== void 0 && { size: inline.size }
-      };
-      if (answerArr.length > 0) {
-        answers[inline.name] = answerArr;
-      }
-    }
-  }
-  for (const block of ast.lines) {
-    if (block.type !== AST_TYPES.VERTICAL_OPERATION_BLOCK) continue;
-    const vop = block;
-    for (const item of vop.items) {
-      if (item.type !== AST_TYPES.VOP_ROW && item.type !== AST_TYPES.VOP_CARRY_ROW) continue;
-      for (const cell of item.cells) {
-        if (cell.kind !== "input") continue;
-        if (widgets[cell.name]) {
-          throw new Error(`VERTICAL_OPERATION: duplicate INPUT name "${cell.name}"`);
-        }
-        widgets[cell.name] = {
-          type: JSON_TYPES.INLINE_INPUT,
-          inputType: INPUT_TYPES.NUMERIC,
-          digits: cell.digits
-        };
-        if (cell.answer !== void 0) {
-          answers[cell.name] = cell.answer;
-        }
-      }
-    }
-  }
-  for (const block of ast.lines) {
-    if (block.type === AST_TYPES.RADIO_OPTIONS) {
-      const radioBlock = block;
-      widgets[radioBlock.name] = {
-        type: JSON_TYPES.RADIO_OPTIONS,
-        options: radioBlock.options
-      };
-      answers[radioBlock.name] = radioBlock.answer;
-    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
-      const matcherBlock = block;
-      widgets[matcherBlock.name] = buildMatcherWidget(matcherBlock, idGenerator, inlineDragIds);
-      answers[matcherBlock.name] = matcherBlock.answers;
-    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
-      const pmBlock = block;
-      widgets[pmBlock.name] = buildPairMatcherWidget(pmBlock, idGenerator, inlineDragIds);
-      answers[pmBlock.name] = pmBlock.answers;
-    }
-  }
-  if (ast.tools) {
-    for (const tool of ast.tools) {
-      if (tool.type === AST_TYPES.DRAG_OPTIONS) {
-        widgets["_drag_options"] = {
-          type: JSON_TYPES.DRAG_OPTIONS,
-          options: tool.options
-        };
-      } else if (tool.type === AST_TYPES.NUMERIC_KEYPAD) {
-        widgets["_numeric_keypad"] = {
-          type: JSON_TYPES.NUMERIC_KEYPAD,
-          includeOperators: tool.includeOperators,
-          includeDecimal: tool.includeDecimal,
-          style: tool.style
-        };
-      } else if (tool.type === AST_TYPES.GEOMETRY_RULER) {
-        widgets[RULER_WIDGET_ID] = {
-          type: JSON_TYPES.RULER,
-          size: tool.size
-        };
-      } else if (tool.type === AST_TYPES.GEOMETRY_PROTRACTOR) {
-        widgets[PROTRACTOR_WIDGET_ID] = {
-          type: JSON_TYPES.PROTRACTOR,
-          size: tool.size
-        };
-      } else if (tool.type === AST_TYPES.GEOMETRY_SET_SQUARE) {
-        widgets[SET_SQUARE_WIDGET_ID] = {
-          type: JSON_TYPES.SET_SQUARE,
-          size: tool.size
-        };
-      }
-    }
-  }
-  return {
-    version: "2.0",
-    // Natural DSL version
-    layout,
-    widgets,
-    ...ast.validation ? { validation: transformValidation(ast.validation, answers, widgets) } : {}
-  };
-}
-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);
-        }
-      }
-    } else if (block.type === AST_TYPES.NUMBER_LINE_BLOCK) {
-      const numberLine = block;
-      for (const position of numberLine.positions) {
-        result.push(...position.inlines);
-      }
-      for (const arrow of numberLine.arrows ?? []) {
-        result.push(...arrow.inlines);
-      }
-    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
-      for (const row of block.rows) {
-        for (const item of row.items) {
-          result.push(...item.inlines);
-        }
-      }
-    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
-      const pm = block;
-      for (const item of [...pm.topItems, ...pm.bottomItems]) {
-        result.push(...item.inlines);
-      }
-    }
-  }
-  return result;
-}
-function transformNumberLine(numberLine, idGenerator, inlineDragIds) {
-  const positions = numberLine.positions.map((pos) => {
-    const content = pos.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds));
-    return {
-      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_POSITION),
-      type: JSON_TYPES.NUMBER_LINE_POSITION,
-      value: pos.value,
-      content
-    };
-  });
-  let counterItem;
-  if (numberLine.counter !== void 0) {
-    const c = numberLine.counter;
-    counterItem = {
-      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_COUNTER),
-      type: JSON_TYPES.NUMBER_LINE_COUNTER,
-      min: c.min,
-      max: c.max,
-      ...c.default !== void 0 && { default: c.default },
-      ...c.name !== void 0 && { name: c.name },
-      ...c.answer !== void 0 && { answer: c.answer }
-    };
-  }
-  let highlights;
-  if (numberLine.highlights !== void 0 && numberLine.highlights.length > 0) {
-    highlights = numberLine.highlights.map((h) => ({
-      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_HIGHLIGHT),
-      type: JSON_TYPES.NUMBER_LINE_HIGHLIGHT,
-      from: h.from,
-      to: h.to,
-      ...h.color !== void 0 && { color: h.color },
-      ...h.label !== void 0 && { label: h.label }
-    }));
-  }
-  let cursors;
-  if (numberLine.cursors !== void 0 && numberLine.cursors.length > 0) {
-    cursors = numberLine.cursors.map((c) => ({
-      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_CURSOR),
-      type: JSON_TYPES.NUMBER_LINE_CURSOR,
-      value: c.value,
-      answer: c.answer,
-      fillRange: c.fillRange,
-      ...c.color !== void 0 && { color: c.color },
-      ...c.label !== void 0 && { label: c.label }
-    }));
-  }
-  let arrows;
-  if (numberLine.arrows !== void 0 && numberLine.arrows.length > 0) {
-    arrows = numberLine.arrows.map((a) => ({
-      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_ARROW),
-      type: JSON_TYPES.NUMBER_LINE_ARROW,
-      from: a.from,
-      to: a.to,
-      ...a.color !== void 0 && { color: a.color },
-      content: a.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds))
-    }));
-  }
-  const item = {
-    id: idGenerator.generate(JSON_TYPES.NUMBER_LINE),
-    type: JSON_TYPES.NUMBER_LINE,
-    min: numberLine.min,
-    max: numberLine.max,
-    step: numberLine.step,
-    ...numberLine.minorTicks !== void 0 && { minorTicks: numberLine.minorTicks },
-    ...numberLine.style !== void 0 && { style: numberLine.style },
-    ...numberLine.labelVisibility !== void 0 && { labelVisibility: numberLine.labelVisibility },
-    ...counterItem !== void 0 && { counter: counterItem },
-    ...highlights !== void 0 && { highlights },
-    ...cursors !== void 0 && { cursors },
-    ...arrows !== void 0 && { arrows },
-    ...numberLine.dragMode !== void 0 && { dragMode: numberLine.dragMode },
-    positions
-  };
-  return item;
-}
-function mapMatcherItemList(items, idGenerator, inlineDragIds) {
-  return items.map((item) => ({
-    id: idGenerator.generate(JSON_TYPES.MATCHER_ITEM),
-    type: JSON_TYPES.MATCHER_ITEM,
-    itemId: item.itemId,
-    content: item.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds))
-  }));
-}
-function buildMatcherWidget(matcher, idGenerator, inlineDragIds) {
-  const rows = matcher.rows.map((row) => ({
-    id: idGenerator.generate(JSON_TYPES.MATCHER_ROW),
-    type: JSON_TYPES.MATCHER_ROW,
-    items: mapMatcherItemList(row.items, idGenerator, inlineDragIds)
-  }));
-  const result = {
-    type: JSON_TYPES.MATCHER,
-    rows,
-    groupCount: matcher.answers.length
-  };
-  if (matcher.colors !== void 0) {
-    result.colors = matcher.colors;
-  }
-  return result;
-}
-function buildPairMatcherWidget(pm, idGenerator, inlineDragIds) {
-  return {
-    type: JSON_TYPES.PAIR_MATCHER,
-    topItems: mapMatcherItemList(pm.topItems, idGenerator, inlineDragIds),
-    bottomItems: mapMatcherItemList(pm.bottomItems, idGenerator, inlineDragIds)
-  };
-}
-function transformVerticalOperation(vop, idGenerator) {
-  const anyRowHasOp = vop.items.some(
-    (item) => item.type === AST_TYPES.VOP_ROW && item.op !== void 0
-  );
-  if (!anyRowHasOp && vop.op === void 0) {
-    throw new Error("VERTICAL_OPERATION: at least one op is required (set op on the block or on individual ROWs)");
-  }
-  let cols = 1;
-  for (const item of vop.items) {
-    if (item.type === AST_TYPES.VOP_ROW || item.type === AST_TYPES.VOP_CARRY_ROW) {
-      cols = Math.max(cols, item.cells.length);
-    }
-  }
-  function buildCells(row) {
-    return row.cells.map((cell) => {
-      const id = idGenerator.generate(JSON_TYPES.VOP_CELL);
-      if (cell.kind === "digit") return { id, type: JSON_TYPES.VOP_CELL, kind: "digit", value: cell.value };
-      if (cell.kind === "label") return { id, type: JSON_TYPES.VOP_CELL, kind: "label", value: cell.value };
-      if (cell.kind === "color") return { id, type: JSON_TYPES.VOP_CELL, kind: "color", value: cell.value, color: cell.color };
-      if (cell.kind === "bold") return { id, type: JSON_TYPES.VOP_CELL, kind: "bold", value: cell.value };
-      if (cell.kind === "highlight") return { id, type: JSON_TYPES.VOP_CELL, kind: "highlight", value: cell.value };
-      if (cell.kind === "input") return { id, type: JSON_TYPES.VOP_CELL, kind: "input", widgetId: cell.name };
-      return { id, type: JSON_TYPES.VOP_CELL, kind: "empty" };
-    });
-  }
-  const items = vop.items.map((item) => {
-    if (item.type === AST_TYPES.VOP_SEPARATOR) {
-      return {
-        id: idGenerator.generate(JSON_TYPES.VOP_SEPARATOR),
-        type: JSON_TYPES.VOP_SEPARATOR
-      };
-    }
-    if (item.type === AST_TYPES.VOP_CARRY_ROW) {
-      return {
-        id: idGenerator.generate(JSON_TYPES.VOP_CARRY_ROW),
-        type: JSON_TYPES.VOP_CARRY_ROW,
-        cells: buildCells(item)
-      };
-    }
-    const row = item;
-    return {
-      id: idGenerator.generate(JSON_TYPES.VOP_ROW),
-      type: JSON_TYPES.VOP_ROW,
-      cells: buildCells(row),
-      ...row.op !== void 0 && { op: row.op }
-    };
-  });
-  return {
-    id: idGenerator.generate(JSON_TYPES.VERTICAL_OPERATION),
-    type: JSON_TYPES.VERTICAL_OPERATION,
-    op: vop.op,
-    cols,
-    items
-  };
-}
-function transformTable(table, idGenerator, inlineDragIds) {
-  const rows = table.rows.map((row) => {
-    const cells = row.cells.map((cell) => {
-      const items = cell.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds));
-      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, inlineDragIds) {
-  const items = [];
-  for (const inline of line.inlines) {
-    items.push(transformInline(inline, idGenerator, inlineDragIds));
-  }
-  items.push({
-    id: idGenerator.generate(JSON_TYPES.LINEBREAK),
-    type: JSON_TYPES.LINEBREAK
-  });
-  return items;
-}
-function transformInline(inline, idGenerator, inlineDragIds) {
-  switch (inline.type) {
-    case AST_TYPES.FREE_TEXT: {
-      const trimmed = inline.value.trim();
-      const operators = ["+", "-", "×", "÷", "=", "<", ">", "?"];
-      if (operators.includes(trimmed) && inline.value.trim() === inline.value) {
-        return {
-          id: idGenerator.generate("operator"),
-          type: "operator",
-          operator: trimmed
-        };
-      }
-      return {
-        id: idGenerator.generate(JSON_TYPES.TEXT),
-        type: JSON_TYPES.TEXT,
-        value: inline.value
-      };
-    }
-    case AST_TYPES.SPACE:
-      return {
-        id: idGenerator.generate(JSON_TYPES.SPACE),
-        type: JSON_TYPES.SPACE
-      };
-    case AST_TYPES.HIGHLIGHTED_TEXT:
-      return {
-        id: idGenerator.generate(JSON_TYPES.HIGHLIGHTED_TEXT),
-        type: JSON_TYPES.HIGHLIGHTED_TEXT,
-        value: inline.value,
-        highlight: inline.highlight
-      };
-    case AST_TYPES.COLOR_TEXT:
-      return {
-        id: idGenerator.generate(JSON_TYPES.COLOR_TEXT),
-        type: JSON_TYPES.COLOR_TEXT,
-        value: inline.value,
-        color: inline.color,
-        highlight: inline.highlight
-      };
-    case AST_TYPES.BOLD_TEXT:
-      return {
-        id: idGenerator.generate(JSON_TYPES.BOLD_TEXT),
-        type: JSON_TYPES.BOLD_TEXT,
-        value: inline.value,
-        highlight: inline.highlight
-      };
-    case AST_TYPES.INLINE_INPUT:
-      return {
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: inline.name
-      };
-    case AST_TYPES.FRACTION:
-      return {
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: inline.name
-      };
-    case AST_TYPES.IMAGE:
-      return {
-        id: idGenerator.generate(JSON_TYPES.IMAGE),
-        type: JSON_TYPES.IMAGE,
-        name: inline.name,
-        src: inline.src,
-        alt: inline.alt,
-        ...inline.width !== void 0 && { width: inline.width },
-        ...inline.height !== void 0 && { height: inline.height }
-      };
-    case AST_TYPES.VISUAL_FRACTION:
-      return {
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: inline.name
-      };
-    case AST_TYPES.INLINE_DRAG_OPTION:
-      return {
-        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
-        type: JSON_TYPES.WIDGET_REF,
-        widgetId: inlineDragIds.get(inline)
-      };
-    case AST_TYPES.CLOCK: {
-      const base = {
-        id: idGenerator.generate(JSON_TYPES.CLOCK),
-        type: JSON_TYPES.CLOCK,
-        mode: inline.mode,
-        clockType: inline.clockType,
-        value: inline.value,
-        ...inline.format !== void 0 && { format: inline.format },
-        ...inline.name !== void 0 && { name: inline.name }
-      };
-      if (inline.mode === "interactive") {
-        return { ...base, ...inline.snap !== void 0 && { snap: inline.snap } };
-      }
-      return base;
-    }
-    default:
-      throw new Error(`Unknown inline type: ${inline.type}`);
-  }
-}
-function transformValidation(validation, answers, widgets) {
-  if (validation.type === AST_TYPES.SIMPLE_VALIDATION) {
-    return {
-      mode: VALIDATION_MODES.SIMPLE,
-      answers
-    };
-  } else if (validation.type === AST_TYPES.EXPRESSION_VALIDATION) {
-    const validVariableNames = Object.keys(widgets);
-    const variables = extractVariables$1(validation.expression, validVariableNames);
-    return {
-      mode: VALIDATION_MODES.EXPRESSION,
-      expression: validation.expression,
-      variables
-    };
-  } else if (validation.type === AST_TYPES.MIXED_VALIDATION) {
-    const validVariableNames = Object.keys(widgets);
-    const variables = extractVariables$1(validation.expression, validVariableNames);
-    const inExpression = new Set(variables);
-    for (const [name, widget] of Object.entries(widgets)) {
-      if (name.startsWith("_")) continue;
-      if (name in answers) continue;
-      if (inExpression.has(name)) continue;
-      if (widget.type === JSON_TYPES.FRACTION) {
-        const w = widget;
-        if (w.numerator !== null && w.denominator !== null) continue;
-      }
-      if (widget.type === JSON_TYPES.VISUAL_FRACTION) {
-        const w = widget;
-        if (Array.isArray(w.filled) && w.filled.length > 0) continue;
-      }
-      throw new Error(
-        `Mixed validation: widget "${name}" has no \`answer\` and is not referenced in expression "${validation.expression}"`
-      );
-    }
-    return {
-      mode: VALIDATION_MODES.MIXED,
-      expression: validation.expression,
-      answers,
-      variables
-    };
-  }
-  throw new Error(`Unknown validation type: ${validation.type}`);
-}
-function extractVariables$1(expression, validVariables) {
-  const matches = expression.match(/\b[a-zA-Z_][a-zA-Z0-9_]*\b/g) || [];
-  const variables = matches.filter(
-    (v) => v !== "true" && v !== "false" && v !== "null" && v !== "undefined"
-  );
-  const uniqueVars = Array.from(new Set(variables));
-  if (validVariables && validVariables.length > 0) {
-    return uniqueVars.filter((v) => validVariables.includes(v));
-  }
-  return uniqueVars;
-}
-function normalize(value) {
-  if (typeof value === "number") {
-    return String(Math.round(value * 10 ** INTERNAL_PRECISION) / 10 ** INTERNAL_PRECISION);
-  }
-  const trimmed = String(value).trim().toLowerCase().replace(/^["']|["']$/g, "");
-  const asNum = Number(trimmed);
-  if (trimmed !== "" && !isNaN(asNum)) {
-    return String(Math.round(asNum * 10 ** INTERNAL_PRECISION) / 10 ** INTERNAL_PRECISION);
-  }
-  return trimmed;
-}
-const NL_DRAG_PREFIX = "\0nl-drag\0";
-const isNLDragEncoded = (v) => v.startsWith(NL_DRAG_PREFIX);
-const encodeNLDragValue = (label, position) => `${NL_DRAG_PREFIX}${label}@${String(position)}`;
-function isNLDragCorrect(encoded, expectedLabel, expectedPosition) {
-  const payload = encoded.slice(NL_DRAG_PREFIX.length);
-  const atIdx = payload.lastIndexOf("@");
-  const label = normalize(payload.slice(0, atIdx));
-  const position = normalize(payload.slice(atIdx + 1));
-  return label === normalize(expectedLabel) && position === normalize(expectedPosition);
-}
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var lodash = { exports: {} };
 /**
@@ -9701,172 +9072,803 @@ lodash.exports;
       arrayEach(["bind", "bindKey", "curry", "curryRight", "partial", "partialRight"], function(methodName) {
         lodash2[methodName].placeholder = lodash2;
       });
-      arrayEach(["drop", "take"], function(methodName, index) {
-        LazyWrapper.prototype[methodName] = function(n) {
-          n = n === undefined$1 ? 1 : nativeMax(toInteger(n), 0);
-          var result2 = this.__filtered__ && !index ? new LazyWrapper(this) : this.clone();
-          if (result2.__filtered__) {
-            result2.__takeCount__ = nativeMin(n, result2.__takeCount__);
-          } else {
-            result2.__views__.push({
-              "size": nativeMin(n, MAX_ARRAY_LENGTH),
-              "type": methodName + (result2.__dir__ < 0 ? "Right" : "")
-            });
-          }
-          return result2;
+      arrayEach(["drop", "take"], function(methodName, index) {
+        LazyWrapper.prototype[methodName] = function(n) {
+          n = n === undefined$1 ? 1 : nativeMax(toInteger(n), 0);
+          var result2 = this.__filtered__ && !index ? new LazyWrapper(this) : this.clone();
+          if (result2.__filtered__) {
+            result2.__takeCount__ = nativeMin(n, result2.__takeCount__);
+          } else {
+            result2.__views__.push({
+              "size": nativeMin(n, MAX_ARRAY_LENGTH),
+              "type": methodName + (result2.__dir__ < 0 ? "Right" : "")
+            });
+          }
+          return result2;
+        };
+        LazyWrapper.prototype[methodName + "Right"] = function(n) {
+          return this.reverse()[methodName](n).reverse();
+        };
+      });
+      arrayEach(["filter", "map", "takeWhile"], function(methodName, index) {
+        var type = index + 1, isFilter = type == LAZY_FILTER_FLAG || type == LAZY_WHILE_FLAG;
+        LazyWrapper.prototype[methodName] = function(iteratee2) {
+          var result2 = this.clone();
+          result2.__iteratees__.push({
+            "iteratee": getIteratee(iteratee2, 3),
+            "type": type
+          });
+          result2.__filtered__ = result2.__filtered__ || isFilter;
+          return result2;
+        };
+      });
+      arrayEach(["head", "last"], function(methodName, index) {
+        var takeName = "take" + (index ? "Right" : "");
+        LazyWrapper.prototype[methodName] = function() {
+          return this[takeName](1).value()[0];
+        };
+      });
+      arrayEach(["initial", "tail"], function(methodName, index) {
+        var dropName = "drop" + (index ? "" : "Right");
+        LazyWrapper.prototype[methodName] = function() {
+          return this.__filtered__ ? new LazyWrapper(this) : this[dropName](1);
+        };
+      });
+      LazyWrapper.prototype.compact = function() {
+        return this.filter(identity);
+      };
+      LazyWrapper.prototype.find = function(predicate) {
+        return this.filter(predicate).head();
+      };
+      LazyWrapper.prototype.findLast = function(predicate) {
+        return this.reverse().find(predicate);
+      };
+      LazyWrapper.prototype.invokeMap = baseRest(function(path, args) {
+        if (typeof path == "function") {
+          return new LazyWrapper(this);
+        }
+        return this.map(function(value) {
+          return baseInvoke(value, path, args);
+        });
+      });
+      LazyWrapper.prototype.reject = function(predicate) {
+        return this.filter(negate(getIteratee(predicate)));
+      };
+      LazyWrapper.prototype.slice = function(start, end) {
+        start = toInteger(start);
+        var result2 = this;
+        if (result2.__filtered__ && (start > 0 || end < 0)) {
+          return new LazyWrapper(result2);
+        }
+        if (start < 0) {
+          result2 = result2.takeRight(-start);
+        } else if (start) {
+          result2 = result2.drop(start);
+        }
+        if (end !== undefined$1) {
+          end = toInteger(end);
+          result2 = end < 0 ? result2.dropRight(-end) : result2.take(end - start);
+        }
+        return result2;
+      };
+      LazyWrapper.prototype.takeRightWhile = function(predicate) {
+        return this.reverse().takeWhile(predicate).reverse();
+      };
+      LazyWrapper.prototype.toArray = function() {
+        return this.take(MAX_ARRAY_LENGTH);
+      };
+      baseForOwn(LazyWrapper.prototype, function(func, methodName) {
+        var checkIteratee = /^(?:filter|find|map|reject)|While$/.test(methodName), isTaker = /^(?:head|last)$/.test(methodName), lodashFunc = lodash2[isTaker ? "take" + (methodName == "last" ? "Right" : "") : methodName], retUnwrapped = isTaker || /^find/.test(methodName);
+        if (!lodashFunc) {
+          return;
+        }
+        lodash2.prototype[methodName] = function() {
+          var value = this.__wrapped__, args = isTaker ? [1] : arguments, isLazy = value instanceof LazyWrapper, iteratee2 = args[0], useLazy = isLazy || isArray(value);
+          var interceptor = function(value2) {
+            var result3 = lodashFunc.apply(lodash2, arrayPush([value2], args));
+            return isTaker && chainAll ? result3[0] : result3;
+          };
+          if (useLazy && checkIteratee && typeof iteratee2 == "function" && iteratee2.length != 1) {
+            isLazy = useLazy = false;
+          }
+          var chainAll = this.__chain__, isHybrid = !!this.__actions__.length, isUnwrapped = retUnwrapped && !chainAll, onlyLazy = isLazy && !isHybrid;
+          if (!retUnwrapped && useLazy) {
+            value = onlyLazy ? value : new LazyWrapper(this);
+            var result2 = func.apply(value, args);
+            result2.__actions__.push({ "func": thru, "args": [interceptor], "thisArg": undefined$1 });
+            return new LodashWrapper(result2, chainAll);
+          }
+          if (isUnwrapped && onlyLazy) {
+            return func.apply(this, args);
+          }
+          result2 = this.thru(interceptor);
+          return isUnwrapped ? isTaker ? result2.value()[0] : result2.value() : result2;
+        };
+      });
+      arrayEach(["pop", "push", "shift", "sort", "splice", "unshift"], function(methodName) {
+        var func = arrayProto[methodName], chainName = /^(?:push|sort|unshift)$/.test(methodName) ? "tap" : "thru", retUnwrapped = /^(?:pop|shift)$/.test(methodName);
+        lodash2.prototype[methodName] = function() {
+          var args = arguments;
+          if (retUnwrapped && !this.__chain__) {
+            var value = this.value();
+            return func.apply(isArray(value) ? value : [], args);
+          }
+          return this[chainName](function(value2) {
+            return func.apply(isArray(value2) ? value2 : [], args);
+          });
+        };
+      });
+      baseForOwn(LazyWrapper.prototype, function(func, methodName) {
+        var lodashFunc = lodash2[methodName];
+        if (lodashFunc) {
+          var key2 = lodashFunc.name + "";
+          if (!hasOwnProperty.call(realNames, key2)) {
+            realNames[key2] = [];
+          }
+          realNames[key2].push({ "name": methodName, "func": lodashFunc });
+        }
+      });
+      realNames[createHybrid(undefined$1, WRAP_BIND_KEY_FLAG).name] = [{
+        "name": "wrapper",
+        "func": undefined$1
+      }];
+      LazyWrapper.prototype.clone = lazyClone;
+      LazyWrapper.prototype.reverse = lazyReverse;
+      LazyWrapper.prototype.value = lazyValue;
+      lodash2.prototype.at = wrapperAt;
+      lodash2.prototype.chain = wrapperChain;
+      lodash2.prototype.commit = wrapperCommit;
+      lodash2.prototype.next = wrapperNext;
+      lodash2.prototype.plant = wrapperPlant;
+      lodash2.prototype.reverse = wrapperReverse;
+      lodash2.prototype.toJSON = lodash2.prototype.valueOf = lodash2.prototype.value = wrapperValue;
+      lodash2.prototype.first = lodash2.prototype.head;
+      if (symIterator) {
+        lodash2.prototype[symIterator] = wrapperToIterator;
+      }
+      return lodash2;
+    };
+    var _ = runInContext();
+    if (freeModule) {
+      (freeModule.exports = _)._ = _;
+      freeExports._ = _;
+    } else {
+      root._ = _;
+    }
+  }).call(commonjsGlobal);
+})(lodash, lodash.exports);
+var lodashExports = lodash.exports;
+class LayoutIdGenerator {
+  constructor() {
+    this.counter = 0;
+  }
+  reset() {
+    this.counter = 0;
+  }
+  generate(type) {
+    return `${type}_${++this.counter}`;
+  }
+}
+function toJSON(ast) {
+  const idGenerator = new LayoutIdGenerator();
+  const widgets = {};
+  const answers = {};
+  const allInlines = collectAllInlines(ast.lines);
+  const inlineDragIds = /* @__PURE__ */ new Map();
+  {
+    let counter = 0;
+    for (const inline of allInlines) {
+      if (inline.type === AST_TYPES.INLINE_DRAG_OPTION) {
+        inlineDragIds.set(inline, `${INLINE_DRAG_OPT_PREFIX}${counter++}`);
+      }
+    }
+  }
+  const layout = [];
+  if (ast.question) {
+    layout.push({
+      id: idGenerator.generate(JSON_TYPES.QUESTION_TEXT),
+      type: JSON_TYPES.QUESTION_TEXT,
+      value: ast.question.value
+    });
+  }
+  for (const block of ast.lines) {
+    if (block.type === AST_TYPES.TABLE_BLOCK) {
+      layout.push(transformTable(block, idGenerator, inlineDragIds));
+    } else if (block.type === AST_TYPES.NUMBER_LINE_BLOCK) {
+      const nlItem = transformNumberLine(block, idGenerator, inlineDragIds);
+      layout.push(nlItem);
+      if (nlItem.counter?.answer !== void 0) {
+        answers[nlItem.counter.id] = nlItem.counter.answer;
+      }
+      for (const cursor of nlItem.cursors ?? []) {
+        answers[cursor.id] = cursor.answer;
+      }
+    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
+      const matcherBlock = block;
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: matcherBlock.name
+      });
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
+        type: JSON_TYPES.LINEBREAK
+      });
+    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
+      const pmBlock = block;
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: pmBlock.name
+      });
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
+        type: JSON_TYPES.LINEBREAK
+      });
+    } else if (block.type === AST_TYPES.VERTICAL_OPERATION_BLOCK) {
+      layout.push(transformVerticalOperation(block, idGenerator));
+    } else if (block.type === AST_TYPES.RADIO_OPTIONS) {
+      const radioBlock = block;
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: radioBlock.name
+      });
+      layout.push({
+        id: idGenerator.generate(JSON_TYPES.LINEBREAK),
+        type: JSON_TYPES.LINEBREAK
+      });
+    } else {
+      const lineItems = transformLine(block, idGenerator, inlineDragIds);
+      layout.push(...lineItems);
+    }
+  }
+  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,
+          placeholder: inline.placeholder
         };
-        LazyWrapper.prototype[methodName + "Right"] = function(n) {
-          return this.reverse()[methodName](n).reverse();
+      } else {
+        widgets[inline.name] = {
+          type: JSON_TYPES.INLINE_INPUT,
+          inputType: INPUT_TYPES.NUMERIC,
+          digits: inline.digits,
+          placeholder: inline.placeholder
         };
-      });
-      arrayEach(["filter", "map", "takeWhile"], function(methodName, index) {
-        var type = index + 1, isFilter = type == LAZY_FILTER_FLAG || type == LAZY_WHILE_FLAG;
-        LazyWrapper.prototype[methodName] = function(iteratee2) {
-          var result2 = this.clone();
-          result2.__iteratees__.push({
-            "iteratee": getIteratee(iteratee2, 3),
-            "type": type
-          });
-          result2.__filtered__ = result2.__filtered__ || isFilter;
-          return result2;
+      }
+      if (inline.answer !== void 0) {
+        answers[inline.name] = inline.answer;
+      }
+    } else if (inline.type === AST_TYPES.CLOCK && inline.mode === "interactive") {
+      answers[inline.name] = inline.answer;
+    }
+    if (inline.type === AST_TYPES.FRACTION) {
+      widgets[inline.name] = {
+        type: JSON_TYPES.FRACTION,
+        numerator: inline.numerator ?? null,
+        denominator: inline.denominator ?? null,
+        simplified: inline.simplified ?? true,
+        placeholder: inline.placeholder
+      };
+      if (inline.answer !== void 0) {
+        answers[inline.name] = inline.answer;
+      }
+    }
+    if (inline.type === AST_TYPES.INLINE_DRAG_OPTION) {
+      const widgetId = inlineDragIds.get(inline);
+      widgets[widgetId] = {
+        type: JSON_TYPES.INLINE_DRAG_OPTION,
+        value: inline.value
+      };
+    }
+    if (inline.type === AST_TYPES.VISUAL_FRACTION) {
+      const answerArr = inline.answer ?? [];
+      widgets[inline.name] = {
+        type: JSON_TYPES.VISUAL_FRACTION,
+        shape: inline.shape,
+        divisions: inline.divisions,
+        filled: inline.filled ?? [],
+        answer: answerArr,
+        ...inline.orientation !== void 0 && { orientation: inline.orientation },
+        ...inline.label !== void 0 && { label: inline.label },
+        ...inline.size !== void 0 && { size: inline.size }
+      };
+      if (answerArr.length > 0) {
+        answers[inline.name] = answerArr;
+      }
+    }
+  }
+  for (const block of ast.lines) {
+    if (block.type !== AST_TYPES.VERTICAL_OPERATION_BLOCK) continue;
+    const vop = block;
+    for (const item of vop.items) {
+      if (item.type !== AST_TYPES.VOP_ROW && item.type !== AST_TYPES.VOP_CARRY_ROW) continue;
+      for (const cell of item.cells) {
+        if (cell.kind !== "input") continue;
+        if (widgets[cell.name]) {
+          throw new Error(`VERTICAL_OPERATION: duplicate INPUT name "${cell.name}"`);
+        }
+        widgets[cell.name] = {
+          type: JSON_TYPES.INLINE_INPUT,
+          inputType: INPUT_TYPES.NUMERIC,
+          digits: cell.digits
         };
-      });
-      arrayEach(["head", "last"], function(methodName, index) {
-        var takeName = "take" + (index ? "Right" : "");
-        LazyWrapper.prototype[methodName] = function() {
-          return this[takeName](1).value()[0];
+        if (cell.answer !== void 0) {
+          answers[cell.name] = cell.answer;
+        }
+      }
+    }
+  }
+  for (const block of ast.lines) {
+    if (block.type === AST_TYPES.RADIO_OPTIONS) {
+      const radioBlock = block;
+      widgets[radioBlock.name] = {
+        type: JSON_TYPES.RADIO_OPTIONS,
+        // Randomise option order per compile so the answer position isn't fixed.
+        options: lodashExports.shuffle(radioBlock.options)
+      };
+      answers[radioBlock.name] = radioBlock.answer;
+    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
+      const matcherBlock = block;
+      widgets[matcherBlock.name] = buildMatcherWidget(matcherBlock, idGenerator, inlineDragIds);
+      answers[matcherBlock.name] = matcherBlock.answers;
+    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
+      const pmBlock = block;
+      widgets[pmBlock.name] = buildPairMatcherWidget(pmBlock, idGenerator, inlineDragIds);
+      answers[pmBlock.name] = pmBlock.answers;
+    }
+  }
+  if (ast.tools) {
+    for (const tool of ast.tools) {
+      if (tool.type === AST_TYPES.DRAG_OPTIONS) {
+        widgets["_drag_options"] = {
+          type: JSON_TYPES.DRAG_OPTIONS,
+          // Randomise chip order per compile so the answer position isn't fixed.
+          options: lodashExports.shuffle(tool.options)
         };
-      });
-      arrayEach(["initial", "tail"], function(methodName, index) {
-        var dropName = "drop" + (index ? "" : "Right");
-        LazyWrapper.prototype[methodName] = function() {
-          return this.__filtered__ ? new LazyWrapper(this) : this[dropName](1);
+      } else if (tool.type === AST_TYPES.NUMERIC_KEYPAD) {
+        widgets["_numeric_keypad"] = {
+          type: JSON_TYPES.NUMERIC_KEYPAD,
+          includeOperators: tool.includeOperators,
+          includeDecimal: tool.includeDecimal,
+          style: tool.style
+        };
+      } else if (tool.type === AST_TYPES.GEOMETRY_RULER) {
+        widgets[RULER_WIDGET_ID] = {
+          type: JSON_TYPES.RULER,
+          size: tool.size
+        };
+      } else if (tool.type === AST_TYPES.GEOMETRY_PROTRACTOR) {
+        widgets[PROTRACTOR_WIDGET_ID] = {
+          type: JSON_TYPES.PROTRACTOR,
+          size: tool.size
+        };
+      } else if (tool.type === AST_TYPES.GEOMETRY_SET_SQUARE) {
+        widgets[SET_SQUARE_WIDGET_ID] = {
+          type: JSON_TYPES.SET_SQUARE,
+          size: tool.size
+        };
+      }
+    }
+  }
+  return {
+    version: "2.0",
+    // Natural DSL version
+    layout,
+    widgets,
+    ...ast.validation ? { validation: transformValidation(ast.validation, answers, widgets) } : {}
+  };
+}
+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);
+        }
+      }
+    } else if (block.type === AST_TYPES.NUMBER_LINE_BLOCK) {
+      const numberLine = block;
+      for (const position of numberLine.positions) {
+        result.push(...position.inlines);
+      }
+      for (const arrow of numberLine.arrows ?? []) {
+        result.push(...arrow.inlines);
+      }
+    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
+      for (const row of block.rows) {
+        for (const item of row.items) {
+          result.push(...item.inlines);
+        }
+      }
+    } else if (block.type === AST_TYPES.PAIR_MATCHER_BLOCK) {
+      const pm = block;
+      for (const item of [...pm.topItems, ...pm.bottomItems]) {
+        result.push(...item.inlines);
+      }
+    }
+  }
+  return result;
+}
+function transformNumberLine(numberLine, idGenerator, inlineDragIds) {
+  const positions = numberLine.positions.map((pos) => {
+    const content = pos.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds));
+    return {
+      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_POSITION),
+      type: JSON_TYPES.NUMBER_LINE_POSITION,
+      value: pos.value,
+      content
+    };
+  });
+  let counterItem;
+  if (numberLine.counter !== void 0) {
+    const c = numberLine.counter;
+    counterItem = {
+      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_COUNTER),
+      type: JSON_TYPES.NUMBER_LINE_COUNTER,
+      min: c.min,
+      max: c.max,
+      ...c.default !== void 0 && { default: c.default },
+      ...c.name !== void 0 && { name: c.name },
+      ...c.answer !== void 0 && { answer: c.answer }
+    };
+  }
+  let highlights;
+  if (numberLine.highlights !== void 0 && numberLine.highlights.length > 0) {
+    highlights = numberLine.highlights.map((h) => ({
+      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_HIGHLIGHT),
+      type: JSON_TYPES.NUMBER_LINE_HIGHLIGHT,
+      from: h.from,
+      to: h.to,
+      ...h.color !== void 0 && { color: h.color },
+      ...h.label !== void 0 && { label: h.label }
+    }));
+  }
+  let cursors;
+  if (numberLine.cursors !== void 0 && numberLine.cursors.length > 0) {
+    cursors = numberLine.cursors.map((c) => ({
+      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_CURSOR),
+      type: JSON_TYPES.NUMBER_LINE_CURSOR,
+      value: c.value,
+      answer: c.answer,
+      fillRange: c.fillRange,
+      ...c.color !== void 0 && { color: c.color },
+      ...c.label !== void 0 && { label: c.label }
+    }));
+  }
+  let arrows;
+  if (numberLine.arrows !== void 0 && numberLine.arrows.length > 0) {
+    arrows = numberLine.arrows.map((a) => ({
+      id: idGenerator.generate(JSON_TYPES.NUMBER_LINE_ARROW),
+      type: JSON_TYPES.NUMBER_LINE_ARROW,
+      from: a.from,
+      to: a.to,
+      ...a.color !== void 0 && { color: a.color },
+      content: a.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds))
+    }));
+  }
+  const item = {
+    id: idGenerator.generate(JSON_TYPES.NUMBER_LINE),
+    type: JSON_TYPES.NUMBER_LINE,
+    min: numberLine.min,
+    max: numberLine.max,
+    step: numberLine.step,
+    ...numberLine.minorTicks !== void 0 && { minorTicks: numberLine.minorTicks },
+    ...numberLine.style !== void 0 && { style: numberLine.style },
+    ...numberLine.labelVisibility !== void 0 && { labelVisibility: numberLine.labelVisibility },
+    ...counterItem !== void 0 && { counter: counterItem },
+    ...highlights !== void 0 && { highlights },
+    ...cursors !== void 0 && { cursors },
+    ...arrows !== void 0 && { arrows },
+    ...numberLine.dragMode !== void 0 && { dragMode: numberLine.dragMode },
+    positions
+  };
+  return item;
+}
+function mapMatcherItemList(items, idGenerator, inlineDragIds) {
+  return items.map((item) => ({
+    id: idGenerator.generate(JSON_TYPES.MATCHER_ITEM),
+    type: JSON_TYPES.MATCHER_ITEM,
+    itemId: item.itemId,
+    content: item.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds))
+  }));
+}
+function buildMatcherWidget(matcher, idGenerator, inlineDragIds) {
+  const rows = matcher.rows.map((row) => ({
+    id: idGenerator.generate(JSON_TYPES.MATCHER_ROW),
+    type: JSON_TYPES.MATCHER_ROW,
+    items: mapMatcherItemList(row.items, idGenerator, inlineDragIds)
+  }));
+  const result = {
+    type: JSON_TYPES.MATCHER,
+    rows,
+    groupCount: matcher.answers.length
+  };
+  if (matcher.colors !== void 0) {
+    result.colors = matcher.colors;
+  }
+  return result;
+}
+function buildPairMatcherWidget(pm, idGenerator, inlineDragIds) {
+  return {
+    type: JSON_TYPES.PAIR_MATCHER,
+    topItems: mapMatcherItemList(pm.topItems, idGenerator, inlineDragIds),
+    bottomItems: mapMatcherItemList(pm.bottomItems, idGenerator, inlineDragIds)
+  };
+}
+function transformVerticalOperation(vop, idGenerator) {
+  const anyRowHasOp = vop.items.some(
+    (item) => item.type === AST_TYPES.VOP_ROW && item.op !== void 0
+  );
+  if (!anyRowHasOp && vop.op === void 0) {
+    throw new Error("VERTICAL_OPERATION: at least one op is required (set op on the block or on individual ROWs)");
+  }
+  let cols = 1;
+  for (const item of vop.items) {
+    if (item.type === AST_TYPES.VOP_ROW || item.type === AST_TYPES.VOP_CARRY_ROW) {
+      cols = Math.max(cols, item.cells.length);
+    }
+  }
+  function buildCells(row) {
+    return row.cells.map((cell) => {
+      const id = idGenerator.generate(JSON_TYPES.VOP_CELL);
+      if (cell.kind === "digit") return { id, type: JSON_TYPES.VOP_CELL, kind: "digit", value: cell.value };
+      if (cell.kind === "label") return { id, type: JSON_TYPES.VOP_CELL, kind: "label", value: cell.value };
+      if (cell.kind === "color") return { id, type: JSON_TYPES.VOP_CELL, kind: "color", value: cell.value, color: cell.color };
+      if (cell.kind === "bold") return { id, type: JSON_TYPES.VOP_CELL, kind: "bold", value: cell.value };
+      if (cell.kind === "highlight") return { id, type: JSON_TYPES.VOP_CELL, kind: "highlight", value: cell.value };
+      if (cell.kind === "input") return { id, type: JSON_TYPES.VOP_CELL, kind: "input", widgetId: cell.name };
+      return { id, type: JSON_TYPES.VOP_CELL, kind: "empty" };
+    });
+  }
+  const items = vop.items.map((item) => {
+    if (item.type === AST_TYPES.VOP_SEPARATOR) {
+      return {
+        id: idGenerator.generate(JSON_TYPES.VOP_SEPARATOR),
+        type: JSON_TYPES.VOP_SEPARATOR
+      };
+    }
+    if (item.type === AST_TYPES.VOP_CARRY_ROW) {
+      return {
+        id: idGenerator.generate(JSON_TYPES.VOP_CARRY_ROW),
+        type: JSON_TYPES.VOP_CARRY_ROW,
+        cells: buildCells(item)
+      };
+    }
+    const row = item;
+    return {
+      id: idGenerator.generate(JSON_TYPES.VOP_ROW),
+      type: JSON_TYPES.VOP_ROW,
+      cells: buildCells(row),
+      ...row.op !== void 0 && { op: row.op }
+    };
+  });
+  return {
+    id: idGenerator.generate(JSON_TYPES.VERTICAL_OPERATION),
+    type: JSON_TYPES.VERTICAL_OPERATION,
+    op: vop.op,
+    cols,
+    items
+  };
+}
+function transformTable(table, idGenerator, inlineDragIds) {
+  const rows = table.rows.map((row) => {
+    const cells = row.cells.map((cell) => {
+      const items = cell.inlines.map((inline) => transformInline(inline, idGenerator, inlineDragIds));
+      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, inlineDragIds) {
+  const items = [];
+  for (const inline of line.inlines) {
+    items.push(transformInline(inline, idGenerator, inlineDragIds));
+  }
+  items.push({
+    id: idGenerator.generate(JSON_TYPES.LINEBREAK),
+    type: JSON_TYPES.LINEBREAK
+  });
+  return items;
+}
+function transformInline(inline, idGenerator, inlineDragIds) {
+  switch (inline.type) {
+    case AST_TYPES.FREE_TEXT: {
+      const trimmed = inline.value.trim();
+      const operators = ["+", "-", "×", "÷", "=", "<", ">", "?"];
+      if (operators.includes(trimmed) && inline.value.trim() === inline.value) {
+        return {
+          id: idGenerator.generate("operator"),
+          type: "operator",
+          operator: trimmed
         };
-      });
-      LazyWrapper.prototype.compact = function() {
-        return this.filter(identity);
+      }
+      return {
+        id: idGenerator.generate(JSON_TYPES.TEXT),
+        type: JSON_TYPES.TEXT,
+        value: inline.value
       };
-      LazyWrapper.prototype.find = function(predicate) {
-        return this.filter(predicate).head();
+    }
+    case AST_TYPES.SPACE:
+      return {
+        id: idGenerator.generate(JSON_TYPES.SPACE),
+        type: JSON_TYPES.SPACE
+      };
+    case AST_TYPES.HIGHLIGHTED_TEXT:
+      return {
+        id: idGenerator.generate(JSON_TYPES.HIGHLIGHTED_TEXT),
+        type: JSON_TYPES.HIGHLIGHTED_TEXT,
+        value: inline.value,
+        highlight: inline.highlight
+      };
+    case AST_TYPES.COLOR_TEXT:
+      return {
+        id: idGenerator.generate(JSON_TYPES.COLOR_TEXT),
+        type: JSON_TYPES.COLOR_TEXT,
+        value: inline.value,
+        color: inline.color,
+        highlight: inline.highlight
+      };
+    case AST_TYPES.BOLD_TEXT:
+      return {
+        id: idGenerator.generate(JSON_TYPES.BOLD_TEXT),
+        type: JSON_TYPES.BOLD_TEXT,
+        value: inline.value,
+        highlight: inline.highlight
       };
-      LazyWrapper.prototype.findLast = function(predicate) {
-        return this.reverse().find(predicate);
+    case AST_TYPES.INLINE_INPUT:
+      return {
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: inline.name
       };
-      LazyWrapper.prototype.invokeMap = baseRest(function(path, args) {
-        if (typeof path == "function") {
-          return new LazyWrapper(this);
-        }
-        return this.map(function(value) {
-          return baseInvoke(value, path, args);
-        });
-      });
-      LazyWrapper.prototype.reject = function(predicate) {
-        return this.filter(negate(getIteratee(predicate)));
+    case AST_TYPES.FRACTION:
+      return {
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: inline.name
       };
-      LazyWrapper.prototype.slice = function(start, end) {
-        start = toInteger(start);
-        var result2 = this;
-        if (result2.__filtered__ && (start > 0 || end < 0)) {
-          return new LazyWrapper(result2);
-        }
-        if (start < 0) {
-          result2 = result2.takeRight(-start);
-        } else if (start) {
-          result2 = result2.drop(start);
-        }
-        if (end !== undefined$1) {
-          end = toInteger(end);
-          result2 = end < 0 ? result2.dropRight(-end) : result2.take(end - start);
-        }
-        return result2;
+    case AST_TYPES.IMAGE:
+      return {
+        id: idGenerator.generate(JSON_TYPES.IMAGE),
+        type: JSON_TYPES.IMAGE,
+        name: inline.name,
+        src: inline.src,
+        alt: inline.alt,
+        ...inline.width !== void 0 && { width: inline.width },
+        ...inline.height !== void 0 && { height: inline.height }
       };
-      LazyWrapper.prototype.takeRightWhile = function(predicate) {
-        return this.reverse().takeWhile(predicate).reverse();
+    case AST_TYPES.VISUAL_FRACTION:
+      return {
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: inline.name
       };
-      LazyWrapper.prototype.toArray = function() {
-        return this.take(MAX_ARRAY_LENGTH);
+    case AST_TYPES.INLINE_DRAG_OPTION:
+      return {
+        id: idGenerator.generate(JSON_TYPES.WIDGET_REF),
+        type: JSON_TYPES.WIDGET_REF,
+        widgetId: inlineDragIds.get(inline)
       };
-      baseForOwn(LazyWrapper.prototype, function(func, methodName) {
-        var checkIteratee = /^(?:filter|find|map|reject)|While$/.test(methodName), isTaker = /^(?:head|last)$/.test(methodName), lodashFunc = lodash2[isTaker ? "take" + (methodName == "last" ? "Right" : "") : methodName], retUnwrapped = isTaker || /^find/.test(methodName);
-        if (!lodashFunc) {
-          return;
-        }
-        lodash2.prototype[methodName] = function() {
-          var value = this.__wrapped__, args = isTaker ? [1] : arguments, isLazy = value instanceof LazyWrapper, iteratee2 = args[0], useLazy = isLazy || isArray(value);
-          var interceptor = function(value2) {
-            var result3 = lodashFunc.apply(lodash2, arrayPush([value2], args));
-            return isTaker && chainAll ? result3[0] : result3;
-          };
-          if (useLazy && checkIteratee && typeof iteratee2 == "function" && iteratee2.length != 1) {
-            isLazy = useLazy = false;
-          }
-          var chainAll = this.__chain__, isHybrid = !!this.__actions__.length, isUnwrapped = retUnwrapped && !chainAll, onlyLazy = isLazy && !isHybrid;
-          if (!retUnwrapped && useLazy) {
-            value = onlyLazy ? value : new LazyWrapper(this);
-            var result2 = func.apply(value, args);
-            result2.__actions__.push({ "func": thru, "args": [interceptor], "thisArg": undefined$1 });
-            return new LodashWrapper(result2, chainAll);
-          }
-          if (isUnwrapped && onlyLazy) {
-            return func.apply(this, args);
-          }
-          result2 = this.thru(interceptor);
-          return isUnwrapped ? isTaker ? result2.value()[0] : result2.value() : result2;
-        };
-      });
-      arrayEach(["pop", "push", "shift", "sort", "splice", "unshift"], function(methodName) {
-        var func = arrayProto[methodName], chainName = /^(?:push|sort|unshift)$/.test(methodName) ? "tap" : "thru", retUnwrapped = /^(?:pop|shift)$/.test(methodName);
-        lodash2.prototype[methodName] = function() {
-          var args = arguments;
-          if (retUnwrapped && !this.__chain__) {
-            var value = this.value();
-            return func.apply(isArray(value) ? value : [], args);
-          }
-          return this[chainName](function(value2) {
-            return func.apply(isArray(value2) ? value2 : [], args);
-          });
-        };
-      });
-      baseForOwn(LazyWrapper.prototype, function(func, methodName) {
-        var lodashFunc = lodash2[methodName];
-        if (lodashFunc) {
-          var key2 = lodashFunc.name + "";
-          if (!hasOwnProperty.call(realNames, key2)) {
-            realNames[key2] = [];
-          }
-          realNames[key2].push({ "name": methodName, "func": lodashFunc });
-        }
-      });
-      realNames[createHybrid(undefined$1, WRAP_BIND_KEY_FLAG).name] = [{
-        "name": "wrapper",
-        "func": undefined$1
-      }];
-      LazyWrapper.prototype.clone = lazyClone;
-      LazyWrapper.prototype.reverse = lazyReverse;
-      LazyWrapper.prototype.value = lazyValue;
-      lodash2.prototype.at = wrapperAt;
-      lodash2.prototype.chain = wrapperChain;
-      lodash2.prototype.commit = wrapperCommit;
-      lodash2.prototype.next = wrapperNext;
-      lodash2.prototype.plant = wrapperPlant;
-      lodash2.prototype.reverse = wrapperReverse;
-      lodash2.prototype.toJSON = lodash2.prototype.valueOf = lodash2.prototype.value = wrapperValue;
-      lodash2.prototype.first = lodash2.prototype.head;
-      if (symIterator) {
-        lodash2.prototype[symIterator] = wrapperToIterator;
+    case AST_TYPES.CLOCK: {
+      const base = {
+        id: idGenerator.generate(JSON_TYPES.CLOCK),
+        type: JSON_TYPES.CLOCK,
+        mode: inline.mode,
+        clockType: inline.clockType,
+        value: inline.value,
+        ...inline.format !== void 0 && { format: inline.format },
+        ...inline.name !== void 0 && { name: inline.name }
+      };
+      if (inline.mode === "interactive") {
+        return { ...base, ...inline.snap !== void 0 && { snap: inline.snap } };
       }
-      return lodash2;
+      return base;
+    }
+    default:
+      throw new Error(`Unknown inline type: ${inline.type}`);
+  }
+}
+function transformValidation(validation, answers, widgets) {
+  if (validation.type === AST_TYPES.SIMPLE_VALIDATION) {
+    return {
+      mode: VALIDATION_MODES.SIMPLE,
+      answers
     };
-    var _ = runInContext();
-    if (freeModule) {
-      (freeModule.exports = _)._ = _;
-      freeExports._ = _;
-    } else {
-      root._ = _;
+  } else if (validation.type === AST_TYPES.EXPRESSION_VALIDATION) {
+    const validVariableNames = Object.keys(widgets);
+    const variables = extractVariables$1(validation.expression, validVariableNames);
+    return {
+      mode: VALIDATION_MODES.EXPRESSION,
+      expression: validation.expression,
+      variables
+    };
+  } else if (validation.type === AST_TYPES.MIXED_VALIDATION) {
+    const validVariableNames = Object.keys(widgets);
+    const variables = extractVariables$1(validation.expression, validVariableNames);
+    const inExpression = new Set(variables);
+    for (const [name, widget] of Object.entries(widgets)) {
+      if (name.startsWith("_")) continue;
+      if (name in answers) continue;
+      if (inExpression.has(name)) continue;
+      if (widget.type === JSON_TYPES.FRACTION) {
+        const w = widget;
+        if (w.numerator !== null && w.denominator !== null) continue;
+      }
+      if (widget.type === JSON_TYPES.VISUAL_FRACTION) {
+        const w = widget;
+        if (Array.isArray(w.filled) && w.filled.length > 0) continue;
+      }
+      throw new Error(
+        `Mixed validation: widget "${name}" has no \`answer\` and is not referenced in expression "${validation.expression}"`
+      );
     }
-  }).call(commonjsGlobal);
-})(lodash, lodash.exports);
-var lodashExports = lodash.exports;
+    return {
+      mode: VALIDATION_MODES.MIXED,
+      expression: validation.expression,
+      answers,
+      variables
+    };
+  }
+  throw new Error(`Unknown validation type: ${validation.type}`);
+}
+function extractVariables$1(expression, validVariables) {
+  const matches = expression.match(/\b[a-zA-Z_][a-zA-Z0-9_]*\b/g) || [];
+  const variables = matches.filter(
+    (v) => v !== "true" && v !== "false" && v !== "null" && v !== "undefined"
+  );
+  const uniqueVars = Array.from(new Set(variables));
+  if (validVariables && validVariables.length > 0) {
+    return uniqueVars.filter((v) => validVariables.includes(v));
+  }
+  return uniqueVars;
+}
+function normalize(value) {
+  if (typeof value === "number") {
+    return String(Math.round(value * 10 ** INTERNAL_PRECISION) / 10 ** INTERNAL_PRECISION);
+  }
+  const trimmed = String(value).trim().toLowerCase().replace(/^["']|["']$/g, "");
+  const asNum = Number(trimmed);
+  if (trimmed !== "" && !isNaN(asNum)) {
+    return String(Math.round(asNum * 10 ** INTERNAL_PRECISION) / 10 ** INTERNAL_PRECISION);
+  }
+  return trimmed;
+}
+const NL_DRAG_PREFIX = "\0nl-drag\0";
+const isNLDragEncoded = (v) => v.startsWith(NL_DRAG_PREFIX);
+const encodeNLDragValue = (label, position) => `${NL_DRAG_PREFIX}${label}@${String(position)}`;
+function isNLDragCorrect(encoded, expectedLabel, expectedPosition) {
+  const payload = encoded.slice(NL_DRAG_PREFIX.length);
+  const atIdx = payload.lastIndexOf("@");
+  const label = normalize(payload.slice(0, atIdx));
+  const position = normalize(payload.slice(atIdx + 1));
+  return label === normalize(expectedLabel) && position === normalize(expectedPosition);
+}
 function areMatcherEqual(expected, result) {
   if (!Array.isArray(result)) return false;
   if (expected.length !== result.length) return false;
@@ -15245,21 +15247,19 @@ const DragOptions = ({
   options,
   onOptionClick
 }) => {
-  const [shuffledOptions] = React.useState(
-    () => lodashExports.shuffle(options.map((option, idx) => ({
-      optionId: `drag-option-${idx}`,
-      value: String(option)
-    })))
-  );
-  return /* @__PURE__ */ jsxRuntime.jsx(PillBackground, { children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "drag-options", children: shuffledOptions.map(({ optionId, value }) => /* @__PURE__ */ jsxRuntime.jsx(
-    SingleDragOption,
-    {
-      optionId,
-      value,
-      onOptionClick
-    },
-    optionId
-  )) }) });
+  return /* @__PURE__ */ jsxRuntime.jsx(PillBackground, { children: /* @__PURE__ */ jsxRuntime.jsx("div", { className: "drag-options", children: options.map((option, idx) => {
+    const optionId = `drag-option-${idx}`;
+    const optionValue = String(option);
+    return /* @__PURE__ */ jsxRuntime.jsx(
+      SingleDragOption,
+      {
+        optionId,
+        value: optionValue,
+        onOptionClick
+      },
+      optionId
+    );
+  }) }) });
 };
 const InlineDragOption = ({
   widgetId,
@@ -15843,8 +15843,7 @@ const RadioOptions = ({
   onChange
 }) => {
   const playSound = useSound();
-  const [shuffledOptions] = React.useState(() => lodashExports.shuffle(options));
-  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "radio-options", children: shuffledOptions.map((option, idx) => {
+  return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "radio-options", children: options.map((option, idx) => {
     const isSelected = value === option;
     const statusClass = isSelected && validationStatus ? ` widget--${validationStatus}` : "";
     return /* @__PURE__ */ jsxRuntime.jsx(
@@ -17677,26 +17676,42 @@ const NumberLineRenderer = ({
     positions,
     cursors
   } = item;
-  const [counterCount, setCounterCount] = React.useState(
-    counter !== void 0 ? counter.default ?? counter.min : 0
-  );
+  const [counterCount, setCounterCount] = React.useState(() => {
+    if (counter === void 0) return 0;
+    const raw = values[counter.id];
+    const n = typeof raw === "string" && raw !== "" ? Number(raw) : NaN;
+    return Number.isFinite(n) ? Math.min(counter.max, Math.max(counter.min, n)) : counter.default ?? counter.min;
+  });
   const defaultCounterCount = counter !== void 0 ? counter.default ?? counter.min : 0;
+  const prevCounterKey = React.useRef(null);
   React.useEffect(() => {
-    setCounterCount(defaultCounterCount);
-  }, [counter]);
+    const key2 = counter ? `${counter.id}:${defaultCounterCount}` : "";
+    const changed = prevCounterKey.current !== null && prevCounterKey.current !== key2;
+    prevCounterKey.current = key2;
+    if (changed) setCounterCount(defaultCounterCount);
+  }, [counter, defaultCounterCount]);
   const onChangeRef = React.useRef(onChange);
   onChangeRef.current = onChange;
+  const valuesRef = React.useRef(values);
+  valuesRef.current = values;
   React.useEffect(() => {
-    if (counter !== void 0) {
-      onChangeRef.current(counter.id, String(counterCount));
+    if (counter === void 0) return;
+    const next = String(counterCount);
+    if (valuesRef.current[counter.id] !== next) {
+      onChangeRef.current(counter.id, next);
     }
   }, [counterCount, counter?.id]);
   const cursorKeys = React.useMemo(
     () => (cursors ?? []).map((c) => `${c.id}:${c.value}`).join(","),
     [cursors]
   );
+  const prevCursorKeys = React.useRef(null);
   React.useEffect(() => {
+    const isDefinitionChange = prevCursorKeys.current !== null && prevCursorKeys.current !== cursorKeys;
+    prevCursorKeys.current = cursorKeys;
     for (const cursor of cursors ?? []) {
+      const existing = valuesRef.current[cursor.id];
+      if (!isDefinitionChange && existing !== void 0 && existing !== "") continue;
       onChangeRef.current(cursor.id, String(cursor.value));
     }
   }, [cursorKeys]);
@@ -18136,6 +18151,8 @@ function groupLineItems(items) {
   return groups;
 }
 const toValidationStatus = (v) => v === true ? "correct" : v === false ? "incorrect" : null;
+const isNumericText = (value) => /^[\d.,\s]+$/.test(value);
+const numberClass = (value) => isNumericText(value) ? "text-item-number" : "";
 const LayoutRenderer = ({
   item,
   widgets,
@@ -18152,47 +18169,49 @@ const LayoutRenderer = ({
       return /* @__PURE__ */ jsxRuntime.jsx("span", { className: `question-text ${hasArabic ? "question-text-arabic" : ""}`, children: item.value });
     }
     case JSON_TYPES.TEXT: {
-      const isNum = /^[\d.,\s]+$/.test(item.value);
-      return /* @__PURE__ */ jsxRuntime.jsx("span", { className: `text-item ${isNum ? "text-item-number" : ""} ${isArabic(item.value) ? "text-item-arabic" : "text-item-not-arabic"}`, children: item.value });
+      return /* @__PURE__ */ jsxRuntime.jsx("span", { className: `text-item ${numberClass(item.value)} ${isArabic(item.value) ? "text-item-arabic" : "text-item-not-arabic"}`, children: item.value });
     }
     case JSON_TYPES.HIGHLIGHTED_TEXT: {
       const hasArabic = isArabic(item.value);
       const dirAttr = !hasArabic ? "ltr" : void 0;
+      const numClass = numberClass(item.value);
       if (item.highlight) {
         const [start, end] = item.highlight;
-        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "highlighted-text text-item", dir: dirAttr, children: [
+        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: `highlighted-text text-item ${numClass}`, dir: dirAttr, children: [
           item.value.slice(0, start),
           /* @__PURE__ */ jsxRuntime.jsx("mark", { className: "highlight text-item", children: item.value.slice(start, end) }),
           item.value.slice(end)
         ] });
       }
-      return /* @__PURE__ */ jsxRuntime.jsx("mark", { className: "highlighted-text text-item", dir: dirAttr, children: item.value });
+      return /* @__PURE__ */ jsxRuntime.jsx("mark", { className: `highlighted-text text-item ${numClass}`, dir: dirAttr, children: item.value });
     }
     case JSON_TYPES.COLOR_TEXT: {
       const hasArabic = isArabic(item.value);
       const dirAttr = !hasArabic ? "ltr" : void 0;
+      const numClass = numberClass(item.value);
       if (item.highlight) {
         const [start, end] = item.highlight;
-        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "color-text text-item", dir: dirAttr, children: [
+        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: `color-text text-item ${numClass}`, dir: dirAttr, children: [
           item.value.slice(0, start),
           /* @__PURE__ */ jsxRuntime.jsx("span", { className: "color-text-colored", style: { color: item.color }, children: item.value.slice(start, end) }),
           item.value.slice(end)
         ] });
       }
-      return /* @__PURE__ */ jsxRuntime.jsx("span", { className: "color-text text-item", style: { color: item.color }, dir: dirAttr, children: item.value });
+      return /* @__PURE__ */ jsxRuntime.jsx("span", { className: `color-text text-item ${numClass}`, style: { color: item.color }, dir: dirAttr, children: item.value });
     }
     case JSON_TYPES.BOLD_TEXT: {
       const hasArabic = isArabic(item.value);
       const dirAttr = !hasArabic ? "ltr" : void 0;
+      const numClass = numberClass(item.value);
       if (item.highlight) {
         const [start, end] = item.highlight;
-        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: "bold-text text-item", dir: dirAttr, children: [
+        return /* @__PURE__ */ jsxRuntime.jsxs("span", { className: `bold-text text-item ${numClass}`, dir: dirAttr, children: [
           item.value.slice(0, start),
           /* @__PURE__ */ jsxRuntime.jsx("strong", { className: "bold-text-strong text-item", children: item.value.slice(start, end) }),
           item.value.slice(end)
         ] });
       }
-      return /* @__PURE__ */ jsxRuntime.jsx("strong", { className: "bold-text text-item", dir: dirAttr, children: item.value });
+      return /* @__PURE__ */ jsxRuntime.jsx("strong", { className: `bold-text text-item ${numClass}`, dir: dirAttr, children: item.value });
     }
     case JSON_TYPES.IMAGE:
       return /* @__PURE__ */ jsxRuntime.jsx(
@@ -18444,6 +18463,44 @@ function buildInitialValues(json) {
   }
   return initial;
 }
+function buildRevealedValues(json) {
+  const revealed = {};
+  const validation = json.validation;
+  if (!validation) return revealed;
+  const answers = validation.answers ?? {};
+  for (const [widgetId, expected] of Object.entries(answers)) {
+    const widget = json.widgets[widgetId];
+    if (widget?.type === JSON_TYPES.FRACTION && typeof expected === "string") {
+      const [num, den] = expected.split("/", 2);
+      if (widget.numerator === null && num !== void 0) revealed[getFractionKey(widgetId, "num")] = num;
+      if (widget.denominator === null && den !== void 0) revealed[getFractionKey(widgetId, "den")] = den;
+      continue;
+    }
+    revealed[widgetId] = typeof expected === "number" ? String(expected) : expected;
+  }
+  if ((validation.mode === VALIDATION_MODES.EXPRESSION || validation.mode === VALIDATION_MODES.MIXED) && validation.expression) {
+    const vars = validation.variables ?? [];
+    const freeVars = vars.filter((v) => !(v in answers));
+    if (freeVars.length > 0) {
+      const ranges = {};
+      for (const v of vars) {
+        if (v in answers) {
+          const pinned = Number(answers[v]);
+          if (Number.isFinite(pinned)) ranges[v] = { min: pinned, max: pinned, step: 1 };
+        } else {
+          ranges[v] = { min: 1, max: 100, step: 1 };
+        }
+      }
+      const combo = findValidCombination(validation.expression, ranges);
+      if (combo) {
+        for (const v of freeVars) {
+          if (combo[v] !== void 0) revealed[v] = String(combo[v]);
+        }
+      }
+    }
+  }
+  return revealed;
+}
 const ExerciseRenderer = React.forwardRef(({
   json,
   onSubmit,
@@ -18454,10 +18511,13 @@ const ExerciseRenderer = React.forwardRef(({
   sounds
 }, ref) => {
   const [values, setValues] = React.useState(() => buildInitialValues(json));
+  const valuesRef = React.useRef(values);
+  valuesRef.current = values;
   const [droppedSources, setDroppedSources] = React.useState(/* @__PURE__ */ new Map());
   const [focusedInputId, setFocusedInputId] = React.useState(null);
   const [validationDetails, setValidationDetails] = React.useState(null);
   const [resetKey, setResetKey] = React.useState(0);
+  const [revealed, setRevealed] = React.useState(false);
   const playSound = useSoundPlayer(soundEnabled, sounds);
   React.useImperativeHandle(ref, () => ({
     submit: () => {
@@ -18491,7 +18551,7 @@ const ExerciseRenderer = React.forwardRef(({
     getValues: () => values,
     getCompletion: () => {
       const answerable = getAnswerableInputs(json);
-      const missing = getMissingInputs(json, values);
+      const missing = getMissingInputs(json, valuesRef.current);
       const missingSet = new Set(missing);
       const filledIds = answerable.filter((id) => !missingSet.has(id));
       return {
@@ -18504,11 +18564,28 @@ const ExerciseRenderer = React.forwardRef(({
       };
     },
     reset: () => {
-      setValues(buildInitialValues(json));
+      const initial = buildInitialValues(json);
+      valuesRef.current = initial;
+      setValues(initial);
       setDroppedSources(/* @__PURE__ */ new Map());
       setFocusedInputId(null);
       setValidationDetails(null);
       setResetKey((k) => k + 1);
+      setRevealed(false);
+    },
+    revealAnswers: () => {
+      const revealedValues = buildRevealedValues(json);
+      const details = {};
+      for (const [widgetId, userValue] of Object.entries(revealedValues)) {
+        details[widgetId] = { widgetId, userValue, isCorrect: true };
+      }
+      const next = { ...valuesRef.current, ...revealedValues };
+      valuesRef.current = next;
+      setValues(next);
+      setDroppedSources(/* @__PURE__ */ new Map());
+      setValidationDetails(details);
+      setRevealed(true);
+      setResetKey((k) => k + 1);
     },
     focusFirstInput: () => {
       const container = document.querySelector(".math-exercise-renderer");
@@ -18519,17 +18596,20 @@ const ExerciseRenderer = React.forwardRef(({
     }
   }), [json, values, onSubmit, playSound]);
   const handleChange = (widgetId, value, fromDrop = false, sourceOptionId) => {
-    setValues((prev) => ({ ...prev, [widgetId]: value }));
+    setRevealed(false);
+    const next = { ...valuesRef.current, [widgetId]: value };
+    valuesRef.current = next;
+    setValues(next);
     setDroppedSources((prev) => {
-      const next = new Map(prev);
+      const next2 = new Map(prev);
       if (fromDrop && typeof value === "string" && value !== "" && sourceOptionId) {
-        next.set(widgetId, sourceOptionId);
+        next2.set(widgetId, sourceOptionId);
       } else {
-        next.delete(widgetId);
+        next2.delete(widgetId);
       }
-      return next;
+      return next2;
     });
-    onChange?.({ ...values, [widgetId]: value });
+    onChange?.(next);
   };
   const handleSubmit = () => {
     onSubmit?.(values);
@@ -18647,7 +18727,7 @@ const ExerciseRenderer = React.forwardRef(({
     if (setSquareWidget) add2("set-square-1", "set-square", Math.round(getSize(setSquareWidget) * 160));
     return { tools: list, toolsMinHeight: maxH };
   }, [rulerWidget, protractorWidget, setSquareWidget]);
-  return /* @__PURE__ */ jsxRuntime.jsx(SoundPlayerProvider, { play: playSound, children: /* @__PURE__ */ jsxRuntime.jsx(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `math-exercise-renderer ${className}`, children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(SoundPlayerProvider, { play: playSound, children: /* @__PURE__ */ jsxRuntime.jsx(ExerciseDndProvider, { droppedSources, children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: `math-exercise-renderer ${revealed ? "revealed" : ""} ${className}`, children: [
     /* @__PURE__ */ jsxRuntime.jsxs(
       "div",
       {