math-exercises 2.2.47 → 2.2.49

package/lib/server.js

@@ -58,9 +58,11 @@ const runServer = () => {
     });
     app.get("/exo", (req, res) => {
         const exoId = req.query.exoId;
+        console.log(req.query.options);
         const options = req.query.options
             ? JSON.parse(req.query.options)
             : undefined;
+        console.log("parsed", options);
         const exoIndex = allExercises.findIndex((exo) => exo.id == exoId);
         const exo = allExercises[exoIndex];
         if (!exo)
@@ -76,18 +78,21 @@ const runServer = () => {
     });
     app.get("/qcmExo", (req, res) => {
         const exoId = req.query.exoId;
+        const options = req.query.options
+            ? JSON.parse(req.query.options)
+            : undefined;
         const exoIndex = allExercises.findIndex((exo) => exo.id == exoId);
         const exo = allExercises[exoIndex];
         if (!exo)
             res.send("Exo not found");
-        const questions = exo?.generator(10);
+        const questions = exo?.generator(10, options);
         const populatedQuestions = questions?.map((q) => {
             return {
                 ...q,
                 propositions: exo.getPropositions?.(4, {
                     answer: q.answer,
                     ...q.identifiers,
-                }),
+                }, options),
             };
         });
         res.json({
@@ -103,7 +108,6 @@ const runServer = () => {
         const options = req.query.options
             ? JSON.parse(req.query.options)
             : undefined;
-        console.log("vea opts", options);
         const { ans, veaProps } = req.body;
         const exoIndex = allExercises.findIndex((exo) => exo.id == exoId);
         const exo = allExercises[exoIndex];

package/lib/tree/parsers/rationalParser.d.ts

@@ -1 +1,3 @@
+import { FractionNode } from "../nodes/operators/fractionNode";
+export declare const rationalParser: (ans: string) => false | import("../nodes/algebraicNode").AlgebraicNode | FractionNode | undefined;
 //# sourceMappingURL=rationalParser.d.ts.map

package/lib/tree/parsers/rationalParser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rationalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/rationalParser.ts"],"names":[],"mappings":""}
+{"version":3,"file":"rationalParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/rationalParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAG/D,eAAO,MAAM,cAAc,QAAS,MAAM,sFAyBzC,CAAC"}

package/lib/tree/parsers/rationalParser.js

@@ -1,9 +1,34 @@
 "use strict";
-// export const rationalParser = (ans: string) => {
-//     if(ans.startsWith("\\frac")){
-//         const num
-//     }
-//     const nb = ans.unfrenchify();
-//     if (isNaN(nb)) return false;
-//     return nb.frenchify();
-//   };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rationalParser = void 0;
+const fractionNode_1 = require("../nodes/operators/fractionNode");
+const numberParser_1 = require("./numberParser");
+const rationalParser = (ans) => {
+    const nb = (0, numberParser_1.numberParser)(ans);
+    if (nb !== false) {
+        return nb.toTree();
+    }
+    if (!ans.includes("\\frac"))
+        return false;
+    if (ans.startsWith("\\frac")) {
+        const fracs = ans.replaceAll("}", "").split("{").slice(1);
+        if (fracs.length !== 2)
+            return false;
+        const parsedFracs = fracs.map((e) => (0, numberParser_1.numberParser)(e));
+        if (parsedFracs.some((e) => e === false))
+            return false;
+        const nodeFracs = fracs.map((e) => e.unfrenchify().toTree());
+        return new fractionNode_1.FractionNode(nodeFracs[0], nodeFracs[1]);
+    }
+    //   if(ans.startsWith("-")){
+    //       const fracs = ans.replaceAll("}","").split('{').slice(1)
+    //       if(fracs.length !== 2) return false
+    //       const parsedFracs = fracs.map((e)=>numberParser(e))
+    //       if(parsedFracs.some((e)=>e===false)) return false
+    //       return ans;
+    //   }
+    // const nb = ans.unfrenchify();
+    // if (isNaN(nb)) return false;
+    // return nb.frenchify();
+};
+exports.rationalParser = rationalParser;

package/lib/tree/parsers/spacePointParser.d.ts

@@ -0,0 +1,3 @@
+import { SpacePoint } from "../../math/geometry/spacePoint";
+export declare const spacePointParser: (ans: string) => false | SpacePoint;
+//# sourceMappingURL=spacePointParser.d.ts.map

package/lib/tree/parsers/spacePointParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spacePointParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spacePointParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,gCAAgC,CAAC;AAK5D,eAAO,MAAM,gBAAgB,QAAS,MAAM,uBAW3C,CAAC"}

package/lib/tree/parsers/spacePointParser.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spacePointParser = void 0;
+const spacePoint_1 = require("../../math/geometry/spacePoint");
+const valueParser_1 = require("./valueParser");
+const spacePointParser = (ans) => {
+    const formated = ans
+        .replaceAll("\\left", "")
+        .replaceAll("\\right", "")
+        .replaceAll("(", "")
+        .replaceAll(")", "");
+    const coords = formated.split(";").map((e) => (0, valueParser_1.valueParser)(e));
+    if (coords?.some((e) => e === false))
+        return false;
+    const trees = coords.map((e) => e.toTree());
+    return new spacePoint_1.SpacePoint("A", trees[0], trees[1], trees[2]);
+};
+exports.spacePointParser = spacePointParser;

package/lib/tree/parsers/spaceVectorParser.d.ts

@@ -0,0 +1,3 @@
+import { SpaceVector } from "../../math/geometry/spaceVector";
+export declare const spaceVectorParser: (ans: string) => false | SpaceVector;
+//# sourceMappingURL=spaceVectorParser.d.ts.map

package/lib/tree/parsers/spaceVectorParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"spaceVectorParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/spaceVectorParser.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,eAAO,MAAM,iBAAiB,QAAS,MAAM,wBAW5C,CAAC"}

package/lib/tree/parsers/spaceVectorParser.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.spaceVectorParser = void 0;
+const valueParser_1 = require("./valueParser");
+const spaceVector_1 = require("../../math/geometry/spaceVector");
+const spaceVectorParser = (ans) => {
+    const formated = ans
+        .replaceAll("\\left", "")
+        .replaceAll("\\right", "")
+        .replaceAll("(", "")
+        .replaceAll(")", "");
+    const coords = formated.split(";").map((e) => (0, valueParser_1.valueParser)(e));
+    if (coords?.some((e) => e === false))
+        return false;
+    const trees = coords.map((e) => e.toTree());
+    return new spaceVector_1.SpaceVector("A", trees[0], trees[1], trees[2]);
+};
+exports.spaceVectorParser = spaceVectorParser;

package/lib/tree/parsers/valueParser.d.ts

@@ -0,0 +1,2 @@
+export declare const valueParser: (ans: string) => number | false;
+//# sourceMappingURL=valueParser.d.ts.map

package/lib/tree/parsers/valueParser.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"valueParser.d.ts","sourceRoot":"","sources":["../../../src/tree/parsers/valueParser.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,WAAW,QAAS,MAAM,mBAItC,CAAC"}

package/lib/tree/parsers/valueParser.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.valueParser = void 0;
+const valueParser = (ans) => {
+    const nb = ans.unfrenchify();
+    if (isNaN(nb))
+        return false;
+    return nb;
+};
+exports.valueParser = valueParser;

package/package.json

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