@ldsg/workflow 0.3.9 → 0.3.11

package/dist/__tests__/unit/resource.portId.test.js

@@ -0,0 +1,275 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const resource_1 = require("../../resource");
+// 创建测试节点
+const createNode = (nodeId, inputSchema, outputSchema, execute) => ({
+    id: nodeId,
+    propertiesSchema: {
+        type: 'object',
+        properties: {
+            input: inputSchema,
+            output: outputSchema
+        }
+    },
+    execute
+});
+// 测试 portId 功能
+test('WorkflowResource execute with portId', async () => {
+    // 创建节点
+    const startNode = createNode('start', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                default: 'start'
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': 'value'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { value: variables.value || 'start' }, // 确保输出有 value 字段
+        portId: 'port-success' // 返回成功端口
+    }));
+    const successNode = createNode('success', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': `$."start".value`
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'result'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { result: `success: ${variables.value}` }
+    }));
+    const failureNode = createNode('failure', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': `$."start".value`
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'value'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { result: `failure: ${variables.value}` }
+    }));
+    const endNode = createNode('end', {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': '$."success".result'
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'result'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables // 直接返回评估后的变量
+    }));
+    // 创建工作流数据
+    // start -> success -> end (使用 port-success)
+    // start -> failure (使用 port-failure, 不会被执行)
+    const workflowData = {
+        edges: [
+            {
+                sourceWorkflowNodeResourceId: 'start',
+                sourceWorkflowNodePortId: 'port-success',
+                targetWorkflowNodeResourceId: 'success'
+            },
+            {
+                sourceWorkflowNodeResourceId: 'start',
+                sourceWorkflowNodePortId: 'port-failure',
+                targetWorkflowNodeResourceId: 'failure'
+            },
+            {
+                sourceWorkflowNodeResourceId: 'success',
+                targetWorkflowNodeResourceId: 'end'
+            }
+        ],
+        nodes: [startNode, successNode, failureNode, endNode]
+    };
+    const getWorkflowDataRes = {
+        workflowData
+    };
+    class TestWorkflowResource extends resource_1.WorkflowResource {
+        constructor() {
+            super(...arguments);
+            this.getWorkflowData = () => {
+                return getWorkflowDataRes;
+            };
+        }
+    }
+    const testWorkflowResource = new TestWorkflowResource({
+        id: 'test',
+        kind: 'workflow',
+        parentId: 'root',
+        settings: {
+            title: '',
+            description: '',
+            startWorkflowNodeResourceId: 'start',
+            endWorkflowNodeResourceId: 'end'
+        }
+    });
+    const { variables } = await testWorkflowResource.execute({
+        context: {},
+        variables: {}
+    });
+    // 验证只有 success 分支被执行
+    expect(variables.result).toBe('success: start');
+});
+// 测试默认端口（无 portId）
+test('WorkflowResource execute without portId', async () => {
+    const startNode = createNode('start', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                default: 'default'
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': 'value'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { value: variables.value || 'default' }
+        // 不返回 portId，使用默认端口
+    }));
+    const defaultNode = createNode('default', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': `$."start".value`
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'result'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { result: `default: ${variables.value}` }
+    }));
+    const specificNode = createNode('specific', {
+        type: 'object',
+        properties: {
+            value: {
+                type: 'string',
+                'x-expression': `$."start".value`
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'result'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables: { result: `specific: ${variables.value}` }
+    }));
+    const endNode = createNode('end', {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': '$."default".result'
+            }
+        }
+    }, {
+        type: 'object',
+        properties: {
+            result: {
+                type: 'string',
+                'x-expression': 'result'
+            }
+        }
+    }, async ({ variables }) => ({
+        variables // 直接返回评估后的变量
+    }));
+    // start -> default -> end (默认端口，无 portId)
+    // start -> specific (使用 port-specific, 不会被执行)
+    const workflowData = {
+        edges: [
+            {
+                sourceWorkflowNodeResourceId: 'start',
+                // 无 sourceWorkflowNodePortId，表示默认端口
+                targetWorkflowNodeResourceId: 'default'
+            },
+            {
+                sourceWorkflowNodeResourceId: 'start',
+                sourceWorkflowNodePortId: 'port-specific',
+                targetWorkflowNodeResourceId: 'specific'
+            },
+            {
+                sourceWorkflowNodeResourceId: 'default',
+                targetWorkflowNodeResourceId: 'end'
+            }
+        ],
+        nodes: [startNode, defaultNode, specificNode, endNode]
+    };
+    const getWorkflowDataRes = {
+        workflowData
+    };
+    class TestWorkflowResource extends resource_1.WorkflowResource {
+        constructor() {
+            super(...arguments);
+            this.getWorkflowData = () => {
+                return getWorkflowDataRes;
+            };
+        }
+    }
+    const testWorkflowResource = new TestWorkflowResource({
+        id: 'test',
+        kind: 'workflow',
+        parentId: 'root',
+        settings: {
+            title: '',
+            description: '',
+            startWorkflowNodeResourceId: 'start',
+            endWorkflowNodeResourceId: 'end'
+        }
+    });
+    const { variables } = await testWorkflowResource.execute({
+        context: {},
+        variables: {}
+    });
+    // 验证只有默认分支被执行
+    expect(variables.result).toBe('default: default');
+});

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,CAiItB;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,EACf,YAAY,EACZ,gBAAgB,EAChB,gCAAgC,EACjC,MAAM,SAAS,CAAC;AAGjB,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,CAuBtB;IAEF,eAAe,EAAE,eAAe,CAY9B;CACH"}

package/dist/resource.js

@@ -6,40 +6,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WorkflowResource = void 0;
 const resource_1 = require("@ldsg/resource");
 const lodash_1 = __importDefault(require("lodash"));
-const evaluate_variables_1 = require("./utils/evaluate-variables");
-const get_execution_levels_1 = require("./utils/get-execution-levels");
+const execute_workflow_1 = require("./utils/execute-workflow");
 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,96 +48,37 @@ 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 workflowVariablesMap = new Map(Object.entries(presetWorkflowVariables));
+            const { context, presetWorkflowVariables, variables, traceContext } = params;
+            const { getWorkflowData, settings: { startWorkflowNodeResourceId, endWorkflowNodeResourceId } } = this;
             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");
-            }
-            const { executionLevels } = (0, get_execution_levels_1.getExecutionLevels)({
+            const { nodes, edges } = workflowData;
+            return (0, execute_workflow_1.executeWorkflow)({
+                context,
+                endWorkflowNodeResourceId,
+                nodes,
+                edges,
+                presetWorkflowVariables,
+                startWorkflowNodeResourceId,
+                variables,
                 workflowData,
-                startNode,
-                endNode,
+                traceContext
             });
-            if (executionLevels.length < 1) {
-                throw new Error("invalid workflow execution levels");
-            }
-            let workflowOutputVariables;
-            // 按层级执行，同一层级的节点可以并行执行
-            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");
-                    }
-                    const { variables: workflowNodeInputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                        jsonSchema: workflowNodePropertiesInputSchema,
-                        /**
-                         * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
-                         */
-                        variables: levelIndex === 0 ? workflowInputVariables : workflowVariables,
-                    });
-                    const { variables: workflowNodeOutputExpressionEvaluateInput } = await nodeExecute({
-                        variables: workflowNodeInputVariables,
-                        context: {
-                            workflowResourceInstance: this,
-                        },
-                    });
-                    /**
-                     * 输出变量从结果中使用表达式获取
-                     * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
-                     */
-                    const { variables: workflowNodeOutputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                        jsonSchema: workflowNodePropertiesOutputSchema,
-                        variables: workflowNodeOutputExpressionEvaluateInput,
-                    });
-                    return {
-                        nodeId: id,
-                        variables: workflowNodeOutputVariables,
-                    };
-                });
-                // 等待当前层级的所有节点执行完成
-                const levelResults = await Promise.all(levelPromises);
-                // 将当前层级的结果更新到工作流变量映射中
-                levelResults.forEach((result) => {
-                    workflowVariablesMap.set(result.nodeId, result.variables);
-                    // 如果是结束节点，保存输出变量
-                    if (result.nodeId === endNode.id) {
-                        workflowOutputVariables = result.variables;
-                    }
-                });
-            }
-            const res = {
-                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,17 @@
-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;
+    prefixItems?: 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,WAAW,CAAC,EAAE,iCAAiC,EAAE,CAAC;IAElD,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,sBAAsB,CAAC,EAAE,MAAM,CAAC;CACjC"}