@mathscan/math-exercise-engine 1.0.14 → 1.0.15

package/dist/index.mjs

@@ -23,6 +23,8 @@ const AST_TYPES = {
   INLINE_INPUT: "InlineInput",
   /** Inline fraction widget (numerator/denominator with optional inputs) */
   FRACTION: "Fraction",
+  /** Inline image element */
+  IMAGE: "Image",
   // ═══════════════════════════════════════════════════════════════════════════
   // Blocks
   // ═══════════════════════════════════════════════════════════════════════════
@@ -88,6 +90,8 @@ const JSON_TYPES = {
   COLOR_TEXT: "color-text",
   /** Bold text */
   BOLD_TEXT: "bold-text",
+  /** Inline image */
+  IMAGE: "image",
   /** Reference to a widget */
   WIDGET_REF: "widget-ref",
   /** Line break element */
@@ -278,6 +282,10 @@ const ANSWERS = createToken({
   name: "ANSWERS",
   pattern: /ANSWERS/
 });
+const IMAGE = createToken({
+  name: "IMAGE",
+  pattern: /IMAGE/
+});
 const NumberLiteral = createToken({
   name: "NumberLiteral",
   pattern: /-?\d+(\.\d+)?/
@@ -391,6 +399,7 @@ const allTokens = [
   MATCHER,
   ITEM,
   ANSWERS,
+  IMAGE,
   // Literals
   NumberLiteral,
   StringLiteral,
@@ -849,6 +858,8 @@ class MathExerciseParser extends CstParser {
         { ALT: () => this.SUBRULE(this.boldText) },
         // FRACTION (inline fraction widget)
         { ALT: () => this.SUBRULE(this.fraction) },
+        // IMAGE (inline image element)
+        { ALT: () => this.SUBRULE(this.image) },
         // W_S_I (inline input widget) — excluded in display-only contexts (e.g. MATCHER ITEM)
         { GATE: () => !displayOnly, ALT: () => this.SUBRULE(this.inlineInput) }
       ]);
@@ -880,6 +891,12 @@ class MathExerciseParser extends CstParser {
       this.SUBRULE(this.parameterList);
       this.CONSUME(RBracket);
     });
+    this.image = this.RULE("image", () => {
+      this.CONSUME(IMAGE);
+      this.CONSUME(LBracket);
+      this.SUBRULE(this.parameterList);
+      this.CONSUME(RBracket);
+    });
     this.inlineInput = this.RULE("inlineInput", () => {
       this.OR([
         { ALT: () => this.CONSUME(W_S_I, { LABEL: "stringInput" }) },
@@ -1070,6 +1087,17 @@ const FractionInlineSchema = z.object({
   answer: z.string().optional(),
   simplified: z.boolean().default(true)
 });
+const IMAGE_SRC_SCHEME_RE$1 = /^(https?:\/\/|data:image\/)/i;
+const ImageInlineSchema = z.object({
+  type: z.literal(AST_TYPES.IMAGE),
+  name: z.string().min(1),
+  src: z.string().url().refine((s) => IMAGE_SRC_SCHEME_RE$1.test(s), {
+    message: "src must use http(s) or data:image scheme"
+  }),
+  alt: z.string(),
+  width: z.number().positive().optional(),
+  height: z.number().positive().optional()
+});
 const InlineNodeSchema = z.union([
   FreeTextInlineSchema,
   SpaceInlineSchema,
@@ -1077,7 +1105,8 @@ const InlineNodeSchema = z.union([
   ColorTextInlineSchema,
   BoldTextInlineSchema,
   InlineInputWidgetSchema,
-  FractionInlineSchema
+  FractionInlineSchema,
+  ImageInlineSchema
 ]);
 function createFreeText(value) {
   return FreeTextInlineSchema.parse({
@@ -1130,6 +1159,15 @@ function createNumericInput(name, digits, answer) {
     answer
   });
 }
+function createImage(name, src, alt, options = {}) {
+  return ImageInlineSchema.parse({
+    type: AST_TYPES.IMAGE,
+    name,
+    src,
+    alt,
+    ...options
+  });
+}
 function createFraction(name, options = {}) {
   return FractionInlineSchema.parse({
     type: AST_TYPES.FRACTION,
@@ -1149,6 +1187,9 @@ function isInlineInput(value) {
 function isFraction(value) {
   return FractionInlineSchema.safeParse(value).success;
 }
+function isImage(value) {
+  return ImageInlineSchema.safeParse(value).success;
+}
 function isInlineNode(value) {
   return InlineNodeSchema.safeParse(value).success;
 }
@@ -1353,7 +1394,8 @@ const DisplayInlineNodeSchema = z.union([
   HighlightedTextInlineSchema,
   ColorTextInlineSchema,
   BoldTextInlineSchema,
-  DisplayFractionInlineSchema
+  DisplayFractionInlineSchema,
+  ImageInlineSchema
 ]);
 const MatcherItemSchema = z.object({
   type: z.literal(AST_TYPES.MATCHER_ITEM),
@@ -1529,6 +1571,51 @@ const ExerciseDocumentSchema = z.object({
   lines: z.array(ContentBlockSchema),
   tools: z.array(ToolNodeSchema).optional(),
   validation: ValidationNodeSchema.optional()
+}).superRefine((doc, ctx) => {
+  const seen = /* @__PURE__ */ new Set();
+  const record = (name, path) => {
+    if (seen.has(name)) {
+      ctx.addIssue({
+        code: z.ZodIssueCode.custom,
+        message: `Duplicate name "${name}" — widget/image names must be unique across the document`,
+        path
+      });
+    } else {
+      seen.add(name);
+    }
+  };
+  const visitInlines = (inlines, basePath) => {
+    inlines.forEach((inline, i) => {
+      if (inline.type === AST_TYPES.INLINE_INPUT || inline.type === AST_TYPES.FRACTION || inline.type === AST_TYPES.IMAGE) {
+        record(inline.name, [...basePath, i, "name"]);
+      }
+    });
+  };
+  doc.lines.forEach((block, bi) => {
+    if (block.type === AST_TYPES.LINE_BLOCK) {
+      visitInlines(block.inlines, ["lines", bi, "inlines"]);
+    } else if (block.type === AST_TYPES.TABLE_BLOCK) {
+      block.rows.forEach((row, ri) => {
+        row.cells.forEach((cell, ci) => {
+          visitInlines(cell.inlines, ["lines", bi, "rows", ri, "cells", ci, "inlines"]);
+        });
+      });
+    } else if (block.type === AST_TYPES.NUMBER_LINE_BLOCK) {
+      block.positions.forEach((pos, pi) => {
+        visitInlines(pos.inlines, ["lines", bi, "positions", pi, "inlines"]);
+      });
+    } else if (block.type === AST_TYPES.MATCHER_BLOCK) {
+      const m = block;
+      record(m.name, ["lines", bi, "name"]);
+      m.rows.forEach((row, ri) => {
+        row.items.forEach((item, ii) => {
+          visitInlines(item.inlines, ["lines", bi, "rows", ri, "items", ii, "inlines"]);
+        });
+      });
+    } else if (block.type === AST_TYPES.RADIO_OPTIONS) {
+      record(block.name, ["lines", bi, "name"]);
+    }
+  });
 });
 function createExerciseDocument(question, lines, validation, tools) {
   return ExerciseDocumentSchema.parse({
@@ -1771,6 +1858,9 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     if (ctx.fraction) {
       return this.visit(ctx.fraction);
     }
+    if (ctx.image) {
+      return this.visit(ctx.image);
+    }
     if (ctx.inlineInput) {
       return this.visit(ctx.inlineInput);
     }
@@ -1813,6 +1903,15 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     const simplified = params.simplified !== void 0 ? params.simplified : void 0;
     return createFraction(name, { numerator, denominator, answer, simplified });
   }
+  image(ctx) {
+    const params = this.visit(ctx.parameterList);
+    const name = params.name;
+    const src = params.src;
+    const alt = params.alt;
+    const width = params.width;
+    const height = params.height;
+    return createImage(name, src, alt, { width, height });
+  }
   inlineInput(ctx) {
     const params = this.visit(ctx.parameterList);
     const name = params.name;
@@ -1971,6 +2070,18 @@ const BoldTextSchema = z.object({
   value: z.string(),
   highlight: z.tuple([z.number(), z.number()]).optional()
 });
+const IMAGE_SRC_SCHEME_RE = /^(https?:\/\/|data:image\/)/i;
+const ImageItemSchema = z.object({
+  id: z.string(),
+  type: z.literal(JSON_TYPES.IMAGE),
+  name: z.string().min(1),
+  src: z.string().url().refine((s) => IMAGE_SRC_SCHEME_RE.test(s), {
+    message: "src must use http(s) or data:image scheme"
+  }),
+  alt: z.string(),
+  width: z.number().positive().optional(),
+  height: z.number().positive().optional()
+});
 const SpaceItemSchema = z.object({
   id: z.string(),
   type: z.literal(JSON_TYPES.SPACE)
@@ -1993,6 +2104,7 @@ const LayoutItemSchema = z.lazy(
     HighlightedTextSchema,
     ColorTextSchema,
     BoldTextSchema,
+    ImageItemSchema,
     SpaceItemSchema,
     LinebreakSchema,
     GroupItemSchema,
@@ -2179,6 +2291,9 @@ function isColorText(item) {
 function isBoldText(item) {
   return item.type === JSON_TYPES.BOLD_TEXT;
 }
+function isImageItem(item) {
+  return item.type === JSON_TYPES.IMAGE;
+}
 function isSpaceItem(item) {
   return item.type === JSON_TYPES.SPACE;
 }
@@ -2531,6 +2646,16 @@ function transformInline(inline, idGenerator) {
         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 }
+      };
     default:
       throw new Error(`Unknown inline type: ${inline.type}`);
   }
@@ -13754,6 +13879,18 @@ const LayoutRenderer = ({
       }
       return /* @__PURE__ */ jsx("strong", { className: "bold-text text-item", dir: dirAttr, children: item.value });
     }
+    case JSON_TYPES.IMAGE:
+      return /* @__PURE__ */ jsx(
+        "img",
+        {
+          className: "image-item text-item",
+          src: item.src,
+          alt: item.alt,
+          ...item.width !== void 0 && { width: item.width },
+          ...item.height !== void 0 && { height: item.height },
+          loading: "lazy"
+        }
+      );
     case JSON_TYPES.WIDGET_REF: {
       const widget = widgets[item.widgetId];
       if (!widget) return null;
@@ -14129,6 +14266,8 @@ export {
   GroupItemSchema,
   HighlightedTextInlineSchema,
   HighlightedTextSchema,
+  ImageInlineSchema,
+  ImageItemSchema,
   InlineInputJSONSchema,
   InlineInputWidgetSchema,
   InlineNodeSchema,
@@ -14178,6 +14317,7 @@ export {
   createFraction,
   createFreeText,
   createHighlightedText,
+  createImage,
   createLineBlock,
   createMatcherBlock,
   createMatcherItem,
@@ -14205,6 +14345,8 @@ export {
   isFreeText,
   isGroupItem,
   isHighlightedText,
+  isImage,
+  isImageItem,
   isInlineInput,
   isInlineInputJSON,
   isInlineNode,