@ldsg/workflow 0.3.8 → 0.3.10

package/dist/__tests__/unit/resource.js

@@ -1,80 +1,80 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const resource_1 = require("../../resource");
-const numberIdList = ["1", "2", "3", "4", "5"];
+const numberIdList = ['1', '2', '3', '4', '5'];
 const nodeIdList = numberIdList.map((id) => `node-${id}`);
 const nodes = nodeIdList.map((nodeId) => {
     const workflowNodeExecute = async (params) => {
         const { variables: workflowNodeInputVariables } = params;
         const workflowNodeOutputVariables = workflowNodeInputVariables;
         const res = {
-            variables: workflowNodeOutputVariables,
+            variables: workflowNodeOutputVariables
         };
         return res;
     };
     let input;
     let output;
     switch (nodeId) {
-        case "node-1": {
+        case 'node-1': {
             input = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        "x-expression": "hello",
-                    },
-                },
+                        type: 'string',
+                        'x-expression': 'hello'
+                    }
+                }
             };
             output = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        "x-expression": "hello",
-                    },
-                },
+                        type: 'string',
+                        'x-expression': 'hello'
+                    }
+                }
             };
             break;
         }
-        case "node-5": {
+        case 'node-5': {
             input = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        "x-expression": `$."node-1".hello`,
-                    },
-                },
+                        type: 'string',
+                        'x-expression': `$."node-1".hello`
+                    }
+                }
             };
             output = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        "x-expression": "hello",
-                    },
-                },
+                        type: 'string',
+                        'x-expression': 'hello'
+                    }
+                }
             };
             break;
         }
         default: {
             input = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        default: "other",
-                    },
-                },
+                        type: 'string',
+                        default: 'other'
+                    }
+                }
             };
             output = {
-                type: "object",
+                type: 'object',
                 properties: {
                     hello: {
-                        type: "string",
-                        default: "other",
-                    },
-                },
+                        type: 'string',
+                        default: 'other'
+                    }
+                }
             };
             break;
         }
@@ -82,39 +82,39 @@ const nodes = nodeIdList.map((nodeId) => {
     const res = {
         id: nodeId,
         propertiesSchema: {
-            type: "object",
+            type: 'object',
             properties: {
                 input,
-                output,
-            },
+                output
+            }
         },
-        execute: workflowNodeExecute,
+        execute: workflowNodeExecute
     };
     return res;
 });
 const workflowData = {
     edges: [
         {
-            sourceWorkflowNodeResourceId: "node-1",
-            targetWorkflowNodeResourceId: "node-2",
+            sourceWorkflowNodeResourceId: 'node-1',
+            targetWorkflowNodeResourceId: 'node-2'
         },
         {
-            sourceWorkflowNodeResourceId: "node-2",
-            targetWorkflowNodeResourceId: "node-3",
+            sourceWorkflowNodeResourceId: 'node-2',
+            targetWorkflowNodeResourceId: 'node-3'
         },
         {
-            sourceWorkflowNodeResourceId: "node-3",
-            targetWorkflowNodeResourceId: "node-4",
+            sourceWorkflowNodeResourceId: 'node-3',
+            targetWorkflowNodeResourceId: 'node-4'
         },
         {
-            sourceWorkflowNodeResourceId: "node-4",
-            targetWorkflowNodeResourceId: "node-5",
-        },
+            sourceWorkflowNodeResourceId: 'node-4',
+            targetWorkflowNodeResourceId: 'node-5'
+        }
     ],
-    nodes,
+    nodes
 };
 const getWorkflowDataRes = {
-    workflowData,
+    workflowData
 };
 class TestWorkflowResource extends resource_1.WorkflowResource {
     constructor() {
@@ -124,26 +124,27 @@ class TestWorkflowResource extends resource_1.WorkflowResource {
         };
     }
 }
-test("WorkflowResource execute", async () => {
+test('WorkflowResource execute', async () => {
     const testWorkflowResource = new TestWorkflowResource({
-        id: "test",
-        kind: "workflow",
-        parentId: "root",
+        id: 'test',
+        kind: 'workflow',
+        parentId: 'root',
         settings: {
-            title: "",
-            description: "",
-            startWorkflowNodeResourceId: "node-1",
-            endWorkflowNodeResourceId: "node-5",
-        },
+            title: '',
+            description: '',
+            startWorkflowNodeResourceId: 'node-1',
+            endWorkflowNodeResourceId: 'node-5'
+        }
     });
     const workflowInputVariables = {
-        hello: "world",
+        hello: 'world'
     };
     const workflowOutputVariables = {
-        hello: "world",
+        hello: 'world'
     };
     const { variables } = await testWorkflowResource.execute({
-        variables: workflowInputVariables,
+        context: {},
+        variables: workflowInputVariables
     });
     expect(variables).toMatchObject(workflowOutputVariables);
 });

package/dist/constants.d.ts

@@ -1,6 +1,6 @@
-import { HandlerSpecificResourceSettings } from "@ldsg/handler";
-import { ResourceDefinitionSpecificResourceSettings } from "@ldsg/resource-definition";
-import { GeneralResourceSettings } from "@ldsg/types";
+import { HandlerSpecificResourceSettings } from '@ldsg/handler';
+import { ResourceDefinitionSpecificResourceSettings } from '@ldsg/resource-definition';
+import { GeneralResourceSettings } from '@ldsg/types';
 /**
  * Instantiate Resource Handler General Resource Settings
  * 实例化资源处理程序普通资源配置

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,sDAAsD,EAAE,uBAIlE,CAAC;AAEJ;;;;GAIG;AACH,eAAO,MAAM,uDAAuD,EAAE,+BAQnE,CAAC;AAEJ,eAAO,MAAM,6CAA6C,EAAE,uBAIzD,CAAC;AAEJ,eAAO,MAAM,8CAA8C,EAAE,0CAI1D,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,iEAAiE;;;CAIlE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,EAAE,0CAA0C,EAAE,MAAM,2BAA2B,CAAC;AACvF,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AAEtD;;;GAGG;AACH,eAAO,MAAM,sDAAsD,EAAE,uBAGpE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uDAAuD,EAAE,+BAOrE,CAAC;AAEF,eAAO,MAAM,6CAA6C,EAAE,uBAG3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAG5D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,iEAAiE;;;CAGpE,CAAC"}

package/dist/constants.js

@@ -7,8 +7,8 @@ const constants_1 = require("@ldsg/constants");
  * 实例化资源处理程序普通资源配置
  */
 exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = {
-    title: "工作流实例化资源处理程序",
-    description: "",
+    title: '工作流实例化资源处理程序',
+    description: ''
 };
 /**
  * Instantiate Resource Handler Specific Resource Settings
@@ -19,22 +19,22 @@ exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = {
     code: `export * from "@ldsg/workflow";`,
     dependencies: [
         {
-            name: "@ldsg/workflow",
-        },
-    ],
+            name: '@ldsg/workflow'
+        }
+    ]
 };
 exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = {
-    title: "工作流资源定义",
-    description: "",
+    title: '工作流资源定义',
+    description: ''
 };
 exports.RESOURCE_DEFINITION_SPECIFIC_RESOURCE_SETTINGS = {
-    kind: "workflow",
-    parentKind: constants_1.ROOT_RESOURCE_KIND,
+    kind: 'workflow',
+    parentKind: constants_1.ROOT_RESOURCE_KIND
 };
 /**
  * Specific Workflow Node Type Id Map
  */
 exports.SPECIFIC_WORKFLOW_NODE_TYPE_TO_WORKFLOW_NODE_TYPE_RESOURCE_ID_MAP = {
-    start: "start-workflow-node-type",
-    end: "end-workflow-node-type",
+    start: 'start-workflow-node-type',
+    end: 'end-workflow-node-type'
 };

package/dist/handler.d.ts

@@ -1,8 +1,6 @@
-import { Handler, HandlerExtendedResourceSettings } from "@ldsg/handler";
-import { InstantiateResourceParams, InstantiateResourceRes } from "@ldsg/resource";
-import { WorkflowResource } from "./resource";
-import { WorkflowSpecificResourceSettings } from "./types";
-export declare const handler: Handler<[
-    InstantiateResourceParams<HandlerExtendedResourceSettings<WorkflowSpecificResourceSettings>>
-], InstantiateResourceRes<WorkflowResource>>;
+import { Handler, HandlerExtendedResourceSettings } from '@ldsg/handler';
+import { InstantiateResourceParams, InstantiateResourceRes } from '@ldsg/resource';
+import { WorkflowResource } from './resource';
+import { WorkflowSpecificResourceSettings } from './types';
+export declare const handler: Handler<InstantiateResourceParams<HandlerExtendedResourceSettings<WorkflowSpecificResourceSettings>>, InstantiateResourceRes<WorkflowResource>>;
 //# sourceMappingURL=handler.d.ts.map

package/dist/handler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EACL,yBAAyB,EACzB,sBAAsB,EACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gCAAgC,EAAE,MAAM,SAAS,CAAC;AAE3D,eAAO,MAAM,OAAO,EAAE,OAAO,CAC3B;IACE,yBAAyB,CACvB,+BAA+B,CAAC,gCAAgC,CAAC,CAClE;CACF,EACD,sBAAsB,CAAC,gBAAgB,CAAC,CACnB,CAAC"}
+{"version":3,"file":"handler.d.ts","sourceRoot":"","sources":["../src/handler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;AACzE,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,MAAM,gBAAgB,CAAC;AAEnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,gCAAgC,EAAE,MAAM,SAAS,CAAC;AAE3D,eAAO,MAAM,OAAO,EAAE,OAAO,CAC3B,yBAAyB,CAAC,+BAA+B,CAAC,gCAAgC,CAAC,CAAC,EAC5F,sBAAsB,CAAC,gBAAgB,CAAC,CACnB,CAAC"}

package/dist/index.d.ts

@@ -1,6 +1,6 @@
-export * from "./constants";
-export * from "./handler";
-export * from "./instantiate-resource";
-export * from "./resource";
-export * from "./types";
+export * from './constants';
+export * from './handler';
+export * from './instantiate-resource';
+export * from './resource';
+export * from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/instantiate-resource.d.ts

@@ -1,6 +1,6 @@
-import { HandlerExtendedResourceSettings } from "@ldsg/handler";
-import { InstantiateResource } from "@ldsg/resource";
-import { WorkflowResource } from "./resource";
-import { WorkflowSpecificResourceSettings } from "./types";
+import { HandlerExtendedResourceSettings } from '@ldsg/handler';
+import { InstantiateResource } from '@ldsg/resource';
+import { WorkflowResource } from './resource';
+import { WorkflowSpecificResourceSettings } from './types';
 export declare const instantiateResource: InstantiateResource<HandlerExtendedResourceSettings<WorkflowSpecificResourceSettings>, WorkflowResource>;
 //# sourceMappingURL=instantiate-resource.d.ts.map

package/dist/instantiate-resource.js

@@ -6,7 +6,7 @@ const instantiateResource = (params) => {
     const { resourceConstructorParams } = params;
     const resource = new resource_1.WorkflowResource(resourceConstructorParams);
     const res = {
-        resource,
+        resource
     };
     return res;
 };

package/dist/resource.d.ts

@@ -1,5 +1,5 @@
-import { Resource } from "@ldsg/resource";
-import { WorkflowData, WorkflowEdgeInfo, WorkflowExecute, WorkflowInfo, WorkflowNodeInfo, WorkflowSpecificResourceSettings } from "./types";
+import { Resource } from '@ldsg/resource';
+import { WorkflowData, WorkflowEdgeInfo, WorkflowExecute, WorkflowInfo, WorkflowNodeInfo, WorkflowSpecificResourceSettings } from './types';
 export interface GetWorkflowEdgeInfoListRes {
     workflowEdgeInfoList: WorkflowEdgeInfo[];
 }

package/dist/resource.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAGL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EAEf,YAAY,EACZ,gBAAgB,EAChB,gCAAgC,EAGjC,MAAM,SAAS,CAAC;AAIjB,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,gBAAgB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC;AAEvE,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,gBAAgB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC;AAEvE,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;AAEvD,qBAAa,gBAAiB,SAAQ,QAAQ,CAAC,gCAAgC,CAAC;IAC9E,uBAAuB,EAAE,uBAAuB,CA4B9C;IAEF,uBAAuB,EAAE,uBAAuB,CAsB9C;IAEF,eAAe,EAAE,eAAe,CAiB9B;IAEF,OAAO,EAAE,eAAe,CA+GtB;IAEF,eAAe,EAAE,eAAe,CAY9B;CACH"}
+{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAE1C,OAAO,EAGL,YAAY,EACZ,gBAAgB,EAChB,eAAe,EAEf,YAAY,EACZ,gBAAgB,EAChB,gCAAgC,EAGjC,MAAM,SAAS,CAAC;AAIjB,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,gBAAgB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC;AAEvE,MAAM,WAAW,0BAA0B;IACzC,oBAAoB,EAAE,gBAAgB,EAAE,CAAC;CAC1C;AAED,MAAM,MAAM,uBAAuB,GAAG,MAAM,0BAA0B,CAAC;AAEvE,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;AAEvD,MAAM,WAAW,kBAAkB;IACjC,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,MAAM,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC;AAEvD,qBAAa,gBAAiB,SAAQ,QAAQ,CAAC,gCAAgC,CAAC;IAC9E,uBAAuB,EAAE,uBAAuB,CAsB9C;IAEF,uBAAuB,EAAE,uBAAuB,CAsB9C;IAEF,eAAe,EAAE,eAAe,CAiB9B;IAEF,OAAO,EAAE,eAAe,CAgHtB;IAEF,eAAe,EAAE,eAAe,CAY9B;CACH"}

package/dist/resource.js

@@ -6,40 +6,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowResource = void 0;
 const resource_1 = require("@ldsg/resource");
 const lodash_1 = __importDefault(require("lodash"));
-const utils_1 = require("./utils");
 const evaluate_variables_1 = require("./utils/evaluate-variables");
+const get_execution_levels_1 = require("./utils/get-execution-levels");
 class WorkflowResource extends resource_1.Resource {
     constructor() {
         super(...arguments);
         this.getWorkflowEdgeInfoList = () => {
             const { id, getFilteredResources } = this;
             const { resources } = getFilteredResources({
-                parentId: id,
+                parentId: id
             });
             const mapRes = resources.map((resource) => {
                 var _a;
                 return (_a = resource.getWorkflowEdgeInfo) === null || _a === void 0 ? void 0 : _a.call(resource);
             });
             const getWorkflowEdgeInfoResList = lodash_1.default.filter(mapRes, (value) => !lodash_1.default.isUndefined(value));
-            const workflowEdgeInfoList = lodash_1.default.map(getWorkflowEdgeInfoResList, "workflowEdgeInfo");
+            const workflowEdgeInfoList = lodash_1.default.map(getWorkflowEdgeInfoResList, 'workflowEdgeInfo');
             const res = {
-                workflowEdgeInfoList,
+                workflowEdgeInfoList
             };
             return res;
         };
         this.getWorkflowNodeInfoList = () => {
             const { id, getFilteredResources } = this;
             const { resources } = getFilteredResources({
-                parentId: id,
+                parentId: id
             });
             const mapRes = resources.map((resource) => {
                 var _a;
                 return (_a = resource.getWorkflowNodeInfo) === null || _a === void 0 ? void 0 : _a.call(resource);
             });
             const filterRes = lodash_1.default.filter(mapRes, (value) => !lodash_1.default.isUndefined(value));
-            const workflowNodeInfoList = lodash_1.default.map(filterRes, "workflowNodeInfo");
+            const workflowNodeInfoList = lodash_1.default.map(filterRes, 'workflowNodeInfo');
             const res = {
-                workflowNodeInfoList,
+                workflowNodeInfoList
             };
             return res;
         };
@@ -49,83 +49,96 @@ class WorkflowResource extends resource_1.Resource {
             const { workflowNodeInfoList } = getWorkflowNodeInfoList();
             const workflowData = {
                 edges: workflowEdgeInfoList,
-                nodes: workflowNodeInfoList,
+                nodes: workflowNodeInfoList
             };
             const res = {
-                workflowData,
+                workflowData
             };
             return res;
         };
         this.execute = async (params) => {
-            const { presetWorkflowVariables = {}, variables: workflowInputVariables } = params;
-            const { getWorkflowData, settings: { startWorkflowNodeResourceId, endWorkflowNodeResourceId }, } = this;
+            const { context, presetWorkflowVariables = {}, variables: workflowInputVariables } = params;
+            const { getWorkflowData, settings: { startWorkflowNodeResourceId, endWorkflowNodeResourceId } } = this;
             const workflowVariablesMap = new Map(Object.entries(presetWorkflowVariables));
             const { workflowData } = getWorkflowData();
             const { nodes } = workflowData;
             const startNode = nodes.find((value) => value.id === startWorkflowNodeResourceId);
             const endNode = nodes.find((value) => value.id === endWorkflowNodeResourceId);
             if (!startNode || !endNode) {
-                throw new Error("invalid workflow nodes");
+                throw new Error('invalid workflow nodes');
             }
-            const { orderedNodeList } = (0, utils_1.getOrderedNodeList)({
+            const { executionLevels } = (0, get_execution_levels_1.getExecutionLevels)({
                 workflowData,
                 startNode,
-                endNode,
+                endNode
             });
-            const orderedNodeListLength = orderedNodeList.length;
-            if (orderedNodeListLength < 2) {
-                throw new Error("invalid workflow nodes count");
+            if (executionLevels.length < 1) {
+                throw new Error('invalid workflow execution levels');
             }
             let workflowOutputVariables;
-            for (let index = 0; index < orderedNodeListLength; index++) {
-                const node = orderedNodeList[index];
-                const { id, propertiesSchema, execute: nodeExecute } = node;
-                const workflowVariables = Object.fromEntries(workflowVariablesMap);
-                // 输入变量从工作流变量中使用表达式获取
-                const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, "properties.input");
-                const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, "properties.output");
-                if (!lodash_1.default.isObject(workflowNodePropertiesInputSchema) ||
-                    !lodash_1.default.isObject(workflowNodePropertiesOutputSchema)) {
-                    throw new Error("invalid workflow node properties schema");
-                }
-                const { variables: workflowNodeInputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                    jsonSchema: workflowNodePropertiesInputSchema,
+            // 按层级执行，同一层级的节点可以并行执行
+            for (let levelIndex = 0; levelIndex < executionLevels.length; levelIndex++) {
+                const currentLevel = executionLevels[levelIndex];
+                // 并行执行当前层级的所有节点
+                const levelPromises = currentLevel.map(async (node) => {
+                    const { id, propertiesSchema, execute: nodeExecute } = node;
+                    const workflowVariables = Object.fromEntries(workflowVariablesMap);
+                    // 输入变量从工作流变量中使用表达式获取
+                    const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, 'properties.input');
+                    const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, 'properties.output');
+                    if (!lodash_1.default.isObject(workflowNodePropertiesInputSchema) ||
+                        !lodash_1.default.isObject(workflowNodePropertiesOutputSchema)) {
+                        throw new Error('invalid workflow node properties schema');
+                    }
                     /**
                      * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
                      */
-                    variables: index === 0 ? workflowInputVariables : workflowVariables,
-                });
-                const { variables: workflowNodeOutputExpressionEvaluateInput } = await nodeExecute({
-                    variables: workflowNodeInputVariables,
-                    context: {
-                        workflowResourceInstance: this,
-                    },
+                    const workflowNodeInputExpressionEvaluateInput = levelIndex === 0 ? workflowInputVariables : workflowVariables;
+                    const { variables: workflowNodeInputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
+                        jsonSchema: workflowNodePropertiesInputSchema,
+                        variables: workflowNodeInputExpressionEvaluateInput
+                    });
+                    const { variables: workflowNodeOutputExpressionEvaluateInput } = await nodeExecute({
+                        context,
+                        variables: workflowNodeInputVariables
+                    });
+                    /**
+                     * 输出变量从结果中使用表达式获取
+                     * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
+                     */
+                    const { variables: workflowNodeOutputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
+                        jsonSchema: workflowNodePropertiesOutputSchema,
+                        variables: workflowNodeOutputExpressionEvaluateInput
+                    });
+                    const res = {
+                        nodeId: id,
+                        variables: workflowNodeOutputVariables
+                    };
+                    return res;
                 });
-                /**
-                 * 输出变量从结果中使用表达式获取
-                 * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
-                 */
-                const { variables: workflowNodeOutputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                    jsonSchema: workflowNodePropertiesOutputSchema,
-                    variables: workflowNodeOutputExpressionEvaluateInput,
+                // 等待当前层级的所有节点执行完成
+                const levelResults = await Promise.all(levelPromises);
+                // 将当前层级的结果更新到工作流变量映射中
+                levelResults.forEach((result) => {
+                    workflowVariablesMap.set(result.nodeId, result.variables);
+                    // 如果是结束节点，保存输出变量
+                    if (result.nodeId === endNode.id) {
+                        workflowOutputVariables = result.variables;
+                    }
                 });
-                workflowVariablesMap.set(id, workflowNodeOutputVariables);
-                if (index === orderedNodeListLength - 1) {
-                    workflowOutputVariables = workflowNodeOutputVariables;
-                }
             }
             const res = {
-                variables: workflowOutputVariables,
+                variables: workflowOutputVariables
             };
             return res;
         };
         this.getWorkflowInfo = () => {
             const { execute } = this;
             const workflowInfo = {
-                execute,
+                execute
             };
             const res = {
-                workflowInfo,
+                workflowInfo
             };
             return res;
         };

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
-export * from "./edge";
-export * from "./json_schema_with_expression_extension";
-export * from "./node";
-export * from "./specific-resource-settings";
-export * from "./variables";
-export * from "./workflow";
+export * from './edge';
+export * from './json_schema_with_expression_extension';
+export * from './node';
+export * from './specific-resource-settings';
+export * from './variables';
+export * from './workflow';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/json_schema_with_expression_extension.d.ts

@@ -1,14 +1,16 @@
-import { JSONSchema7 } from "json-schema";
+import { JSONSchema7, JSONSchema7TypeName } from 'json-schema';
+export type JSONSchemaWithExpressionExtensionType = JSONSchema7TypeName | 'any';
 /**
  * JSON Schema with Expression Extension
  */
-export interface JSONSchemaWithExpressionExtension extends JSONSchema7 {
-    "x-expression"?: string;
-    "x-expression-const"?: string;
-    "x-expression-default"?: string;
+export interface JSONSchemaWithExpressionExtension extends Omit<JSONSchema7, 'type' | 'items' | 'properties'> {
+    type?: JSONSchemaWithExpressionExtensionType;
     properties?: {
         [key: string]: JSONSchemaWithExpressionExtension;
     };
-    items?: JSONSchemaWithExpressionExtension | JSONSchemaWithExpressionExtension[];
+    items?: JSONSchemaWithExpressionExtension;
+    'x-expression'?: string;
+    'x-expression-const'?: string;
+    'x-expression-default'?: string;
 }
 //# sourceMappingURL=json_schema_with_expression_extension.d.ts.map

package/dist/types/json_schema_with_expression_extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json_schema_with_expression_extension.d.ts","sourceRoot":"","sources":["../../src/types/json_schema_with_expression_extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1C;;GAEG;AACH,MAAM,WAAW,iCAAkC,SAAQ,WAAW;IACpE,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;IAEhC,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,iCAAiC,CAAC;KAClD,CAAC;IAEF,KAAK,CAAC,EACF,iCAAiC,GACjC,iCAAiC,EAAE,CAAC;CACzC"}
+{"version":3,"file":"json_schema_with_expression_extension.d.ts","sourceRoot":"","sources":["../../src/types/json_schema_with_expression_extension.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE/D,MAAM,MAAM,qCAAqC,GAAG,mBAAmB,GAAG,KAAK,CAAC;AAEhF;;GAEG;AACH,MAAM,WAAW,iCACf,SAAQ,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,GAAG,YAAY,CAAC;IAC1D,IAAI,CAAC,EAAE,qCAAqC,CAAC;IAE7C,UAAU,CAAC,EAAE;QACX,CAAC,GAAG,EAAE,MAAM,GAAG,iCAAiC,CAAC;KAClD,CAAC;IAEF,KAAK,CAAC,EAAE,iCAAiC,CAAC;IAE1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC"}

package/dist/types/node.d.ts

@@ -1,28 +1,28 @@
-import { JSONSchema7 } from "json-schema";
-import { WorkflowResource } from "../resource";
+import { JSONSchemaWithExpressionExtension } from './json_schema_with_expression_extension';
 export type WorkflowNodeExecuterExecute = () => void | Promise<void>;
-export interface WorkflowNodeExecuteParams {
+export interface WorkflowNodeExecuteParams<Variables = any, Context = any> {
+    /**
+     * 上下文
+     */
+    context: Context;
     /**
      * （输入）变量
      * 由工作流向工作流节点内输入
      */
-    variables: any;
-    context: {
-        workflowResourceInstance: WorkflowResource;
-    };
+    variables: Variables;
 }
-export interface WorkflowNodeExecuteRes {
+export interface WorkflowNodeExecuteRes<Variables = any> {
     /**
      * （输出）变量
      * 由工作流节点向工作流内输入
      */
-    variables: any;
+    variables: Variables;
 }
 /**
  * 工作流执行方法
  * 工作执行时，实际运行的方法
  */
-export type WorkflowNodeExecute = (params: WorkflowNodeExecuteParams) => Promise<WorkflowNodeExecuteRes>;
+export type WorkflowNodeExecute<Variables = any, Context = any> = (params: WorkflowNodeExecuteParams<Variables, Context>) => Promise<WorkflowNodeExecuteRes<Variables>>;
 export interface WorkflowNodeInfo {
     /**
      * ID
@@ -32,7 +32,7 @@ export interface WorkflowNodeInfo {
      * Workflow Node Properties Schema
      * 在运行时，可用于检验数据，默认不开启，仅开启调试模式时开启
      */
-    propertiesSchema: JSONSchema7;
+    propertiesSchema: JSONSchemaWithExpressionExtension;
     /**
      * 工作流节点执行方法
      * 工作流节点执行时，实际运行的方法

package/dist/types/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/types/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE/C,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,WAAW,yBAAyB;IACxC;;;OAGG;IACH,SAAS,EAAE,GAAG,CAAC;IAEf,OAAO,EAAE;QACP,wBAAwB,EAAE,gBAAgB,CAAC;KAC5C,CAAC;CACH;AAED,MAAM,WAAW,sBAAsB;IACrC;;;OAGG;IACH,SAAS,EAAE,GAAG,CAAC;CAChB;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,CAChC,MAAM,EAAE,yBAAyB,KAC9B,OAAO,CAAC,sBAAsB,CAAC,CAAC;AAErC,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,gBAAgB,EAAE,WAAW,CAAC;IAE9B;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../src/types/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,yCAAyC,CAAC;AAE5F,MAAM,MAAM,2BAA2B,GAAG,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AAErE,MAAM,WAAW,yBAAyB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG;IACvE;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;IAEjB;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;CACtB;AAED,MAAM,WAAW,sBAAsB,CAAC,SAAS,GAAG,GAAG;IACrD;;;OAGG;IACH,SAAS,EAAE,SAAS,CAAC;CACtB;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,CAAC,SAAS,GAAG,GAAG,EAAE,OAAO,GAAG,GAAG,IAAI,CAChE,MAAM,EAAE,yBAAyB,CAAC,SAAS,EAAE,OAAO,CAAC,KAClD,OAAO,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;AAEhD,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;OAGG;IACH,gBAAgB,EAAE,iCAAiC,CAAC;IAEpD;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;CAC9B;AAED,MAAM,WAAW,sBAAsB;IACrC;;OAEG;IACH,gBAAgB,EAAE,gBAAgB,CAAC;CACpC;AAED,MAAM,MAAM,mBAAmB,GAAG,MAAM,sBAAsB,CAAC"}