@nocobase/plugin-workflow 0.7.1-alpha.5 → 0.7.2-alpha.1

package/lib/client/triggers/schedule/locale/Cron.zh-CN.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _default = {
+  everyText: '每',
+  emptyMonths: '每月',
+  emptyMonthDays: '每日(月)',
+  emptyMonthDaysShort: '每日',
+  emptyWeekDays: '每天(周)',
+  emptyWeekDaysShort: '每天(周)',
+  emptyHours: '每小时',
+  emptyMinutes: '每分钟',
+  emptyMinutesForHourPeriod: '每',
+  yearOption: '年',
+  monthOption: '月',
+  weekOption: '周',
+  dayOption: '天',
+  hourOption: '小时',
+  minuteOption: '分钟',
+  rebootOption: '重启',
+  prefixPeriod: '每',
+  prefixMonths: '的',
+  prefixMonthDays: '的',
+  prefixWeekDays: '的',
+  prefixWeekDaysForMonthAndYearPeriod: '并且',
+  prefixHours: '的',
+  prefixMinutes: ':',
+  prefixMinutesForHourPeriod: '的',
+  suffixMinutesForHourPeriod: '分钟',
+  errorInvalidCron: '不符合 cron 规则的表达式',
+  clearButtonText: '清空',
+  weekDays: [// Order is important, the index will be used as value
+  '周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  months: [// Order is important, the index will be used as value
+  '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
+  altWeekDays: [// Order is important, the index will be used as value
+  '周日', '周一', '周二', '周三', '周四', '周五', '周六'],
+  altMonths: [// Order is important, the index will be used as value
+  '一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月']
+};
+exports.default = _default;

package/lib/index.d.ts

@@ -1,6 +1 @@
-export * from './calculators';
-export * from './constants';
-export * from './instructions';
-export * from './triggers';
-export * from './Processor';
-export { default } from './Plugin';
+export { default } from './server';

package/lib/index.js

@@ -3,84 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-var _exportNames = {};
 Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function get() {
-    return _Plugin.default;
+    return _server.default;
   }
 });
 
-var _calculators = require("./calculators");
-
-Object.keys(_calculators).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _calculators[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _calculators[key];
-    }
-  });
-});
-
-var _constants = require("./constants");
-
-Object.keys(_constants).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _constants[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _constants[key];
-    }
-  });
-});
-
-var _instructions = require("./instructions");
-
-Object.keys(_instructions).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _instructions[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _instructions[key];
-    }
-  });
-});
-
-var _triggers = require("./triggers");
-
-Object.keys(_triggers).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _triggers[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _triggers[key];
-    }
-  });
-});
-
-var _Processor = require("./Processor");
-
-Object.keys(_Processor).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _Processor[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function get() {
-      return _Processor[key];
-    }
-  });
-});
-
-var _Plugin = _interopRequireDefault(require("./Plugin"));
+var _server = _interopRequireDefault(require("./server"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/{Processor.d.ts → server/Processor.d.ts}

@@ -29,11 +29,12 @@ export default class Processor {
     private commit;
     private exec;
     run(node: any, input?: any): any;
-    end(node: any, job: any): any;
-    recall(node: any, job: any): any;
+    end(node: any, job: any): Promise<any>;
+    recall(node: any, job: any): Promise<any>;
     exit(job: JobModel | null): Promise<any>;
     saveJob(payload: any): Promise<any>;
-    findBranchStartNode(node: FlowNodeModel): FlowNodeModel | null;
+    getBranches(node: FlowNodeModel): FlowNodeModel[];
+    findBranchStartNode(node: FlowNodeModel, parent?: FlowNodeModel): FlowNodeModel | null;
     findBranchParentNode(node: FlowNodeModel): FlowNodeModel | null;
     findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null;
     getParsedValue(value: any, node?: any): any;

package/lib/{Processor.js → server/Processor.js}

@@ -281,22 +281,28 @@ class Processor {
 
 
   end(node, job) {
-    const parentNode = this.findBranchParentNode(node); // no parent, means on main flow
+    var _this8 = this;
+
+    return _asyncToGenerator(function* () {
+      const parentNode = _this8.findBranchParentNode(node); // no parent, means on main flow
+
 
-    if (parentNode) {
-      return this.recall(parentNode, job);
-    } // really done for all nodes
-    // * should mark execution as done with last job status
+      if (parentNode) {
+        yield _this8.recall(parentNode, job);
+        return job;
+      } // really done for all nodes
+      // * should mark execution as done with last job status
 
 
-    return this.exit(job);
+      return _this8.exit(job);
+    })();
   }
 
   recall(node, job) {
-    var _this8 = this;
+    var _this9 = this;
 
     return _asyncToGenerator(function* () {
-      const instructions = _this8.options.plugin.instructions;
+      const instructions = _this9.options.plugin.instructions;
 
       const _instructions$get2 = instructions.get(node.type),
             resume = _instructions$get2.resume;
@@ -305,19 +311,19 @@ class Processor {
         return Promise.reject(new Error('`resume` should be implemented'));
       }
 
-      return _this8.exec(resume, node, job);
+      return _this9.exec(resume, node, job);
     })();
   }
 
   exit(job) {
-    var _this9 = this;
+    var _this10 = this;
 
     return _asyncToGenerator(function* () {
-      const status = job ? _this9.constructor.StatusMap[job.status] : _constants.EXECUTION_STATUS.RESOLVED;
-      yield _this9.execution.update({
+      const status = job ? _this10.constructor.StatusMap[job.status] : _constants.EXECUTION_STATUS.RESOLVED;
+      yield _this10.execution.update({
         status
       }, {
-        transaction: _this9.transaction
+        transaction: _this10.transaction
       });
       return null;
     })();
@@ -325,10 +331,10 @@ class Processor {
 
 
   saveJob(payload) {
-    var _this10 = this;
+    var _this11 = this;
 
     return _asyncToGenerator(function* () {
-      const database = _this10.execution.constructor.database;
+      const database = _this11.execution.constructor.database;
 
       const _database$getCollecti = database.getCollection('jobs'),
             model = _database$getCollecti.model;
@@ -337,7 +343,7 @@ class Processor {
 
       if (payload instanceof model) {
         job = yield payload.save({
-          transaction: _this10.transaction
+          transaction: _this11.transaction
         });
       } else if (payload.id) {
         var _yield$model$update = yield model.update(payload, {
@@ -345,7 +351,7 @@ class Processor {
             id: payload.id
           },
           returning: true,
-          transaction: _this10.transaction
+          transaction: _this11.transaction
         });
 
         var _yield$model$update2 = _slicedToArray(_yield$model$update, 1);
@@ -353,24 +359,34 @@ class Processor {
         job = _yield$model$update2[0];
       } else {
         job = yield model.create(_objectSpread(_objectSpread({}, payload), {}, {
-          executionId: _this10.execution.id
+          executionId: _this11.execution.id
         }), {
-          transaction: _this10.transaction
+          transaction: _this11.transaction
         });
       }
 
-      _this10.jobsMap.set(job.id, job);
+      _this11.jobsMap.set(job.id, job);
 
-      _this10.jobsMapByNodeId[job.nodeId] = job.result;
+      _this11.jobsMapByNodeId[job.nodeId] = job.result;
       return job;
     })();
+  }
+
+  getBranches(node) {
+    return this.nodes.filter(item => item.upstream === node && item.branchIndex !== null).sort((a, b) => a.branchIndex - b.branchIndex);
   } // find the first node in current branch
 
 
-  findBranchStartNode(node) {
+  findBranchStartNode(node, parent) {
     for (let n = node; n; n = n.upstream) {
-      if (n.branchIndex !== null) {
-        return n;
+      if (!parent) {
+        if (n.branchIndex !== null) {
+          return n;
+        }
+      } else {
+        if (n.upstream === parent) {
+          return n;
+        }
       }
     }
 

package/lib/{actions → server/actions}/nodes.js

@@ -153,6 +153,7 @@ function _create() {
         }
 
         instance.set('upstream', upstream);
+        return instance;
       });
 
       return function (_x7) {

package/lib/server/index.d.ts

@@ -0,0 +1,6 @@
+export * from './calculators';
+export * from './constants';
+export * from './instructions';
+export * from './triggers';
+export * from './Processor';
+export { default } from './Plugin';

package/lib/server/index.js

@@ -0,0 +1,86 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+var _exportNames = {};
+Object.defineProperty(exports, "default", {
+  enumerable: true,
+  get: function get() {
+    return _Plugin.default;
+  }
+});
+
+var _calculators = require("./calculators");
+
+Object.keys(_calculators).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _calculators[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _calculators[key];
+    }
+  });
+});
+
+var _constants = require("./constants");
+
+Object.keys(_constants).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _constants[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _constants[key];
+    }
+  });
+});
+
+var _instructions = require("./instructions");
+
+Object.keys(_instructions).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _instructions[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _instructions[key];
+    }
+  });
+});
+
+var _triggers = require("./triggers");
+
+Object.keys(_triggers).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _triggers[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _triggers[key];
+    }
+  });
+});
+
+var _Processor = require("./Processor");
+
+Object.keys(_Processor).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
+  if (key in exports && exports[key] === _Processor[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _Processor[key];
+    }
+  });
+});
+
+var _Plugin = _interopRequireDefault(require("./Plugin"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/{instructions → server/instructions}/delay.js

@@ -75,9 +75,15 @@ class _default {
           status: _constants.JOB_STATUS.PENDING
         },
         include: [{
-          association: 'execution'
+          association: 'execution',
+          attributes: [],
+          where: {
+            status: _constants.EXECUTION_STATUS.STARTED
+          },
+          required: true
         }, {
           association: 'node',
+          attributes: ['config'],
           where: {
             type: 'delay'
           },
@@ -120,12 +126,13 @@ class _default {
     var _this3 = this;
 
     return _asyncToGenerator(function* () {
-      const _job$execution = job.execution,
-            execution = _job$execution === void 0 ? yield job.getExecution() : _job$execution;
+      const execution = yield job.getExecution();
 
-      const processor = _this3.plugin.createProcessor(execution);
+      if (execution.status === _constants.EXECUTION_STATUS.STARTED) {
+        const processor = _this3.plugin.createProcessor(execution);
 
-      yield processor.resume(job);
+        yield processor.resume(job);
+      }
 
       if (_this3.timers.get(job.id)) {
         _this3.timers.delete(job.id);

package/lib/{instructions → server/instructions}/parallel.js

@@ -17,34 +17,68 @@ const PARALLEL_MODE = {
   RACE: 'race'
 };
 exports.PARALLEL_MODE = PARALLEL_MODE;
-const StatusGetters = {
-  [PARALLEL_MODE.ALL](result) {
-    if (result.some(j => j && j.status === _constants.JOB_STATUS.REJECTED)) {
-      return _constants.JOB_STATUS.REJECTED;
-    }
+const Modes = {
+  [PARALLEL_MODE.ALL]: {
+    next(previous) {
+      return previous.status !== _constants.JOB_STATUS.REJECTED;
+    },
+
+    getStatus(result) {
+      if (result.some(status => status != null && status === _constants.JOB_STATUS.REJECTED)) {
+        return _constants.JOB_STATUS.REJECTED;
+      }
+
+      if (result.every(status => status != null && status === _constants.JOB_STATUS.RESOLVED)) {
+        return _constants.JOB_STATUS.RESOLVED;
+      }
 
-    if (result.every(j => j && j.status === _constants.JOB_STATUS.RESOLVED)) {
-      return _constants.JOB_STATUS.RESOLVED;
+      return _constants.JOB_STATUS.PENDING;
     }
 
-    return _constants.JOB_STATUS.PENDING;
   },
+  [PARALLEL_MODE.ANY]: {
+    next(previous) {
+      return previous.status !== _constants.JOB_STATUS.RESOLVED;
+    },
+
+    getStatus(result) {
+      if (result.some(status => status != null && status === _constants.JOB_STATUS.RESOLVED)) {
+        return _constants.JOB_STATUS.RESOLVED;
+      }
+
+      if (result.some(status => status != null ? status === _constants.JOB_STATUS.PENDING : true)) {
+        return _constants.JOB_STATUS.PENDING;
+      }
+
+      return _constants.JOB_STATUS.REJECTED;
+    }
 
-  [PARALLEL_MODE.ANY](result) {
-    return result.some(j => j && j.status === _constants.JOB_STATUS.RESOLVED) ? _constants.JOB_STATUS.RESOLVED : result.some(j => j && j.status === _constants.JOB_STATUS.PENDING) ? _constants.JOB_STATUS.PENDING : _constants.JOB_STATUS.REJECTED;
   },
+  [PARALLEL_MODE.RACE]: {
+    next(previous) {
+      return previous.status === _constants.JOB_STATUS.PENDING;
+    },
+
+    getStatus(result) {
+      if (result.some(status => status != null && status === _constants.JOB_STATUS.RESOLVED)) {
+        return _constants.JOB_STATUS.RESOLVED;
+      }
 
-  [PARALLEL_MODE.RACE](result) {
-    return result.some(j => j && j.status === _constants.JOB_STATUS.RESOLVED) ? _constants.JOB_STATUS.RESOLVED : result.some(j => j && j.status === _constants.JOB_STATUS.REJECTED) ? _constants.JOB_STATUS.REJECTED : _constants.JOB_STATUS.PENDING;
-  }
+      if (result.some(status => status != null && status === _constants.JOB_STATUS.REJECTED)) {
+        return _constants.JOB_STATUS.REJECTED;
+      }
 
+      return _constants.JOB_STATUS.PENDING;
+    }
+
+  }
 };
 var _default = {
   run(node, prevJob, processor) {
     return _asyncToGenerator(function* () {
       var _prevJob$id;
 
-      const branches = processor.nodes.filter(item => item.upstream === node && item.branchIndex !== null).sort((a, b) => a.branchIndex - b.branchIndex);
+      const branches = processor.getBranches(node);
       const job = yield processor.saveJob({
         status: _constants.JOB_STATUS.PENDING,
         result: Array(branches.length).fill(null),
@@ -56,7 +90,15 @@ var _default = {
       // because of the delay is not significant sensible.
       // another benifit of this is, it could handle sequenced branches in future.
 
-      yield branches.reduce((promise, branch) => promise.then(() => processor.run(branch, job)), Promise.resolve());
+      const _node$config$mode = node.config.mode,
+            mode = _node$config$mode === void 0 ? PARALLEL_MODE.ALL : _node$config$mode;
+      yield branches.reduce((promise, branch, i) => promise.then(previous => {
+        if (i && !Modes[mode].next(previous)) {
+          return Promise.resolve(previous);
+        }
+
+        return processor.run(branch, job);
+      }), Promise.resolve());
       return processor.end(node, job);
     })();
   },
@@ -73,18 +115,18 @@ var _default = {
 
 
       const jobNode = processor.nodesMap.get(branchJob.nodeId);
-
-      const _processor$findBranch = processor.findBranchStartNode(jobNode),
-            branchIndex = _processor$findBranch.branchIndex;
+      const branchStartNode = processor.findBranchStartNode(jobNode, node);
+      const branches = processor.getBranches(node);
+      const branchIndex = branches.indexOf(branchStartNode);
 
       const _ref = node.config || {},
             _ref$mode = _ref.mode,
             mode = _ref$mode === void 0 ? PARALLEL_MODE.ALL : _ref$mode;
 
-      const newResult = [...result.slice(0, branchIndex), branchJob.get(), ...result.slice(branchIndex + 1)];
+      const newResult = [...result.slice(0, branchIndex), branchJob.status, ...result.slice(branchIndex + 1)];
       job.set({
         result: newResult,
-        status: StatusGetters[mode](newResult)
+        status: Modes[mode].getStatus(newResult)
       });
 
       if (job.status === _constants.JOB_STATUS.PENDING) {