@nocobase/plugin-workflow 0.7.0-alpha.31 → 0.7.0-alpha.34

package/esm/actions/index.js

@@ -1,8 +1,14 @@
-import * as flow_nodes from './flow_nodes';
+import * as workflows from './workflows';
+import * as nodes from './nodes';
 function make(name, mod) {
     return Object.keys(mod).reduce((result, key) => (Object.assign(Object.assign({}, result), { [`${name}:${key}`]: mod[key] })), {});
 }
 export default function (app) {
-    app.actions(Object.assign({}, make('flow_nodes', flow_nodes)));
+    app.actions(Object.assign(Object.assign(Object.assign({}, make('workflows', workflows)), make('workflows.nodes', {
+        create: nodes.create,
+        destroy: nodes.destroy
+    })), make('flow_nodes', {
+        update: nodes.update
+    })));
 }
 //# sourceMappingURL=index.js.map

package/esm/actions/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,UAAU,MAAM,cAAc,CAAC;AAE3C,SAAS,IAAI,CAAC,IAAI,EAAE,GAAG;IACrB,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,iCAC3C,MAAM,KACT,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAC5B,EAAE,EAAE,CAAC,CAAA;AACT,CAAC;AAED,MAAM,CAAC,OAAO,WAAU,GAAG;IACzB,GAAG,CAAC,OAAO,mBACN,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,EACjC,CAAC;AACL,CAAC","sourcesContent":["import * as flow_nodes from './flow_nodes';\n\nfunction make(name, mod) {\n  return Object.keys(mod).reduce((result, key) => ({\n    ...result,\n    [`${name}:${key}`]: mod[key]\n  }), {})\n}\n\nexport default function(app) {\n  app.actions({\n    ...make('flow_nodes', flow_nodes)\n  });\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AAEjC,SAAS,IAAI,CAAC,IAAI,EAAE,GAAG;IACrB,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,CAAC,iCAC3C,MAAM,KACT,CAAC,GAAG,IAAI,IAAI,GAAG,EAAE,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,IAC5B,EAAE,EAAE,CAAC,CAAA;AACT,CAAC;AAED,MAAM,CAAC,OAAO,WAAU,GAAG;IACzB,GAAG,CAAC,OAAO,+CACN,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAC5B,IAAI,CAAC,iBAAiB,EAAE;QACzB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,GACC,IAAI,CAAC,YAAY,EAAE;QACpB,MAAM,EAAE,KAAK,CAAC,MAAM;KACrB,CAAC,EACF,CAAC;AACL,CAAC","sourcesContent":["import * as workflows from './workflows';\nimport * as nodes from './nodes';\n\nfunction make(name, mod) {\n  return Object.keys(mod).reduce((result, key) => ({\n    ...result,\n    [`${name}:${key}`]: mod[key]\n  }), {})\n}\n\nexport default function(app) {\n  app.actions({\n    ...make('workflows', workflows),\n    ...make('workflows.nodes', {\n      create: nodes.create,\n      destroy: nodes.destroy\n    }),\n    ...make('flow_nodes', {\n      update: nodes.update\n    })\n  });\n}\n"]}

package/esm/actions/{flow_nodes.d.ts → nodes.d.ts}

@@ -1,3 +1,4 @@
 import { Context } from '@nocobase/actions';
 export declare function create(context: Context, next: any): Promise<void>;
 export declare function destroy(context: Context, next: any): Promise<void>;
+export declare function update(context: Context, next: any): Promise<void>;

package/esm/actions/{flow_nodes.js → nodes.js}

@@ -8,12 +8,25 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { Op } from 'sequelize';
-import actions, { utils } from '@nocobase/actions';
+import { utils } from '@nocobase/actions';
 export function create(context, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        return actions.create(context, () => __awaiter(this, void 0, void 0, function* () {
-            const { body: instance, db } = context;
-            const repository = utils.getRepositoryFromParams(context);
+        const { db } = context;
+        const repository = utils.getRepositoryFromParams(context);
+        const { whitelist, blacklist, updateAssociationValues, values, associatedIndex: workflowId } = context.action.params;
+        context.body = yield db.sequelize.transaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+            const workflow = yield repository.getSourceModel(transaction);
+            if (workflow.executed) {
+                context.throw(400, 'Node could not be created in executed workflow');
+            }
+            const instance = yield repository.create({
+                values,
+                whitelist,
+                blacklist,
+                updateAssociationValues,
+                context,
+                transaction
+            });
             if (!instance.upstreamId) {
                 const previousHead = yield repository.findOne({
                     filter: {
@@ -21,26 +34,27 @@ export function create(context, next) {
                             $ne: instance.id
                         },
                         upstreamId: null
-                    }
+                    },
+                    transaction
                 });
                 if (previousHead) {
-                    yield previousHead.setUpstream(instance);
-                    yield instance.setDownstream(previousHead);
+                    yield previousHead.setUpstream(instance, { transaction });
+                    yield instance.setDownstream(previousHead, { transaction });
                     instance.set('downstream', previousHead);
                 }
-                return next();
+                return instance;
             }
-            const upstream = yield instance.getUpstream();
+            const upstream = yield instance.getUpstream({ transaction });
             if (instance.branchIndex == null) {
-                const downstream = yield upstream.getDownstream();
+                const downstream = yield upstream.getDownstream({ transaction });
                 if (downstream) {
-                    yield downstream.setUpstream(instance);
-                    yield instance.setDownstream(downstream);
+                    yield downstream.setUpstream(instance, { transaction });
+                    yield instance.setDownstream(downstream, { transaction });
                     instance.set('downstream', downstream);
                 }
                 yield upstream.update({
                     downstreamId: instance.id
-                });
+                }, { transaction });
                 upstream.set('downstream', instance);
             }
             else {
@@ -50,20 +64,21 @@ export function create(context, next) {
                             [Op.ne]: instance.id
                         },
                         branchIndex: instance.branchIndex
-                    }
+                    },
+                    transaction
                 });
                 if (downstream) {
                     yield downstream.update({
                         upstreamId: instance.id,
                         branchIndex: null
-                    });
-                    yield instance.setDownstream(downstream);
+                    }, { transaction });
+                    yield instance.setDownstream(downstream, { transaction });
                     instance.set('downstream', downstream);
                 }
             }
             instance.set('upstream', upstream);
-            yield next();
         }));
+        yield next();
     });
 }
 function searchBranchNodes(nodes, from) {
@@ -80,10 +95,14 @@ function searchBranchDownstreams(nodes, from) {
 }
 export function destroy(context, next) {
     return __awaiter(this, void 0, void 0, function* () {
-        const repository = utils.getRepositoryFromParams(context);
         const { db } = context;
+        const repository = utils.getRepositoryFromParams(context);
         const { filterByTk } = context.action.params;
         context.body = yield db.sequelize.transaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+            const workflow = yield repository.getSourceModel(transaction);
+            if (workflow.executed) {
+                context.throw(400, 'Nodes in executed workflow could not be deleted');
+            }
             const fields = ['id', 'upstreamId', 'downstreamId', 'branchIndex'];
             const instance = yield repository.findOne({
                 filterByTk,
@@ -136,4 +155,33 @@ export function destroy(context, next) {
         yield next();
     });
 }
-//# sourceMappingURL=flow_nodes.js.map
+export function update(context, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { db } = context;
+        const repository = utils.getRepositoryFromParams(context);
+        const { filterByTk, values, whitelist, blacklist, filter, updateAssociationValues } = context.action.params;
+        context.body = yield db.sequelize.transaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+            // TODO(optimize): duplicated instance query
+            const { workflow } = yield repository.findOne({
+                filterByTk,
+                appends: ['workflow.executed'],
+                transaction
+            });
+            if (workflow.executed) {
+                context.throw(400, 'Nodes in executed workflow could not be reconfigured');
+            }
+            return repository.update({
+                filterByTk,
+                values,
+                whitelist,
+                blacklist,
+                filter,
+                updateAssociationValues,
+                context,
+                transaction
+            });
+        }));
+        yield next();
+    });
+}
+//# sourceMappingURL=nodes.js.map

package/esm/actions/nodes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"nodes.js","sourceRoot":"","sources":["../../src/actions/nodes.ts"],"names":[],"mappings":"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","sourcesContent":["import { Op } from 'sequelize';\nimport { Context, utils } from '@nocobase/actions';\nimport { MultipleRelationRepository } from '@nocobase/database';\nimport WorkflowModel from '../models/Workflow';\n\nexport async function create(context: Context, next) {\n  const { db } = context;\n  const repository = utils.getRepositoryFromParams(context) as MultipleRelationRepository;\n  const { whitelist, blacklist, updateAssociationValues, values, associatedIndex: workflowId } = context.action.params;\n\n  context.body = await db.sequelize.transaction(async transaction => {\n    const workflow = await repository.getSourceModel(transaction) as WorkflowModel;\n    if (workflow.executed) {\n      context.throw(400, 'Node could not be created in executed workflow');\n    }\n\n    const instance = await repository.create({\n      values,\n      whitelist,\n      blacklist,\n      updateAssociationValues,\n      context,\n      transaction\n    });\n\n    if (!instance.upstreamId) {\n      const previousHead = await repository.findOne({\n        filter: {\n          id: {\n            $ne: instance.id\n          },\n          upstreamId: null\n        },\n        transaction\n      });\n      if (previousHead) {\n        await previousHead.setUpstream(instance, { transaction });\n        await instance.setDownstream(previousHead, { transaction });\n        instance.set('downstream', previousHead);\n      }\n      return instance;\n    }\n\n    const upstream = await instance.getUpstream({ transaction });\n\n    if (instance.branchIndex == null) {\n      const downstream = await upstream.getDownstream({ transaction });\n\n      if (downstream) {\n        await downstream.setUpstream(instance, { transaction });\n        await instance.setDownstream(downstream, { transaction });\n        instance.set('downstream', downstream);\n      }\n\n      await upstream.update({\n        downstreamId: instance.id\n      }, { transaction });\n\n      upstream.set('downstream', instance);\n    } else {\n      const [downstream] = await upstream.getBranches({\n        where: {\n          id: {\n            [Op.ne]: instance.id\n          },\n          branchIndex: instance.branchIndex\n        },\n        transaction\n      });\n\n      if (downstream) {\n        await downstream.update({\n          upstreamId: instance.id,\n          branchIndex: null\n        }, { transaction });\n        await instance.setDownstream(downstream, { transaction });\n        instance.set('downstream', downstream);\n      }\n    }\n\n    instance.set('upstream', upstream);\n  });\n\n  await next();\n}\n\nfunction searchBranchNodes(nodes, from): any[] {\n  const branchHeads = nodes\n    .filter((item: any) => item.upstreamId === from.id && item.branchIndex != null);\n  return branchHeads.reduce((flatten: any[], head) => flatten.concat(searchBranchDownstreams(nodes, head)), []) as any[];\n}\n\nfunction searchBranchDownstreams(nodes, from) {\n  let result = [];\n  for (let search = from; search; search = search.downstream) {\n    result = [...result, search, ...searchBranchNodes(nodes, search)];\n  }\n  return result;\n}\n\nexport async function destroy(context: Context, next) {\n  const { db } = context;\n  const repository = utils.getRepositoryFromParams(context) as MultipleRelationRepository;\n  const { filterByTk } = context.action.params;\n\n  context.body = await db.sequelize.transaction(async transaction => {\n    const workflow = await repository.getSourceModel(transaction) as WorkflowModel;\n    if (workflow.executed) {\n      context.throw(400, 'Nodes in executed workflow could not be deleted');\n    }\n\n    const fields = ['id', 'upstreamId', 'downstreamId', 'branchIndex'];\n    const instance = await repository.findOne({\n      filterByTk,\n      fields: [...fields, 'workflowId'],\n      appends: ['upstream', 'downstream'],\n      transaction\n    });\n    const { upstream, downstream } = instance.get();\n\n    if (upstream && upstream.downstreamId === instance.id) {\n      await upstream.update({\n        downstreamId: instance.downstreamId\n      }, { transaction });\n    }\n\n    if (downstream) {\n      await downstream.update({\n        upstreamId: instance.upstreamId,\n        branchIndex: instance.branchIndex\n      }, { transaction });\n    }\n\n    const nodes = await repository.find({\n      filter: {\n        workflowId: instance.workflowId\n      },\n      fields,\n      transaction\n    });\n    const nodesMap = new Map();\n    // make map\n    nodes.forEach(item => {\n      nodesMap.set(item.id, item);\n    });\n    // overwrite\n    nodesMap.set(instance.id, instance);\n    // make linked list\n    nodes.forEach(item => {\n      if (item.upstreamId) {\n        item.upstream = nodesMap.get(item.upstreamId);\n      }\n      if (item.downstreamId) {\n        item.downstream = nodesMap.get(item.downstreamId);\n      }\n    });\n\n    const branchNodes = searchBranchNodes(nodes, instance);\n\n    await repository.destroy({\n      filterByTk: [instance.id, ...branchNodes.map(item => item.id)],\n      transaction\n    });\n\n    return instance;\n  });\n\n  await next();\n}\n\nexport async function update(context: Context, next) {\n  const { db } = context;\n  const repository = utils.getRepositoryFromParams(context);\n  const { filterByTk, values, whitelist, blacklist, filter, updateAssociationValues } = context.action.params;\n  context.body = await db.sequelize.transaction(async transaction => {\n    // TODO(optimize): duplicated instance query\n    const { workflow } = await repository.findOne({\n      filterByTk,\n      appends: ['workflow.executed'],\n      transaction\n    });\n    if (workflow.executed) {\n      context.throw(400, 'Nodes in executed workflow could not be reconfigured');\n    }\n\n    return repository.update({\n      filterByTk,\n      values,\n      whitelist,\n      blacklist,\n      filter,\n      updateAssociationValues,\n      context,\n      transaction\n    });\n  });\n\n  await next();\n}\n"]}

package/esm/actions/workflows.d.ts

@@ -0,0 +1,3 @@
+import { Context } from '@nocobase/actions';
+export declare function update(context: Context, next: any): Promise<void>;
+export declare function duplicate(context: Context, next: any): Promise<void>;

package/esm/actions/workflows.js

@@ -0,0 +1,163 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
+import { utils } from '@nocobase/actions';
+import { Op } from '@nocobase/database';
+export function update(context, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { db } = context;
+        const repository = utils.getRepositoryFromParams(context);
+        const { filterByTk, values, whitelist, blacklist, filter, updateAssociationValues } = context.action.params;
+        context.body = yield db.sequelize.transaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+            const others = {};
+            if (values.enabled) {
+                values.current = true;
+                others.enabled = false;
+            }
+            if (values.current) {
+                others.current = false;
+                yield repository.update({
+                    filter: {
+                        key: values.key,
+                        id: {
+                            [Op.ne]: filterByTk
+                        }
+                    },
+                    values: others,
+                    context,
+                    transaction
+                });
+            }
+            const instance = yield repository.update({
+                filterByTk,
+                values,
+                whitelist,
+                blacklist,
+                filter,
+                updateAssociationValues,
+                context,
+                transaction
+            });
+            return instance;
+        }));
+        yield next();
+    });
+}
+function typeOf(value) {
+    if (Array.isArray(value)) {
+        return 'array';
+    }
+    else if (value instanceof Date) {
+        return 'date';
+    }
+    else if (value === null) {
+        return 'null';
+    }
+    return typeof value;
+}
+function migrateConfig(config, oldToNew) {
+    function migrate(value) {
+        switch (typeOf(value)) {
+            case 'object':
+                return Object.keys(value).reduce((result, key) => (Object.assign(Object.assign({}, result), { [key]: migrate(value[key]) })), {});
+            case 'array':
+                return value.map(item => migrate(item));
+            case 'string':
+                return value
+                    .replace(/(\{\{\$jobsMapByNodeId\.)(\d+)/, (_, prefix, id) => `${prefix}${oldToNew.get(Number.parseInt(id, 10)).id}`);
+            default:
+                return value;
+        }
+    }
+    return migrate(config);
+}
+export function duplicate(context, next) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const { db } = context;
+        const repository = utils.getRepositoryFromParams(context);
+        const { filterByTk } = context.action.params;
+        context.body = yield db.sequelize.transaction((transaction) => __awaiter(this, void 0, void 0, function* () {
+            var e_1, _a, e_2, _b;
+            var _c, _d;
+            const origin = yield repository.findOne({
+                filterByTk,
+                appends: ['nodes'],
+                context,
+                transaction
+            });
+            const instance = yield repository.create({
+                values: {
+                    key: origin.key,
+                    title: origin.title,
+                    description: origin.description,
+                    type: origin.type,
+                    config: origin.config
+                },
+                transaction
+            });
+            const originalNodesMap = new Map();
+            origin.nodes.forEach((node) => {
+                originalNodesMap.set(node.id, node);
+            });
+            const oldToNew = new Map();
+            const newToOld = new Map();
+            try {
+                for (var _e = __asyncValues(origin.nodes), _f; _f = yield _e.next(), !_f.done;) {
+                    const node = _f.value;
+                    const newNode = yield instance.createNode({
+                        type: node.type,
+                        config: node.config,
+                        title: node.title,
+                        branchIndex: node.branchIndex
+                    }, { transaction });
+                    // NOTE: keep original node references for later replacement
+                    oldToNew.set(node.id, newNode);
+                    newToOld.set(newNode.id, node);
+                }
+            }
+            catch (e_1_1) { e_1 = { error: e_1_1 }; }
+            finally {
+                try {
+                    if (_f && !_f.done && (_a = _e.return)) yield _a.call(_e);
+                }
+                finally { if (e_1) throw e_1.error; }
+            }
+            try {
+                for (var _g = __asyncValues(oldToNew.entries()), _h; _h = yield _g.next(), !_h.done;) {
+                    const [oldId, newNode] = _h.value;
+                    const oldNode = originalNodesMap.get(oldId);
+                    const newUpstream = oldNode.upstreamId ? oldToNew.get(oldNode.upstreamId) : null;
+                    const newDownstream = oldNode.downstreamId ? oldToNew.get(oldNode.downstreamId) : null;
+                    yield newNode.update({
+                        upstreamId: (_c = newUpstream === null || newUpstream === void 0 ? void 0 : newUpstream.id) !== null && _c !== void 0 ? _c : null,
+                        downstreamId: (_d = newDownstream === null || newDownstream === void 0 ? void 0 : newDownstream.id) !== null && _d !== void 0 ? _d : null,
+                        config: migrateConfig(oldNode.config, oldToNew)
+                    }, { transaction });
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (_h && !_h.done && (_b = _g.return)) yield _b.call(_g);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+            return instance;
+        }));
+        yield next();
+    });
+}
+//# sourceMappingURL=workflows.js.map

package/esm/actions/workflows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/actions/workflows.ts"],"names":[],"mappings":"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","sourcesContent":["import parse from 'json-templates';\n\nimport { Context, utils } from '@nocobase/actions';\nimport { Op } from '@nocobase/database';\n\n\n\nexport async function update(context: Context, next) {\n  const { db } = context;\n  const repository = utils.getRepositoryFromParams(context);\n  const { filterByTk, values, whitelist, blacklist, filter, updateAssociationValues } = context.action.params;\n\n  context.body = await db.sequelize.transaction(async transaction => {\n    const others: { enabled?: boolean, current?: boolean } = {};\n\n    if (values.enabled) {\n      values.current = true;\n      others.enabled = false;\n    }\n\n    if (values.current) {\n      others.current = false;\n      await repository.update({\n        filter: {\n          key: values.key,\n          id: {\n            [Op.ne]: filterByTk\n          }\n        },\n        values: others,\n        context,\n        transaction\n      });\n    }\n\n    const instance = await repository.update({\n      filterByTk,\n      values,\n      whitelist,\n      blacklist,\n      filter,\n      updateAssociationValues,\n      context,\n      transaction\n    });\n\n    return instance;\n  });\n\n  await next();\n}\n\nfunction typeOf(value) {\n  if (Array.isArray(value)) {\n    return 'array';\n  } else if (value instanceof Date) {\n    return 'date';\n  } else if (value === null) {\n    return 'null';\n  }\n\n  return typeof value;\n}\n\nfunction migrateConfig(config, oldToNew) {\n  function migrate(value) {\n    switch (typeOf(value)) {\n      case 'object':\n        return Object.keys(value).reduce((result, key) => ({ ...result, [key]: migrate(value[key]) }), {});\n      case 'array':\n        return value.map(item => migrate(item));\n      case 'string':\n        return value\n          .replace(\n            /(\\{\\{\\$jobsMapByNodeId\\.)(\\d+)/,\n            (_, prefix, id) => `${prefix}${oldToNew.get(Number.parseInt(id, 10)).id}`\n          );\n      default:\n        return value;\n    }\n  }\n\n  return migrate(config);\n}\n\nexport async function duplicate(context: Context, next) {\n  const { db } = context;\n  const repository = utils.getRepositoryFromParams(context);\n  const { filterByTk } = context.action.params;\n\n  context.body = await db.sequelize.transaction(async transaction => {\n    const origin = await repository.findOne({\n      filterByTk,\n      appends: ['nodes'],\n      context,\n      transaction\n    });\n\n    const instance = await repository.create({\n      values: {\n        key: origin.key,\n        title: origin.title,\n        description: origin.description,\n        type: origin.type,\n        config: origin.config\n      },\n      transaction\n    });\n\n    const originalNodesMap = new Map();\n    origin.nodes.forEach((node) => {\n      originalNodesMap.set(node.id, node);\n    });\n\n    const oldToNew = new Map();\n    const newToOld = new Map();\n    for await (const node of origin.nodes) {\n      const newNode = await instance.createNode({\n        type: node.type,\n        config: node.config,\n        title: node.title,\n        branchIndex: node.branchIndex\n      }, { transaction });\n      // NOTE: keep original node references for later replacement\n      oldToNew.set(node.id, newNode);\n      newToOld.set(newNode.id, node);\n    }\n\n    for await (const [oldId, newNode] of oldToNew.entries()) {\n      const oldNode = originalNodesMap.get(oldId);\n      const newUpstream = oldNode.upstreamId ? oldToNew.get(oldNode.upstreamId) : null;\n      const newDownstream = oldNode.downstreamId ? oldToNew.get(oldNode.downstreamId) : null;\n\n      await newNode.update({\n        upstreamId: newUpstream?.id ?? null,\n        downstreamId: newDownstream?.id ?? null,\n        config: migrateConfig(oldNode.config, oldToNew)\n      }, { transaction });\n    }\n\n    return instance;\n  });\n\n  await next();\n}\n"]}

package/esm/collections/flow_nodes.js

@@ -38,7 +38,7 @@ export default {
             type: 'integer',
             title: 'branch index'
         },
-        // for reasons:
+        // Note: for reasons:
         // 1. redirect type node to solve cycle flow.
         // 2. recognize as real next node after branches.
         {
@@ -51,14 +51,7 @@ export default {
             interface: 'select',
             type: 'string',
             name: 'type',
-            title: '类型',
-            // TODO: data for test only now
-            dataSource: [
-                { label: '数据处理', value: 'data' },
-                { label: '数据查询', value: 'query' },
-                { label: '等待人工输入', value: 'prompt' },
-                { label: '条件判断', value: 'condition' },
-            ]
+            title: '类型'
         },
         {
             interface: 'json',

package/esm/collections/flow_nodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"flow_nodes.js","sourceRoot":"","sources":["../../src/collections/flow_nodes.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,YAAY;IAClB,0BAA0B;IAC1B,KAAK,EAAE,gBAAgB;IACvB,MAAM,EAAE;QACN;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,IAAI;SACZ;QACD,4BAA4B;QAC5B;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,WAAW;SAClB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,YAAY;SACrB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,YAAY;SACzB;QACD,mFAAmF;QACnF,mFAAmF;QACnF,6CAA6C;QAC7C;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,cAAc;SACtB;QACD,eAAe;QACf,6CAA6C;QAC7C,iDAAiD;QACjD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,YAAY;SACrB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,IAAI;YACX,+BAA+B;YAC/B,UAAU,EAAE;gBACV,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;gBAChC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE;gBACjC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE;gBACpC,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,WAAW,EAAE;aACtC;SACF;QACD;YACE,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,EAAE;SACjB;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'flow_nodes',\n  // model: 'FlowNodeModel',\n  title: 'Workflow Nodes',\n  fields: [\n    {\n      interface: 'string',\n      type: 'string',\n      name: 'title',\n      title: '名称'\n    },\n    // which workflow belongs to\n    {\n      interface: 'linkTo',\n      name: 'workflow',\n      type: 'belongsTo',\n    },\n    {\n      interface: 'linkTo',\n      name: 'upstream',\n      type: 'belongsTo',\n      target: 'flow_nodes'\n    },\n    {\n      interface: 'linkTo',\n      name: 'branches',\n      type: 'hasMany',\n      target: 'flow_nodes',\n      sourceKey: 'id',\n      foreignKey: 'upstreamId',\n    },\n    // only works when upstream node is branching type, such as condition and parallel.\n    // put here because the design of flow-links model is not really necessary for now.\n    // or it should be put into flow-links model.\n    {\n      interface: 'select',\n      name: 'branchIndex',\n      type: 'integer',\n      title: 'branch index'\n    },\n    // for reasons:\n    // 1. redirect type node to solve cycle flow.\n    // 2. recognize as real next node after branches.\n    {\n      interface: 'linkTo',\n      name: 'downstream',\n      type: 'belongsTo',\n      target: 'flow_nodes'\n    },\n    {\n      interface: 'select',\n      type: 'string',\n      name: 'type',\n      title: '类型',\n      // TODO: data for test only now\n      dataSource: [\n        { label: '数据处理', value: 'data' },\n        { label: '数据查询', value: 'query' },\n        { label: '等待人工输入', value: 'prompt' },\n        { label: '条件判断', value: 'condition' },\n      ]\n    },\n    {\n      interface: 'json',\n      type: 'jsonb',\n      name: 'config',\n      title: '配置',\n      defaultValue: {}\n    }\n  ]\n} as CollectionOptions;\n"]}
+{"version":3,"file":"flow_nodes.js","sourceRoot":"","sources":["../../src/collections/flow_nodes.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,YAAY;IAClB,0BAA0B;IAC1B,KAAK,EAAE,gBAAgB;IACvB,MAAM,EAAE;QACN;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,IAAI;SACZ;QACD,4BAA4B;QAC5B;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,WAAW;SAClB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,YAAY;SACrB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,SAAS;YACf,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;YACf,UAAU,EAAE,YAAY;SACzB;QACD,mFAAmF;QACnF,mFAAmF;QACnF,6CAA6C;QAC7C;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,aAAa;YACnB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,cAAc;SACtB;QACD,qBAAqB;QACrB,6CAA6C;QAC7C,iDAAiD;QACjD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,YAAY;SACrB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,MAAM;YACZ,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,OAAO;YACb,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,EAAE;SACjB;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'flow_nodes',\n  // model: 'FlowNodeModel',\n  title: 'Workflow Nodes',\n  fields: [\n    {\n      interface: 'string',\n      type: 'string',\n      name: 'title',\n      title: '名称'\n    },\n    // which workflow belongs to\n    {\n      interface: 'linkTo',\n      name: 'workflow',\n      type: 'belongsTo',\n    },\n    {\n      interface: 'linkTo',\n      name: 'upstream',\n      type: 'belongsTo',\n      target: 'flow_nodes'\n    },\n    {\n      interface: 'linkTo',\n      name: 'branches',\n      type: 'hasMany',\n      target: 'flow_nodes',\n      sourceKey: 'id',\n      foreignKey: 'upstreamId',\n    },\n    // only works when upstream node is branching type, such as condition and parallel.\n    // put here because the design of flow-links model is not really necessary for now.\n    // or it should be put into flow-links model.\n    {\n      interface: 'select',\n      name: 'branchIndex',\n      type: 'integer',\n      title: 'branch index'\n    },\n    // Note: for reasons:\n    // 1. redirect type node to solve cycle flow.\n    // 2. recognize as real next node after branches.\n    {\n      interface: 'linkTo',\n      name: 'downstream',\n      type: 'belongsTo',\n      target: 'flow_nodes'\n    },\n    {\n      interface: 'select',\n      type: 'string',\n      name: 'type',\n      title: '类型'\n    },\n    {\n      interface: 'json',\n      type: 'jsonb',\n      name: 'config',\n      title: '配置',\n      defaultValue: {}\n    }\n  ]\n} as CollectionOptions;\n"]}

package/esm/collections/workflows.js

@@ -3,6 +3,10 @@ export default {
     model: 'WorkflowModel',
     title: '自动化',
     fields: [
+        {
+            name: 'key',
+            type: 'uid'
+        },
         {
             interface: 'string',
             type: 'string',
@@ -58,6 +62,25 @@ export default {
             name: 'executions',
             target: 'executions',
             title: '触发执行'
+        },
+        {
+            type: 'boolean',
+            name: 'executed',
+            defaultValue: false
+        },
+        {
+            type: 'boolean',
+            name: 'current',
+            defaultValue: false
+        },
+        {
+            type: 'hasMany',
+            name: 'revisions',
+            target: 'workflows',
+            foreignKey: 'key',
+            sourceKey: 'key',
+            // NOTE: no constraints needed here because tricky self-referencing
+            constraints: false
         }
     ]
 };

package/esm/collections/workflows.js.map

@@ -1 +1 @@
-{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/collections/workflows.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,eAAe;IACtB,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE;QACN;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;YACd,QAAQ,EAAE,IAAI;SACf;QACD;YACE,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,KAAK;SACpB;QACD;YACE,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;SACf;QACD;YACE,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,EAAE;SACjB;QACD;YACE,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,gBAAgB;YACtB,YAAY,EAAE,IAAI;SACnB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,MAAM;SACd;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,MAAM;SACd;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'workflows',\n  model: 'WorkflowModel',\n  title: '自动化',\n  fields: [\n    {\n      interface: 'string',\n      type: 'string',\n      name: 'title',\n      title: '工作流名称',\n      required: true\n    },\n    {\n      interface: 'boolean',\n      type: 'boolean',\n      name: 'enabled',\n      title: '启用',\n      defaultValue: false\n    },\n    {\n      interface: 'textarea',\n      type: 'text',\n      name: 'description',\n      title: '描述'\n    },\n    {\n      interface: 'select',\n      type: 'string',\n      title: '触发方式',\n      name: 'type',\n      required: true\n    },\n    {\n      interface: 'json',\n      type: 'jsonb',\n      title: '触发配置',\n      name: 'config',\n      required: true,\n      defaultValue: {}\n    },\n    {\n      interface: 'boolean',\n      type: 'boolean',\n      title: '使用事务',\n      name: 'useTransaction',\n      defaultValue: true\n    },\n    {\n      interface: 'linkTo',\n      type: 'hasMany',\n      name: 'nodes',\n      target: 'flow_nodes',\n      title: '流程节点'\n    },\n    {\n      interface: 'linkTo',\n      type: 'hasMany',\n      name: 'executions',\n      target: 'executions',\n      title: '触发执行'\n    }\n  ]\n} as CollectionOptions;\n"]}
+{"version":3,"file":"workflows.js","sourceRoot":"","sources":["../../src/collections/workflows.ts"],"names":[],"mappings":"AAEA,eAAe;IACb,IAAI,EAAE,WAAW;IACjB,KAAK,EAAE,eAAe;IACtB,KAAK,EAAE,KAAK;IACZ,MAAM,EAAE;QACN;YACE,IAAI,EAAE,KAAK;YACX,IAAI,EAAE,KAAK;SACZ;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,OAAO;YACd,QAAQ,EAAE,IAAI;SACf;QACD;YACE,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,IAAI;YACX,YAAY,EAAE,KAAK;SACpB;QACD;YACE,SAAS,EAAE,UAAU;YACrB,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,IAAI;SACZ;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,QAAQ;YACd,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;SACf;QACD;YACE,SAAS,EAAE,MAAM;YACjB,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,YAAY,EAAE,EAAE;SACjB;QACD;YACE,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,MAAM;YACb,IAAI,EAAE,gBAAgB;YACtB,YAAY,EAAE,IAAI;SACnB;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,MAAM;SACd;QACD;YACE,SAAS,EAAE,QAAQ;YACnB,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,YAAY;YAClB,MAAM,EAAE,YAAY;YACpB,KAAK,EAAE,MAAM;SACd;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,UAAU;YAChB,YAAY,EAAE,KAAK;SACpB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,SAAS;YACf,YAAY,EAAE,KAAK;SACpB;QACD;YACE,IAAI,EAAE,SAAS;YACf,IAAI,EAAE,WAAW;YACjB,MAAM,EAAE,WAAW;YACnB,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,KAAK;YAChB,mEAAmE;YACnE,WAAW,EAAE,KAAK;SACnB;KACF;CACmB,CAAC","sourcesContent":["import { CollectionOptions } from '@nocobase/database';\n\nexport default {\n  name: 'workflows',\n  model: 'WorkflowModel',\n  title: '自动化',\n  fields: [\n    {\n      name: 'key',\n      type: 'uid'\n    },\n    {\n      interface: 'string',\n      type: 'string',\n      name: 'title',\n      title: '工作流名称',\n      required: true\n    },\n    {\n      interface: 'boolean',\n      type: 'boolean',\n      name: 'enabled',\n      title: '启用',\n      defaultValue: false\n    },\n    {\n      interface: 'textarea',\n      type: 'text',\n      name: 'description',\n      title: '描述'\n    },\n    {\n      interface: 'select',\n      type: 'string',\n      title: '触发方式',\n      name: 'type',\n      required: true\n    },\n    {\n      interface: 'json',\n      type: 'jsonb',\n      title: '触发配置',\n      name: 'config',\n      required: true,\n      defaultValue: {}\n    },\n    {\n      interface: 'boolean',\n      type: 'boolean',\n      title: '使用事务',\n      name: 'useTransaction',\n      defaultValue: true\n    },\n    {\n      interface: 'linkTo',\n      type: 'hasMany',\n      name: 'nodes',\n      target: 'flow_nodes',\n      title: '流程节点'\n    },\n    {\n      interface: 'linkTo',\n      type: 'hasMany',\n      name: 'executions',\n      target: 'executions',\n      title: '触发执行'\n    },\n    {\n      type: 'boolean',\n      name: 'executed',\n      defaultValue: false\n    },\n    {\n      type: 'boolean',\n      name: 'current',\n      defaultValue: false\n    },\n    {\n      type: 'hasMany',\n      name: 'revisions',\n      target: 'workflows',\n      foreignKey: 'key',\n      sourceKey: 'key',\n      // NOTE: no constraints needed here because tricky self-referencing\n      constraints: false\n    }\n  ]\n} as CollectionOptions;\n"]}

package/esm/instructions/create.d.ts

@@ -1,7 +1,7 @@
 import FlowNodeModel from "../models/FlowNode";
 declare const _default: {
     run(this: FlowNodeModel, input: any, execution: any): Promise<{
-        result: import("@nocobase/database").Model<any, any>;
+        result: any;
         status: number;
     }>;
 };

package/esm/instructions/create.js

@@ -14,9 +14,10 @@ export default {
             const { collection, params = {} } = this.config;
             const repo = this.constructor.database.getRepository(collection);
             const options = execution.getParsedValue(params);
-            const result = yield repo.create(Object.assign(Object.assign({}, options), { transaction: execution.transaction }));
+            const result = yield repo.create(Object.assign(Object.assign({}, options), { transaction: execution.tx }));
             return {
-                result,
+                // NOTE: get() for non-proxied instance (#380)
+                result: result.get(),
                 status: JOB_STATUS.RESOLVED
             };
         });

package/esm/instructions/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/instructions/create.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,iCAC3B,OAAO,KACV,WAAW,EAAE,SAAS,CAAC,WAAW,IAClC,CAAC;YAEH,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAA","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await repo.create({\n      ...options,\n      transaction: execution.transaction\n    });\n\n    return {\n      result,\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n}\n"]}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../src/instructions/create.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,iCAC3B,OAAO,KACV,WAAW,EAAE,SAAS,CAAC,EAAE,IACzB,CAAC;YAEH,OAAO;gBACL,8CAA8C;gBAC9C,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE;gBACpB,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAA","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await repo.create({\n      ...options,\n      transaction: execution.tx\n    });\n\n    return {\n      // NOTE: get() for non-proxied instance (#380)\n      result: result.get(),\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n}\n"]}

package/esm/instructions/destroy.js

@@ -14,7 +14,7 @@ export default {
             const { collection, params = {} } = this.config;
             const repo = this.constructor.database.getRepository(collection);
             const options = execution.getParsedValue(params);
-            const result = yield repo.destroy(Object.assign(Object.assign({}, options), { transaction: execution.transaction }));
+            const result = yield repo.destroy(Object.assign(Object.assign({}, options), { transaction: execution.tx }));
             return {
                 result,
                 status: JOB_STATUS.RESOLVED

package/esm/instructions/destroy.js.map

@@ -1 +1 @@
-{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/instructions/destroy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,iCAC5B,OAAO,KACV,WAAW,EAAE,SAAS,CAAC,WAAW,IAClC,CAAC;YAEH,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAA","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await repo.destroy({\n      ...options,\n      transaction: execution.transaction\n    });\n\n    return {\n      result,\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n}\n"]}
+{"version":3,"file":"destroy.js","sourceRoot":"","sources":["../../src/instructions/destroy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,iCAC5B,OAAO,KACV,WAAW,EAAE,SAAS,CAAC,EAAE,IACzB,CAAC;YAEH,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAA","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await repo.destroy({\n      ...options,\n      transaction: execution.tx\n    });\n\n    return {\n      result,\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n}\n"]}

package/esm/instructions/parallel.js

@@ -78,7 +78,7 @@ export default {
                 status: StatusGetters[mode](newResult)
             });
             if (job.status === JOB_STATUS.PENDING) {
-                yield job.save({ transaction: execution.transaction });
+                yield job.save({ transaction: execution.tx });
                 return execution.end(this, job);
             }
             return job;

package/esm/instructions/parallel.js.map

@@ -1 +1 @@
-{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../src/instructions/parallel.ts"],"names":[],"mappings":"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","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport ExecutionModel from \"../models/Execution\";\nimport FlowNodeModel from \"../models/FlowNode\";\nimport JobModel from \"../models/Job\";\n\nexport const PARALLEL_MODE = {\n  ALL: 'all',\n  ANY: 'any',\n  RACE: 'race'\n} as const;\n\nconst StatusGetters = {\n  [PARALLEL_MODE.ALL](result) {\n    if (result.some(j => j && j.status === JOB_STATUS.REJECTED)) {\n      return JOB_STATUS.REJECTED;\n    }\n    if (result.every(j => j && j.status === JOB_STATUS.RESOLVED)) {\n      return JOB_STATUS.RESOLVED;\n    }\n    return JOB_STATUS.PENDING;\n  },\n  [PARALLEL_MODE.ANY](result) {\n    return result.some(j => j && j.status === JOB_STATUS.RESOLVED)\n      ? JOB_STATUS.RESOLVED\n      : (\n        result.some(j => j && j.status === JOB_STATUS.PENDING)\n          ? JOB_STATUS.PENDING\n          : JOB_STATUS.REJECTED\n      )\n  },\n  [PARALLEL_MODE.RACE](result) {\n    return result.some(j => j && j.status === JOB_STATUS.RESOLVED)\n      ? JOB_STATUS.RESOLVED\n      : (\n        result.some(j => j && j.status === JOB_STATUS.REJECTED)\n          ? JOB_STATUS.REJECTED\n          : JOB_STATUS.PENDING\n      )\n  }\n};\n\nexport default {\n  async run(this: FlowNodeModel, prevJob: JobModel, execution: ExecutionModel) {\n    const branches = execution.nodes\n      .filter(item => item.upstream === this && item.branchIndex !== null)\n      .sort((a, b) => a.branchIndex - b.branchIndex);\n\n    const job = await execution.saveJob({\n      status: JOB_STATUS.PENDING,\n      result: Array(branches.length).fill(null),\n      nodeId: this.id,\n      upstreamId: prevJob?.id ?? null\n    });\n\n    // NOTE:\n    // use `reduce` but not `Promise.all` here to avoid racing manupulating db.\n    // for users, this is almost equivalent to `Promise.all`,\n    // because of the delay is not significant sensible.\n    // another better aspect of this is, it could handle sequenced branches in future.\n    await branches.reduce((promise: Promise<any>, branch) => promise.then(() => execution.run(branch, job)), Promise.resolve());\n\n    return execution.end(this, job);\n  },\n\n  async resume(this, branchJob, execution: ExecutionModel) {\n    const job = execution.findBranchParentJob(branchJob, this);\n\n    const { result, status } = job;\n    // if parallel has been done (resolved / rejected), do not care newly executed branch jobs.\n    if (status !== JOB_STATUS.PENDING) {\n      return null;\n    }\n\n    // find the index of the node which start the branch\n    const jobNode = execution.nodesMap.get(branchJob.nodeId);\n    const { branchIndex } = execution.findBranchStartNode(jobNode);\n    const { mode = PARALLEL_MODE.ALL } = this.config || {};\n\n    const newResult = [...result.slice(0, branchIndex), branchJob.get(), ...result.slice(branchIndex + 1)];\n    job.set({\n      result: newResult,\n      status: StatusGetters[mode](newResult)\n    });\n\n    if (job.status === JOB_STATUS.PENDING) {\n      await job.save({ transaction: execution.transaction });\n      return execution.end(this, job);\n    }\n\n    return job;\n  }\n};\n"]}
+{"version":3,"file":"parallel.js","sourceRoot":"","sources":["../../src/instructions/parallel.ts"],"names":[],"mappings":"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","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport ExecutionModel from \"../models/Execution\";\nimport FlowNodeModel from \"../models/FlowNode\";\nimport JobModel from \"../models/Job\";\n\nexport const PARALLEL_MODE = {\n  ALL: 'all',\n  ANY: 'any',\n  RACE: 'race'\n} as const;\n\nconst StatusGetters = {\n  [PARALLEL_MODE.ALL](result) {\n    if (result.some(j => j && j.status === JOB_STATUS.REJECTED)) {\n      return JOB_STATUS.REJECTED;\n    }\n    if (result.every(j => j && j.status === JOB_STATUS.RESOLVED)) {\n      return JOB_STATUS.RESOLVED;\n    }\n    return JOB_STATUS.PENDING;\n  },\n  [PARALLEL_MODE.ANY](result) {\n    return result.some(j => j && j.status === JOB_STATUS.RESOLVED)\n      ? JOB_STATUS.RESOLVED\n      : (\n        result.some(j => j && j.status === JOB_STATUS.PENDING)\n          ? JOB_STATUS.PENDING\n          : JOB_STATUS.REJECTED\n      )\n  },\n  [PARALLEL_MODE.RACE](result) {\n    return result.some(j => j && j.status === JOB_STATUS.RESOLVED)\n      ? JOB_STATUS.RESOLVED\n      : (\n        result.some(j => j && j.status === JOB_STATUS.REJECTED)\n          ? JOB_STATUS.REJECTED\n          : JOB_STATUS.PENDING\n      )\n  }\n};\n\nexport default {\n  async run(this: FlowNodeModel, prevJob: JobModel, execution: ExecutionModel) {\n    const branches = execution.nodes\n      .filter(item => item.upstream === this && item.branchIndex !== null)\n      .sort((a, b) => a.branchIndex - b.branchIndex);\n\n    const job = await execution.saveJob({\n      status: JOB_STATUS.PENDING,\n      result: Array(branches.length).fill(null),\n      nodeId: this.id,\n      upstreamId: prevJob?.id ?? null\n    });\n\n    // NOTE:\n    // use `reduce` but not `Promise.all` here to avoid racing manupulating db.\n    // for users, this is almost equivalent to `Promise.all`,\n    // because of the delay is not significant sensible.\n    // another better aspect of this is, it could handle sequenced branches in future.\n    await branches.reduce((promise: Promise<any>, branch) => promise.then(() => execution.run(branch, job)), Promise.resolve());\n\n    return execution.end(this, job);\n  },\n\n  async resume(this, branchJob, execution: ExecutionModel) {\n    const job = execution.findBranchParentJob(branchJob, this);\n\n    const { result, status } = job;\n    // if parallel has been done (resolved / rejected), do not care newly executed branch jobs.\n    if (status !== JOB_STATUS.PENDING) {\n      return null;\n    }\n\n    // find the index of the node which start the branch\n    const jobNode = execution.nodesMap.get(branchJob.nodeId);\n    const { branchIndex } = execution.findBranchStartNode(jobNode);\n    const { mode = PARALLEL_MODE.ALL } = this.config || {};\n\n    const newResult = [...result.slice(0, branchIndex), branchJob.get(), ...result.slice(branchIndex + 1)];\n    job.set({\n      result: newResult,\n      status: StatusGetters[mode](newResult)\n    });\n\n    if (job.status === JOB_STATUS.PENDING) {\n      await job.save({ transaction: execution.tx });\n      return execution.end(this, job);\n    }\n\n    return job;\n  }\n};\n"]}

package/esm/instructions/query.js

@@ -14,7 +14,11 @@ export default {
             const { collection, multiple, params = {} } = this.config;
             const repo = this.constructor.database.getRepository(collection);
             const options = execution.getParsedValue(params);
-            const result = yield (multiple ? repo.find : repo.findOne).call(repo, Object.assign(Object.assign({}, options), { transaction: execution.transaction }));
+            const result = yield (multiple ? repo.find : repo.findOne).call(repo, Object.assign(Object.assign({}, options), { 
+                // NOTE: `raw` to avoid getting undefined value from Proxied model instance (#380)
+                // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false
+                // so the properties can not be get by json-templates(object-path)
+                raw: true, transaction: execution.tx }));
             return {
                 result,
                 status: JOB_STATUS.RESOLVED

package/esm/instructions/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/instructions/query.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,kCAC/D,OAAO,KACV,WAAW,EAAE,SAAS,CAAC,WAAW,IAClC,CAAC;YAEH,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAC","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      multiple,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await (multiple ? repo.find : repo.findOne).call(repo, {\n      ...options,\n      transaction: execution.transaction\n    });\n\n    return {\n      result,\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n};\n"]}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/instructions/query.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAG1C,eAAe;IACP,GAAG,CAAsB,KAAK,EAAE,SAAS;;YAC7C,MAAM,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,EAAE,EACZ,GAAG,IAAI,CAAC,MAAM,CAAC;YAEhB,MAAM,IAAI,GAA0B,IAAI,CAAC,WAAY,CAAC,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;YACzF,MAAM,OAAO,GAAG,SAAS,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,kCAC/D,OAAO;gBACV,kFAAkF;gBAClF,mEAAmE;gBACnE,kEAAkE;gBAClE,GAAG,EAAE,IAAI,EACT,WAAW,EAAE,SAAS,CAAC,EAAE,IACzB,CAAC;YAEH,OAAO;gBACL,MAAM;gBACN,MAAM,EAAE,UAAU,CAAC,QAAQ;aAC5B,CAAC;QACJ,CAAC;KAAA;CACF,CAAC","sourcesContent":["import { JOB_STATUS } from \"../constants\";\nimport FlowNodeModel from \"../models/FlowNode\";\n\nexport default {\n  async run(this: FlowNodeModel, input, execution) {\n    const {\n      collection,\n      multiple,\n      params = {}\n    } = this.config;\n\n    const repo = (<typeof FlowNodeModel>this.constructor).database.getRepository(collection);\n    const options = execution.getParsedValue(params);\n    const result = await (multiple ? repo.find : repo.findOne).call(repo, {\n      ...options,\n      // NOTE: `raw` to avoid getting undefined value from Proxied model instance (#380)\n      // e.g. Object.prototype.hasOwnProperty.call(result, 'id') // false\n      // so the properties can not be get by json-templates(object-path)\n      raw: true,\n      transaction: execution.tx\n    });\n\n    return {\n      result,\n      status: JOB_STATUS.RESOLVED\n    };\n  }\n};\n"]}

package/esm/instructions/update.d.ts

@@ -1,6 +1,7 @@
+import ExecutionModel from "../models/Execution";
 import FlowNodeModel from "../models/FlowNode";
 declare const _default: {
-    run(this: FlowNodeModel, input: any, execution: any): Promise<{
+    run(this: FlowNodeModel, input: any, execution: ExecutionModel): Promise<{
         result: import("@nocobase/database").Model<any, any> | import("@nocobase/database").Model<any, any>[];
         status: number;
     }>;