@nocobase/evaluators 0.11.1-alpha.4 → 0.12.0-alpha.1

package/package.json

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

package/src/client/engines/formulajs.ts

@@ -1,9 +0,0 @@
-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),
-};

package/src/client/engines/mathjs.ts

@@ -1,9 +0,0 @@
-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),
-};

package/src/client/index.tsx

@@ -1,25 +0,0 @@
-import { Registry } from '@nocobase/utils/client';
-
-import mathjs from './engines/mathjs';
-import formulajs from './engines/formulajs';
-
-export interface Evaluator {
-  label: string;
-  tooltip?: string;
-  link?: string;
-  evaluate(exp: string, scope?: { [key: string]: any }): any;
-}
-
-export const evaluators = new Registry<Evaluator>();
-
-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 }),
-    [],
-  );
-}
-
-export default evaluators;

package/src/index.ts

@@ -1,2 +0,0 @@
-export { default } from './server';
-export * from './server';

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

@@ -1,62 +0,0 @@
-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 });
-    expect(result).toBeNull();
-  });
-
-  it('function result string with quote', () => {
-    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;
-      },
-    });
-    expect(result).toBe(1);
-  });
-
-  it('function result Date', () => {
-    const result = formulaEval('{{a}}', {
-      a() {
-        return new Date();
-      },
-    });
-    expect(result).toMatch(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z/);
-  });
-
-  it('number path to array item 0 (math.js)', () => {
-    expect(() => mathEval('{{a.0}}', { a: [1, 2, 3] })).toThrow();
-  });
-
-  it('number path to array item 1 (math.js)', () => {
-    const result = mathEval('{{a}}[1]', { a: [1, 2, 3] });
-    expect(result).toBe(1);
-  });
-
-  it('number path to array item 1 (math.js)', () => {
-    const result = mathEval('{{a.1}}', { a: [1, 2, 3] });
-    expect(result).toBe(1);
-  });
-
-  it('number path to object member 0 (math.js)', () => {
-    const result = mathEval('{{a.1}}', { a: { 1: 1 } });
-    expect(result).toBe(1);
-  });
-
-  it('number lead string path to object member (formula.js)', () => {
-    const result = formulaEval('{{a.1a}}', { a: { '1a': 1 } });
-    expect(result).toBe(1);
-  });
-});

package/src/server/index.ts

@@ -1,14 +0,0 @@
-import { Registry } from '@nocobase/utils';
-
-import { evaluate, Evaluator } from '../utils';
-import mathjs from '../utils/mathjs';
-import formulajs from '../utils/formulajs';
-
-export { Evaluator, evaluate, appendArrayColumn } from '../utils';
-
-export const evaluators = new Registry<Evaluator>();
-
-evaluators.register('math.js', evaluate.bind(mathjs));
-evaluators.register('formula.js', evaluate.bind(formulajs));
-
-export default evaluators;

package/src/utils/formulajs.ts

@@ -1,16 +0,0 @@
-import * as functions from '@formulajs/formulajs';
-
-const fnNames = Object.keys(functions).filter((key) => key !== 'default');
-const fns = fnNames.map((key) => functions[key]);
-
-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') {
-    if (Number.isNaN(result) || !Number.isFinite(result)) {
-      return null;
-    }
-    return functions.ROUND(result, 9);
-  }
-  return result;
-}

package/src/utils/index.ts

@@ -1,65 +0,0 @@
-import { get, cloneDeep } from 'lodash';
-
-export type Scope = { [key: string]: any };
-
-export type Evaluator = (expression: string, scope?: Scope) => any;
-
-export function appendArrayColumn(scope, key) {
-  const paths = key.split('.');
-  let data = scope;
-  for (let p = 0; p < paths.length && data != null; p++) {
-    const path = paths[p];
-    const isIndex = path.match(/^\d+$/);
-    if (Array.isArray(data) && !isIndex && !data[path]) {
-      data[path] = data.map((item) => item[path]);
-    }
-    data = data?.[path];
-  }
-}
-
-function replaceNumberIndex(path: string, scope: Scope): string {
-  const segments = path.split('.');
-  const paths: string[] = [];
-
-  for (let i = 0; i < segments.length; i++) {
-    const p = segments[i];
-    if (p[0] && '0123456789'.indexOf(p[0]) > -1) {
-      paths.push(Array.isArray(get(scope, segments.slice(0, i))) ? `[${p}]` : `["${p}"]`);
-    } else {
-      if (i) {
-        paths.push('.', p);
-      } else {
-        paths.push(p);
-      }
-    }
-  }
-
-  return paths.join('');
-}
-
-export function evaluate(this: Evaluator, expression: string, scope: Scope = {}) {
-  const context = cloneDeep(scope);
-  const exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, (_, v) => {
-    appendArrayColumn(context, v);
-
-    const item = get(context, v);
-
-    let result;
-
-    if (item == null) {
-      result = 'null';
-    } else if (typeof item === 'function') {
-      result = item();
-      result = typeof result === 'string' ? `'${result.replace(/'/g, "\\'")}'` : result;
-    } else {
-      result = replaceNumberIndex(v, context);
-    }
-
-    if (result instanceof Date) {
-      result = `'${result.toISOString()}'`;
-    }
-
-    return ` ${result} `;
-  });
-  return this(exp, context);
-}

package/src/utils/mathjs.ts

@@ -1,12 +0,0 @@
-import * as math from 'mathjs';
-
-export default function (expression: string, scope = {}) {
-  const result = math.evaluate(expression, scope);
-  if (typeof result === 'number') {
-    if (Number.isNaN(result) || !Number.isFinite(result)) {
-      return null;
-    }
-    return math.round(result, 9);
-  }
-  return result;
-}