math-exercises 2.1.4 → 2.1.6

package/lib/tree/nodes/functions/cosNode.js

@@ -11,7 +11,7 @@ function isCosNode(a) {
 exports.isCosNode = isCosNode;
 class CosNode {
     constructor(child) {
-        this.id = functionNode_1.FunctionsIds.opposite;
+        this.id = functionNode_1.FunctionsIds.cos;
         this.child = child;
         this.type = node_1.NodeType.function;
         this.isNumeric = child.isNumeric;
@@ -43,7 +43,7 @@ class CosNode {
             const moduled = Math.abs(value % (2 * Math.PI));
             const trigoPoint = remarkableValues_1.remarkableTrigoValues.find((value) => value.angle.evaluate({}) === moduled);
             if (!trigoPoint)
-                return this;
+                return new CosNode(simplifiedChild);
             else
                 return trigoPoint.cos;
         }
@@ -53,7 +53,7 @@ class CosNode {
             //cos(x+2PI)
             //cos(-x)
         }
-        return this;
+        return new CosNode(simplifiedChild);
     }
     evaluate(vars) {
         return Math.cos(this.child.evaluate(vars));

package/lib/tree/nodes/functions/sinNode.js

@@ -11,7 +11,7 @@ function isSinNode(a) {
 exports.isSinNode = isSinNode;
 class SinNode {
     constructor(child) {
-        this.id = functionNode_1.FunctionsIds.opposite;
+        this.id = functionNode_1.FunctionsIds.sin;
         this.child = child;
         this.type = node_1.NodeType.function;
         this.isNumeric = child.isNumeric;

package/lib/tree/nodes/operators/multiplyNode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IAoDlC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAgH/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}
+{"version":3,"file":"multiplyNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/multiplyNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpE,OAAO,EACL,uBAAuB,EACvB,WAAW,EAEZ,MAAM,gBAAgB,CAAC;AAYxB,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOlE,wBAAgB,cAAc,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,YAAY,CAEzD;AAED,eAAO,MAAM,iBAAiB,QAAS,aAAa,EAAE,SAWrD,CAAC;AACF,qBAAa,YAAa,YAAW,uBAAuB;IAC1D,IAAI,CAAC,EAAE,WAAW,CAAC;IACnB,EAAE,EAAE,WAAW,CAAC;IAChB,SAAS,EAAE,aAAa,CAAC;IACzB,UAAU,EAAE,aAAa,CAAC;IAC1B,IAAI,EAAE,QAAQ,CAAC;IACf,SAAS,EAAE,OAAO,CAAC;gBAEjB,SAAS,EAAE,aAAa,EACxB,UAAU,EAAE,aAAa,EACzB,IAAI,CAAC,EAAE,WAAW;IAUpB,OAAO,aAGL;IAEF,YAAY,IAAI,MAAM;IAItB,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IAyDlC,SAAS;IAkDT,iBAAiB,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,YAAY,EAAE;IAwFrD,cAAc,CAAC,IAAI,CAAC,EAAE,WAAW,GAAG,MAAM,EAAE;IAQ5C,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAIrC,IAAI;IAGJ,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,GAAG,aAAa;IAgH/C,MAAM,CAAC,IAAI,EAAE,aAAa;CAU3B"}

package/lib/tree/nodes/operators/multiplyNode.js

@@ -83,7 +83,12 @@ class MultiplyNode {
             showTimesSign ||= [operatorNode_1.OperatorIds.fraction].includes(this.rightChild.id);
         }
         const nextIsLetter = rightTex[0].toLowerCase() !== rightTex[0].toUpperCase();
-        return `${leftTex}${showTimesSign ? `\\times${nextIsLetter ? " " : ""}` : ""}${rightTex}`;
+        const prevIsCommand = leftTex.match(/\\[a-z]*$/);
+        return `${leftTex}${showTimesSign
+            ? `\\times${nextIsLetter ? " " : ""}`
+            : prevIsCommand && nextIsLetter
+                ? " "
+                : ""}${rightTex}`;
     }
     toAllTexs() {
         const res = [];

package/package.json

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