@nocobase/plugin-workflow 0.10.1-alpha.1 → 0.11.1-alpha.1

package/lib/client/triggers/schedule/index.js

@@ -16,12 +16,17 @@ var _constants = require("./constants");
 var _locale = require("../../locale");
 var _CollectionBlockInitializer = require("../../components/CollectionBlockInitializer");
 var _variable = require("../../variable");
-var _FieldsSelect = require("../../components/FieldsSelect");
 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); }
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+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; }
 var _default = {
   title: `{{t("Schedule event", { ns: "${_locale.NAMESPACE}" })}}`,
   type: 'schedule',
@@ -36,38 +41,45 @@ var _default = {
     useCollectionDataSource: _client().useCollectionDataSource
   },
   components: {
-    ScheduleConfig: _ScheduleConfig.ScheduleConfig,
-    FieldsSelect: _FieldsSelect.FieldsSelect
+    ScheduleConfig: _ScheduleConfig.ScheduleConfig
   },
   useVariables(config, opts) {
-    var _config$appends;
     const compile = (0, _client().useCompile)();
     const _useCollectionManager = (0, _client().useCollectionManager)(),
       getCollectionFields = _useCollectionManager.getCollectionFields;
+    const _opts$fieldNames = opts.fieldNames,
+      fieldNames = _opts$fieldNames === void 0 ? _variable.defaultFieldNames : _opts$fieldNames;
     const options = [];
-    if (!(opts === null || opts === void 0 ? void 0 : opts.types) || opts.types.includes('date')) {
+    if (!(opts !== null && opts !== void 0 && opts.types) || opts.types.includes('date')) {
       options.push({
         key: 'date',
         value: 'date',
         label: (0, _locale.lang)('Trigger time')
       });
     }
-    const depth = ((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.length) ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1 : 1;
-    const fieldOptions = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({
-      depth
-    }, opts), {}, {
-      collection: config.collection,
-      compile,
-      getCollectionFields
-    }));
+    // const depth = config.appends?.length
+    //   ? config.appends.reduce((max, item) => Math.max(max, item.split('.').length), 1) + 1
+    //   : 1;
     if (config.mode === _constants.SCHEDULE_MODE.COLLECTION_FIELD) {
-      if (fieldOptions.length) {
-        options.push({
-          key: 'data',
-          value: 'data',
-          label: (0, _locale.lang)('Trigger data'),
-          children: fieldOptions
-        });
+      var _config$appends;
+      const _getCollectionFieldOp = (0, _variable.getCollectionFieldOptions)(_objectSpread(_objectSpread({}, opts), {}, {
+          fields: [{
+            collectionName: config.collection,
+            name: 'data',
+            type: 'hasOne',
+            target: config.collection,
+            uiSchema: {
+              title: (0, _locale.lang)('Trigger data')
+            }
+          }],
+          appends: ['data', ...(((_config$appends = config.appends) === null || _config$appends === void 0 ? void 0 : _config$appends.map(item => `data.${item}`)) || [])],
+          compile,
+          getCollectionFields
+        })),
+        _getCollectionFieldOp2 = _slicedToArray(_getCollectionFieldOp, 1),
+        fieldOption = _getCollectionFieldOp2[0];
+      if (fieldOption) {
+        options.push(fieldOption);
       }
     }
     return options;

package/lib/client/variable.d.ts

@@ -1,34 +1,52 @@
-export declare type VariableOption = {
+export type VariableOption = {
     key?: string;
-    value: string;
-    label: string;
+    value?: string;
+    label?: string;
     children?: VariableOptions;
+    [key: string]: any;
+};
+export type VariableOptions = VariableOption[] | null;
+export type VariableDataType = string | {
+    type: string;
+    options?: {
+        entity?: boolean;
+        collection?: string;
+    };
+} | ((field: any, appends?: string[]) => boolean);
+export type OptionsOfUseVariableOptions = {
+    types?: VariableDataType[];
+    fieldNames?: {
+        label?: string;
+        value?: string;
+        children?: string;
+    };
+};
+export declare const defaultFieldNames: {
+    readonly label: "label";
+    readonly value: "value";
+    readonly children: "children";
 };
-export declare type VariableOptions = VariableOption[] | null;
 export declare const nodesOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
 };
 export declare const triggerOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): any;
 };
 export declare const scopeOptions: {
     label: string;
     value: string;
-    useOptions(options: any): VariableOption[];
+    useOptions(options: OptionsOfUseVariableOptions): VariableOption[];
 };
 export declare const systemOptions: {
     label: string;
     value: string;
-    useOptions({ types }: {
-        types: any;
-    }): {
+    useOptions({ types, fieldNames }: OptionsOfUseVariableOptions): {
+        [x: string]: string;
         key: string;
-        value: string;
-        label: string;
     }[];
 };
 export declare const BaseTypeSets: {
@@ -37,7 +55,7 @@ export declare const BaseTypeSets: {
     string: Set<string>;
     date: Set<string>;
 };
-export declare function useWorkflowVariableOptions(options?: {}): {
+export declare function useWorkflowVariableOptions(options?: OptionsOfUseVariableOptions): {
     label: any;
     value: any;
     key: any;

package/lib/client/variable.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.BaseTypeSets = void 0;
+exports.defaultFieldNames = exports.BaseTypeSets = void 0;
 exports.getCollectionFieldOptions = getCollectionFieldOptions;
 exports.triggerOptions = exports.systemOptions = exports.scopeOptions = exports.nodesOptions = void 0;
 exports.useWorkflowVariableOptions = useWorkflowVariableOptions;
@@ -25,6 +25,12 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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 defaultFieldNames = {
+  label: 'label',
+  value: 'value',
+  children: 'children'
+};
+exports.defaultFieldNames = defaultFieldNames;
 const nodesOptions = {
   label: `{{t("Node result", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$jobsMapByNodeId',
@@ -60,6 +66,8 @@ const scopeOptions = {
   label: `{{t("Scope variables", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$scopes',
   useOptions(options) {
+    const _options$fieldNames = options.fieldNames,
+      fieldNames = _options$fieldNames === void 0 ? defaultFieldNames : _options$fieldNames;
     const current = (0, _nodes.useNodeContext)();
     const scopes = (0, _nodes.useUpstreamScopes)(current);
     const result = [];
@@ -71,9 +79,9 @@ const scopeOptions = {
         var _node$title;
         result.push({
           key: node.id.toString(),
-          value: node.id.toString(),
-          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
-          children: subOptions
+          [fieldNames.value]: node.id.toString(),
+          [fieldNames.label]: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
+          [fieldNames.children]: subOptions
         });
       }
     });
@@ -85,19 +93,20 @@ const systemOptions = {
   label: `{{t("System variables", { ns: "${_locale.NAMESPACE}" })}}`,
   value: '$system',
   useOptions({
-    types
+    types,
+    fieldNames = defaultFieldNames
   }) {
     return [...(!types || types.includes('date') ? [{
       key: 'now',
-      value: 'now',
-      label: (0, _locale.lang)('System time')
+      [fieldNames.label]: (0, _locale.lang)('System time'),
+      [fieldNames.value]: 'now'
     }] : [])];
   }
 };
 exports.systemOptions = systemOptions;
 const BaseTypeSets = {
   boolean: new Set(['checkbox']),
-  number: new Set(['number', 'percent']),
+  number: new Set(['integer', 'number', 'percent']),
   string: new Set(['input', 'password', 'email', 'phone', 'select', 'radioGroup', 'text', 'markdown', 'richText', 'expression', 'time']),
   date: new Set(['date', 'createdAt', 'updatedAt'])
 };
@@ -142,7 +151,7 @@ function filterTypedFields({
   getCollectionFields
 }) {
   return fields.filter(field => {
-    const match = (types === null || types === void 0 ? void 0 : types.length) ? types.some(type => matchFieldType(field, type, appends)) : true;
+    const match = types !== null && types !== void 0 && types.length ? types.some(type => matchFieldType(field, type, appends)) : true;
     if (isAssociationField(field)) {
       const nextAppends = getNextAppends(field, appends);
       const included = appends.includes(field.name);
@@ -167,15 +176,20 @@ function filterTypedFields({
   });
 }
 function useWorkflowVariableOptions(options = {}) {
+  var _options$fieldNames2;
+  const fieldNames = Object.assign({}, defaultFieldNames, (_options$fieldNames2 = options.fieldNames) !== null && _options$fieldNames2 !== void 0 ? _options$fieldNames2 : {});
+  const opts = Object.assign(options, {
+    fieldNames
+  });
   const compile = (0, _client().useCompile)();
   const result = [scopeOptions, nodesOptions, triggerOptions, systemOptions].map(item => {
-    const opts = item.useOptions(options).filter(Boolean);
+    const children = item.useOptions(opts).filter(Boolean);
     return {
-      label: compile(item.label),
-      value: item.value,
-      key: item.value,
-      children: opts,
-      disabled: opts && !opts.length
+      [fieldNames.label]: compile(item.label),
+      [fieldNames.value]: item.value,
+      key: item[fieldNames.value],
+      [fieldNames.children]: children,
+      disabled: children && !children.length
     };
   });
   return result;
@@ -202,7 +216,7 @@ function getNormalizedFields(collectionName, {
         var _field$uiSchema, _field$uiSchema2;
         otherFields.splice(i, 0, _objectSpread(_objectSpread(_objectSpread({}, field), foreignKeyField), {}, {
           uiSchema: _objectSpread(_objectSpread({}, field.uiSchema), {}, {
-            title: ((_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) ? `${compile((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title)} ID` : foreignKeyField.name
+            title: (_field$uiSchema = field.uiSchema) !== null && _field$uiSchema !== void 0 && _field$uiSchema.title ? `${compile((_field$uiSchema2 = field.uiSchema) === null || _field$uiSchema2 === void 0 ? void 0 : _field$uiSchema2.title)} ID` : foreignKeyField.name
           })
         }));
       } else {
@@ -213,7 +227,7 @@ function getNormalizedFields(collectionName, {
           isForeignKey: true,
           interface: field.interface,
           uiSchema: _objectSpread(_objectSpread({}, field.uiSchema), {}, {
-            title: ((_field$uiSchema3 = field.uiSchema) === null || _field$uiSchema3 === void 0 ? void 0 : _field$uiSchema3.title) ? `${compile((_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title)} ID` : field.name
+            title: (_field$uiSchema3 = field.uiSchema) !== null && _field$uiSchema3 !== void 0 && _field$uiSchema3.title ? `${compile((_field$uiSchema4 = field.uiSchema) === null || _field$uiSchema4 === void 0 ? void 0 : _field$uiSchema4.title)} ID` : field.name
           })
         }));
       }
@@ -224,7 +238,7 @@ function getNormalizedFields(collectionName, {
         type: field.dataType,
         interface: belongsToField.interface,
         uiSchema: _objectSpread(_objectSpread({}, belongsToField.uiSchema), {}, {
-          title: ((_belongsToField$uiSch = belongsToField.uiSchema) === null || _belongsToField$uiSch === void 0 ? void 0 : _belongsToField$uiSch.title) ? `${compile((_belongsToField$uiSch2 = belongsToField.uiSchema) === null || _belongsToField$uiSch2 === void 0 ? void 0 : _belongsToField$uiSch2.title)} ID` : field.name
+          title: (_belongsToField$uiSch = belongsToField.uiSchema) !== null && _belongsToField$uiSch !== void 0 && _belongsToField$uiSch.title ? `${compile((_belongsToField$uiSch2 = belongsToField.uiSchema) === null || _belongsToField$uiSch2 === void 0 ? void 0 : _belongsToField$uiSch2.title)} ID` : field.name
         })
       }));
     }
@@ -236,20 +250,17 @@ function loadChildren(_x) {
 }
 function _loadChildren() {
   _loadChildren = _asyncToGenerator(function* (option) {
-    const result = getCollectionFieldOptions({
+    const result = getCollectionFieldOptions(_objectSpread({
       collection: option.field.target,
       types: option.types,
-      appends: getNextAppends(option.field, option.appends),
-      sourceKey: option.field.key,
-      compile: this.compile,
-      getCollectionFields: this.getCollectionFields
-    });
+      appends: getNextAppends(option.field, option.appends)
+    }, this));
+    option.loadChildren = null;
     if (result.length) {
       option.children = result;
     } else {
       var _option$types;
       option.isLeaf = true;
-      option.loadChildren = null;
       const matchingType = (_option$types = option.types) === null || _option$types === void 0 ? void 0 : _option$types.some(type => matchFieldType(option.field, type, 0));
       if (!matchingType) {
         option.disabled = true;
@@ -265,7 +276,9 @@ function getCollectionFieldOptions(options) {
     _options$appends = options.appends,
     appends = _options$appends === void 0 ? [] : _options$appends,
     compile = options.compile,
-    getCollectionFields = options.getCollectionFields;
+    getCollectionFields = options.getCollectionFields,
+    _options$fieldNames3 = options.fieldNames,
+    fieldNames = _options$fieldNames3 === void 0 ? defaultFieldNames : _options$fieldNames3;
   const normalizedFields = getNormalizedFields(collection, {
     compile,
     getCollectionFields
@@ -273,7 +286,8 @@ function getCollectionFieldOptions(options) {
   const computedFields = fields !== null && fields !== void 0 ? fields : normalizedFields;
   const boundLoadChildren = loadChildren.bind({
     compile,
-    getCollectionFields
+    getCollectionFields,
+    fieldNames
   });
   const result = filterTypedFields({
     fields: computedFields,
@@ -285,13 +299,14 @@ function getCollectionFieldOptions(options) {
   }).map(field => {
     var _field$uiSchema5;
     const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);
+    // console.log('===', label, field);
     const nextAppends = getNextAppends(field, appends);
     // TODO: no matching fields in next appends should consider isLeaf as true
     const isLeaf = !isAssociationField(field) || !nextAppends.length && !appends.includes(field.name);
     return {
-      label,
+      [fieldNames.label]: label,
       key: field.name,
-      value: field.name,
+      [fieldNames.value]: field.name,
       isLeaf,
       loadChildren: isLeaf ? null : boundLoadChildren,
       field,

package/lib/server/Plugin.d.ts

@@ -1,13 +1,12 @@
 import { Plugin } from '@nocobase/server';
 import { Registry } from '@nocobase/utils';
 import { Instruction } from './instructions';
-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;
+import type { WorkflowModel, ExecutionModel } from './types';
+type ID = number | string;
 export default class WorkflowPlugin extends Plugin {
     instructions: Registry<Instruction>;
     triggers: Registry<Trigger>;
@@ -20,9 +19,7 @@ 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: {
-        [key: string]: any;
-    }, options?: {
+    trigger(workflow: WorkflowModel, context: object, options?: {
         context?: any;
     }): void;
     private prepare;

package/lib/server/Plugin.js

@@ -82,7 +82,7 @@ class WorkflowPlugin extends _server().Plugin {
     this.instructions = new (_utils().Registry)();
     this.triggers = new (_utils().Registry)();
     this.functions = new (_utils().Registry)();
-    this.executing = null;
+    this.executing = false;
     this.pending = [];
     this.events = [];
     this.loggerCache = void 0;
@@ -133,7 +133,8 @@ class WorkflowPlugin extends _server().Plugin {
     }();
     this.prepare = /*#__PURE__*/_asyncToGenerator(function* () {
       var _options$context;
-      const event = _this.events.shift();
+      const _this$events = _slicedToArray(_this.events, 1),
+        event = _this$events[0];
       if (!event) {
         return;
       }
@@ -142,7 +143,7 @@ class WorkflowPlugin extends _server().Plugin {
         context = _event[1],
         options = _event[2];
       let valid = true;
-      if ((_options$context = options.context) === null || _options$context === void 0 ? void 0 : _options$context.executionId) {
+      if ((_options$context = options.context) !== null && _options$context !== void 0 && _options$context.executionId) {
         // NOTE: no transaction here for read-uncommitted execution
         const existed = yield workflow.countExecutions({
           where: {
@@ -165,10 +166,6 @@ class WorkflowPlugin extends _server().Plugin {
             }, {
               transaction
             });
-            const executed = yield workflow.countExecutions({
-              transaction
-            });
-            // NOTE: not to trigger afterUpdate hook here
             yield workflow.increment('executed', {
               transaction
             });
@@ -193,6 +190,7 @@ class WorkflowPlugin extends _server().Plugin {
           _this.pending.push([execution]);
         }
       }
+      _this.events.shift();
       if (_this.events.length) {
         yield _this.prepare();
       } else {
@@ -329,30 +327,37 @@ class WorkflowPlugin extends _server().Plugin {
       if (_this4.executing) {
         return;
       }
+      _this4.executing = true;
       let next = null;
       // resuming has high priority
       if (_this4.pending.length) {
         next = _this4.pending.shift();
+        _this4.getLogger(next[0].workflowId).info(`pending execution (${next[0].id}) ready to process`);
       } else {
         const execution = yield _this4.db.getRepository('executions').findOne({
           filter: {
             status: _constants.EXECUTION_STATUS.QUEUEING
           },
+          appends: ['workflow'],
           sort: 'createdAt'
         });
-        if (execution) {
+        if (execution && execution.workflow.enabled) {
+          _this4.getLogger(execution.workflowId).info(`execution (${execution.id}) fetched from db`);
           next = [execution];
         }
       }
       if (next) {
-        _this4.process(...next);
+        yield _this4.process(...next);
+      }
+      _this4.executing = false;
+      if (next) {
+        _this4.dispatch();
       }
     })();
   }
   process(execution, job) {
     var _this5 = this;
     return _asyncToGenerator(function* () {
-      _this5.executing = execution;
       if (execution.status === _constants.EXECUTION_STATUS.QUEUEING) {
         yield execution.update({
           status: _constants.EXECUTION_STATUS.STARTED
@@ -366,8 +371,6 @@ class WorkflowPlugin extends _server().Plugin {
       } catch (err) {
         _this5.getLogger(execution.workflowId).error(`execution (${execution.id}) error: ${err.message}`, err);
       }
-      _this5.executing = null;
-      _this5.dispatch();
     })();
   }
   createProcessor(execution, options = {}) {

package/lib/server/Processor.d.ts

@@ -1,9 +1,7 @@
+import { Transaction, Transactionable } from '@nocobase/database';
 import { Logger } from '@nocobase/logger';
-import { Transaction, Transactionable } from 'sequelize';
 import Plugin from '.';
-import ExecutionModel from './models/Execution';
-import FlowNodeModel from './models/FlowNode';
-import JobModel from './models/Job';
+import type { ExecutionModel, FlowNodeModel, JobModel } from './types';
 export interface ProcessorOptions extends Transactionable {
     plugin: Plugin;
 }
@@ -49,5 +47,5 @@ export default class Processor {
         $system: {};
         $scopes: {};
     };
-    getParsedValue(value: any, node?: any): any;
+    getParsedValue(value: any, node?: any, additionalScope?: object): any;
 }

package/lib/server/Processor.js

@@ -371,9 +371,9 @@ class Processor {
       $scopes
     };
   }
-  getParsedValue(value, node) {
+  getParsedValue(value, node, additionalScope) {
     const template = (0, _utils().parse)(value);
-    const scope = this.getScope(node);
+    const scope = Object.assign(this.getScope(node), additionalScope);
     template.parameters.forEach(({
       key
     }) => {

package/lib/server/actions/nodes.js

@@ -6,16 +6,16 @@ Object.defineProperty(exports, "__esModule", {
 exports.create = create;
 exports.destroy = destroy;
 exports.update = update;
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
+function _actions() {
+  const data = require("@nocobase/actions");
+  _actions = function _actions() {
     return data;
   };
   return data;
 }
-function _actions() {
-  const data = require("@nocobase/actions");
-  _actions = function _actions() {
+function _database() {
+  const data = require("@nocobase/database");
+  _database = function _database() {
     return data;
   };
   return data;
@@ -102,7 +102,7 @@ function _create() {
           const _yield$upstream$getBr = yield upstream.getBranches({
               where: {
                 id: {
-                  [_sequelize().Op.ne]: instance.id
+                  [_database().Op.ne]: instance.id
                 },
                 branchIndex: instance.branchIndex
               },

package/lib/server/fields/expression-field.d.ts

@@ -1,5 +1,4 @@
-import { DataTypes } from 'sequelize';
-import { BaseFieldOptions, Field } from '@nocobase/database';
+import { BaseFieldOptions, DataTypes, Field } from '@nocobase/database';
 export interface ExpressionFieldOptions extends BaseFieldOptions {
     type: 'expression';
 }

package/lib/server/fields/expression-field.js

@@ -4,13 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ExpressionField = void 0;
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
-    return data;
-  };
-  return data;
-}
 function _database() {
   const data = require("@nocobase/database");
   _database = function _database() {
@@ -20,7 +13,7 @@ function _database() {
 }
 class ExpressionField extends _database().Field {
   get dataType() {
-    return _sequelize().DataTypes.TEXT;
+    return _database().DataTypes.TEXT;
   }
 }
 exports.ExpressionField = ExpressionField;

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

@@ -1,7 +1,6 @@
 import Plugin from '..';
-import ExecutionModel from '../models/Execution';
-import FlowNodeModel from '../models/FlowNode';
-export declare type CustomFunction = (this: {
+import type { ExecutionModel, FlowNodeModel } from '../types';
+export type CustomFunction = (this: {
     execution: ExecutionModel;
     node?: FlowNodeModel;
 }) => any;

package/lib/server/index.d.ts

@@ -2,3 +2,4 @@ export * from './constants';
 export { Trigger } from './triggers';
 export { default as Processor } from './Processor';
 export { default } from './Plugin';
+export * from './types';

package/lib/server/index.js

@@ -40,4 +40,16 @@ Object.keys(_constants).forEach(function (key) {
 var _triggers = require("./triggers");
 var _Processor = _interopRequireDefault(require("./Processor"));
 var _Plugin = _interopRequireDefault(require("./Plugin"));
+var _types = require("./types");
+Object.keys(_types).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _types[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _types[key];
+    }
+  });
+});
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/server/instructions/aggregate.d.ts

@@ -1,5 +1,5 @@
-import FlowNodeModel from '../models/FlowNode';
 import Processor from '../Processor';
+import type { FlowNodeModel } from '../types';
 declare const _default: {
     run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
         result: any;

package/lib/server/instructions/aggregate.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _sequelize() {
-  const data = require("sequelize");
-  _sequelize = function _sequelize() {
+function _database() {
+  const data = require("@nocobase/database");
+  _database = function _database() {
     return data;
   };
   return data;
@@ -41,14 +41,14 @@ var _default = {
       const database = node.constructor.database;
       const repo = associated ? database.getRepository(`${association === null || association === void 0 ? void 0 : association.associatedCollection}.${association.name}`, processor.getParsedValue(association === null || association === void 0 ? void 0 : association.associatedKey)) : database.getRepository(collection);
       if (!options.dataType && aggregator === 'avg') {
-        options.dataType = _sequelize().DataTypes.DOUBLE;
+        options.dataType = _database().DataTypes.DOUBLE;
       }
       const result = yield repo.aggregate(_objectSpread(_objectSpread({}, options), {}, {
         method: aggregators[aggregator],
         transaction: processor.transaction
       }));
       return {
-        result: options.dataType === _sequelize().DataTypes.DOUBLE ? Number(result) : result,
+        result: options.dataType === _database().DataTypes.DOUBLE ? Number(result) : result,
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

package/lib/server/instructions/condition.d.ts

@@ -1,5 +1,6 @@
 import { Registry } from '@nocobase/utils';
 import { Instruction } from '.';
-export declare const calculators: Registry<Function>;
+type Comparer = (a: any, b: any) => boolean;
+export declare const calculators: Registry<Comparer>;
 declare const _default: Instruction;
 export default _default;