@nocobase/plugin-workflow 0.12.0-alpha.5 → 0.13.0-alpha.1

package/dist/server/Plugin.js

@@ -1,31 +1,31 @@
 'use strict';
 
 var path = require('path');
-var winston = require('winston');
 var LRUCache = require('lru-cache');
+var winston = require('winston');
 var database = require('@nocobase/database');
 var server = require('@nocobase/server');
 var utils = require('@nocobase/utils');
-var initFields = require('./fields');
+var logger = require('@nocobase/logger');
+var Processor = require('./Processor');
 var initActions = require('./actions');
 var constants = require('./constants');
+var initFields = require('./fields');
+var initFunctions = require('./functions');
 var initInstructions = require('./instructions');
-var Processor = require('./Processor');
 var initTriggers = require('./triggers');
-var initFunctions = require('./functions');
-var logger = require('@nocobase/logger');
 
 function _interopDefault (e) { return e && e.__esModule ? e : { default: e }; }
 
 var path__default = /*#__PURE__*/_interopDefault(path);
-var winston__default = /*#__PURE__*/_interopDefault(winston);
 var LRUCache__default = /*#__PURE__*/_interopDefault(LRUCache);
-var initFields__default = /*#__PURE__*/_interopDefault(initFields);
+var winston__default = /*#__PURE__*/_interopDefault(winston);
+var Processor__default = /*#__PURE__*/_interopDefault(Processor);
 var initActions__default = /*#__PURE__*/_interopDefault(initActions);
+var initFields__default = /*#__PURE__*/_interopDefault(initFields);
+var initFunctions__default = /*#__PURE__*/_interopDefault(initFunctions);
 var initInstructions__default = /*#__PURE__*/_interopDefault(initInstructions);
-var Processor__default = /*#__PURE__*/_interopDefault(Processor);
 var initTriggers__default = /*#__PURE__*/_interopDefault(initTriggers);
-var initFunctions__default = /*#__PURE__*/_interopDefault(initFunctions);
 
 class WorkflowPlugin extends server.Plugin {
   instructions = new utils.Registry();
@@ -147,6 +147,7 @@ class WorkflowPlugin extends server.Plugin {
       });
     });
     this.app.on("afterStart", () => {
+      this.app.setMaintainingMessage("check for not started executions");
       this.dispatch();
     });
     this.app.on("beforeStop", async () => {
@@ -186,6 +187,16 @@ class WorkflowPlugin extends server.Plugin {
     }
     setTimeout(this.prepare);
   }
+  async resume(job) {
+    if (!job.execution) {
+      job.execution = await job.getExecution();
+    }
+    this.pending.push([job.execution, job]);
+    this.dispatch();
+  }
+  createProcessor(execution, options = {}) {
+    return new Processor__default.default(execution, { ...options, plugin: this });
+  }
   prepare = async () => {
     var _a;
     const [event] = this.events;
@@ -241,13 +252,6 @@ class WorkflowPlugin extends server.Plugin {
       this.dispatch();
     }
   };
-  async resume(job) {
-    if (!job.execution) {
-      job.execution = await job.getExecution();
-    }
-    this.pending.push([job.execution, job]);
-    this.dispatch();
-  }
   async dispatch() {
     if (this.executing) {
       return;
@@ -297,9 +301,6 @@ class WorkflowPlugin extends server.Plugin {
       this.getLogger(execution.workflowId).error(`execution (${execution.id}) error: ${err.message}`, err);
     }
   }
-  createProcessor(execution, options = {}) {
-    return new Processor__default.default(execution, { ...options, plugin: this });
-  }
 }
 
 module.exports = WorkflowPlugin;

package/dist/server/Processor.d.ts

@@ -39,7 +39,7 @@ export default class Processor {
     findBranchEndNode(node: FlowNodeModel): FlowNodeModel | null;
     findBranchParentJob(job: JobModel, node: FlowNodeModel): JobModel | null;
     findBranchLastJob(node: FlowNodeModel): JobModel | null;
-    getScope(node?: any): {
+    getScope(sourceNodeId: number): {
         $context: any;
         $jobsMapByNodeId: {
             [key: number]: any;
@@ -47,5 +47,5 @@ export default class Processor {
         $system: {};
         $scopes: {};
     };
-    getParsedValue(value: any, node?: any, additionalScope?: object): any;
+    getParsedValue(value: any, sourceNodeId: number, additionalScope?: object): any;
 }

package/dist/server/Processor.js

@@ -250,7 +250,8 @@ class Processor {
     }
     return null;
   }
-  getScope(node) {
+  getScope(sourceNodeId) {
+    const node = this.nodesMap.get(sourceNodeId);
     const systemFns = {};
     const scope = {
       execution: this.execution,
@@ -260,12 +261,10 @@ class Processor {
       systemFns[name] = fn.bind(scope);
     }
     const $scopes = {};
-    if (node) {
-      for (let n = this.findBranchParentNode(node); n; n = this.findBranchParentNode(n)) {
-        const instruction = this.options.plugin.instructions.get(n.type);
-        if (typeof instruction.getScope === "function") {
-          $scopes[n.id] = instruction.getScope(n, this.jobsMapByNodeId[n.id], this);
-        }
+    for (let n = this.findBranchParentNode(node); n; n = this.findBranchParentNode(n)) {
+      const instruction = this.options.plugin.instructions.get(n.type);
+      if (typeof instruction.getScope === "function") {
+        $scopes[n.id] = instruction.getScope(n, this.jobsMapByNodeId[n.id], this);
       }
     }
     return {
@@ -275,9 +274,9 @@ class Processor {
       $scopes
     };
   }
-  getParsedValue(value, node, additionalScope) {
+  getParsedValue(value, sourceNodeId, additionalScope) {
     const template = utils.parse(value);
-    const scope = Object.assign(this.getScope(node), additionalScope);
+    const scope = Object.assign(this.getScope(sourceNodeId), additionalScope);
     template.parameters.forEach(({ key }) => {
       evaluators.appendArrayColumn(scope, key);
     });

package/dist/server/instructions/aggregate.js

@@ -13,11 +13,11 @@ const aggregators = {
 var aggregate_default = {
   async run(node, input, processor) {
     const { aggregator, associated, collection, association = {}, params = {} } = node.config;
-    const options = processor.getParsedValue(params);
+    const options = processor.getParsedValue(params, node.id);
     const { database: database$1 } = node.constructor;
     const repo = associated ? database$1.getRepository(
       `${association == null ? void 0 : association.associatedCollection}.${association.name}`,
-      processor.getParsedValue(association == null ? void 0 : association.associatedKey)
+      processor.getParsedValue(association == null ? void 0 : association.associatedKey, node.id)
     ) : database$1.getRepository(collection);
     if (!options.dataType && aggregator === "avg") {
       options.dataType = database.DataTypes.DOUBLE;

package/dist/server/instructions/calculation.js

@@ -8,7 +8,7 @@ var calculation_default = {
   async run(node, prevJob, processor) {
     const { dynamic = false } = node.config || {};
     let { engine = "math.js", expression = "" } = node.config;
-    let scope = processor.getScope(node);
+    let scope = processor.getScope(node.id);
     if (dynamic) {
       const parsed = utils.parse(dynamic)(scope) ?? {};
       engine = parsed.engine;

package/dist/server/instructions/condition.js

@@ -84,7 +84,7 @@ var condition_default = {
     const evaluator = evaluators.evaluators.get(engine);
     let result = true;
     try {
-      result = evaluator ? evaluator(expression, processor.getScope()) : logicCalculate(processor.getParsedValue(calculation, node));
+      result = evaluator ? evaluator(expression, processor.getScope(node.id)) : logicCalculate(processor.getParsedValue(calculation, node.id));
     } catch (e) {
       return {
         result: e.toString(),
@@ -109,13 +109,15 @@ var condition_default = {
       return job;
     }
     const savedJob = await processor.saveJob(job);
-    return processor.run(branchNode, savedJob);
+    await processor.run(branchNode, savedJob);
+    return null;
   },
   async resume(node, branchJob, processor) {
+    const job = processor.findBranchParentJob(branchJob, node);
     if (branchJob.status === constants.JOB_STATUS.RESOLVED) {
-      return branchJob;
+      return job;
     }
-    return processor.end(node, branchJob);
+    return processor.exit(branchJob.status);
   }
 };
 

package/dist/server/instructions/create.js

@@ -7,7 +7,7 @@ var create_default = {
   async run(node, input, processor) {
     const { collection, params: { appends = [], ...params } = {} } = node.config;
     const { repository, model } = node.constructor.database.getCollection(collection);
-    const options = processor.getParsedValue(params, node);
+    const options = processor.getParsedValue(params, node.id);
     const created = await repository.create({
       ...options,
       context: {

package/dist/server/instructions/destroy.js

@@ -6,7 +6,7 @@ var destroy_default = {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
     const repo = node.constructor.database.getRepository(collection);
-    const options = processor.getParsedValue(params, node);
+    const options = processor.getParsedValue(params, node.id);
     const result = await repo.destroy({
       ...options,
       context: {

package/dist/server/instructions/loop.js

@@ -18,7 +18,7 @@ function getTargetLength(target) {
 var loop_default = {
   async run(node, prevJob, processor) {
     const [branch] = processor.getBranches(node);
-    const target = processor.getParsedValue(node.config.target, node);
+    const target = processor.getParsedValue(node.config.target, node.id);
     const length = getTargetLength(target);
     if (!branch || !length) {
       return {
@@ -45,7 +45,7 @@ var loop_default = {
       return processor.exit();
     }
     const nextIndex = result + 1;
-    const target = processor.getParsedValue(loop.config.target, node);
+    const target = processor.getParsedValue(loop.config.target, node.id);
     if (branchJob.status > constants.JOB_STATUS.PENDING) {
       job.set({ result: nextIndex });
       const length = getTargetLength(target);
@@ -61,7 +61,7 @@ var loop_default = {
     return job;
   },
   getScope(node, index, processor) {
-    const target = processor.getParsedValue(node.config.target, node);
+    const target = processor.getParsedValue(node.config.target, node.id);
     const targets = (Array.isArray(target) ? target : [target]).filter((t) => t != null);
     const length = getTargetLength(target);
     const item = typeof target === "number" ? index : targets[index];

package/dist/server/instructions/manual/actions.js

@@ -34,11 +34,11 @@ async function submit(context, next) {
   userJob.execution.workflow = userJob.workflow;
   const processor = plugin.createProcessor(userJob.execution);
   await processor.prepare();
-  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? []);
+  const assignees = processor.getParsedValue(userJob.node.config.assignees ?? [], userJob.nodeId);
   if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
     return context.throw(403);
   }
-  const presetValues = processor.getParsedValue(actionItem.values ?? {}, null, {
+  const presetValues = processor.getParsedValue(actionItem.values ?? {}, userJob.nodeId, {
     currentUser: currentUser.toJSON(),
     currentRecord: values.result[formKey],
     currentTime: /* @__PURE__ */ new Date()

package/dist/server/instructions/manual/forms/update.js

@@ -8,7 +8,7 @@ async function update_default(instance, { collection, filter = {} }, processor)
   const { _, ...form } = instance.result;
   const [values] = Object.values(form);
   await repo.update({
-    filter: processor.getParsedValue(filter),
+    filter: processor.getParsedValue(filter, instance.nodeId),
     values: {
       ...values ?? {},
       updatedBy: instance.userId

package/dist/server/instructions/manual/index.d.ts

@@ -1,5 +1,5 @@
 import { Registry } from '@nocobase/utils';
-import Plugin from '../..';
+import Plugin, { Processor } from '../..';
 import { Instruction } from '..';
 import { FormHandler } from './forms';
 type FormType = {
@@ -23,7 +23,7 @@ export default class implements Instruction {
     protected plugin: Plugin;
     formTypes: Registry<FormHandler>;
     constructor(plugin: Plugin);
-    run(node: any, prevJob: any, processor: any): Promise<any>;
-    resume(node: any, job: any, processor: any): Promise<any>;
+    run(node: any, prevJob: any, processor: Processor): Promise<any>;
+    resume(node: any, job: any, processor: Processor): Promise<any>;
 }
 export {};

package/dist/server/instructions/manual/index.js

@@ -108,7 +108,7 @@ class manual_default {
   formTypes = new utils.Registry();
   async run(node, prevJob, processor) {
     const { mode, ...config } = node.config;
-    const assignees = [...new Set(processor.getParsedValue(config.assignees) || [])];
+    const assignees = [...new Set(processor.getParsedValue(config.assignees, node.id) || [])];
     const job = await processor.saveJob({
       status: constants.JOB_STATUS.PENDING,
       result: mode ? [] : null,

package/dist/server/instructions/query.js

@@ -13,7 +13,7 @@ var query_default = {
       pageSize = actions.DEFAULT_PER_PAGE,
       sort = [],
       ...options
-    } = processor.getParsedValue(params, node);
+    } = processor.getParsedValue(params, node.id);
     const appends = options.appends ? Array.from(
       options.appends.reduce((set, field) => {
         set.add(field.split(".")[0]);

package/dist/server/instructions/request.js

@@ -39,7 +39,7 @@ class request_default {
       nodeId: node.id,
       upstreamId: (prevJob == null ? void 0 : prevJob.id) ?? null
     });
-    const config = processor.getParsedValue(node.config, node);
+    const config = processor.getParsedValue(node.config, node.id);
     request(config).then((response) => {
       job.set({
         status: constants.JOB_STATUS.RESOLVED,

package/dist/server/instructions/sql.js

@@ -5,7 +5,7 @@ var __ = require('..');
 var sql_default = {
   async run(node, input, processor) {
     const { sequelize } = node.constructor.database;
-    const sql = processor.getParsedValue(node.config.sql ?? "", node).trim();
+    const sql = processor.getParsedValue(node.config.sql ?? "", node.id).trim();
     if (!sql) {
       return {
         status: __.JOB_STATUS.RESOLVED

package/dist/server/instructions/update.js

@@ -6,7 +6,7 @@ var update_default = {
   async run(node, input, processor) {
     const { collection, params = {} } = node.config;
     const repo = node.constructor.database.getRepository(collection);
-    const options = processor.getParsedValue(params, node);
+    const options = processor.getParsedValue(params, node.id);
     const result = await repo.update({
       ...options,
       context: {