@nocobase/evaluators 0.9.2-alpha.4 → 0.9.4-alpha.1

package/lib/utils/index.js

@@ -56,6 +56,9 @@ function evaluate(expression, scope = {}) {
     } else {
       result = replaceNumberIndex(v, context);
     }
+    if (result instanceof Date) {
+      result = `'${result.toISOString()}'`;
+    }
     return ` ${result} `;
   });
   return this(exp, context);

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@nocobase/evaluators",
-  "version": "0.9.2-alpha.4",
+  "version": "0.9.4-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.2-alpha.4",
+    "@nocobase/utils": "0.9.4-alpha.1",
     "mathjs": "^10.6.0"
   },
   "repository": {
@@ -15,5 +15,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/evaluators"
   },
-  "gitHead": "96cb023f353a4fb099dea074c575be65ebab813f"
+  "gitHead": "0b4936be557be918dbdf8196dadcbc7eb395906d"
 }

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

@@ -27,6 +27,15 @@ describe('evaluate', () => {
     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();
   });

package/src/utils/index.ts

@@ -55,6 +55,10 @@ export function evaluate(this: Evaluator, expression: string, scope: Scope = {})
       result = replaceNumberIndex(v, context);
     }
 
+    if (result instanceof Date) {
+      result = `'${result.toISOString()}'`;
+    }
+
     return ` ${result} `;
   });
   return this(exp, context);