@mathscan/math-exercise-engine 1.0.4 → 1.0.5

package/dist/index.mjs

@@ -14,6 +14,10 @@ const AST_TYPES = {
   SPACE: "Space",
   /** Text with optional character-range highlighting */
   HIGHLIGHTED_TEXT: "HighlightedText",
+  /** Text with color and optional character-range coloring */
+  COLOR_TEXT: "ColorText",
+  /** Bold text with optional character-range bolding */
+  BOLD_TEXT: "BoldText",
   /** Inline input widget (string or numeric) */
   INLINE_INPUT: "InlineInput",
   // ═══════════════════════════════════════════════════════════════════════════
@@ -55,6 +59,10 @@ const JSON_TYPES = {
   SPACE: "space",
   /** Text with optional highlighting */
   HIGHLIGHTED_TEXT: "highlighted-text",
+  /** Text with color styling */
+  COLOR_TEXT: "color-text",
+  /** Bold text */
+  BOLD_TEXT: "bold-text",
   /** Reference to a widget */
   WIDGET_REF: "widget-ref",
   /** Line break element */
@@ -114,6 +122,14 @@ const TEXT_HIGHLIGHTER = createToken({
   name: "TEXT_HIGHLIGHTER",
   pattern: /TEXT_HIGHLIGHTER/
 });
+const COLOR_TEXT = createToken({
+  name: "COLOR_TEXT",
+  pattern: /COLOR_TEXT/
+});
+const BOLD_TEXT = createToken({
+  name: "BOLD_TEXT",
+  pattern: /BOLD_TEXT/
+});
 const HIGHLIGHT_TEXT = createToken({
   name: "HIGHLIGHT_TEXT",
   pattern: /HIGHLIGHT_TEXT/
@@ -229,6 +245,8 @@ const allTokens = [
   // Component keywords (before Identifier!)
   QUESTION_TEXT,
   TEXT_HIGHLIGHTER,
+  COLOR_TEXT,
+  BOLD_TEXT,
   HIGHLIGHT_TEXT,
   W_S_I,
   STRING_INPUT,
@@ -418,6 +436,10 @@ class MathExerciseParser extends CstParser {
         { ALT: () => this.CONSUME(RParen) },
         // TEXT_HIGHLIGHTER / HIGHLIGHT_TEXT (for highlighting)
         { ALT: () => this.SUBRULE(this.textHighlighter) },
+        // COLOR_TEXT (for colored text)
+        { ALT: () => this.SUBRULE(this.colorText) },
+        // BOLD_TEXT (for bold text)
+        { ALT: () => this.SUBRULE(this.boldText) },
         // W_S_I (inline input widget)
         { ALT: () => this.SUBRULE(this.inlineInput) }
       ]);
@@ -431,6 +453,18 @@ class MathExerciseParser extends CstParser {
       this.SUBRULE(this.parameterList);
       this.CONSUME(RBracket);
     });
+    this.colorText = this.RULE("colorText", () => {
+      this.CONSUME(COLOR_TEXT);
+      this.CONSUME(LBracket);
+      this.SUBRULE(this.parameterList);
+      this.CONSUME(RBracket);
+    });
+    this.boldText = this.RULE("boldText", () => {
+      this.CONSUME(BOLD_TEXT);
+      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" }) },
@@ -573,6 +607,17 @@ const HighlightedTextInlineSchema = z.object({
   value: z.string(),
   highlight: z.tuple([z.number(), z.number()]).optional()
 });
+const ColorTextInlineSchema = z.object({
+  type: z.literal(AST_TYPES.COLOR_TEXT),
+  value: z.string(),
+  color: z.string(),
+  highlight: z.tuple([z.number(), z.number()]).optional()
+});
+const BoldTextInlineSchema = z.object({
+  type: z.literal(AST_TYPES.BOLD_TEXT),
+  value: z.string(),
+  highlight: z.tuple([z.number(), z.number()]).optional()
+});
 const InlineInputWidgetSchema = z.discriminatedUnion("inputType", [
   z.object({
     type: z.literal(AST_TYPES.INLINE_INPUT),
@@ -593,6 +638,8 @@ const InlineNodeSchema = z.union([
   FreeTextInlineSchema,
   SpaceInlineSchema,
   HighlightedTextInlineSchema,
+  ColorTextInlineSchema,
+  BoldTextInlineSchema,
   InlineInputWidgetSchema
 ]);
 function createFreeText(value) {
@@ -613,6 +660,21 @@ function createHighlightedText(value, highlight) {
     highlight
   });
 }
+function createColorText(value, color, highlight) {
+  return ColorTextInlineSchema.parse({
+    type: AST_TYPES.COLOR_TEXT,
+    value,
+    color,
+    highlight
+  });
+}
+function createBoldText(value, highlight) {
+  return BoldTextInlineSchema.parse({
+    type: AST_TYPES.BOLD_TEXT,
+    value,
+    highlight
+  });
+}
 function createStringInput(name, length, answer) {
   return InlineInputWidgetSchema.parse({
     type: AST_TYPES.INLINE_INPUT,
@@ -856,6 +918,12 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     if (ctx.textHighlighter) {
       return this.visit(ctx.textHighlighter);
     }
+    if (ctx.colorText) {
+      return this.visit(ctx.colorText);
+    }
+    if (ctx.boldText) {
+      return this.visit(ctx.boldText);
+    }
     if (ctx.inlineInput) {
       return this.visit(ctx.inlineInput);
     }
@@ -870,6 +938,25 @@ class NaturalDSLVisitor extends BaseCstVisitor {
     }
     return createHighlightedText(value, highlight);
   }
+  colorText(ctx) {
+    const params = this.visit(ctx.parameterList);
+    const value = params.value;
+    const color = params.color;
+    let highlight = void 0;
+    if (params.start !== void 0 && params.end !== void 0) {
+      highlight = [params.start, params.end];
+    }
+    return createColorText(value, color, highlight);
+  }
+  boldText(ctx) {
+    const params = this.visit(ctx.parameterList);
+    const value = params.value;
+    let highlight = void 0;
+    if (params.start !== void 0 && params.end !== void 0) {
+      highlight = [params.start, params.end];
+    }
+    return createBoldText(value, highlight);
+  }
   inlineInput(ctx) {
     const params = this.visit(ctx.parameterList);
     const name = params.name;
@@ -1012,6 +1099,19 @@ const HighlightedTextSchema = z.object({
   value: z.string(),
   highlight: z.tuple([z.number(), z.number()]).optional()
 });
+const ColorTextSchema = z.object({
+  id: z.string(),
+  type: z.literal(JSON_TYPES.COLOR_TEXT),
+  value: z.string(),
+  color: z.string(),
+  highlight: z.tuple([z.number(), z.number()]).optional()
+});
+const BoldTextSchema = z.object({
+  id: z.string(),
+  type: z.literal(JSON_TYPES.BOLD_TEXT),
+  value: z.string(),
+  highlight: z.tuple([z.number(), z.number()]).optional()
+});
 const LinebreakSchema = z.object({
   id: z.string(),
   type: z.literal(JSON_TYPES.LINEBREAK)
@@ -1028,6 +1128,8 @@ const LayoutItemSchema = z.lazy(
     TextItemSchema,
     WidgetRefSchema,
     HighlightedTextSchema,
+    ColorTextSchema,
+    BoldTextSchema,
     LinebreakSchema,
     GroupItemSchema,
     OperatorItemSchema
@@ -1110,6 +1212,12 @@ function isWidgetRef(item) {
 function isHighlightedText(item) {
   return item.type === JSON_TYPES.HIGHLIGHTED_TEXT;
 }
+function isColorText(item) {
+  return item.type === JSON_TYPES.COLOR_TEXT;
+}
+function isBoldText(item) {
+  return item.type === JSON_TYPES.BOLD_TEXT;
+}
 function isLinebreak(item) {
   return item.type === JSON_TYPES.LINEBREAK;
 }
@@ -1242,6 +1350,21 @@ function transformInline(inline, idGenerator) {
         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),
@@ -5905,13 +6028,39 @@ const LayoutRenderer = ({
       const dirAttr = !hasArabic ? "ltr" : void 0;
       if (item.highlight) {
         const [start, end] = item.highlight;
-        return /* @__PURE__ */ jsxs("span", { className: "highlighted-text", dir: dirAttr, children: [
+        return /* @__PURE__ */ jsxs("span", { className: "highlighted-text text-item", dir: dirAttr, children: [
+          item.value.slice(0, start),
+          /* @__PURE__ */ jsx("mark", { className: "highlight text-item", children: item.value.slice(start, end) }),
+          item.value.slice(end)
+        ] });
+      }
+      return /* @__PURE__ */ jsx("mark", { className: "highlighted-text text-item", dir: dirAttr, children: item.value });
+    }
+    case JSON_TYPES.COLOR_TEXT: {
+      const hasArabic = isArabic(item.value);
+      const dirAttr = !hasArabic ? "ltr" : void 0;
+      if (item.highlight) {
+        const [start, end] = item.highlight;
+        return /* @__PURE__ */ jsxs("span", { className: "color-text text-item", dir: dirAttr, children: [
+          item.value.slice(0, start),
+          /* @__PURE__ */ jsx("span", { className: "color-text-colored", style: { color: item.color }, children: item.value.slice(start, end) }),
+          item.value.slice(end)
+        ] });
+      }
+      return /* @__PURE__ */ jsx("span", { className: "color-text text-item", 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;
+      if (item.highlight) {
+        const [start, end] = item.highlight;
+        return /* @__PURE__ */ jsxs("span", { className: "bold-text text-item", dir: dirAttr, children: [
           item.value.slice(0, start),
-          /* @__PURE__ */ jsx("mark", { className: "highlight", children: item.value.slice(start, end) }),
+          /* @__PURE__ */ jsx("strong", { className: "bold-text-strong text-item", children: item.value.slice(start, end) }),
           item.value.slice(end)
         ] });
       }
-      return /* @__PURE__ */ jsx("mark", { className: "highlighted-text", dir: dirAttr, children: item.value });
+      return /* @__PURE__ */ jsx("strong", { className: "bold-text text-item", dir: dirAttr, children: item.value });
     }
     case JSON_TYPES.WIDGET_REF: {
       const widget = widgets[item.widgetId];
@@ -38139,6 +38288,10 @@ function compileWithAST(dsl) {
 }
 export {
   AST_TYPES,
+  BoldTextInlineSchema,
+  BoldTextSchema,
+  ColorTextInlineSchema,
+  ColorTextSchema,
   DragOptionsJSONSchema,
   DragOptionsToolSchema,
   EngineError,
@@ -38180,6 +38333,8 @@ export {
   WidgetRenderer,
   compile,
   compileWithAST,
+  createBoldText,
+  createColorText,
   createDragOptions,
   createExerciseDocument,
   createExpressionValidation,
@@ -38196,6 +38351,8 @@ export {
   extractVariables as extractExpressionVariables,
   findValidCombination,
   getMissingInputs,
+  isBoldText,
+  isColorText,
   isDragOptions,
   isDragOptionsJSON,
   isExerciseDocument,