math-exercises 3.0.211 → 3.0.213

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

@@ -27,7 +27,9 @@ export const multiply = (a, b, opts) => {
     const nodeB = typeof b === "number" ? b.toTree() : typeof b === "string" ? b.toTree() : b;
     return new MultiplyNode(nodeA, nodeB, opts);
 };
-export const sortMultiplyNodes = (arr) => {
+export const sortMultiplyNodes = (arr, opts) => {
+    if (opts?.noMultiplyOrder)
+        return 0;
     arr.sort((a, b) => {
         return (Number(b.isNumeric) - Number(a.isNumeric) ||
             Number(isNumberNode(b) && b.value === -1) -
@@ -102,7 +104,8 @@ export class MultiplyNode {
             // }
         }
         //!this is atrocious
-        let showTimesSign = !opts?.forceDotSign &&
+        let showTimesSign = !opts?.forceNoTimesSign &&
+            !opts?.forceDotSign &&
             (opts?.forceTimesSign ||
                 !isNaN(+rightTex[0]) ||
                 (this.rightChild.isNumeric &&
@@ -114,7 +117,7 @@ export class MultiplyNode {
                     isVariableNode(this.rightChild) &&
                     this.leftChild.name === this.rightChild.name) ||
                 (isSqrtNode(this.leftChild) && isSqrtNode(this.rightChild)));
-        if (isOperatorNode(this.rightChild)) {
+        if (!opts?.forceNoTimesSign && isOperatorNode(this.rightChild)) {
             showTimesSign ||= [OperatorIds.fraction].includes(this.rightChild.id);
             if (isFractionNode(this.rightChild.leftChild)) {
                 showTimesSign = true;
@@ -261,6 +264,8 @@ export class MultiplyNode {
         const leftSimplified = this.leftChild.simplify(opts, log);
         const rightSimplified = this.rightChild.simplify(opts, log);
         const copy = new MultiplyNode(leftSimplified, rightSimplified, this.opts);
+        if (opts?.forbidMultiplications)
+            return copy;
         /**get externals nodes (= extremités du sous arbre non multiplicatif)
          * les opposites sont supprimés et on ajoute *-1 à la fin si leur nb est impair
          */
@@ -319,8 +324,8 @@ export class MultiplyNode {
                 if (nums.some((node) => isNumberNode(node) && node.value === 0)) {
                     return new NumberNode(0);
                 }
-                sortMultiplyNodes(nums);
-                sortMultiplyNodes(denums);
+                sortMultiplyNodes(nums, opts);
+                sortMultiplyNodes(denums, opts);
                 const numNode = operatorComposition(MultiplyNode, nums);
                 const denumNode = denums.length === 1
                     ? denums[0]
@@ -403,7 +408,7 @@ export class MultiplyNode {
             return new NumberNode(1);
         if (externals.length === 1)
             return externals[0];
-        sortMultiplyNodes(externals);
+        sortMultiplyNodes(externals, opts);
         return operatorComposition(MultiplyNode, externals);
     }
     toSimplificationTex(opts) {

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

@@ -1 +1 @@
-{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAgB,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOrE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,eAAO,MAAM,MAAM,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,eAKxD,CAAC;AAEF,eAAO,MAAM,KAAK,GAChB,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,OAAO,WAAW,cAOnB,CAAC;AAEF,qBAAa,SAAU,YAAW,YAAY;IAC5C,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,YAAY,IAAI,MAAM;IAGtB,aAAa;;;;;;;;;IAOb,mBAAmB;IAOnB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IA0BlC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,UAAQ,GAAG,aAAa;IA6D7D,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAK1C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;IAcvD,cAAc;CASf;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAIrD"}
+{"version":3,"file":"powerNode.d.ts","sourceRoot":"","sources":["../../../../src/tree/nodes/operators/powerNode.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,UAAU,EAAgB,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAE,YAAY,EAA4B,MAAM,mBAAmB,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAOrE,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,SAAS,CAEnD;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,GAAG,CAAC,IAAI,UAAU,CAErD;AACD,eAAO,MAAM,MAAM,GAAI,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,eAKxD,CAAC;AAEF,eAAO,MAAM,KAAK,GAChB,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,GAAG,aAAa,GAAG,MAAM,GAAG,MAAM,EAClC,OAAO,WAAW,cAOnB,CAAC;AAEF,qBAAa,SAAU,YAAW,YAAY;IAC5C,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,YAAY,IAAI,MAAM;IAGtB,aAAa;;;;;;;;;IAOb,mBAAmB;IAOnB,iBAAiB;IAqBjB,cAAc,IAAI,MAAM,EAAE;IAI1B,KAAK,CAAC,IAAI,CAAC,EAAE,YAAY,GAAG,MAAM;IA2BlC,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAMtC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC;IAOxD,QAAQ,CAAC,IAAI,CAAC,EAAE,eAAe,EAAE,IAAI,UAAQ,GAAG,aAAa;IA6D7D,mBAAmB,CAAC,IAAI,CAAC,EAAE,eAAe;IAK1C,MAAM,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO;IAOpC,UAAU,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,SAAS,GAAG,aAAa;IAcvD,cAAc;CASf;AAED,qBAAa,UAAW,SAAQ,SAAS;gBAC3B,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,EAAE,WAAW;CAIrD"}

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

@@ -101,6 +101,8 @@ export class PowerNode {
         const needBrace = rightTex.length > 1;
         if (needBrace)
             return `${leftTex}^{${rightTex}}`;
+        if (opts?.hidePowerOfOne && rightTex === "1")
+            return leftTex;
         else
             return `${leftTex}^${rightTex}`;
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "math-exercises",
   "type": "module",
-  "version": "3.0.211",
+  "version": "3.0.213",
   "description": "Math exercises generator for middle school and high school",
   "main": "lib/index.js",
   "files": [