From 4db3b283b08840f675a59665316b23d5a30f97c6 Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Fri, 28 Apr 2023 13:50:35 +0700
Subject: [PATCH] fix(evaluators): fix date result in variable (#1781)

---
 .../schema-component/antd/variable/Input.tsx   | 10 +++++-----
 .../src/server/__tests__/index.test.ts         |  9 +++++++++
 packages/core/evaluators/src/utils/index.ts    |  4 ++++
 packages/plugins/workflow/src/server/Plugin.ts |  6 +++---
 .../__tests__/instructions/calculation.test.ts | 18 ++++++++++++++++++
 .../workflow/src/server/functions/index.ts     |  6 +++++-
 6 files changed, 44 insertions(+), 9 deletions(-)

diff --git a/packages/core/client/src/schema-component/antd/variable/Input.tsx b/packages/core/client/src/schema-component/antd/variable/Input.tsx
index c007b4e32..4607cb80f 100644
--- a/packages/core/client/src/schema-component/antd/variable/Input.tsx
+++ b/packages/core/client/src/schema-component/antd/variable/Input.tsx
@@ -36,7 +36,7 @@ const ConstantTypes = {
   string: {
     label: `{{t("String")}}`,
     value: 'string',
-    component({ onChange, value }) {
+    component: function StringComponent({ onChange, value }) {
       return <AntInput value={value} onChange={(ev) => onChange(ev.target.value)} />;
     },
     default: '',
@@ -44,7 +44,7 @@ const ConstantTypes = {
   number: {
     label: '{{t("Number")}}',
     value: 'number',
-    component({ onChange, value }) {
+    component: function NumberComponent({ onChange, value }) {
       return <InputNumber value={value} onChange={onChange} />;
     },
     default: 0,
@@ -52,7 +52,7 @@ const ConstantTypes = {
   boolean: {
     label: `{{t("Boolean")}}`,
     value: 'boolean',
-    component: function Com({ onChange, value }) {
+    component: function BooleanComponent({ onChange, value }) {
       const { t } = useTranslation();
       return (
         <Select
@@ -71,7 +71,7 @@ const ConstantTypes = {
   date: {
     label: '{{t("Date")}}',
     value: 'date',
-    component({ onChange, value }) {
+    component: function DateComponent({ onChange, value }) {
       return (
         <DatePicker
           value={moment(value)}
@@ -89,7 +89,7 @@ const ConstantTypes = {
   null: {
     label: `{{t("Null")}}`,
     value: 'null',
-    component: function Com() {
+    component: function NullComponent() {
       const { t } = useTranslation();
       return <AntInput readOnly placeholder={t('Null')} className="null-value" />;
     },
diff --git a/packages/core/evaluators/src/server/__tests__/index.test.ts b/packages/core/evaluators/src/server/__tests__/index.test.ts
index b13f92d85..8d47c9080 100644
--- a/packages/core/evaluators/src/server/__tests__/index.test.ts
+++ b/packages/core/evaluators/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();
   });
diff --git a/packages/core/evaluators/src/utils/index.ts b/packages/core/evaluators/src/utils/index.ts
index a1d634e19..4727dcc2a 100644
--- a/packages/core/evaluators/src/utils/index.ts
+++ b/packages/core/evaluators/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);
diff --git a/packages/plugins/workflow/src/server/Plugin.ts b/packages/plugins/workflow/src/server/Plugin.ts
index 78427f454..3f21099b6 100644
--- a/packages/plugins/workflow/src/server/Plugin.ts
+++ b/packages/plugins/workflow/src/server/Plugin.ts
@@ -16,7 +16,7 @@ import JobModel from './models/Job';
 import WorkflowModel from './models/Workflow';
 import Processor from './Processor';
 import initTriggers, { Trigger } from './triggers';
-import initFunctions from './functions';
+import initFunctions, { CustomFunction } from './functions';
 import { createLogger, Logger, LoggerOptions, getLoggerLevel, getLoggerFilePath } from '@nocobase/logger';
 
 type Pending = [ExecutionModel, JobModel?];
@@ -25,7 +25,7 @@ type ID = number | string;
 export default class WorkflowPlugin extends Plugin {
   instructions: Registry<Instruction> = new Registry();
   triggers: Registry<Trigger> = new Registry();
-  functions: Registry<Function> = new Registry();
+  functions: Registry<CustomFunction> = new Registry();
   private executing: ExecutionModel | null = null;
   private pending: Pending[] = [];
   private events: [WorkflowModel, any, { context?: any }][] = [];
@@ -193,7 +193,7 @@ export default class WorkflowPlugin extends Plugin {
     }
   }
 
-  public trigger(workflow: WorkflowModel, context: Object, options: { context?: any } = {}): void {
+  public trigger(workflow: WorkflowModel, context: { [key: string]: any }, options: { context?: any } = {}): void {
     // `null` means not to trigger
     if (context == null) {
       return;
diff --git a/packages/plugins/workflow/src/server/__tests__/instructions/calculation.test.ts b/packages/plugins/workflow/src/server/__tests__/instructions/calculation.test.ts
index 063c5c88b..47b2943c3 100644
--- a/packages/plugins/workflow/src/server/__tests__/instructions/calculation.test.ts
+++ b/packages/plugins/workflow/src/server/__tests__/instructions/calculation.test.ts
@@ -130,6 +130,24 @@ describe('workflow > instructions > calculation', () => {
       const [job] = await execution.getJobs();
       expect(job.result).toBe(2);
     });
+
+    it('$system.now()', async () => {
+      const n1 = await workflow.createNode({
+        type: 'calculation',
+        config: {
+          engine: 'math.js',
+          expression: '{{$system.now}}',
+        },
+      });
+
+      const post = await PostRepo.create({ values: { title: 't1' } });
+
+      await sleep(500);
+
+      const [execution] = await workflow.getExecutions();
+      const [job] = await execution.getJobs();
+      expect(job.result).toMatch(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{1,3})?Z/);
+    });
   });
 
   describe('formula.js', () => {
diff --git a/packages/plugins/workflow/src/server/functions/index.ts b/packages/plugins/workflow/src/server/functions/index.ts
index 84e7fd903..1e0d9c07c 100644
--- a/packages/plugins/workflow/src/server/functions/index.ts
+++ b/packages/plugins/workflow/src/server/functions/index.ts
@@ -1,10 +1,14 @@
 import Plugin from '..';
+import ExecutionModel from '../models/Execution';
+import FlowNodeModel from '../models/FlowNode';
+
+export type CustomFunction = (this: { execution: ExecutionModel; node?: FlowNodeModel }) => any;
 
 function now() {
   return new Date();
 }
 
-export default function ({ functions }: Plugin, more: { [key: string]: Function } = {}) {
+export default function ({ functions }: Plugin, more: { [key: string]: CustomFunction } = {}) {
   functions.register('now', now);
 
   for (const [name, fn] of Object.entries(more)) {