@nocobase/plugin-workflow 1.5.0-alpha.5 → 1.6.0-alpha.1

package/dist/client/triggers/collection.d.ts

@@ -10,6 +10,7 @@
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
 import { useWorkflowAnyExecuted } from '../hooks';
 import { Trigger } from '.';
+import { TriggerCollectionRecordSelect } from '../components/TriggerCollectionRecordSelect';
 declare function useVariables(config: any, options: any): import("../variable").VariableOption[];
 export default class extends Trigger {
     title: string;
@@ -117,7 +118,20 @@ export default class extends Trigger {
     };
     components: {
         FieldsSelect: import("react").MemoExoticComponent<import("@formily/reactive-react").ReactFC<Omit<any, "ref">>>;
+        TriggerCollectionRecordSelect: typeof TriggerCollectionRecordSelect;
     };
+    triggerFieldset: {
+        data: {
+            type: string;
+            title: string;
+            description: string;
+            'x-decorator': string;
+            'x-component': string;
+            default: any;
+            required: boolean;
+        };
+    };
+    validate(values: any): any;
     useVariables: typeof useVariables;
     useInitializers(config: any): SchemaInitializerItemType | null;
 }

package/dist/client/triggers/index.d.ts

@@ -15,9 +15,9 @@ export declare abstract class Trigger {
     title: string;
     description?: string;
     useVariables?(config: Record<string, any>, options?: UseVariableOptions): VariableOption[];
-    fieldset: {
-        [key: string]: ISchema;
-    };
+    fieldset: Record<string, ISchema>;
+    triggerFieldset?: Record<string, ISchema>;
+    validate(config: Record<string, any>): boolean;
     view?: ISchema;
     scope?: {
         [key: string]: any;

package/dist/client/triggers/schedule/ScheduleModes.d.ts

@@ -0,0 +1,167 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+export declare const ScheduleModes: {
+    [x: number]: {
+        fieldset: {
+            startsOn: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    showTime: boolean;
+                };
+                required: boolean;
+                'x-reactions'?: undefined;
+            };
+            repeat: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-reactions': {
+                    target: string;
+                    fulfill: {
+                        state: {
+                            visible: string;
+                        };
+                    };
+                }[];
+            };
+            endsOn: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    showTime: boolean;
+                };
+            };
+            limit: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    placeholder: string;
+                    min: number;
+                };
+            };
+            collection?: undefined;
+            appends?: undefined;
+        };
+        triggerFieldset: {
+            date: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    showTime: boolean;
+                    placeholder: string;
+                };
+            };
+            data?: undefined;
+        };
+    } | {
+        fieldset: {
+            collection: {
+                'x-component-props': {
+                    dataSourceFilter(item: any): any;
+                };
+                'x-reactions': any[];
+                type: string;
+                title: string;
+                required: boolean;
+                'x-decorator': string;
+                'x-component': string;
+            };
+            startsOn: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-reactions': {
+                    target: string;
+                    fulfill: {
+                        state: {
+                            visible: string;
+                        };
+                    };
+                }[];
+                required: boolean;
+                'x-component-props'?: undefined;
+            };
+            repeat: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-reactions': {
+                    target: string;
+                    fulfill: {
+                        state: {
+                            visible: string;
+                        };
+                    };
+                }[];
+            };
+            endsOn: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props'?: undefined;
+            };
+            limit: {
+                type: string;
+                title: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    placeholder: string;
+                    min: number;
+                };
+            };
+            appends: {
+                'x-reactions': {
+                    dependencies: string[];
+                    fulfill: {
+                        state: {
+                            visible: string;
+                        };
+                    };
+                }[];
+                type: string;
+                title: string;
+                description: string;
+                'x-decorator': string;
+                'x-component': string;
+                'x-component-props': {
+                    title: string;
+                    multiple: boolean;
+                    useCollection(): any;
+                };
+            };
+        };
+        triggerFieldset: {
+            data: {
+                type: string;
+                title: string;
+                description: string;
+                'x-decorator': string;
+                'x-component': string;
+                default: any;
+                required: boolean;
+            };
+            date?: undefined;
+        };
+        validate(config: any): any;
+    };
+};

package/dist/client/triggers/schedule/TriggerScheduleConfig.d.ts

@@ -0,0 +1,10 @@
+/**
+ * This file is part of the NocoBase (R) project.
+ * Copyright (c) 2020-2024 NocoBase Co., Ltd.
+ * Authors: NocoBase Team.
+ *
+ * This project is dual-licensed under AGPL-3.0 and NocoBase Commercial License.
+ * For more information, please refer to: https://www.nocobase.com/agreement.
+ */
+import React from 'react';
+export declare function TriggerScheduleConfig(): React.JSX.Element;

package/dist/client/triggers/schedule/index.d.ts

@@ -9,6 +9,8 @@
 /// <reference types="react" />
 import { SchemaInitializerItemType, useCollectionDataSource } from '@nocobase/client';
 import { Trigger } from '..';
+import { TriggerScheduleConfig } from './TriggerScheduleConfig';
+import { TriggerCollectionRecordSelect } from '../../components/TriggerCollectionRecordSelect';
 declare function useVariables(config: any, opts: any): any[];
 export default class extends Trigger {
     sync: boolean;
@@ -21,11 +23,20 @@ export default class extends Trigger {
             'x-component-props': {};
         };
     };
+    triggerFieldset: {
+        proxy: {
+            type: string;
+            'x-component': string;
+        };
+    };
+    validate(config: any): any;
     scope: {
         useCollectionDataSource: typeof useCollectionDataSource;
     };
     components: {
         ScheduleConfig: () => import("react").JSX.Element;
+        TriggerScheduleConfig: typeof TriggerScheduleConfig;
+        TriggerCollectionRecordSelect: typeof TriggerCollectionRecordSelect;
     };
     useVariables: typeof useVariables;
     useInitializers(config: any): SchemaInitializerItemType | null;

package/dist/externalVersion.js

@@ -11,24 +11,24 @@ module.exports = {
   "react": "18.2.0",
   "@formily/core": "2.3.0",
   "@formily/react": "2.3.0",
-  "@nocobase/client": "1.5.0-alpha.5",
-  "@nocobase/utils": "1.5.0-alpha.5",
+  "@nocobase/client": "1.6.0-alpha.1",
+  "@nocobase/utils": "1.6.0-alpha.1",
   "antd": "5.12.8",
   "@ant-design/icons": "5.2.6",
   "react-router-dom": "6.21.0",
   "react-i18next": "11.18.6",
   "@formily/shared": "2.3.2",
   "lodash": "4.17.21",
-  "@nocobase/database": "1.5.0-alpha.5",
-  "@nocobase/server": "1.5.0-alpha.5",
-  "@nocobase/logger": "1.5.0-alpha.5",
-  "@nocobase/evaluators": "1.5.0-alpha.5",
+  "@nocobase/database": "1.6.0-alpha.1",
+  "@nocobase/server": "1.6.0-alpha.1",
+  "@nocobase/logger": "1.6.0-alpha.1",
+  "@nocobase/actions": "1.6.0-alpha.1",
+  "@nocobase/data-source-manager": "1.6.0-alpha.1",
+  "@nocobase/evaluators": "1.6.0-alpha.1",
   "@formily/antd-v5": "1.1.9",
   "@formily/reactive": "2.3.0",
-  "@nocobase/actions": "1.5.0-alpha.5",
   "dayjs": "1.11.10",
-  "@nocobase/data-source-manager": "1.5.0-alpha.5",
   "sequelize": "6.35.2",
-  "@nocobase/plugin-workflow-test": "1.5.0-alpha.5",
-  "@nocobase/test": "1.5.0-alpha.5"
+  "@nocobase/plugin-workflow-test": "1.6.0-alpha.1",
+  "@nocobase/test": "1.6.0-alpha.1"
 };

package/dist/locale/zh-CN.json

@@ -16,6 +16,15 @@
   "Duplicate": "复制",
   "Duplicate to new workflow": "复制为新工作流",
   "Delete a main version will cause all other revisions to be deleted too.": "删除主版本将导致其他版本一并被删除。",
+  "Execute manually": "手动执行",
+  "The trigger is not configured correctly, please check the trigger configuration.": "触发器配置不正确，请检查触发器配置。",
+  "This type of trigger has not been supported to be executed manually.": "该类型的触发器暂未支持手动执行。",
+  "Trigger variables need to be filled for executing.": "执行需要填写触发器变量。",
+  "A new version will be created automatically after execution if current version is not executed.": "如果当前版本还未执行过，将在执行后自动创建一个新版本。",
+  "This will perform all the actions configured in the workflow. Are you sure you want to continue?": "将按照工作流中配置的所有操作执行，确定继续吗？",
+  "Automatically create a new version after execution": "执行后自动创建新版本",
+  "Workflow executed, the result status is <1>{{statusText}}</1><2>View the execution</2>": "工作流已执行，结果状态为 <1>{{statusText}}</1><2>查看执行详情</2>",
+
   "Loading": "加载中",
   "Load failed": "加载失败",
   "Use transaction": "启用事务",
@@ -64,6 +73,8 @@
   "Preload associations": "预加载关联数据",
   "Please select the associated fields that need to be accessed in subsequent nodes. With more than two levels of to-many associations may cause performance issue, please use with caution.":
     "请选中需要在后续节点中被访问的关系字段。超过两层的对多关联可能会导致性能问题，请谨慎使用。",
+  "Choose a record of the collection to trigger.": "选择数据表中的一行记录来触发。",
+
   "Schedule event": "定时任务",
   "Triggered according to preset time conditions. Suitable for one-time or periodic tasks, such as sending notifications and cleaning data on a schedule.": "按预设的时间条件定时触发。适用于一次性或周期性的任务，如定时发送通知、清理数据等。",
   "Trigger mode": "触发模式",
@@ -92,6 +103,9 @@
   "By field": "数据表字段",
   "By custom date": "自定义时间",
   "Advanced": "高级模式",
+  "Execute on": "执行时间",
+  "Current time": "当前时间",
+
   "End": "结束",
   "Node result": "节点数据",
   "Variable key of node": "节点变量标识",

package/dist/node_modules/cron-parser/package.json

@@ -1 +1 @@
-{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2024-11-23T15:57:17.219Z"}
+{"name":"cron-parser","version":"4.4.0","description":"Node.js library for parsing crontab instructions","main":"lib/parser.js","types":"index.d.ts","typesVersions":{"<4.1":{"*":["types/ts3/*"]}},"directories":{"test":"test"},"scripts":{"test:tsd":"tsd","test:unit":"TZ=UTC tap ./test/*.js","test:cover":"TZ=UTC tap --coverage-report=html ./test/*.js","lint":"eslint .","lint:fix":"eslint --fix .","test":"npm run lint && npm run test:unit && npm run test:tsd"},"repository":{"type":"git","url":"https://github.com/harrisiirak/cron-parser.git"},"keywords":["cron","crontab","parser"],"author":"Harri Siirak","contributors":["Nicholas Clawson","Daniel Prentis <daniel@salsitasoft.com>","Renault John Lecoultre","Richard Astbury <richard.astbury@gmail.com>","Meaglin Wasabi <Meaglin.wasabi@gmail.com>","Mike Kusold <hello@mikekusold.com>","Alex Kit <alex.kit@atmajs.com>","Santiago Gimeno <santiago.gimeno@gmail.com>","Daniel <darc.tec@gmail.com>","Christian Steininger <christian.steininger.cs@gmail.com>","Mykola Piskovyi <m.piskovyi@gmail.com>","Brian Vaughn <brian.david.vaughn@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Yasuhiroki <yasuhiroki.duck@gmail.com>","Nicholas Clawson <nickclaw@gmail.com>","Brendan Warkentin <faazshift@gmail.com>","Charlie Fish <fishcharlie.code@gmail.com>","Ian Graves <ian+diskimage@iangrav.es>","Andy Thompson <me@andytson.com>","Regev Brody <regevbr@gmail.com>"],"license":"MIT","dependencies":{"luxon":"^1.28.0"},"devDependencies":{"eslint":"^8.2.0","sinon":"^10.0.0","tap":"^16.0.1","tsd":"^0.19.0"},"engines":{"node":">=0.8"},"browser":{"fs":false},"tap":{"check-coverage":false},"tsd":{"directory":"test","compilerOptions":{"lib":["es2017","dom"]}},"_lastModified":"2024-12-03T15:36:12.566Z"}

package/dist/node_modules/lru-cache/package.json

@@ -1 +1 @@
-{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2024-11-23T15:57:16.824Z"}
+{"name":"lru-cache","description":"A cache object that deletes the least-recently-used items.","version":"8.0.5","author":"Isaac Z. Schlueter <i@izs.me>","keywords":["mru","lru","cache"],"sideEffects":false,"scripts":{"build":"npm run prepare","preprepare":"rm -rf dist","prepare":"tsc -p tsconfig.json && tsc -p tsconfig-esm.json","postprepare":"bash fixup.sh","pretest":"npm run prepare","presnap":"npm run prepare","test":"c8 tap","snap":"c8 tap","preversion":"npm test","postversion":"npm publish","prepublishOnly":"git push origin --follow-tags","format":"prettier --write .","typedoc":"typedoc --tsconfig tsconfig-esm.json ./src/*.ts","benchmark-results-typedoc":"bash scripts/benchmark-results-typedoc.sh","prebenchmark":"npm run prepare","benchmark":"make -C benchmark","preprofile":"npm run prepare","profile":"make -C benchmark profile"},"main":"./dist/cjs/index-cjs.js","module":"./dist/mjs/index.js","types":"./dist/mjs/index.d.ts","exports":{"./min":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.min.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index.min.js"}},".":{"import":{"types":"./dist/mjs/index.d.ts","default":"./dist/mjs/index.js"},"require":{"types":"./dist/cjs/index.d.ts","default":"./dist/cjs/index-cjs.js"}}},"repository":"git://github.com/isaacs/node-lru-cache.git","devDependencies":{"@size-limit/preset-small-lib":"^7.0.8","@types/node":"^17.0.31","@types/tap":"^15.0.6","benchmark":"^2.1.4","c8":"^7.11.2","clock-mock":"^1.0.6","esbuild":"^0.17.11","eslint-config-prettier":"^8.5.0","marked":"^4.2.12","mkdirp":"^2.1.5","prettier":"^2.6.2","size-limit":"^7.0.8","tap":"^16.3.4","ts-node":"^10.7.0","tslib":"^2.4.0","typedoc":"^0.23.24","typescript":"^4.6.4"},"license":"ISC","files":["dist"],"engines":{"node":">=16.14"},"prettier":{"semi":false,"printWidth":70,"tabWidth":2,"useTabs":false,"singleQuote":true,"jsxSingleQuote":false,"bracketSameLine":true,"arrowParens":"avoid","endOfLine":"lf"},"tap":{"coverage":false,"node-arg":["--expose-gc","--no-warnings","--loader","ts-node/esm"],"ts":false},"size-limit":[{"path":"./dist/mjs/index.js"}],"_lastModified":"2024-12-03T15:36:12.178Z"}

package/dist/server/Plugin.d.ts

@@ -15,11 +15,13 @@ import { CustomFunction } from './functions';
 import Trigger from './triggers';
 import { InstructionInterface } from './instructions';
 import type { ExecutionModel, WorkflowModel } from './types';
+import { Context } from '@nocobase/actions';
 type ID = number | string;
-type EventOptions = {
+export type EventOptions = {
     eventKey?: string;
     context?: any;
     deferred?: boolean;
+    manually?: boolean;
     [key: string]: any;
 } & Transactionable;
 export default class PluginWorkflowServer extends Plugin {
@@ -55,6 +57,7 @@ export default class PluginWorkflowServer extends Plugin {
     }): void;
     private initTriggers;
     private initInstructions;
+    beforeLoad(): Promise<void>;
     /**
      * @internal
      */
@@ -73,6 +76,7 @@ export default class PluginWorkflowServer extends Plugin {
     private prepare;
     private dispatch;
     private process;
+    execute(workflow: WorkflowModel, context: Context, options?: EventOptions): Promise<void | Processor>;
     /**
      * @experimental
      * @param {string} dataSourceName

package/dist/server/Plugin.js

@@ -58,6 +58,7 @@ var import_CreateInstruction = __toESM(require("./instructions/CreateInstruction
 var import_DestroyInstruction = __toESM(require("./instructions/DestroyInstruction"));
 var import_QueryInstruction = __toESM(require("./instructions/QueryInstruction"));
 var import_UpdateInstruction = __toESM(require("./instructions/UpdateInstruction"));
+var import_WorkflowRepository = __toESM(require("./repositories/WorkflowRepository"));
 class PluginWorkflowServer extends import_server.Plugin {
   instructions = new import_utils.Registry();
   triggers = new import_utils.Registry();
@@ -75,19 +76,6 @@ class PluginWorkflowServer extends import_server.Plugin {
     const Model = instance.constructor;
     if (instance.enabled) {
       instance.set("current", true);
-    } else if (!instance.current) {
-      const count = await Model.count({
-        where: {
-          key: instance.key
-        },
-        transaction
-      });
-      if (!count) {
-        instance.set("current", true);
-      }
-    }
-    if (!instance.changed("enabled") || !instance.enabled) {
-      return;
     }
     const previous = await Model.findOne({
       where: {
@@ -99,7 +87,10 @@ class PluginWorkflowServer extends import_server.Plugin {
       },
       transaction
     });
-    if (previous) {
+    if (!previous) {
+      instance.set("current", true);
+    }
+    if (instance.current && previous) {
       await previous.update(
         { enabled: false, current: null },
         {
@@ -198,6 +189,11 @@ class PluginWorkflowServer extends import_server.Plugin {
       this.registerInstruction(name, instruction);
     }
   }
+  async beforeLoad() {
+    this.db.registerRepositories({
+      WorkflowRepository: import_WorkflowRepository.default
+    });
+  }
   /**
    * @internal
    */
@@ -322,20 +318,20 @@ class PluginWorkflowServer extends import_server.Plugin {
   }
   trigger(workflow, context, options = {}) {
     const logger = this.getLogger(workflow.id);
-    if (!workflow.enabled) {
-      logger.warn(`workflow ${workflow.id} is not enabled, event will be ignored`);
-      return;
-    }
     if (!this.ready) {
       logger.warn(`app is not ready, event of workflow ${workflow.id} will be ignored`);
       logger.debug(`ignored event data:`, context);
       return;
     }
+    if (!options.manually && !workflow.enabled) {
+      logger.warn(`workflow ${workflow.id} is not enabled, event will be ignored`);
+      return;
+    }
     if (context == null) {
       logger.warn(`workflow ${workflow.id} event data context is null, event will be ignored`);
       return;
     }
-    if (this.isWorkflowSync(workflow)) {
+    if (options.manually || this.isWorkflowSync(workflow)) {
       return this.triggerSync(workflow, context, options);
     }
     const { transaction, ...rest } = options;
@@ -388,11 +384,13 @@ class PluginWorkflowServer extends import_server.Plugin {
     return new import_Processor.default(execution, { ...options, plugin: this });
   }
   async createExecution(workflow, context, options) {
-    const { transaction = await this.db.sequelize.transaction(), deferred } = options;
+    const { deferred } = options;
+    const transaction = await this.useDataSourceTransaction("main", options.transaction, true);
+    const sameTransaction = options.transaction === transaction;
     const trigger = this.triggers.get(workflow.type);
     const valid = await trigger.validateEvent(workflow, context, { ...options, transaction });
     if (!valid) {
-      if (!options.transaction) {
+      if (!sameTransaction) {
         await transaction.commit();
       }
       return null;
@@ -409,7 +407,7 @@ class PluginWorkflowServer extends import_server.Plugin {
         { transaction }
       );
     } catch (err) {
-      if (!options.transaction) {
+      if (!sameTransaction) {
         await transaction.rollback();
       }
       throw err;
@@ -430,7 +428,7 @@ class PluginWorkflowServer extends import_server.Plugin {
         transaction
       }
     );
-    if (!options.transaction) {
+    if (!sameTransaction) {
       await transaction.commit();
     }
     execution.workflow = workflow;
@@ -527,6 +525,16 @@ class PluginWorkflowServer extends import_server.Plugin {
     }
     return processor;
   }
+  async execute(workflow, context, options = {}) {
+    const trigger = this.triggers.get(workflow.type);
+    if (!trigger) {
+      throw new Error(`trigger type "${workflow.type}" of workflow ${workflow.id} is not registered`);
+    }
+    if (!trigger.execute) {
+      throw new Error(`"execute" method of trigger ${workflow.type} is not implemented`);
+    }
+    return trigger.execute(workflow, context, options);
+  }
   /**
    * @experimental
    * @param {string} dataSourceName

package/dist/server/actions/workflows.d.ts

@@ -11,4 +11,9 @@ export declare function update(context: Context, next: any): Promise<void>;
 export declare function destroy(context: Context, next: any): Promise<void>;
 export declare function revision(context: Context, next: any): Promise<void>;
 export declare function sync(context: Context, next: any): Promise<void>;
+/**
+ * @deprecated
+ * Keep for action trigger compatibility
+ */
 export declare function trigger(context: Context, next: any): Promise<any>;
+export declare function execute(context: Context, next: any): Promise<any>;

package/dist/server/actions/workflows.js

@@ -37,6 +37,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var workflows_exports = {};
 __export(workflows_exports, {
   destroy: () => destroy,
+  execute: () => execute,
   revision: () => revision,
   sync: () => sync,
   trigger: () => trigger,
@@ -90,69 +91,13 @@ async function destroy(context, next) {
   next();
 }
 async function revision(context, next) {
-  const plugin = context.app.getPlugin(import_Plugin.default);
   const repository = import_actions.utils.getRepositoryFromParams(context);
   const { filterByTk, filter = {}, values = {} } = context.action.params;
-  context.body = await context.db.sequelize.transaction(async (transaction) => {
-    const origin = await repository.findOne({
-      filterByTk,
-      filter,
-      appends: ["nodes"],
-      context,
-      transaction
-    });
-    const trigger2 = plugin.triggers.get(origin.type);
-    const revisionData = filter.key ? {
-      key: filter.key,
-      title: origin.title,
-      triggerTitle: origin.triggerTitle,
-      allExecuted: origin.allExecuted
-    } : values;
-    const instance = await repository.create({
-      values: {
-        title: `${origin.title} copy`,
-        description: origin.description,
-        ...revisionData,
-        sync: origin.sync,
-        type: origin.type,
-        config: typeof trigger2.duplicateConfig === "function" ? await trigger2.duplicateConfig(origin, { transaction }) : origin.config
-      },
-      transaction
-    });
-    const originalNodesMap = /* @__PURE__ */ new Map();
-    origin.nodes.forEach((node) => {
-      originalNodesMap.set(node.id, node);
-    });
-    const oldToNew = /* @__PURE__ */ new Map();
-    const newToOld = /* @__PURE__ */ new Map();
-    for await (const node of origin.nodes) {
-      const instruction = plugin.instructions.get(node.type);
-      const newNode = await instance.createNode(
-        {
-          type: node.type,
-          key: node.key,
-          config: typeof instruction.duplicateConfig === "function" ? await instruction.duplicateConfig(node, { transaction }) : node.config,
-          title: node.title,
-          branchIndex: node.branchIndex
-        },
-        { transaction }
-      );
-      oldToNew.set(node.id, newNode);
-      newToOld.set(newNode.id, node);
-    }
-    for await (const [oldId, newNode] of oldToNew.entries()) {
-      const oldNode = originalNodesMap.get(oldId);
-      const newUpstream = oldNode.upstreamId ? oldToNew.get(oldNode.upstreamId) : null;
-      const newDownstream = oldNode.downstreamId ? oldToNew.get(oldNode.downstreamId) : null;
-      await newNode.update(
-        {
-          upstreamId: (newUpstream == null ? void 0 : newUpstream.id) ?? null,
-          downstreamId: (newDownstream == null ? void 0 : newDownstream.id) ?? null
-        },
-        { transaction }
-      );
-    }
-    return instance;
+  context.body = await repository.revision({
+    filterByTk,
+    filter,
+    values,
+    context
   });
   await next();
 }
@@ -174,9 +119,59 @@ async function sync(context, next) {
 async function trigger(context, next) {
   return next();
 }
+async function execute(context, next) {
+  const plugin = context.app.pm.get(import_Plugin.default);
+  const { filterByTk, autoRevision } = context.action.params;
+  if (!filterByTk) {
+    return context.throw(400, "filterByTk is required");
+  }
+  const id = Number.parseInt(filterByTk, 10);
+  if (Number.isNaN(id)) {
+    return context.throw(400, "filterByTk is invalid");
+  }
+  const repository = import_actions.utils.getRepositoryFromParams(context);
+  const workflow = plugin.enabledCache.get(id) || await repository.findOne({ filterByTk });
+  if (!workflow) {
+    return context.throw(404, "workflow not found");
+  }
+  const { executed } = workflow;
+  let processor;
+  try {
+    processor = await plugin.execute(workflow, context, { manually: true });
+    if (!processor) {
+      return context.throw(400, "workflow not triggered");
+    }
+  } catch (ex) {
+    return context.throw(400, ex.message);
+  }
+  context.action.mergeParams({
+    filter: { key: workflow.key }
+  });
+  let newVersion;
+  if (!executed && autoRevision) {
+    newVersion = await repository.revision({
+      filterByTk: workflow.id,
+      filter: { key: workflow.key },
+      values: {
+        current: workflow.current,
+        enabled: workflow.enabled
+      },
+      context
+    });
+  }
+  context.body = {
+    execution: {
+      id: processor.execution.id,
+      status: processor.execution.status
+    },
+    newVersionId: newVersion == null ? void 0 : newVersion.id
+  };
+  return next();
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   destroy,
+  execute,
   revision,
   sync,
   trigger,