@nocobase/plugin-workflow 0.9.2-alpha.3 → 0.9.3-alpha.1

package/lib/client/components/DynamicExpression.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.DynamicExpression = void 0;
-function _react() {
-  const data = _interopRequireWildcard(require("react"));
-  _react = function _react() {
-    return data;
-  };
-  return data;
-}
 function _core() {
   const data = require("@formily/core");
   _core = function _core() {
@@ -18,9 +11,9 @@ function _core() {
   };
   return data;
 }
-function _react2() {
+function _react() {
   const data = require("@formily/react");
-  _react2 = function _react2() {
+  _react = function _react() {
     return data;
   };
   return data;
@@ -32,6 +25,13 @@ function _antd() {
   };
   return data;
 }
+function _react2() {
+  const data = _interopRequireWildcard(require("react"));
+  _react2 = function _react2() {
+    return data;
+  };
+  return data;
+}
 function _reactI18next() {
   const data = require("react-i18next");
   _reactI18next = function _reactI18next() {
@@ -61,15 +61,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-const InternalExpression = (0, _react2().observer)(props => {
+const InternalExpression = (0, _react().observer)(props => {
   const onChange = props.onChange;
-  const _useForm = (0, _react2().useForm)(),
+  const _useForm = (0, _react().useForm)(),
     values = _useForm.values;
-  const _useState = (0, _react().useState)(values === null || values === void 0 ? void 0 : values.sourceCollection),
+  const _useState = (0, _react2().useState)(values === null || values === void 0 ? void 0 : values.sourceCollection),
     _useState2 = _slicedToArray(_useState, 2),
     collection = _useState2[0],
     setCollection = _useState2[1];
-  (0, _react2().useFormEffects)(() => {
+  (0, _react().useFormEffects)(() => {
     (0, _core().onFormInitialValuesChange)(form => {
       setCollection(form.values.sourceCollection);
     });
@@ -79,9 +79,9 @@ const InternalExpression = (0, _react2().observer)(props => {
     });
   });
   const options = (0, _variable.useCollectionFieldOptions)({
-    collection
+    collection: collection
   });
-  return _react().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+  return _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options
   }));
 });
@@ -89,14 +89,14 @@ function Result(props) {
   const _useTranslation = (0, _reactI18next().useTranslation)(),
     t = _useTranslation.t;
   const values = (0, _client().useRecord)();
-  const options = (0, _react().useMemo)(() => (0, _variable.useCollectionFieldOptions)({
+  const options = (0, _react2().useMemo)(() => (0, _variable.useCollectionFieldOptions)({
     collection: values.sourceCollection
   }), [values.sourceCollection, values.sourceCollection]);
-  return props.value ? _react().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+  return props.value ? _react2().default.createElement(_client().Variable.TextArea, _objectSpread(_objectSpread({}, props), {}, {
     scope: options
-  })) : _react().default.createElement(_antd().Tag, null, t('Unconfigured', {
+  })) : _react2().default.createElement(_antd().Tag, null, t('Unconfigured', {
     ns: _locale.NAMESPACE
   }));
 }
-const DynamicExpression = (0, _react2().connect)(InternalExpression, (0, _react2().mapReadPretty)(Result));
+const DynamicExpression = (0, _react().connect)(InternalExpression, (0, _react().mapReadPretty)(Result));
 exports.DynamicExpression = DynamicExpression;

package/lib/client/components/FieldsSelect.js

@@ -52,7 +52,8 @@ const FieldsSelect = (0, _react2().observer)(props => {
     values = _useForm.values;
   const fields = getCollectionFields(values === null || values === void 0 ? void 0 : values.collection);
   return _react().default.createElement(_antd().Select, _objectSpread(_objectSpread({
-    className: "full-width"
+    className: "full-width",
+    dropdownMatchSelectWidth: false
   }, others), {}, {
     options: fields.filter(filter).map(field => {
       var _field$uiSchema;

package/lib/client/components/renderEngineReference.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.renderEngineReference = 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() {
@@ -26,15 +19,22 @@ function _client() {
   return data;
 }
 function _client2() {
-  const data = _interopRequireDefault(require("@nocobase/evaluators/client"));
+  const data = require("@nocobase/evaluators/client");
   _client2 = function _client2() {
     return data;
   };
   return data;
 }
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const renderEngineReference = key => {
-  const engine = _client2().default.get(key);
+  const engine = _client2().evaluators.get(key);
   if (!engine) {
     return null;
   }

package/lib/client/interfaces/expression.js

@@ -32,6 +32,7 @@ var _default = {
       'x-component': 'DynamicExpression'
     }
   },
-  properties: _objectSpread({}, defaultProps)
+  properties: _objectSpread({}, defaultProps),
+  invariable: true
 };
 exports.default = _default;

package/lib/client/nodes/calculation.d.ts

@@ -1,6 +1,6 @@
 import { SchemaInitializerItemOptions } from '@nocobase/client';
-import { useWorkflowVariableOptions } from '../variable';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { useWorkflowVariableOptions } from '../variable';
 declare function useWorkflowVariableEntityOptions(): {
     label: any;
     value: any;

package/lib/client/nodes/calculation.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _css() {
+  const data = require("@emotion/css");
+  _css = function _css() {
     return data;
   };
   return data;
@@ -18,23 +18,23 @@ function _antd() {
   };
   return data;
 }
-function _css() {
-  const data = require("@emotion/css");
-  _css = function _css() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _client2() {
+  const data = require("@nocobase/evaluators/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
 }
-function _reactI18next() {
-  const data = require("react-i18next");
-  _reactI18next = function _reactI18next() {
+function _client3() {
+  const data = require("@nocobase/utils/client");
+  _client3 = function _client3() {
     return data;
   };
   return data;
@@ -46,25 +46,25 @@ function _antd2() {
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/client");
-  _client = function _client() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _client2() {
-  const data = require("@nocobase/evaluators/client");
-  _client2 = function _client2() {
+function _reactI18next() {
+  const data = require("react-i18next");
+  _reactI18next = function _reactI18next() {
     return data;
   };
   return data;
 }
 var _FlowContext = require("../FlowContext");
-var _locale = require("../locale");
-var _variable = require("../variable");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _renderEngineReference = require("../components/renderEngineReference");
+var _locale = require("../locale");
+var _variable = require("../variable");
 const _excluded = ["node", "insert"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -231,7 +231,7 @@ var _default = {
       if (!execution) {
         return (0, _locale.lang)('Calculation result');
       }
-      const result = (0, _jsonTemplates().default)(dataSource)({
+      const result = (0, _client3().parse)(dataSource)({
         $jobsMapByNodeId: ((_execution$jobs = execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
           [job.nodeId]: job.result
         }), {})

package/lib/client/nodes/condition.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import { Registry } from '@nocobase/utils/client';
-import { useWorkflowVariableOptions } from '../variable';
 import { RadioWithTooltip } from '../components/RadioWithTooltip';
+import { useWorkflowVariableOptions } from '../variable';
 interface Calculator {
     name: string;
     type: 'boolean' | 'number' | 'string' | 'date' | 'unknown' | 'null' | 'array';

package/lib/client/nodes/condition.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Calculation = Calculation;
 exports.default = exports.calculators = void 0;
-function _react() {
-  const data = _interopRequireDefault(require("react"));
-  _react = function _react() {
+function _icons() {
+  const data = require("@ant-design/icons");
+  _icons = function _icons() {
     return data;
   };
   return data;
@@ -19,44 +19,44 @@ function _css() {
   };
   return data;
 }
-function _antd() {
-  const data = require("antd");
-  _antd = function _antd() {
+function _client() {
+  const data = require("@nocobase/client");
+  _client = function _client() {
     return data;
   };
   return data;
 }
-function _icons() {
-  const data = require("@ant-design/icons");
-  _icons = function _icons() {
+function _client2() {
+  const data = require("@nocobase/evaluators/client");
+  _client2 = function _client2() {
     return data;
   };
   return data;
 }
-function _reactI18next() {
-  const data = require("react-i18next");
-  _reactI18next = function _reactI18next() {
+function _client3() {
+  const data = require("@nocobase/utils/client");
+  _client3 = function _client3() {
     return data;
   };
   return data;
 }
-function _client() {
-  const data = require("@nocobase/utils/client");
-  _client = function _client() {
+function _antd() {
+  const data = require("antd");
+  _antd = function _antd() {
     return data;
   };
   return data;
 }
-function _client2() {
-  const data = require("@nocobase/client");
-  _client2 = function _client2() {
+function _react() {
+  const data = _interopRequireDefault(require("react"));
+  _react = function _react() {
     return data;
   };
   return data;
 }
-function _client3() {
-  const data = require("@nocobase/evaluators/client");
-  _client3 = function _client3() {
+function _reactI18next() {
+  const data = require("react-i18next");
+  _reactI18next = function _reactI18next() {
     return data;
   };
   return data;
@@ -64,18 +64,18 @@ function _client3() {
 var _ = require(".");
 var _Branch = require("../Branch");
 var _FlowContext = require("../FlowContext");
-var _style = require("../style");
-var _locale = require("../locale");
-var _variable = require("../variable");
 var _RadioWithTooltip = require("../components/RadioWithTooltip");
 var _renderEngineReference = require("../components/renderEngineReference");
+var _locale = require("../locale");
+var _style = require("../style");
+var _variable = require("../variable");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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 calculators = new (_client().Registry)();
+const calculators = new (_client3().Registry)();
 exports.calculators = calculators;
 calculators.register('equal', {
   name: '=',
@@ -188,7 +188,7 @@ function Calculation({
   operands = [],
   onChange: _onChange
 }) {
-  const compile = (0, _client2().useCompile)();
+  const compile = (0, _client().useCompile)();
   const options = (0, _variable.useWorkflowVariableOptions)();
   return _react().default.createElement("fieldset", {
     className: (0, _css().css)`
@@ -197,7 +197,7 @@ function Calculation({
         align-items: center;
         flex-wrap: wrap;
       `
-  }, _react().default.createElement(_client2().Variable.Input, {
+  }, _react().default.createElement(_client().Variable.Input, {
     value: operands[0],
     onChange: v => _onChange({
       calculator,
@@ -220,7 +220,7 @@ function Calculation({
   }]) => _react().default.createElement(_antd().Select.Option, {
     key: value,
     value: value
-  }, compile(name)))))), _react().default.createElement(_client2().Variable.Input, {
+  }, compile(name)))))), _react().default.createElement(_client().Variable.Input, {
     value: operands[1],
     onChange: v => _onChange({
       calculator,
@@ -405,7 +405,7 @@ var _default = {
       'x-component-props': {
         options: [['basic', {
           label: `{{t("Basic", { ns: "${_locale.NAMESPACE}" })}}`
-        }], ...Array.from(_client3().evaluators.getEntities())].reduce((result, [value, options]) => result.concat(_objectSpread({
+        }], ...Array.from(_client2().evaluators.getEntities())].reduce((result, [value, options]) => result.concat(_objectSpread({
           value
         }, options)), [])
       },
@@ -439,7 +439,7 @@ var _default = {
         form
       }) {
         const values = form.values;
-        const _evaluators$get = _client3().evaluators.get(values.engine),
+        const _evaluators$get = _client2().evaluators.get(values.engine),
           evaluate = _evaluators$get.evaluate;
         const exp = value.trim().replace(/{{([^{}]+)}}/g, ' 1 ');
         try {

package/lib/client/nodes/create.d.ts

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/nodes/destroy.d.ts

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/nodes/index.js

@@ -53,13 +53,6 @@ function _reactI18next() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _client() {
   const data = require("@nocobase/utils/client");
   _client = function _client() {
@@ -229,7 +222,7 @@ function RemoveButton() {
         if (node === current) {
           return false;
         }
-        const template = (0, _jsonTemplates().default)(node.config);
+        const template = (0, _client().parse)(node.config);
         const refs = template.parameters.filter(({
           key
         }) => key.startsWith(`$jobsMapByNodeId.${current.id}.`) || key === `$jobsMapByNodeId.${current.id}`);

package/lib/client/nodes/manual/WorkflowTodo.js

@@ -25,13 +25,6 @@ function _antd() {
   };
   return data;
 }
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _css() {
   const data = require("@emotion/css");
   _css = function _css() {
@@ -468,7 +461,7 @@ function useFlowRecordFromBlock(opts) {
     dataSource = _useFieldSchema['x-context-datasource'];
   const _useFlowContext = (0, _FlowContext.useFlowContext)(),
     execution = _useFlowContext.execution;
-  const result = (0, _jsonTemplates().default)(dataSource)({
+  const result = (0, _client2().parse)(dataSource)({
     $context: execution === null || execution === void 0 ? void 0 : execution.context,
     $jobsMapByNodeId: ((_execution$jobs = execution === null || execution === void 0 ? void 0 : execution.jobs) !== null && _execution$jobs !== void 0 ? _execution$jobs : []).reduce((map, job) => Object.assign(map, {
       [job.nodeId]: job.result

package/lib/client/nodes/query.d.ts

@@ -14,6 +14,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/nodes/update.d.ts

@@ -13,6 +13,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };

package/lib/client/schemas/collection.d.ts

@@ -6,6 +6,7 @@ export declare const collection: {
     'x-decorator': string;
     'x-component': string;
     'x-component-props': {
+        dropdownMatchSelectWidth: boolean;
         placeholder: string;
     };
 };

package/lib/client/schemas/collection.js

@@ -34,6 +34,7 @@ const collection = {
   'x-decorator': 'FormItem',
   'x-component': 'Select',
   'x-component-props': {
+    dropdownMatchSelectWidth: false,
     placeholder: '{{t("Select collection")}}'
   }
 };

package/lib/client/triggers/collection.d.ts

@@ -20,6 +20,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 placeholder: string;
             };
         };
@@ -29,6 +30,7 @@ declare const _default: {
             'x-decorator': string;
             'x-component': string;
             'x-component-props': {
+                dropdownMatchSelectWidth: boolean;
                 options: {
                     label: string;
                     value: number;

package/lib/client/triggers/collection.js

@@ -70,6 +70,7 @@ var _default = {
       'x-decorator': 'FormItem',
       'x-component': 'Select',
       'x-component-props': {
+        dropdownMatchSelectWidth: false,
         options: collectionModeOptions,
         placeholder: `{{t("Trigger on", { ns: "${_locale.NAMESPACE}" })}}`
       },

package/lib/client/variable.js

@@ -81,7 +81,7 @@ function matchFieldType(field, type) {
   const inputType = typeof type;
   if (inputType === 'string') {
     var _BaseTypeSets$type;
-    return Boolean((_BaseTypeSets$type = BaseTypeSets[type]) === null || _BaseTypeSets$type === void 0 ? void 0 : _BaseTypeSets$type.has(field.interface));
+    return (_BaseTypeSets$type = BaseTypeSets[type]) === null || _BaseTypeSets$type === void 0 ? void 0 : _BaseTypeSets$type.has(field.interface);
   }
   if (inputType === 'object' && type.type === 'reference') {
     if (isAssociationField(field)) {

package/lib/server/Plugin.d.ts

@@ -5,12 +5,13 @@ import ExecutionModel from './models/Execution';
 import WorkflowModel from './models/Workflow';
 import Processor from './Processor';
 import { Trigger } from './triggers';
+import { CustomFunction } from './functions';
 import { Logger } from '@nocobase/logger';
 declare type ID = number | string;
 export default class WorkflowPlugin extends Plugin {
     instructions: Registry<Instruction>;
     triggers: Registry<Trigger>;
-    functions: Registry<Function>;
+    functions: Registry<CustomFunction>;
     private executing;
     private pending;
     private events;
@@ -19,7 +20,9 @@ export default class WorkflowPlugin extends Plugin {
     onBeforeSave: (instance: WorkflowModel, options: any) => Promise<void>;
     load(): Promise<void>;
     toggle(workflow: WorkflowModel, enable?: boolean): void;
-    trigger(workflow: WorkflowModel, context: Object, options?: {
+    trigger(workflow: WorkflowModel, context: {
+        [key: string]: any;
+    }, options?: {
         context?: any;
     }): void;
     private prepare;

package/lib/server/Processor.d.ts

@@ -1,9 +1,9 @@
+import { Logger } from '@nocobase/logger';
 import { Transaction, Transactionable } from 'sequelize';
 import Plugin from '.';
 import ExecutionModel from './models/Execution';
-import JobModel from './models/Job';
 import FlowNodeModel from './models/FlowNode';
-import { Logger } from '@nocobase/logger';
+import JobModel from './models/Job';
 export interface ProcessorOptions extends Transactionable {
     plugin: Plugin;
 }

package/lib/server/Processor.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
-    return data;
-  };
-  return data;
-}
 function _database() {
   const data = require("@nocobase/database");
   _database = function _database() {
@@ -25,8 +18,14 @@ function _evaluators() {
   };
   return data;
 }
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
+    return data;
+  };
+  return data;
+}
 var _constants = require("./constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e2) { throw _e2; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e3) { didErr = true; err = _e3; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 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; }
@@ -350,7 +349,7 @@ class Processor {
     };
   }
   getParsedValue(value, node) {
-    const template = (0, _jsonTemplates().default)(value);
+    const template = (0, _utils().parse)(value);
     const scope = this.getScope(node);
     template.parameters.forEach(({
       key

package/lib/server/functions/index.d.ts

@@ -1,4 +1,10 @@
 import Plugin from '..';
+import ExecutionModel from '../models/Execution';
+import FlowNodeModel from '../models/FlowNode';
+export declare type CustomFunction = (this: {
+    execution: ExecutionModel;
+    node?: FlowNodeModel;
+}) => any;
 export default function ({ functions }: Plugin, more?: {
-    [key: string]: Function;
+    [key: string]: CustomFunction;
 }): void;

package/lib/server/instructions/calculation.js

@@ -4,22 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _jsonTemplates() {
-  const data = _interopRequireDefault(require("json-templates"));
-  _jsonTemplates = function _jsonTemplates() {
+function _evaluators() {
+  const data = require("@nocobase/evaluators");
+  _evaluators = function _evaluators() {
     return data;
   };
   return data;
 }
-function _evaluators() {
-  const data = _interopRequireDefault(require("@nocobase/evaluators"));
-  _evaluators = function _evaluators() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
 }
 var _constants = require("../constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var _default = {
@@ -36,12 +35,12 @@ var _default = {
       let scope = processor.getScope();
       if (dynamic) {
         var _parse, _parse2, _node$config$scope;
-        const parsed = (_parse = (0, _jsonTemplates().default)(dynamic)(scope)) !== null && _parse !== void 0 ? _parse : {};
+        const parsed = (_parse = (0, _utils().parse)(dynamic)(scope)) !== null && _parse !== void 0 ? _parse : {};
         engine = parsed.engine;
         expression = parsed.expression;
-        scope = (_parse2 = (0, _jsonTemplates().default)((_node$config$scope = node.config.scope) !== null && _node$config$scope !== void 0 ? _node$config$scope : '')(scope)) !== null && _parse2 !== void 0 ? _parse2 : {};
+        scope = (_parse2 = (0, _utils().parse)((_node$config$scope = node.config.scope) !== null && _node$config$scope !== void 0 ? _node$config$scope : '')(scope)) !== null && _parse2 !== void 0 ? _parse2 : {};
       }
-      const evaluator = _evaluators().default.get(engine);
+      const evaluator = _evaluators().evaluators.get(engine);
       try {
         const result = evaluator && expression ? evaluator(expression, scope) : null;
         return {

package/lib/server/instructions/condition.js

@@ -4,22 +4,21 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.calculators = void 0;
-function _utils() {
-  const data = require("@nocobase/utils");
-  _utils = function _utils() {
+function _evaluators() {
+  const data = require("@nocobase/evaluators");
+  _evaluators = function _evaluators() {
     return data;
   };
   return data;
 }
-function _evaluators() {
-  const data = _interopRequireDefault(require("@nocobase/evaluators"));
-  _evaluators = function _evaluators() {
+function _utils() {
+  const data = require("@nocobase/utils");
+  _utils = function _utils() {
     return data;
   };
   return data;
 }
 var _constants = require("../constants");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 const calculators = new (_utils().Registry)();
@@ -106,7 +105,7 @@ var _default = {
         calculation = _ref.calculation,
         expression = _ref.expression,
         rejectOnFalse = _ref.rejectOnFalse;
-      const evaluator = _evaluators().default.get(engine);
+      const evaluator = _evaluators().evaluators.get(engine);
       let result = true;
       try {
         result = evaluator ? evaluator(expression, processor.getScope()) : logicCalculate(processor.getParsedValue(calculation));

package/package.json

@@ -1,32 +1,31 @@
 {
   "name": "@nocobase/plugin-workflow",
-  "version": "0.9.2-alpha.3",
+  "version": "0.9.3-alpha.1",
   "description": "",
   "license": "AGPL-3.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.9.2-alpha.3",
-    "@nocobase/client": "0.9.2-alpha.3",
-    "@nocobase/database": "0.9.2-alpha.3",
-    "@nocobase/evaluators": "0.9.2-alpha.3",
-    "@nocobase/logger": "0.9.2-alpha.3",
-    "@nocobase/resourcer": "0.9.2-alpha.3",
-    "@nocobase/server": "0.9.2-alpha.3",
-    "@nocobase/utils": "0.9.2-alpha.3",
+    "@nocobase/actions": "0.9.3-alpha.1",
+    "@nocobase/client": "0.9.3-alpha.1",
+    "@nocobase/database": "0.9.3-alpha.1",
+    "@nocobase/evaluators": "0.9.3-alpha.1",
+    "@nocobase/logger": "0.9.3-alpha.1",
+    "@nocobase/resourcer": "0.9.3-alpha.1",
+    "@nocobase/server": "0.9.3-alpha.1",
+    "@nocobase/utils": "0.9.3-alpha.1",
     "antd": "4.22.8",
     "axios": "^0.27.2",
     "classnames": "^2.3.1",
     "cron-parser": "4.4.0",
-    "json-templates": "^4.2.0",
     "lru-cache": "8.0.5",
     "moment": "^2.29.2",
     "react-js-cron": "^3.1.0"
   },
   "devDependencies": {
-    "@nocobase/plugin-formula-field": "0.9.2-alpha.3",
-    "@nocobase/test": "0.9.2-alpha.3",
+    "@nocobase/plugin-formula-field": "0.9.3-alpha.1",
+    "@nocobase/test": "0.9.3-alpha.1",
     "@types/ejs": "^3.1.1"
   },
-  "gitHead": "b6b5f9372202d942c97d2d90a4197e060db05124"
+  "gitHead": "24979bc561537c0b84469c161eeef1a6de4c4684"
 }