@mathscan/math-exercise-engine 1.2.3 → 1.2.4

package/dist/index.d.ts

@@ -6239,6 +6239,7 @@ export declare function compileWithAST(dsl: string): {
                 backgroundColor?: string | undefined;
             }[];
             cols: number;
+            borderColor: string;
         } | {
             type: "VerticalOperationBlock";
             items: ({
@@ -7402,6 +7403,7 @@ export declare const ContentBlockSchema: z.ZodUnion<[z.ZodObject<{
 }>, z.ZodObject<{
     type: z.ZodLiteral<"TableBlock">;
     cols: z.ZodNumber;
+    borderColor: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
     rows: z.ZodArray<z.ZodObject<{
         type: z.ZodLiteral<"TableRow">;
         backgroundColor: z.ZodOptional<z.ZodString>;
@@ -8095,6 +8097,7 @@ export declare const ContentBlockSchema: z.ZodUnion<[z.ZodObject<{
         backgroundColor?: string | undefined;
     }[];
     cols: number;
+    borderColor: string;
 }, {
     type: "TableBlock";
     rows: {
@@ -8186,6 +8189,7 @@ export declare const ContentBlockSchema: z.ZodUnion<[z.ZodObject<{
         backgroundColor?: string | undefined;
     }[];
     cols: number;
+    borderColor?: string | undefined;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"RadioOptions">;
     name: z.ZodString;
@@ -16281,6 +16285,9 @@ export declare function createVopRow(cells: VopCell[], op?: VopOperator): VopRow
 
 export declare function createVopSeparator(): VopSeparator;
 
+/** Default color used for table borders and internal separators. */
+export declare const DEFAULT_TABLE_BORDER_COLOR = "#7c6cf2";
+
 export declare type DisplayInlineNode = z.infer<typeof DisplayInlineNodeSchema>;
 
 export declare const DisplayInlineNodeSchema: z.ZodUnion<[z.ZodObject<{
@@ -16995,6 +17002,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
     }>, z.ZodObject<{
         type: z.ZodLiteral<"TableBlock">;
         cols: z.ZodNumber;
+        borderColor: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
         rows: z.ZodArray<z.ZodObject<{
             type: z.ZodLiteral<"TableRow">;
             backgroundColor: z.ZodOptional<z.ZodString>;
@@ -17688,6 +17696,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor: string;
     }, {
         type: "TableBlock";
         rows: {
@@ -17779,6 +17788,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor?: string | undefined;
     }>, z.ZodObject<{
         type: z.ZodLiteral<"RadioOptions">;
         name: z.ZodString;
@@ -26123,6 +26133,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor: string;
     } | {
         type: "VerticalOperationBlock";
         items: ({
@@ -27119,6 +27130,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor?: string | undefined;
     } | {
         type: "VerticalOperationBlock";
         items: ({
@@ -28115,6 +28127,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor: string;
     } | {
         type: "VerticalOperationBlock";
         items: ({
@@ -29111,6 +29124,7 @@ export declare const ExerciseDocumentSchema: z.ZodEffects<z.ZodObject<{
             backgroundColor?: string | undefined;
         }[];
         cols: number;
+        borderColor?: string | undefined;
     } | {
         type: "VerticalOperationBlock";
         items: ({
@@ -38876,6 +38890,7 @@ export declare type TableBlock = z.infer<typeof TableBlockSchema>;
 declare const TableBlockSchema: z.ZodObject<{
     type: z.ZodLiteral<"TableBlock">;
     cols: z.ZodNumber;
+    borderColor: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
     rows: z.ZodArray<z.ZodObject<{
         type: z.ZodLiteral<"TableRow">;
         backgroundColor: z.ZodOptional<z.ZodString>;
@@ -39569,6 +39584,7 @@ declare const TableBlockSchema: z.ZodObject<{
         backgroundColor?: string | undefined;
     }[];
     cols: number;
+    borderColor: string;
 }, {
     type: "TableBlock";
     rows: {
@@ -39660,6 +39676,7 @@ declare const TableBlockSchema: z.ZodObject<{
         backgroundColor?: string | undefined;
     }[];
     cols: number;
+    borderColor?: string | undefined;
 }>;
 
 export declare type TableCell = z.infer<typeof TableCellSchema>;
@@ -40120,6 +40137,7 @@ export declare const TableItemSchema: z.ZodObject<{
     id: z.ZodString;
     type: z.ZodLiteral<"table">;
     cols: z.ZodNumber;
+    borderColor: z.ZodDefault<z.ZodEffects<z.ZodString, string, string>>;
     rows: z.ZodArray<z.ZodObject<{
         id: z.ZodString;
         type: z.ZodLiteral<"table-row">;
@@ -40187,6 +40205,7 @@ export declare const TableItemSchema: z.ZodObject<{
         backgroundColor?: string | undefined;
     }[];
     cols: number;
+    borderColor: string;
     id: string;
 }, {
     type: "table";
@@ -40205,6 +40224,7 @@ export declare const TableItemSchema: z.ZodObject<{
     }[];
     cols: number;
     id: string;
+    borderColor?: string | undefined;
 }>;
 
 export declare type TableRow = z.infer<typeof TableRowSchema>;

package/dist/index.js

@@ -267,6 +267,10 @@ const HEX_COLOR_REGEX = /^#([0-9A-Fa-f]{3}|[0-9A-Fa-f]{6})$/;
 const isNumberLineHighlightColor = (value) => NUMBER_LINE_HIGHLIGHT_COLORS.includes(value) || HEX_COLOR_REGEX.test(value);
 const highlightColorMessage = (block) => `${block}: color must be one of ${NUMBER_LINE_HIGHLIGHT_COLORS.join(", ")} or a hex value (e.g. "#3B82F6")`;
 const NUMBER_LINE_DRAG_MODES = ["axis", "inputs"];
+const DEFAULT_TABLE_BORDER_COLOR = "#7c6cf2";
+const isTableBorderColor = (value) => value.toLowerCase() === "transparent" || HEX_COLOR_REGEX.test(value);
+const TABLE_BORDER_COLOR_ERROR = 'TABLE: bordercolor must be "transparent" or a hex value (e.g. "#E67E22" or "#F00")';
+const TableBorderColorSchema = zod.z.string({ message: TABLE_BORDER_COLOR_ERROR }).refine(isTableBorderColor, { message: TABLE_BORDER_COLOR_ERROR }).default(DEFAULT_TABLE_BORDER_COLOR);
 function getFractionKey(widgetId, part) {
   return `${widgetId}__${part}`;
 }
@@ -2536,12 +2540,14 @@ function createTableRow(cells, backgroundColor) {
 const TableBlockSchema = zod.z.object({
   type: zod.z.literal(AST_TYPES.TABLE_BLOCK),
   cols: zod.z.number().int().positive(),
+  borderColor: TableBorderColorSchema,
   rows: zod.z.array(TableRowSchema).min(1)
 });
-function createTableBlock(cols, rows) {
+function createTableBlock(cols, rows, borderColor) {
   return TableBlockSchema.parse({
     type: AST_TYPES.TABLE_BLOCK,
     cols,
+    borderColor,
     rows
   });
 }
@@ -3486,8 +3492,10 @@ class NaturalDSLVisitor extends BaseCstVisitor {
   table(ctx) {
     const params = this.visit(ctx.parameterList);
     const cols = params.cols;
+    const borderColorParam = params.bordercolor;
+    const borderColor = borderColorParam === void 0 ? void 0 : String(borderColorParam);
     const rows = ctx.row.map((r) => this.visit(r));
-    return createTableBlock(cols, rows);
+    return createTableBlock(cols, rows, borderColor);
   }
   row(ctx) {
     const params = ctx.parameterList ? this.visit(ctx.parameterList) : {};
@@ -4282,6 +4290,7 @@ const TableItemSchema = zod.z.object({
   id: zod.z.string(),
   type: zod.z.literal(JSON_TYPES.TABLE),
   cols: zod.z.number().int().positive(),
+  borderColor: TableBorderColorSchema,
   rows: zod.z.array(TableRowItemSchema)
 });
 const NumberLinePositionItemSchema = zod.z.object({
@@ -10866,6 +10875,7 @@ function transformTable(table, idGenerator, inlineDragIds) {
     id: idGenerator.generate(JSON_TYPES.TABLE),
     type: JSON_TYPES.TABLE,
     cols: table.cols,
+    borderColor: table.borderColor,
     rows
   };
 }
@@ -20627,7 +20637,10 @@ const LayoutRenderer = ({
       )) });
     case JSON_TYPES.TABLE: {
       const totalRows = item.rows.length;
-      return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "exercise-table-container", children: /* @__PURE__ */ jsxRuntime.jsx("table", { className: "exercise-table", children: /* @__PURE__ */ jsxRuntime.jsx("tbody", { children: item.rows.map((row, rowIndex) => /* @__PURE__ */ jsxRuntime.jsx("tr", { className: "exercise-table-row", style: { backgroundColor: row.backgroundColor }, children: row.cells.map((cell) => {
+      const tableStyle = {
+        "--exercise-table-border-color": item.borderColor ?? DEFAULT_TABLE_BORDER_COLOR
+      };
+      return /* @__PURE__ */ jsxRuntime.jsx("div", { className: "exercise-table-container", style: tableStyle, children: /* @__PURE__ */ jsxRuntime.jsx("table", { className: "exercise-table", children: /* @__PURE__ */ jsxRuntime.jsx("tbody", { children: item.rows.map((row, rowIndex) => /* @__PURE__ */ jsxRuntime.jsx("tr", { className: "exercise-table-row", style: { backgroundColor: row.backgroundColor }, children: row.cells.map((cell) => {
         const rowspan = cell.rowspan || 1;
         const isLastRow = rowIndex + rowspan - 1 >= totalRows - 1;
         return /* @__PURE__ */ jsxRuntime.jsx(
@@ -21333,6 +21346,7 @@ exports.ClockItemSchema = ClockItemSchema;
 exports.ColorTextInlineSchema = ColorTextInlineSchema;
 exports.ColorTextSchema = ColorTextSchema;
 exports.ContentBlockSchema = ContentBlockSchema;
+exports.DEFAULT_TABLE_BORDER_COLOR = DEFAULT_TABLE_BORDER_COLOR;
 exports.DisplayInlineNodeSchema = DisplayInlineNodeSchema;
 exports.DragOptionsJSONSchema = DragOptionsJSONSchema;
 exports.DragOptionsToolSchema = DragOptionsToolSchema;