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

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

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

package/lib/server/instructions/create.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("../constants");
+var _utils = require("../utils");
 const _excluded = ["appends"];
 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; }
@@ -29,29 +30,28 @@ var _default = {
         repository = _node$constructor$dat.repository,
         model = _node$constructor$dat.model;
       const options = processor.getParsedValue(params, node);
-      const result = yield repository.create(_objectSpread(_objectSpread({}, options), {}, {
+      const created = yield repository.create(_objectSpread(_objectSpread({}, options), {}, {
         context: {
           executionId: processor.execution.id
         },
         transaction: processor.transaction
       }));
-      if (result && appends.length) {
-        const includeFields = appends.filter(field => !result.get(field) || !result[field]);
-        const included = yield model.findByPk(result[model.primaryKeyAttribute], {
-          attributes: [model.primaryKeyAttribute],
-          include: includeFields,
+      let result = created;
+      if (created && appends.length) {
+        const includeFields = appends.reduce((set, field) => {
+          set.add(field.split('.')[0]);
+          set.add(field);
+          return set;
+        }, new Set());
+        result = yield repository.findOne({
+          filterByTk: created[model.primaryKeyAttribute],
+          appends: Array.from(includeFields),
           transaction: processor.transaction
         });
-        includeFields.forEach(field => {
-          const value = included.get(field);
-          result.set(field, Array.isArray(value) ? value.map(item => item.toJSON()) : value.toJSON(), {
-            raw: true
-          });
-        });
       }
       return {
         // NOTE: get() for non-proxied instance (#380)
-        result: result === null || result === void 0 ? void 0 : result.toJSON(),
+        result: (0, _utils.toJSON)(result),
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

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

package/lib/server/instructions/delay.js

@@ -15,43 +15,9 @@ class _default {
     var _this = this;
     this.plugin = void 0;
     this.timers = new Map();
-    this.run = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (node, prevJob, processor) {
-        var _prevJob$id;
-        const job = yield processor.saveJob({
-          status: _constants.JOB_STATUS.PENDING,
-          result: null,
-          nodeId: node.id,
-          upstreamId: (_prevJob$id = prevJob === null || prevJob === void 0 ? void 0 : prevJob.id) !== null && _prevJob$id !== void 0 ? _prevJob$id : null
-        });
-        const duration = node.config.duration;
-        // add to schedule
-        _this.schedule(job, duration);
-        return processor.exit();
-      });
-      return function (_x, _x2, _x3) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    this.resume = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (node, prevJob, processor) {
-        const endStatus = node.config.endStatus;
-        prevJob.set('status', endStatus);
-        return prevJob;
-      });
-      return function (_x4, _x5, _x6) {
-        return _ref2.apply(this, arguments);
-      };
-    }();
-    this.plugin = plugin;
-    plugin.app.on('beforeStart', () => this.load());
-    plugin.app.on('beforeStop', () => this.unload());
-  }
-  load() {
-    var _this2 = this;
-    return _asyncToGenerator(function* () {
-      const _this2$plugin$db$getC = _this2.plugin.db.getCollection('jobs'),
-        model = _this2$plugin$db$getC.model;
+    this.load = /*#__PURE__*/_asyncToGenerator(function* () {
+      const _this$plugin$db$getCo = _this.plugin.db.getCollection('jobs'),
+        model = _this$plugin$db$getCo.model;
       const jobs = yield model.findAll({
         where: {
           status: _constants.JOB_STATUS.PENDING
@@ -73,42 +39,78 @@ class _default {
         }]
       });
       jobs.forEach(job => {
-        _this2.schedule(job, job.node.config.duration);
+        _this.schedule(job);
       });
-    })();
-  }
-  unload() {
-    var _iterator = _createForOfIteratorHelper(this.timers.values()),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        const timer = _step.value;
-        clearTimeout(timer);
+    });
+    this.unload = () => {
+      var _iterator = _createForOfIteratorHelper(this.timers.values()),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          const timer = _step.value;
+          clearTimeout(timer);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
       }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-    this.timers = new Map();
+      this.timers = new Map();
+    };
+    this.run = /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator(function* (node, prevJob, processor) {
+        var _prevJob$id;
+        const job = yield processor.saveJob({
+          status: _constants.JOB_STATUS.PENDING,
+          result: null,
+          nodeId: node.id,
+          upstreamId: (_prevJob$id = prevJob === null || prevJob === void 0 ? void 0 : prevJob.id) !== null && _prevJob$id !== void 0 ? _prevJob$id : null
+        });
+        job.node = node;
+        // add to schedule
+        _this.schedule(job);
+        return processor.exit();
+      });
+      return function (_x, _x2, _x3) {
+        return _ref2.apply(this, arguments);
+      };
+    }();
+    this.resume = /*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(function* (node, prevJob, processor) {
+        const endStatus = node.config.endStatus;
+        prevJob.set('status', endStatus);
+        return prevJob;
+      });
+      return function (_x4, _x5, _x6) {
+        return _ref3.apply(this, arguments);
+      };
+    }();
+    this.plugin = plugin;
+    plugin.app.on('beforeStart', this.load);
+    plugin.app.on('beforeStop', this.unload);
   }
-  schedule(job, duration) {
+  schedule(job) {
     const now = new Date();
     const createdAt = Date.parse(job.createdAt);
-    const delay = createdAt + duration - now.getTime();
-    const trigger = this.trigger.bind(this, job);
-    this.timers.set(job.id, setTimeout(trigger, Math.max(0, delay)));
+    const delay = createdAt + job.node.config.duration - now.getTime();
+    if (delay > 0) {
+      const trigger = this.trigger.bind(this, job);
+      this.timers.set(job.id, setTimeout(trigger, delay));
+    } else {
+      this.trigger(job);
+    }
   }
   trigger(job) {
-    var _this3 = this;
+    var _this2 = this;
     return _asyncToGenerator(function* () {
-      const execution = yield job.getExecution();
-      if (execution.status === _constants.EXECUTION_STATUS.STARTED) {
-        job.execution = execution;
-        yield _this3.plugin.resume(job);
+      if (!job.execution) {
+        job.execution = yield job.getExecution();
+      }
+      if (job.execution.status === _constants.EXECUTION_STATUS.STARTED) {
+        _this2.plugin.resume(job);
       }
-      if (_this3.timers.get(job.id)) {
-        _this3.timers.delete(job.id);
+      if (_this2.timers.get(job.id)) {
+        _this2.timers.delete(job.id);
       }
     })();
   }

package/lib/server/instructions/destroy.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/index.d.ts

@@ -1,19 +1,19 @@
-import FlowNodeModel from '../models/FlowNode';
 import Plugin from '..';
 import Processor from '../Processor';
-export declare type Job = {
+import type { FlowNodeModel } from '../types';
+export type Job = {
     status: number;
     result?: unknown;
     [key: string]: unknown;
 } | null;
-export declare type InstructionResult = Job | Promise<Job>;
-export declare type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
+export type InstructionResult = Job | Promise<Job>;
+export type Runner = (node: FlowNodeModel, input: any, processor: Processor) => InstructionResult;
 export interface Instruction {
     run: Runner;
     resume?: Runner;
     getScope?: (node: FlowNodeModel, job: any, processor: Processor) => any;
 }
-declare type InstructionConstructor<T> = {
+type InstructionConstructor<T> = {
     new (p: Plugin): T;
 };
 export default function <T extends Instruction>(plugin: any, more?: {

package/lib/server/instructions/index.js

@@ -32,7 +32,7 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typ
 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 _default(plugin, more = {}) {
   const instructions = plugin.instructions;
-  const natives = ['calculation', 'condition', 'parallel', 'loop', 'delay', 'manual', 'query', 'create', 'update', 'destroy', 'aggregate', 'request'].reduce((result, key) => Object.assign(result, {
+  const natives = ['calculation', 'condition', 'parallel', 'loop', 'delay', 'manual', 'query', 'create', 'update', 'destroy', 'aggregate', 'request', 'sql'].reduce((result, key) => Object.assign(result, {
     [key]: (0, _utils().requireModule)(_path().default.isAbsolute(key) ? key : _path().default.join(__dirname, key))
   }), {});
   for (var _i = 0, _Object$entries = Object.entries(_objectSpread(_objectSpread({}, more), natives)); _i < _Object$entries.length; _i++) {

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

@@ -1,6 +1,5 @@
-import FlowNodeModel from '../models/FlowNode';
-import JobModel from '../models/Job';
 import Processor from '../Processor';
+import type { FlowNodeModel, JobModel } from '../types';
 declare const _default: {
     run(node: FlowNodeModel, prevJob: JobModel, processor: Processor): Promise<{
         status: number;

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

@@ -25,7 +25,7 @@ function submit(_x, _x2) {
 }
 function _submit() {
   _submit = _asyncToGenerator(function* (context, next) {
-    var _values$result, _forms$formKey, _forms$formKey$action, _userJob$node$config$2, _userJob$result;
+    var _values$result, _values$result2, _forms$formKey, _forms$formKey$action, _userJob$node$config$2, _actionItem$values, _userJob$result;
     const repository = _actions().utils.getRepositoryFromParams(context);
     const _context$action$param = context.action.params,
       filterByTk = _context$action$param.filterByTk,
@@ -49,11 +49,13 @@ function _submit() {
     }
     const _userJob$node$config$ = userJob.node.config.forms,
       forms = _userJob$node$config$ === void 0 ? {} : _userJob$node$config$;
-    const _Object$keys = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}),
-      _Object$keys2 = _slicedToArray(_Object$keys, 1),
-      formKey = _Object$keys2[0];
+    const _Object$keys$filter = Object.keys((_values$result = values.result) !== null && _values$result !== void 0 ? _values$result : {}).filter(key => key !== '_'),
+      _Object$keys$filter2 = _slicedToArray(_Object$keys$filter, 1),
+      formKey = _Object$keys$filter2[0];
+    const actionKey = (_values$result2 = values.result) === null || _values$result2 === void 0 ? void 0 : _values$result2._;
+    const actionItem = (_forms$formKey = forms[formKey]) === null || _forms$formKey === void 0 ? void 0 : (_forms$formKey$action = _forms$formKey.actions) === null || _forms$formKey$action === void 0 ? void 0 : _forms$formKey$action.find(item => item.key === actionKey);
     // NOTE: validate status
-    if (userJob.status !== _constants.JOB_STATUS.PENDING || userJob.job.status !== _constants.JOB_STATUS.PENDING || userJob.execution.status !== _constants.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !((_forms$formKey = forms[formKey]) === null || _forms$formKey === void 0 ? void 0 : (_forms$formKey$action = _forms$formKey.actions) === null || _forms$formKey$action === void 0 ? void 0 : _forms$formKey$action.includes(values.status))) {
+    if (userJob.status !== _constants.JOB_STATUS.PENDING || userJob.job.status !== _constants.JOB_STATUS.PENDING || userJob.execution.status !== _constants.EXECUTION_STATUS.STARTED || !userJob.workflow.enabled || !actionKey || (actionItem === null || actionItem === void 0 ? void 0 : actionItem.status) == null) {
       return context.throw(400);
     }
     userJob.execution.workflow = userJob.workflow;
@@ -64,9 +66,17 @@ function _submit() {
     if (!assignees.includes(currentUser.id) || userJob.userId !== currentUser.id) {
       return context.throw(403);
     }
+    const presetValues = processor.getParsedValue((_actionItem$values = actionItem.values) !== null && _actionItem$values !== void 0 ? _actionItem$values : {}, null, {
+      currentUser: currentUser.toJSON(),
+      currentRecord: values.result[formKey],
+      currentTime: new Date()
+    });
     userJob.set({
-      status: values.status,
-      result: values.status ? values.result : Object.assign((_userJob$result = userJob.result) !== null && _userJob$result !== void 0 ? _userJob$result : {}, values.result)
+      status: actionItem.status,
+      result: actionItem.status > _constants.JOB_STATUS.PENDING ? {
+        [formKey]: Object.assign(values.result[formKey], presetValues),
+        _: actionKey
+      } : Object.assign((_userJob$result = userJob.result) !== null && _userJob$result !== void 0 ? _userJob$result : {}, values.result)
     });
     const handler = instruction.formTypes.get(forms[formKey].type);
     if (handler && userJob.status) {
@@ -79,8 +89,10 @@ function _submit() {
     context.body = userJob;
     context.status = 202;
     yield next();
+    userJob.job.execution = userJob.execution;
     userJob.job.latestUserJob = userJob;
     // NOTE: resume the process and no `await` for quick returning
+    processor.logger.info(`manual node (${userJob.nodeId}) action trigger execution (${userJob.execution.id}) to resume`);
     plugin.resume(userJob.job);
   });
   return _submit.apply(this, arguments);

package/lib/server/instructions/manual/forms/create.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+const _excluded = ["_"];
 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; }
@@ -15,6 +16,8 @@ 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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 _default(_x, _x2, _x3) {
@@ -28,7 +31,10 @@ function _ref() {
     if (!repo) {
       throw new Error(`collection ${collection} for create data on manual node not found`);
     }
-    const _Object$values = Object.values(instance.result),
+    const _instance$result = instance.result,
+      _ = _instance$result._,
+      form = _objectWithoutProperties(_instance$result, _excluded);
+    const _Object$values = Object.values(form),
       _Object$values2 = _slicedToArray(_Object$values, 1),
       values = _Object$values2[0];
     yield repo.create({

package/lib/server/instructions/manual/forms/index.d.ts

@@ -1,6 +1,6 @@
 import { Processor } from '../../..';
 import ManualInstruction from '..';
-export declare type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
+export type FormHandler = (this: ManualInstruction, instance: any, formConfig: any, processor: Processor) => Promise<void>;
 export default function ({ formTypes }: {
     formTypes: any;
 }): void;

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

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = _default;
+const _excluded = ["_"];
 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; }
@@ -15,6 +16,8 @@ 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; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 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 _default(_x, _x2, _x3) {
@@ -29,7 +32,10 @@ function _ref() {
     if (!repo) {
       throw new Error(`collection ${collection} for update data on manual node not found`);
     }
-    const _Object$values = Object.values(instance.result),
+    const _instance$result = instance.result,
+      _ = _instance$result._,
+      form = _objectWithoutProperties(_instance$result, _excluded);
+    const _Object$values = Object.values(form),
       _Object$values2 = _slicedToArray(_Object$values, 1),
       values = _Object$values2[0];
     yield repo.update({

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

@@ -2,7 +2,7 @@ import { Registry } from '@nocobase/utils';
 import Plugin from '../..';
 import { Instruction } from '..';
 import { FormHandler } from './forms';
-declare type FormType = {
+type FormType = {
     type: 'custom' | 'create' | 'update';
     actions: number[];
     options: {

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

@@ -1,6 +1,5 @@
-import FlowNodeModel from '../models/FlowNode';
-import JobModel from '../models/Job';
 import Processor from '../Processor';
+import type { FlowNodeModel, JobModel } from '../types';
 export declare const PARALLEL_MODE: {
     readonly ALL: "all";
     readonly ANY: "any";

package/lib/server/instructions/query.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/query.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _constants = require("../constants");
+var _utils = require("../utils");
 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; }
@@ -24,7 +25,13 @@ var _default = {
         failOnEmpty = _node$config$failOnEm === void 0 ? false : _node$config$failOnEm;
       const repo = node.constructor.database.getRepository(collection);
       const options = processor.getParsedValue(params, node);
+      const appends = options.appends ? Array.from(options.appends.reduce((set, field) => {
+        set.add(field.split('.')[0]);
+        set.add(field);
+        return set;
+      }, new Set())) : options.appends;
       const result = yield (multiple ? repo.find : repo.findOne).call(repo, _objectSpread(_objectSpread({}, options), {}, {
+        appends: appends,
         transaction: processor.transaction
       }));
       if (failOnEmpty && (multiple ? !result.length : !result)) {
@@ -37,7 +44,7 @@ var _default = {
       // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false
       // so the properties can not be get by json-templates(object-path)
       return {
-        result: multiple ? result.map(item => item.toJSON()) : result === null || result === void 0 ? void 0 : result.toJSON(),
+        result: (0, _utils.toJSON)(result),
         status: _constants.JOB_STATUS.RESOLVED
       };
     })();

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

@@ -1,18 +1,18 @@
 import { AxiosRequestConfig } from 'axios';
 import { Instruction } from './index';
 import Processor from '../Processor';
-import FlowNodeModel from '../models/FlowNode';
+import type { FlowNodeModel } from '../types';
 export interface Header {
     name: string;
     value: string;
 }
-export declare type RequestConfig = Pick<AxiosRequestConfig, 'url' | 'method' | 'params' | 'data' | 'timeout'> & {
+export type RequestConfig = Pick<AxiosRequestConfig, 'url' | 'method' | 'params' | 'data' | 'timeout'> & {
     headers: Array<Header>;
     ignoreFail: boolean;
 };
 export default class implements Instruction {
     plugin: any;
     constructor(plugin: any);
-    run(node: FlowNodeModel, input: any, processor: Processor): Promise<any>;
+    run(node: FlowNodeModel, prevJob: any, processor: Processor): Promise<any>;
     resume(node: FlowNodeModel, job: any, processor: Processor): Promise<any>;
 }

package/lib/server/instructions/request.js

@@ -57,14 +57,17 @@ class _default {
     this.plugin = void 0;
     this.plugin = plugin;
   }
-  run(node, input, processor) {
+  run(node, prevJob, processor) {
     var _this = this;
     return _asyncToGenerator(function* () {
+      var _prevJob$id;
       const job = yield processor.saveJob({
         status: _constants.JOB_STATUS.PENDING,
-        nodeId: node.id
+        nodeId: node.id,
+        upstreamId: (_prevJob$id = prevJob === null || prevJob === void 0 ? void 0 : prevJob.id) !== null && _prevJob$id !== void 0 ? _prevJob$id : null
       });
       const config = processor.getParsedValue(node.config, node);
+      // eslint-disable-next-line promise/catch-or-return
       request(config).then(response => {
         job.set({
           status: _constants.JOB_STATUS.RESOLVED,

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

@@ -0,0 +1,12 @@
+import { Processor } from '..';
+import type { FlowNodeModel } from '../types';
+declare const _default: {
+    run(node: FlowNodeModel, input: any, processor: Processor): Promise<{
+        status: number;
+        result?: undefined;
+    } | {
+        result: [unknown[], unknown];
+        status: number;
+    }>;
+};
+export default _default;

package/lib/server/instructions/sql.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _ = require("..");
+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 = {
+  run(node, input, processor) {
+    return _asyncToGenerator(function* () {
+      var _node$config$sql;
+      const sequelize = node.constructor.database.sequelize;
+      const sql = processor.getParsedValue((_node$config$sql = node.config.sql) !== null && _node$config$sql !== void 0 ? _node$config$sql : '', node).trim();
+      if (!sql) {
+        return {
+          status: _.JOB_STATUS.RESOLVED
+        };
+      }
+      const result = yield sequelize.query(sql, {
+        transaction: processor.transaction
+        // plain: true,
+        // model: db.getCollection(node.config.collection).model
+      });
+
+      return {
+        result,
+        status: _.JOB_STATUS.RESOLVED
+      };
+    })();
+  }
+};
+exports.default = _default;

package/lib/server/instructions/update.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/migrations/20230221071831-calculation-expression.js

@@ -65,7 +65,7 @@ function migrateConfig(_ref = {}) {
   var _calculation$operands, _calculator$operands;
   let calculation = _ref.calculation,
     config = _objectWithoutProperties(_ref, _excluded);
-  if (!(calculation === null || calculation === void 0 ? void 0 : calculation.calculator) || !(calculation === null || calculation === void 0 ? void 0 : (_calculation$operands = calculation.operands) === null || _calculation$operands === void 0 ? void 0 : _calculation$operands.length)) {
+  if (!(calculation !== null && calculation !== void 0 && calculation.calculator) || !(calculation !== null && calculation !== void 0 && (_calculation$operands = calculation.operands) !== null && _calculation$operands !== void 0 && _calculation$operands.length)) {
     return config;
   }
   const calculator = calculatorsMap[calculation.calculator];

package/lib/server/migrations/20230221121203-condition-calculation.js

@@ -59,7 +59,7 @@ function migrateConfig({
         calculator = '===',
         operands = []
       }) => {
-        return `(${operands.map(operand => (operand === null || operand === void 0 ? void 0 : operand.group) ? migrateConfig(operand) : operand).join(` ${calculatorsMap[calculator]} `)})`;
+        return `(${operands.map(operand => operand !== null && operand !== void 0 && operand.group ? migrateConfig(operand) : operand).join(` ${calculatorsMap[calculator]} `)})`;
       })
     }
   };

package/lib/server/migrations/20230221162902-jsonb-to-json.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;
@@ -34,22 +34,22 @@ class _default extends _server().Migration {
       yield sequelize.transaction( /*#__PURE__*/function () {
         var _ref = _asyncToGenerator(function* (transaction) {
           yield queryInterface.changeColumn(db.getCollection('workflows').model.getTableName(), 'config', {
-            type: _sequelize().DataTypes.JSON
+            type: _database().DataTypes.JSON
           }, {
             transaction
           });
           yield queryInterface.changeColumn(db.getCollection('flow_nodes').model.getTableName(), 'config', {
-            type: _sequelize().DataTypes.JSON
+            type: _database().DataTypes.JSON
           }, {
             transaction
           });
           yield queryInterface.changeColumn(db.getCollection('executions').model.getTableName(), 'context', {
-            type: _sequelize().DataTypes.JSON
+            type: _database().DataTypes.JSON
           }, {
             transaction
           });
           yield queryInterface.changeColumn(db.getCollection('jobs').model.getTableName(), 'result', {
-            type: _sequelize().DataTypes.JSON
+            type: _database().DataTypes.JSON
           }, {
             transaction
           });