@nocobase/plugin-workflow 0.10.0-alpha.5 → 0.11.0-alpha.1

package/lib/client/variable.js

@@ -4,9 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.BaseTypeSets = void 0;
-exports.filterTypedFields = filterTypedFields;
+exports.getCollectionFieldOptions = getCollectionFieldOptions;
 exports.triggerOptions = exports.systemOptions = exports.scopeOptions = exports.nodesOptions = void 0;
-exports.useCollectionFieldOptions = useCollectionFieldOptions;
 exports.useWorkflowVariableOptions = useWorkflowVariableOptions;
 function _client() {
   const data = require("@nocobase/client");
@@ -19,6 +18,8 @@ var _FlowContext = require("./FlowContext");
 var _locale = require("./locale");
 var _nodes = require("./nodes");
 var _triggers = require("./triggers");
+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); }); }; }
 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; }
@@ -34,15 +35,9 @@ const nodesOptions = {
     upstreams.forEach(node => {
       var _instruction$useVaria;
       const instruction = _nodes.instructions.get(node.type);
-      const subOptions = (_instruction$useVaria = instruction.useVariables) === null || _instruction$useVaria === void 0 ? void 0 : _instruction$useVaria.call(instruction, node, options);
-      if (subOptions) {
-        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
-        });
+      const subOption = (_instruction$useVaria = instruction.useVariables) === null || _instruction$useVaria === void 0 ? void 0 : _instruction$useVaria.call(instruction, node, options);
+      if (subOption) {
+        result.push(subOption);
       }
     });
     return result;
@@ -73,11 +68,11 @@ const scopeOptions = {
       const instruction = _nodes.instructions.get(node.type);
       const subOptions = (_instruction$useScope = instruction.useScopeVariables) === null || _instruction$useScope === void 0 ? void 0 : _instruction$useScope.call(instruction, node, options);
       if (subOptions) {
-        var _node$title2;
+        var _node$title;
         result.push({
           key: node.id.toString(),
           value: node.id.toString(),
-          label: (_node$title2 = node.title) !== null && _node$title2 !== void 0 ? _node$title2 : `#${node.id}`,
+          label: (_node$title = node.title) !== null && _node$title !== void 0 ? _node$title : `#${node.id}`,
           children: subOptions
         });
       }
@@ -95,14 +90,14 @@ const systemOptions = {
     return [...(!types || types.includes('date') ? [{
       key: 'now',
       value: 'now',
-      label: `{{t("System time")}}`
+      label: (0, _locale.lang)('System time')
     }] : [])];
   }
 };
 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'])
 };
@@ -110,7 +105,7 @@ const BaseTypeSets = {
 // { type: 'reference', options: { collection: 'attachments', multiple: false } }
 // { type: 'reference', options: { collection: 'myExpressions', entity: false } }
 exports.BaseTypeSets = BaseTypeSets;
-function matchFieldType(field, type, depth) {
+function matchFieldType(field, type, appends) {
   const inputType = typeof type;
   if (inputType === 'string') {
     var _BaseTypeSets$type;
@@ -128,42 +123,67 @@ function matchFieldType(field, type, depth) {
     }
   }
   if (inputType === 'function') {
-    return type(field, depth);
+    return type(field, appends);
   }
   return false;
 }
 function isAssociationField(field) {
   return ['belongsTo', 'hasOne', 'hasMany', 'belongsToMany'].includes(field.type);
 }
-function filterTypedFields(fields, types, depth = 1) {
-  if (!types) {
-    return fields;
-  }
+function getNextAppends(field, appends) {
+  const fieldPrefix = `${field.name}.`;
+  return appends.filter(item => item.startsWith(fieldPrefix)).map(item => item.replace(fieldPrefix, ''));
+}
+function filterTypedFields({
+  fields,
+  types,
+  appends,
+  compile,
+  getCollectionFields
+}) {
   return fields.filter(field => {
-    if (isAssociationField(field) && depth && filterTypedFields(useNormalizedFields(field.target), types, depth - 1).length) {
-      return 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);
+      if (match) {
+        return included;
+      } else {
+        return (nextAppends.length || included) && filterTypedFields({
+          fields: getNormalizedFields(field.target, {
+            compile,
+            getCollectionFields
+          }),
+          types,
+          // depth: depth - 1,
+          appends: nextAppends,
+          compile,
+          getCollectionFields
+        }).length;
+      }
+    } else {
+      return match;
     }
-    return types.some(type => matchFieldType(field, type, depth));
   });
 }
 function useWorkflowVariableOptions(options = {}) {
   const compile = (0, _client().useCompile)();
   const result = [scopeOptions, nodesOptions, triggerOptions, systemOptions].map(item => {
-    const opts = typeof item.useOptions === 'function' ? item.useOptions(options).filter(Boolean) : null;
+    const opts = item.useOptions(options).filter(Boolean);
     return {
       label: compile(item.label),
       value: item.value,
       key: item.value,
-      children: compile(opts),
+      children: opts,
       disabled: opts && !opts.length
     };
   });
   return result;
 }
-function useNormalizedFields(collectionName) {
-  const compile = (0, _client().useCompile)();
-  const _useCollectionManager = (0, _client().useCollectionManager)(),
-    getCollectionFields = _useCollectionManager.getCollectionFields;
+function getNormalizedFields(collectionName, {
+  compile,
+  getCollectionFields
+}) {
   const fields = getCollectionFields(collectionName);
   const foreignKeyFields = [];
   const otherFields = [];
@@ -182,7 +202,7 @@ function useNormalizedFields(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 {
@@ -193,7 +213,7 @@ function useNormalizedFields(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
           })
         }));
       }
@@ -204,35 +224,80 @@ function useNormalizedFields(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
         })
       }));
     }
   }
   return otherFields.filter(field => field.interface && !field.hidden);
 }
-function useCollectionFieldOptions(options) {
+function loadChildren(_x) {
+  return _loadChildren.apply(this, arguments);
+}
+function _loadChildren() {
+  _loadChildren = _asyncToGenerator(function* (option) {
+    const result = getCollectionFieldOptions({
+      collection: option.field.target,
+      types: option.types,
+      appends: getNextAppends(option.field, option.appends),
+      sourceKey: option.field.key,
+      compile: this.compile,
+      getCollectionFields: this.getCollectionFields
+    });
+    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;
+      }
+    }
+  });
+  return _loadChildren.apply(this, arguments);
+}
+function getCollectionFieldOptions(options) {
   const fields = options.fields,
     collection = options.collection,
     types = options.types,
-    _options$depth = options.depth,
-    depth = _options$depth === void 0 ? 1 : _options$depth;
-  const compile = (0, _client().useCompile)();
-  const normalizedFields = useNormalizedFields(collection);
+    _options$appends = options.appends,
+    appends = _options$appends === void 0 ? [] : _options$appends,
+    compile = options.compile,
+    getCollectionFields = options.getCollectionFields;
+  const normalizedFields = getNormalizedFields(collection, {
+    compile,
+    getCollectionFields
+  });
   const computedFields = fields !== null && fields !== void 0 ? fields : normalizedFields;
-  const result = filterTypedFields(computedFields, types, depth).filter(field => !isAssociationField(field) || depth).map(field => {
+  const boundLoadChildren = loadChildren.bind({
+    compile,
+    getCollectionFields
+  });
+  const result = filterTypedFields({
+    fields: computedFields,
+    types,
+    // depth,
+    appends,
+    compile,
+    getCollectionFields
+  }).map(field => {
     var _field$uiSchema5;
     const label = compile(((_field$uiSchema5 = field.uiSchema) === null || _field$uiSchema5 === void 0 ? void 0 : _field$uiSchema5.title) || field.name);
+    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,
       key: field.name,
       value: field.name,
-      children: isAssociationField(field) && depth ? useCollectionFieldOptions({
-        collection: field.target,
-        types,
-        depth: depth - 1
-      }) : null,
-      field
+      isLeaf,
+      loadChildren: isLeaf ? null : boundLoadChildren,
+      field,
+      // depth,
+      appends,
+      types
     };
   });
   return result;

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>;

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;
@@ -142,7 +142,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 +165,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
             });
@@ -329,6 +325,7 @@ class WorkflowPlugin extends _server().Plugin {
       if (_this4.executing) {
         return;
       }
+      _this4.executing = true;
       let next = null;
       // resuming has high priority
       if (_this4.pending.length) {
@@ -338,21 +335,23 @@ class WorkflowPlugin extends _server().Plugin {
           filter: {
             status: _constants.EXECUTION_STATUS.QUEUEING
           },
+          appends: ['workflow'],
           sort: 'createdAt'
         });
-        if (execution) {
+        if (execution && execution.workflow.enabled) {
           next = [execution];
         }
       }
       if (next) {
         _this4.process(...next);
+      } else {
+        _this4.executing = false;
       }
     })();
   }
   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,7 +365,7 @@ class WorkflowPlugin extends _server().Plugin {
       } catch (err) {
         _this5.getLogger(execution.workflowId).error(`execution (${execution.id}) error: ${err.message}`, err);
       }
-      _this5.executing = null;
+      _this5.executing = false;
       _this5.dispatch();
     })();
   }

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;
 }

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;

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

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

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

@@ -6,9 +6,9 @@ export default class implements Instruction {
     protected plugin: Plugin;
     timers: Map<number, NodeJS.Timeout>;
     constructor(plugin: Plugin);
-    load(): Promise<void>;
-    unload(): void;
-    schedule(job: any, duration: number): void;
+    load: () => Promise<void>;
+    unload: () => void;
+    schedule(job: any): void;
     trigger(job: any): Promise<void>;
     run: (node: any, prevJob: any, processor: Processor) => Promise<any>;
     resume: (node: any, prevJob: any, processor: Processor) => Promise<any>;