refactor: clean up

Author: danpoletaev

package-lock.json

@@ -49,6 +49,7 @@
     },
     "dependencies": {
         "@apify/consts": "^2.47.0",
-        "@apify/log": "^2.5.26"
+        "@apify/log": "^2.5.26",
+        "mathjs": "^15.1.0"
     }
 }

packages/math-utils/package.json

@@ -1,5 +1,21 @@
 // MathJS bundle with only numbers is ~2x smaller than the default one.
-import { all, create, type EvalFunction } from 'mathjs/number';
+import {
+    addDependencies,
+    andDependencies,
+    compileDependencies,
+    create,
+    divideDependencies,
+    type EvalFunction,
+    evaluateDependencies,
+    maxDependencies,
+    minDependencies,
+    multiplyDependencies,
+    notDependencies,
+    nullishDependencies,
+    orDependencies,
+    subtractDependencies,
+    xorDependencies,
+} from 'mathjs';
 
 import { ACTOR_LIMITS } from '@apify/consts';
 
@@ -37,10 +53,29 @@ const ALLOWED_RUN_OPTION_KEYS = new Set<keyof ActorRunOptions>([
 ]);
 
 /**
- * Create a mathjs instance with all functions, then disable potentially dangerous ones.
+ * Create a mathjs instance with selected dependencies, then disable potentially dangerous ones.
  * MathJS security recommendations: https://mathjs.org/docs/expressions/security.html
  */
-const math = create(all);
+const math = create({
+    // arithmetic dependencies
+    addDependencies,
+    subtractDependencies,
+    multiplyDependencies,
+    divideDependencies,
+    // expression dependencies
+    compileDependencies,
+    evaluateDependencies,
+    // statistics dependencies
+    maxDependencies,
+    minDependencies,
+    // logical dependencies
+    andDependencies,
+    notDependencies,
+    orDependencies,
+    xorDependencies,
+    // without that dependency 'null ?? 5', won't work
+    nullishDependencies,
+});
 const limitedEvaluate = math.evaluate;
 const limitedCompile = math.compile;
 

packages/math-utils/src/memory_calculator.ts

@@ -52,6 +52,36 @@ describe('calculateDefaultMemoryFromExpression', () => {
             const result = calculateDefaultMemoryFromExpression(expr, context);
             expect(result).toBe(512);
         });
+
+        describe('operations supported', () => {
+            const context = {
+                input: { A: 200, B: 10, C: 4, nullVal: null, zeroVal: 0, startUrls: [1, 2, 3] },
+                runOptions: { timeoutSecs: 60, memoryMbytes: 512 },
+            };
+
+            const cases = [
+                { expression: '5 + 5', desc: '+ allowed' },
+                { expression: '6 - 5', desc: '- allowed' },
+                { expression: '5 / 5', desc: '/ allowed' },
+                { expression: '5 * 5', desc: '* allowed' },
+                { expression: 'max(1, 2, 3)', desc: 'max() allowed' },
+                { expression: 'min(1, 2, 3)', desc: 'min() allowed' },
+                { expression: '(true and false) ? 0 : 5', desc: 'and allowed' },
+                { expression: '(true or false) ? 5 : 0', desc: 'or allowed' },
+                { expression: '(true xor false) ? 5 : 0', desc: 'xor allowed' },
+                { expression: 'not(false) ? 5 : 0', desc: 'not allowed' },
+                { expression: 'input.nullVal ?? 256', desc: 'nullish coalescing allowed' },
+                { expression: 'a = 5', desc: 'variable assignment' },
+            ];
+
+            it.each(cases)(
+                '$desc',
+                ({ expression }) => {
+                    // in case operation is not supported, mathjs will throw
+                    expect(calculateDefaultMemoryFromExpression(expression, context)).toBeDefined();
+                },
+            );
+        });
     });
 
     describe('Preprocessing with {{variable}}', () => {