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

package/lib/client/engines/formulajs.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("../../utils");
-
 var _formulajs = _interopRequireDefault(require("../../utils/formulajs"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 var _default = {
   label: 'Formula.js',
   tooltip: '{{t("Formula.js supports most Microsoft Excel formula functions.")}}',

package/lib/client/engines/mathjs.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _utils = require("../../utils");
-
 var _mathjs = _interopRequireDefault(require("../../utils/mathjs"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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')}}`,

package/lib/client/index.d.ts

@@ -8,5 +8,5 @@ export interface Evaluator {
     }): any;
 }
 export declare const evaluators: Registry<Evaluator>;
-export declare const renderReference: (key: string) => JSX.Element;
+export declare function getOptions(): any[];
 export default evaluators;

package/lib/client/index.js

@@ -3,81 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderReference = exports.evaluators = exports.default = void 0;
-
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-
-  _react = function _react() {
-    return data;
-  };
-
-  return data;
-}
-
-function _css() {
-  const data = require("@emotion/css");
-
-  _css = function _css() {
-    return data;
-  };
-
-  return data;
-}
-
+exports.evaluators = exports.default = void 0;
+exports.getOptions = getOptions;
 function _client() {
-  const data = require("@nocobase/client");
-
-  _client = function _client() {
-    return data;
-  };
-
-  return data;
-}
-
-function _client2() {
   const data = require("@nocobase/utils/client");
-
-  _client2 = function _client2() {
+  _client = function _client() {
     return data;
   };
-
   return data;
 }
-
 var _mathjs = _interopRequireDefault(require("./engines/mathjs"));
-
 var _formulajs = _interopRequireDefault(require("./engines/formulajs"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-const evaluators = new (_client2().Registry)();
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const evaluators = new (_client().Registry)();
 exports.evaluators = evaluators;
 evaluators.register('math.js', _mathjs.default);
 evaluators.register('formula.js', _formulajs.default);
-
-const renderReference = key => {
-  const engine = evaluators.get(key);
-
-  if (!engine) {
-    return null;
-  }
-
-  return engine.link ? _react().default.createElement(_react().default.Fragment, null, _react().default.createElement("span", {
-    className: (0, _css().css)`
-          &:after {
-            content: ':';
-          }
-          & + a {
-            margin-left: .25em;
-          }
-        `
-  }, _client().i18n.t('Syntax references')), _react().default.createElement("a", {
-    href: engine.link,
-    target: "_blank"
-  }, engine.label)) : null;
-};
-
-exports.renderReference = renderReference;
+function getOptions() {
+  return Array.from(evaluators.getEntities()).reduce((result, [value, options]) => result.concat(_objectSpread({
+    value
+  }, options)), []);
+}
 var _default = evaluators;
 exports.default = _default;

package/lib/index.js

@@ -10,9 +10,7 @@ Object.defineProperty(exports, "default", {
     return _server.default;
   }
 });
-
 var _server = _interopRequireWildcard(require("./server"));
-
 Object.keys(_server).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
@@ -24,7 +22,5 @@ Object.keys(_server).forEach(function (key) {
     }
   });
 });
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }

package/lib/server/index.d.ts

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

package/lib/server/index.js

@@ -3,26 +3,31 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.evaluators = exports.default = void 0;
-
+Object.defineProperty(exports, "appendArrayColumn", {
+  enumerable: true,
+  get: function get() {
+    return _utils2.appendArrayColumn;
+  }
+});
+exports.default = void 0;
+Object.defineProperty(exports, "evaluate", {
+  enumerable: true,
+  get: function get() {
+    return _utils2.evaluate;
+  }
+});
+exports.evaluators = void 0;
 function _utils() {
   const data = require("@nocobase/utils");
-
   _utils = function _utils() {
     return data;
   };
-
   return data;
 }
-
 var _utils2 = require("../utils");
-
 var _mathjs = _interopRequireDefault(require("../utils/mathjs"));
-
 var _formulajs = _interopRequireDefault(require("../utils/formulajs"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const evaluators = new (_utils().Registry)();
 exports.evaluators = evaluators;
 evaluators.register('math.js', _utils2.evaluate.bind(_mathjs.default));

package/lib/utils/formulajs.js

@@ -4,35 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function functions() {
   const data = _interopRequireWildcard(require("@formulajs/formulajs"));
-
   functions = function functions() {
     return data;
   };
-
   return data;
 }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 const fnNames = Object.keys(functions()).filter(key => key !== 'default');
 const fns = fnNames.map(key => functions()[key]);
-
 function _default(expression, 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/lib/utils/index.d.ts

@@ -2,4 +2,5 @@ export declare type Scope = {
     [key: string]: any;
 };
 export declare type Evaluator = (expression: string, scope?: Scope) => any;
+export declare function appendArrayColumn(scope: any, key: any): void;
 export declare function evaluate(this: Evaluator, expression: string, scope?: Scope): any;

package/lib/utils/index.js

@@ -3,41 +3,33 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.appendArrayColumn = appendArrayColumn;
 exports.evaluate = evaluate;
-
 function _lodash() {
   const data = require("lodash");
-
   _lodash = function _lodash() {
     return data;
   };
-
   return data;
 }
-
 function appendArrayColumn(scope, key) {
   const paths = key.split('.');
   let data = scope;
-
   for (let p = 0; p < paths.length && data != null; p++) {
+    var _data;
     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];
+    data = (_data = data) === null || _data === void 0 ? void 0 : _data[path];
   }
 }
-
 function replaceNumberIndex(path, scope) {
   const segments = path.split('.');
   const paths = [];
-
   for (let i = 0; i < segments.length; i++) {
     const p = segments[i];
-
     if (p.match(/^\d+$/)) {
       paths.push(Array.isArray((0, _lodash().get)(scope, segments.slice(0, i))) ? `[${p}]` : `["${p}"]`);
     } else {
@@ -48,26 +40,23 @@ function replaceNumberIndex(path, scope) {
       }
     }
   }
-
   return paths.join('');
 }
-
 function evaluate(expression, scope = {}) {
   const context = (0, _lodash().cloneDeep)(scope);
   const exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, (_, v) => {
     appendArrayColumn(context, v);
     const item = (0, _lodash().get)(context, v);
-
+    let result;
     if (item == null) {
-      return 'null';
-    }
-
-    if (typeof item === 'function') {
-      const result = item();
-      return typeof result === 'string' ? `'${result.replace(/'/g, "\\'")}'` : result;
+      result = 'null';
+    } else if (typeof item === 'function') {
+      result = item();
+      result = typeof result === 'string' ? `'${result.replace(/'/g, "\\'")}'` : result;
+    } else {
+      result = replaceNumberIndex(v, context);
     }
-
-    return replaceNumberIndex(v, context);
+    return ` ${result} `;
   });
   return this(exp, context);
 }

package/lib/utils/mathjs.js

@@ -4,31 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
-
 function math() {
   const data = _interopRequireWildcard(require("mathjs"));
-
   math = function math() {
     return data;
   };
-
   return data;
 }
-
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 function _default(expression, 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;
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.9.1-alpha.1",
+  "version": "0.9.2-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.9.1-alpha.1",
+    "@nocobase/utils": "0.9.2-alpha.1",
     "mathjs": "^10.6.0"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/evaluators"
   },
-  "gitHead": "56cb184b00dc383b853015d525bf6e79dea92169"
+  "gitHead": "a4f103eb0144f07205aff7b2a6be8ea6aa1330df"
 }

package/src/client/index.tsx

@@ -1,7 +1,3 @@
-import React from 'react';
-import { css } from '@emotion/css';
-
-import { i18n } from '@nocobase/client';
 import { Registry } from '@nocobase/utils/client';
 
 import mathjs from './engines/mathjs';
@@ -19,29 +15,8 @@ export const evaluators = new Registry<Evaluator>();
 evaluators.register('math.js', mathjs);
 evaluators.register('formula.js', formulajs);
 
-export const renderReference = (key: string) => {
-  const engine = evaluators.get(key);
-  if (!engine) {
-    return null;
-  }
-
-  return engine.link
-    ? (
-      <>
-        <span className={css`
-          &:after {
-            content: ':';
-          }
-          & + a {
-            margin-left: .25em;
-          }
-        `}>
-          {i18n.t('Syntax references')}
-        </span>
-        <a href={engine.link} target="_blank">{engine.label}</a>
-      </>
-    )
-    : null
-};
+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/server/index.ts

@@ -6,7 +6,7 @@ import formulajs from "../utils/formulajs";
 
 
 
-export { Evaluator } from '../utils';
+export { Evaluator, evaluate, appendArrayColumn } from '../utils';
 
 export const evaluators = new Registry<Evaluator>();
 

package/src/utils/index.ts

@@ -6,7 +6,7 @@ export type Scope = { [key: string]: any };
 
 export type Evaluator = (expression: string, scope?: Scope) => any;
 
-function appendArrayColumn(scope, key) {
+export function appendArrayColumn(scope, key) {
   const paths = key.split('.');
   let data = scope;
   for (let p = 0; p < paths.length && data != null; p++) {
@@ -15,13 +15,13 @@ function appendArrayColumn(scope, key) {
     if (Array.isArray(data) && !isIndex && !data[path]) {
       data[path] = data.map(item => item[path]);
     }
-    data = data[path];
+    data = data?.[path];
   }
 }
 
 function replaceNumberIndex(path: string, scope: Scope): string {
   const segments = path.split('.');
-  const paths = [];
+  const paths: string[] = [];
 
   for (let i = 0; i < segments.length; i++) {
     const p = segments[i];
@@ -46,16 +46,18 @@ export function evaluate(this: Evaluator, expression: string, scope: Scope = {})
 
     const item = get(context, v);
 
-    if (item == null) {
-      return 'null';
-    }
+    let result;
 
-    if (typeof item === 'function') {
-      const result = item();
-      return typeof result === 'string' ? `'${result.replace(/'/g, "\\'")}'` : 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);
     }
 
-    return replaceNumberIndex(v, context);
+    return ` ${result} `;
   });
   return this(exp, context);
 }