@mathscan/math-exercise-engine 1.0.1 → 1.0.2

package/dist/index.mjs

@@ -29,14 +29,18 @@ const QUESTION_TEXT = createToken({
   name: "QUESTION_TEXT",
   pattern: /QUESTION_TEXT/
 });
-const NUMBER_TEXT = createToken({
-  name: "NUMBER_TEXT",
-  pattern: /NUMBER_TEXT/
+const TEXT_HIGHLIGHTER = createToken({
+  name: "TEXT_HIGHLIGHTER",
+  pattern: /TEXT_HIGHLIGHTER/
 });
 const W_S_I = createToken({
   name: "W_S_I",
   pattern: /W_S_I/
 });
+const STRING_INPUT = createToken({
+  name: "STRING_INPUT",
+  pattern: /STRING_INPUT/
+});
 const DRAGABLE_BUTTONS_OPTIONS = createToken({
   name: "DRAGABLE_BUTTONS_OPTIONS",
   pattern: /DRAGABLE_BUTTONS_OPTIONS/
@@ -53,6 +57,10 @@ const W_N_I = createToken({
   name: "W_N_I",
   pattern: /W_N_I/
 });
+const NUMERIC_INPUT = createToken({
+  name: "NUMERIC_INPUT",
+  pattern: /NUMERIC_INPUT/
+});
 const NumberLiteral = createToken({
   name: "NumberLiteral",
   pattern: /-?\d+(\.\d+)?/
@@ -135,13 +143,14 @@ const allTokens = [
   Comment,
   // Component keywords (before Identifier!)
   QUESTION_TEXT,
-  NUMBER_TEXT,
+  TEXT_HIGHLIGHTER,
   W_S_I,
+  STRING_INPUT,
   DRAGABLE_BUTTONS_OPTIONS,
   NUMERIC_KEYPAD,
   WIDGET_ANSWER,
-  // Legacy keywords
   W_N_I,
+  NUMERIC_INPUT,
   // Literals
   NumberLiteral,
   StringLiteral,
@@ -319,14 +328,14 @@ class MathExerciseParser extends CstParser {
         // Parentheses (for grouping)
         { ALT: () => this.CONSUME(LParen) },
         { ALT: () => this.CONSUME(RParen) },
-        // NUMBER_TEXT (for highlighting)
-        { ALT: () => this.SUBRULE(this.numberText) },
+        // TEXT_HIGHLIGHTER (for highlighting)
+        { ALT: () => this.SUBRULE(this.textHighlighter) },
         // W_S_I (inline input widget)
         { ALT: () => this.SUBRULE(this.inlineInput) }
       ]);
     });
-    this.numberText = this.RULE("numberText", () => {
-      this.CONSUME(NUMBER_TEXT);
+    this.textHighlighter = this.RULE("textHighlighter", () => {
+      this.CONSUME(TEXT_HIGHLIGHTER);
       this.CONSUME(LBracket);
       this.SUBRULE(this.parameterList);
       this.CONSUME(RBracket);
@@ -334,7 +343,9 @@ class MathExerciseParser extends CstParser {
     this.inlineInput = this.RULE("inlineInput", () => {
       this.OR([
         { ALT: () => this.CONSUME(W_S_I, { LABEL: "stringInput" }) },
-        { ALT: () => this.CONSUME(W_N_I, { LABEL: "numericInput" }) }
+        { ALT: () => this.CONSUME(STRING_INPUT, { LABEL: "stringInput" }) },
+        { ALT: () => this.CONSUME(W_N_I, { LABEL: "numericInput" }) },
+        { ALT: () => this.CONSUME(NUMERIC_INPUT, { LABEL: "numericInput" }) }
       ]);
       this.CONSUME(LBracket);
       this.SUBRULE(this.parameterList);
@@ -527,13 +538,6 @@ function createNumericInput(name, digits, answer) {
     answer
   });
 }
-function createInlineInput(name, inputType, lengthOrDigits, answer) {
-  if (inputType === "string") {
-    return createStringInput(name, lengthOrDigits, answer);
-  } else {
-    return createNumericInput(name, lengthOrDigits, answer);
-  }
-}
 function isFreeText(value) {
   return FreeTextInlineSchema.safeParse(value).success;
 }
@@ -752,18 +756,21 @@ class NaturalDSLVisitor extends BaseCstVisitor {
       const token = ctx.RParen[0];
       return createFreeText(token.image);
     }
-    if (ctx.numberText) {
-      return this.visit(ctx.numberText);
+    if (ctx.textHighlighter) {
+      return this.visit(ctx.textHighlighter);
     }
     if (ctx.inlineInput) {
       return this.visit(ctx.inlineInput);
     }
     throw new Error("Unknown inline element");
   }
-  numberText(ctx) {
+  textHighlighter(ctx) {
     const params = this.visit(ctx.parameterList);
     const value = params.value;
-    const highlight = params.highlight;
+    let highlight = void 0;
+    if (params.start !== void 0 && params.end !== void 0) {
+      highlight = [params.start, params.end];
+    }
     return createNumberText(value, highlight);
   }
   inlineInput(ctx) {
@@ -1022,12 +1029,6 @@ function isDragOptionsJSON(widget) {
 function isNumericKeypadJSON(widget) {
   return widget.type === "numeric-keypad";
 }
-function isWidgetPlaceholder(item) {
-  return item.type === "widget-ref";
-}
-function isNumericInputJSON(widget) {
-  return widget.type === "inline-input";
-}
 class LayoutIdGenerator {
   constructor() {
     this.counter = 0;
@@ -5743,7 +5744,7 @@ const LayoutRenderer = ({
         const [start, end] = item.highlight;
         return /* @__PURE__ */ jsxs("span", { className: "number-text", children: [
           item.value.slice(0, start),
-          /* @__PURE__ */ jsx("mark", { className: "highlight", children: item.value.slice(start, end) }),
+          /* @__PURE__ */ jsx("span", { className: "highlight", children: item.value.slice(start, end) }),
           item.value.slice(end)
         ] });
       }
@@ -6024,7 +6025,6 @@ export {
   createExerciseDocument,
   createExpressionValidation,
   createFreeText,
-  createInlineInput,
   createLineBlock,
   createNumberText,
   createNumericInput,
@@ -6049,7 +6049,6 @@ export {
   isLineBlock,
   isLinebreak,
   isNumberText,
-  isNumericInputJSON,
   isNumericKeypad,
   isNumericKeypadJSON,
   isOperatorItem,
@@ -6061,7 +6060,6 @@ export {
   isToolNode,
   isValidExpression,
   isValidationNode,
-  isWidgetPlaceholder,
   isWidgetRef,
   parse,
   parseSafe,