@nocobase/evaluators 0.9.2-alpha.1 → 0.9.2-alpha.3

package/lib/client/engines/mathjs.js

@@ -10,7 +10,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var _default = {
   label: 'Math.js',
   tooltip: `{{t('Math.js comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types')}}`,
-  link: "https://mathjs.org/",
+  link: 'https://mathjs.org/',
   evaluate: _utils.evaluate.bind(_mathjs.default)
 };
 exports.default = _default;

package/lib/server/index.d.ts

@@ -1,4 +1,4 @@
-import { Registry } from "@nocobase/utils";
+import { Registry } from '@nocobase/utils';
 import { Evaluator } from '../utils';
 export { Evaluator, evaluate, appendArrayColumn } from '../utils';
 export declare const evaluators: Registry<Evaluator>;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.9.2-alpha.1",
+  "version": "0.9.2-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
     "@formulajs/formulajs": "4.2.0",
-    "@nocobase/utils": "0.9.2-alpha.1",
+    "@nocobase/utils": "0.9.2-alpha.3",
     "mathjs": "^10.6.0"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/evaluators"
   },
-  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
+  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
 }

package/src/client/engines/formulajs.ts

@@ -1,11 +1,9 @@
 import { evaluate } from '../../utils';
 import formulajs from '../../utils/formulajs';
 
-
-
 export default {
   label: 'Formula.js',
   tooltip: '{{t("Formula.js supports most Microsoft Excel formula functions.")}}',
   link: 'https://formulajs.info/functions/',
-  evaluate: evaluate.bind(formulajs)
+  evaluate: evaluate.bind(formulajs),
 };

package/src/client/engines/mathjs.ts

@@ -1,11 +1,9 @@
-import { evaluate } from "../../utils";
-import mathjs from "../../utils/mathjs";
-
-
+import { evaluate } from '../../utils';
+import mathjs from '../../utils/mathjs';
 
 export default {
   label: 'Math.js',
   tooltip: `{{t('Math.js comes with a large set of built-in functions and constants, and offers an integrated solution to work with different data types')}}`,
-  link: "https://mathjs.org/",
-  evaluate: evaluate.bind(mathjs)
+  link: 'https://mathjs.org/',
+  evaluate: evaluate.bind(mathjs),
 };

package/src/client/index.tsx

@@ -16,7 +16,10 @@ evaluators.register('math.js', mathjs);
 evaluators.register('formula.js', formulajs);
 
 export function getOptions() {
-  return Array.from((evaluators as Registry<Evaluator>).getEntities()).reduce((result: any[], [value, options]) => result.concat({ value, ...options }), []);
+  return Array.from((evaluators as Registry<Evaluator>).getEntities()).reduce(
+    (result: any[], [value, options]) => result.concat({ value, ...options }),
+    [],
+  );
 }
 
 export default evaluators;

package/src/server/__tests__/index.test.ts

@@ -3,8 +3,6 @@ import evaluators from '..';
 const mathEval = evaluators.get('math.js');
 const formulaEval = evaluators.get('formula.js');
 
-
-
 describe('evaluate', () => {
   it('reference null or undefined', () => {
     const result = formulaEval('{{a.b}}', { a: null });
@@ -12,12 +10,20 @@ describe('evaluate', () => {
   });
 
   it('function result string with quote', () => {
-    const result = formulaEval('{{a}}', { a() { return "I'm done." } });
+    const result = formulaEval('{{a}}', {
+      a() {
+        return "I'm done.";
+      },
+    });
     expect(result).toBe("I'm done.");
   });
 
   it('function result number', () => {
-    const result = formulaEval('{{a}}', { a() { return 1 } });
+    const result = formulaEval('{{a}}', {
+      a() {
+        return 1;
+      },
+    });
     expect(result).toBe(1);
   });
 

package/src/server/index.ts

@@ -1,10 +1,8 @@
-import { Registry } from "@nocobase/utils";
+import { Registry } from '@nocobase/utils';
 
 import { evaluate, Evaluator } from '../utils';
-import mathjs from "../utils/mathjs";
-import formulajs from "../utils/formulajs";
-
-
+import mathjs from '../utils/mathjs';
+import formulajs from '../utils/formulajs';
 
 export { Evaluator, evaluate, appendArrayColumn } from '../utils';
 

package/src/utils/formulajs.ts

@@ -1,11 +1,9 @@
 import * as functions from '@formulajs/formulajs';
 
+const fnNames = Object.keys(functions).filter((key) => key !== 'default');
+const fns = fnNames.map((key) => functions[key]);
 
-
-const fnNames = Object.keys(functions).filter(key => key !== 'default');
-const fns = fnNames.map(key => functions[key]);
-
-export default function(expression: string, scope = {}) {
+export default function (expression: string, scope = {}) {
   const fn = new Function(...fnNames, ...Object.keys(scope), `return ${expression}`);
   const result = fn(...fns, ...Object.values(scope));
   if (typeof result === 'number') {

package/src/utils/index.ts

@@ -1,6 +1,4 @@
-import { get, cloneDeep } from "lodash";
-
-
+import { get, cloneDeep } from 'lodash';
 
 export type Scope = { [key: string]: any };
 
@@ -13,7 +11,7 @@ export function appendArrayColumn(scope, key) {
     const path = paths[p];
     const isIndex = path.match(/^\d+$/);
     if (Array.isArray(data) && !isIndex && !data[path]) {
-      data[path] = data.map(item => item[path]);
+      data[path] = data.map((item) => item[path]);
     }
     data = data?.[path];
   }