math-exercises 2.2.45 → 2.2.47

package/lib/tree/parsers/latexParser.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseLatex = exports.tokenize = void 0;
+exports.parseLatex = exports.parseAlgebraic = exports.tokenize = void 0;
+const equalNode_1 = require("../nodes/equations/equalNode");
 const oppositeNode_1 = require("../nodes/functions/oppositeNode");
 const sqrtNode_1 = require("../nodes/functions/sqrtNode");
+const inequationNode_1 = require("../nodes/inequations/inequationNode");
 const numberNode_1 = require("../nodes/numbers/numberNode");
 const piNode_1 = require("../nodes/numbers/piNode");
 const addNode_1 = require("../nodes/operators/addNode");
@@ -24,6 +26,7 @@ const functions = [
 const operators = ["+", "-", "\\div", "\\times", "^"];
 //cmds childless, like \\pi
 const symbols = [{ tex: "\\pi", node: piNode_1.PiNode }];
+const separators = ["=", "<", ">", "\\leq", "\\geq"];
 const isDyck = (tokens) => {
     const brackets = tokens.filter((el) => el === "(" || el === ")");
     while (brackets.length) {
@@ -50,7 +53,7 @@ const tokenize = (latex) => {
         const char = latex[i];
         if (char === " ")
             continue;
-        const match = char.match(/[\+\-\(\)\^a-zA-Z_=\{\}]/);
+        const match = char.match(/[\+\-\(\)\^a-zA-Z_=<>\{\}]/);
         if (match) {
             tokens.push(char);
             continue;
@@ -72,14 +75,14 @@ const tokenize = (latex) => {
     return tokens;
 };
 exports.tokenize = tokenize;
-const parseLatex = (latex) => {
+const parseAlgebraic = (latex) => {
     const formattedLatex = latex
         .replaceAll("\\left", "")
         .replaceAll("\\right", "");
-    const tokens = (0, exports.tokenize)(formattedLatex);
-    if (!isDyck(tokens))
-        throw Error("Problème de parenthèses.");
     try {
+        const tokens = (0, exports.tokenize)(formattedLatex);
+        if (!isDyck(tokens))
+            throw Error("Problème de parenthèses.");
         const parsed = buildTree(tokens);
         return parsed;
     }
@@ -87,6 +90,51 @@ const parseLatex = (latex) => {
         throw err;
     }
 };
+exports.parseAlgebraic = parseAlgebraic;
+const parseLatex = (latex) => {
+    const formattedLatex = latex
+        .replaceAll("\\left", "")
+        .replaceAll("\\right", "");
+    try {
+        const tokens = (0, exports.tokenize)(formattedLatex);
+        if (!isDyck(tokens))
+            throw Error("Problème de parenthèses.");
+        if (tokens.some((el) => separators.includes(el))) {
+            const groups = [];
+            for (const token of tokens) {
+                if (separators.includes(token)) {
+                    if (typeof groups[groups.length - 1] === "string") {
+                        throw Error("Consecutive separators not allowed");
+                    }
+                    groups.push(token);
+                }
+                else {
+                    if (Array.isArray(groups[groups.length - 1]))
+                        groups[groups.length - 1].push(token);
+                    else
+                        groups.push([token]);
+                }
+            }
+            if (groups.length !== 3)
+                throw Error("Consecutive separators not implemented");
+            const children = [
+                buildTree(groups[0]),
+                buildTree(groups[2]),
+            ];
+            const parsed = groups[1] === "="
+                ? new equalNode_1.EqualNode(children[0], children[1])
+                : new inequationNode_1.InequationNode(children, groups[1]);
+            return parsed;
+        }
+        else {
+            const parsed = buildTree(tokens);
+            return parsed;
+        }
+    }
+    catch (err) {
+        throw err;
+    }
+};
 exports.parseLatex = parseLatex;
 const buildTree = (tokens) => {
     let currentDepth = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "math-exercises",
-  "version": "2.2.45",
+  "version": "2.2.47",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [