@nocobase/evaluators 0.19.0-alpha.8 → 0.20.0-alpha.1

package/lib/client/engines/formulajs.js

@@ -30,11 +30,10 @@ __export(formulajs_exports, {
   default: () => formulajs_default
 });
 module.exports = __toCommonJS(formulajs_exports);
-var import_utils = require("../../utils");
 var import_formulajs = __toESM(require("../../utils/formulajs"));
 var formulajs_default = {
   label: "Formula.js",
   tooltip: '{{t("Formula.js supports most Microsoft Excel formula functions.")}}',
   link: "https://formulajs.info/functions/",
-  evaluate: import_utils.evaluate.bind(import_formulajs.default)
+  evaluate: import_formulajs.default
 };

package/lib/client/engines/mathjs.js

@@ -30,11 +30,10 @@ __export(mathjs_exports, {
   default: () => mathjs_default
 });
 module.exports = __toCommonJS(mathjs_exports);
-var import_utils = require("../../utils");
 var import_mathjs = __toESM(require("../../utils/mathjs"));
 var mathjs_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')}}`,
+  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: import_utils.evaluate.bind(import_mathjs.default)
+  evaluate: import_mathjs.default
 };

package/lib/client/engines/string.d.ts

@@ -0,0 +1,6 @@
+declare const _default: {
+    label: string;
+    tooltip: string;
+    evaluate: any;
+};
+export default _default;

package/lib/client/engines/string.js

@@ -0,0 +1,38 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var string_exports = {};
+__export(string_exports, {
+  default: () => string_default
+});
+module.exports = __toCommonJS(string_exports);
+var import_string = __toESM(require("../../utils/string"));
+var string_default = {
+  label: `{{t('String template')}}`,
+  tooltip: `{{t('Simple string replacement, can be used to interpolate variables in a string.')}}`,
+  evaluate: import_string.default
+};

package/lib/client/index.js

@@ -36,9 +36,11 @@ module.exports = __toCommonJS(client_exports);
 var import_client = require("@nocobase/utils/client");
 var import_mathjs = __toESM(require("./engines/mathjs"));
 var import_formulajs = __toESM(require("./engines/formulajs"));
+var import_string = __toESM(require("./engines/string"));
 const evaluators = new import_client.Registry();
 evaluators.register("math.js", import_mathjs.default);
 evaluators.register("formula.js", import_formulajs.default);
+evaluators.register("string", import_string.default);
 function getOptions() {
   return Array.from(evaluators.getEntities()).reduce(
     (result, [value, options]) => result.concat({ value, ...options }),

package/lib/server/index.js

@@ -35,13 +35,14 @@ __export(server_exports, {
 });
 module.exports = __toCommonJS(server_exports);
 var import_utils = require("@nocobase/utils");
-var import_utils2 = require("../utils");
 var import_mathjs = __toESM(require("../utils/mathjs"));
 var import_formulajs = __toESM(require("../utils/formulajs"));
+var import_string = __toESM(require("../utils/string"));
 var import_utils3 = require("../utils");
 const evaluators = new import_utils.Registry();
-evaluators.register("math.js", import_utils2.evaluate.bind(import_mathjs.default));
-evaluators.register("formula.js", import_utils2.evaluate.bind(import_formulajs.default));
+evaluators.register("math.js", import_mathjs.default);
+evaluators.register("formula.js", import_formulajs.default);
+evaluators.register("string", import_string.default);
 var server_default = evaluators;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/lib/utils/formulajs.d.ts

@@ -1 +1,2 @@
-export default function (expression: string, scope?: {}): any;
+declare const _default: any;
+export default _default;

package/lib/utils/formulajs.js

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,9 +31,10 @@ __export(formulajs_exports, {
 });
 module.exports = __toCommonJS(formulajs_exports);
 var functions = __toESM(require("@formulajs/formulajs"));
+var import__ = require(".");
 const fnNames = Object.keys(functions).filter((key) => key !== "default");
 const fns = fnNames.map((key) => functions[key]);
-function formulajs_default(expression, scope = {}) {
+var formulajs_default = import__.evaluate.bind(function(expression, scope = {}) {
   const fn = new Function(...fnNames, ...Object.keys(scope), `return ${expression}`);
   const result = fn(...fns, ...Object.values(scope));
   if (typeof result === "number") {
@@ -44,5 +44,4 @@ function formulajs_default(expression, scope = {}) {
     return functions.ROUND(result, 9);
   }
   return result;
-}
-__name(formulajs_default, "default");
+}, {});

package/lib/utils/index.d.ts

@@ -3,4 +3,8 @@ export type Scope = {
 };
 export 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;
+interface EvaluatorOptions {
+    replaceValue?: boolean;
+}
+export declare function evaluate(this: Evaluator, options: EvaluatorOptions, expression: string, scope?: Scope): any;
+export {};

package/lib/utils/index.js

@@ -36,21 +36,24 @@ function appendArrayColumn(scope, key) {
   }
 }
 __name(appendArrayColumn, "appendArrayColumn");
-function evaluate(expression, scope = {}) {
+function evaluate(options = {}, expression, scope = {}) {
   const context = (0, import_lodash.cloneDeep)(scope);
   const newContext = {};
-  const exp = expression.trim().replace(/{{\s*([^{}]+)\s*}}/g, (_, v) => {
+  const keyMap = {};
+  let index = 0;
+  const exp = expression.trim().replace(/{{\s*([\w$.-]+)\s*}}/g, (_, v) => {
     appendArrayColumn(context, v);
-    let item = (0, import_lodash.get)(context, v);
+    let item = (0, import_lodash.get)(context, v) ?? null;
     if (typeof item === "function") {
       item = item();
     }
-    const randomKey = `$$${Math.random().toString(36).slice(2, 10).padEnd(8, "0")}`;
-    if (item == null) {
-      return "null";
+    let key = keyMap[v];
+    if (!key) {
+      key = `$$${index++}`;
+      keyMap[v] = key;
+      newContext[key] = item;
     }
-    newContext[randomKey] = item;
-    return ` ${randomKey} `;
+    return options.replaceValue ? `${item == null || typeof item === "number" && (Number.isNaN(item) || !Number.isFinite(item)) ? "" : item}` : key;
   });
   return this(exp, newContext);
 }

package/lib/utils/mathjs.d.ts

@@ -1 +1,2 @@
-export default function (expression: string, scope?: {}): any;
+declare const _default: any;
+export default _default;

package/lib/utils/mathjs.js

@@ -4,7 +4,6 @@ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -32,14 +31,17 @@ __export(mathjs_exports, {
 });
 module.exports = __toCommonJS(mathjs_exports);
 var math = __toESM(require("mathjs"));
-function mathjs_default(expression, scope = {}) {
-  const result = math.evaluate(expression, scope);
-  if (typeof result === "number") {
-    if (Number.isNaN(result) || !Number.isFinite(result)) {
-      return null;
+var import__ = require(".");
+var mathjs_default = import__.evaluate.bind(
+  function(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 math.round(result, 9);
-  }
-  return result;
-}
-__name(mathjs_default, "default");
+    return result;
+  },
+  { replaceKey: true }
+);

package/lib/utils/string.d.ts

@@ -0,0 +1,2 @@
+declare const _default: any;
+export default _default;

package/lib/utils/string.js

@@ -0,0 +1,29 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var string_exports = {};
+__export(string_exports, {
+  default: () => string_default
+});
+module.exports = __toCommonJS(string_exports);
+var import__ = require(".");
+var string_default = import__.evaluate.bind(
+  function(expression, scope = {}) {
+    return expression;
+  },
+  { replaceValue: true }
+);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.19.0-alpha.8",
+  "version": "0.20.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.19.0-alpha.8",
+    "@nocobase/utils": "0.20.0-alpha.1",
     "mathjs": "^10.6.0"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/evaluators"
   },
-  "gitHead": "b8fbe613e320e40ebf2da1bf64907eab0197b589"
+  "gitHead": "516c0b1470d77ff499f533ae6b57e4c084450ff5"
 }