fix: xApplyFunctionStr did not accept functions

mljs · Oct 27, 2022 · 8b6dca3 · targos · Oct 28, 2022 · lpatiny
1 parent 9538864
commit 8b6dca3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/x/__tests__/xApplyFunctionStr.test.ts b/src/x/__tests__/xApplyFunctionStr.test.ts
@@ -11,4 +11,13 @@ test('xApplyFunctionStr', () => {
   expect(
     xApplyFunctionStr([3, 4], { fctString: 'y*2', variableLabel: 'y' }),
   ).toStrictEqual(Float64Array.from([6, 8]));
+  expect(
+    xApplyFunctionStr([100, 10], { fctString: 'log10(x)', variableLabel: 'x' }),
+  ).toStrictEqual(Float64Array.from([2, 1]));
+  expect(
+    xApplyFunctionStr([100.12, 10.23], {
+      fctString: 'floor(y)',
+      variableLabel: 'y',
+    }),
+  ).toStrictEqual(Float64Array.from([100, 10]));
 });
diff --git a/src/x/xApplyFunctionStr.ts b/src/x/xApplyFunctionStr.ts
@@ -30,7 +30,7 @@ export function xApplyFunctionStr(
   const fct = new Function(
     variableLabel,
     `return Number(${fctString
-      .replace(/(?:^|\W)(?:[a-z]{2,})/g, '$1Math.$2')
+      .replace(/(?<before>^|\W)(?<after>[a-z0-9]{2,}\()/g, '$1Math.$2')
       .replace(/Math\.Math/g, 'Math')})`,
   );
   const toReturn = Float64Array.from(array);