@ldsg/workflow 0.3.38 → 0.3.41

package/dist/__tests__/unit/multi-predecessor.test.js

@@ -119,6 +119,7 @@ describe("workflow BFS level scheduling with multiple predecessors", () => {
             kind: "workflow",
             parentId: "root",
             settings: {
+                slug: "test",
                 title: "",
                 description: "",
                 startWorkflowNodeResourceId: "start",
@@ -205,6 +206,7 @@ describe("workflow BFS level scheduling with multiple predecessors", () => {
             kind: "workflow",
             parentId: "root",
             settings: {
+                slug: "test",
                 title: "",
                 description: "",
                 startWorkflowNodeResourceId: "start",
@@ -312,6 +314,7 @@ describe("workflow BFS level scheduling with multiple predecessors", () => {
             kind: "workflow",
             parentId: "root",
             settings: {
+                slug: "test",
                 title: "",
                 description: "",
                 startWorkflowNodeResourceId: "start",
@@ -428,6 +431,7 @@ describe("workflow BFS level scheduling with multiple predecessors", () => {
             kind: "workflow",
             parentId: "root",
             settings: {
+                slug: "test",
                 title: "",
                 description: "",
                 startWorkflowNodeResourceId: "start",

package/dist/__tests__/unit/resource.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const resource_1 = require("../../resource");
+const resource_1 = require("@ldsg/resource");
+const resource_2 = require("../../resource");
 const numberIdList = ["1", "2", "3", "4", "5"];
 const nodeIdList = numberIdList.map((id) => `node-${id}`);
 const nodes = nodeIdList.map((nodeId) => {
@@ -116,7 +117,7 @@ const workflowData = {
 const getWorkflowDataRes = {
     workflowData,
 };
-class TestWorkflowResource extends resource_1.WorkflowResource {
+class TestWorkflowResource extends resource_2.WorkflowResource {
     constructor() {
         super(...arguments);
         this.getWorkflowData = () => {
@@ -124,12 +125,16 @@ class TestWorkflowResource extends resource_1.WorkflowResource {
         };
     }
 }
+beforeEach(() => {
+    (0, resource_1.clearResourceRegistry)();
+});
 test("WorkflowResource execute", async () => {
     const testWorkflowResource = new TestWorkflowResource({
         id: "test",
         kind: "workflow",
         parentId: "root",
         settings: {
+            slug: "test",
             title: "",
             description: "",
             startWorkflowNodeResourceId: "node-1",
@@ -148,3 +153,201 @@ test("WorkflowResource execute", async () => {
     });
     expect(variables).toMatchObject(workflowOutputVariables);
 });
+test("WorkflowResource execute with wrapper workflow", async () => {
+    var _a, _b, _c, _d;
+    let wrapperInputVariables;
+    class RecordingWrapperWorkflowResource extends resource_2.WorkflowResource {
+        constructor() {
+            super(...arguments);
+            this.execute = async (params) => {
+                wrapperInputVariables = params.variables;
+                const { wrapperWorkflowsInfo } = params.variables;
+                const innerWorkflowInfo = wrapperWorkflowsInfo.wrapperWorkflowResourceIdToInnerWorkflowInfoMap["wrapper-workflow"];
+                const { variables: innerWorkflowVariables } = await innerWorkflowInfo.execute({
+                    context: params.context,
+                    variables: { hello: "inner" },
+                });
+                const res = {
+                    variables: {
+                        ...innerWorkflowVariables,
+                        wrapped: true,
+                    },
+                };
+                return res;
+            };
+        }
+    }
+    const wrapperWorkflowResource = new RecordingWrapperWorkflowResource({
+        id: "wrapper-workflow",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "wrapper-workflow",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "",
+            endWorkflowNodeResourceId: "",
+        },
+    });
+    const testWorkflowResource = new TestWorkflowResource({
+        id: "wrapped-workflow",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "wrapped-workflow",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: wrapperWorkflowResource.id,
+        },
+    });
+    const { variables } = await testWorkflowResource.execute({
+        context: {},
+        variables: { hello: "world" },
+    });
+    /**
+     * 包装工作流接收到了内层工作流执行方法及原变量
+     */
+    expect((_c = (_b = (_a = wrapperInputVariables === null || wrapperInputVariables === void 0 ? void 0 : wrapperInputVariables.wrapperWorkflowsInfo) === null || _a === void 0 ? void 0 : _a.wrapperWorkflowResourceIdToInnerWorkflowInfoMap) === null || _b === void 0 ? void 0 : _b["wrapper-workflow"]) === null || _c === void 0 ? void 0 : _c.execute).toBeDefined();
+    expect((_d = wrapperInputVariables === null || wrapperInputVariables === void 0 ? void 0 : wrapperInputVariables.wrapperWorkflowsInfo) === null || _d === void 0 ? void 0 : _d.pendingWrapperWorkflowResourceIdsFromInnerToOuter).toEqual(["wrapper-workflow"]);
+    expect(wrapperInputVariables === null || wrapperInputVariables === void 0 ? void 0 : wrapperInputVariables.hello).toBe("world");
+    /**
+     * 执行结果由包装工作流决定
+     */
+    expect(variables).toMatchObject({ hello: "inner", wrapped: true });
+});
+test("WorkflowResource execute with two layer wrapper workflows", async () => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    let topWorkflowInputVariables;
+    class TopWorkflowResource extends resource_2.WorkflowResource {
+        constructor() {
+            super(...arguments);
+            this.execute = async (params) => {
+                topWorkflowInputVariables = params.variables;
+                const { wrapperWorkflowsInfo } = params.variables;
+                /**
+                 * 顶层包装工作流执行自己的内嵌工作流，即中间层包装工作流
+                 */
+                const middleWorkflowInfo = wrapperWorkflowsInfo.wrapperWorkflowResourceIdToInnerWorkflowInfoMap["workflow-top"];
+                const { variables: middleWorkflowVariables } = await middleWorkflowInfo.execute({
+                    context: params.context,
+                    variables: { ...params.variables, hello: "inner" },
+                });
+                const res = {
+                    variables: middleWorkflowVariables,
+                };
+                return res;
+            };
+        }
+    }
+    const topWorkflowResource = new TopWorkflowResource({
+        id: "workflow-top",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-top",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+        },
+    });
+    const middleWorkflowResource = new TestWorkflowResource({
+        id: "workflow-middle",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-middle",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: topWorkflowResource.id,
+        },
+    });
+    const wrappedWorkflowResource = new TestWorkflowResource({
+        id: "workflow-wrapped",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-wrapped",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: middleWorkflowResource.id,
+        },
+    });
+    const { variables } = await wrappedWorkflowResource.execute({
+        context: {},
+        variables: { hello: "world" },
+    });
+    /**
+     * 顶层包装工作流收到的内嵌工作流信息表中同时保留了中间层与最内层
+     */
+    expect(Object.keys((_b = (_a = topWorkflowInputVariables === null || topWorkflowInputVariables === void 0 ? void 0 : topWorkflowInputVariables.wrapperWorkflowsInfo) === null || _a === void 0 ? void 0 : _a.wrapperWorkflowResourceIdToInnerWorkflowInfoMap) !== null && _b !== void 0 ? _b : {}).sort()).toEqual(["workflow-middle", "workflow-top"]);
+    /**
+     * 待消费栈按包装链由内到外登记，末位为顶层包装工作流自身
+     */
+    expect((_c = topWorkflowInputVariables === null || topWorkflowInputVariables === void 0 ? void 0 : topWorkflowInputVariables.wrapperWorkflowsInfo) === null || _c === void 0 ? void 0 : _c.pendingWrapperWorkflowResourceIdsFromInnerToOuter).toEqual(["workflow-middle", "workflow-top"]);
+    expect((_f = (_e = (_d = topWorkflowInputVariables === null || topWorkflowInputVariables === void 0 ? void 0 : topWorkflowInputVariables.wrapperWorkflowsInfo) === null || _d === void 0 ? void 0 : _d.wrapperWorkflowResourceIdToInnerWorkflowInfoMap) === null || _e === void 0 ? void 0 : _e["workflow-top"]) === null || _f === void 0 ? void 0 : _f.execute).toBeDefined();
+    expect((_j = (_h = (_g = topWorkflowInputVariables === null || topWorkflowInputVariables === void 0 ? void 0 : topWorkflowInputVariables.wrapperWorkflowsInfo) === null || _g === void 0 ? void 0 : _g.wrapperWorkflowResourceIdToInnerWorkflowInfoMap) === null || _h === void 0 ? void 0 : _h["workflow-middle"]) === null || _j === void 0 ? void 0 : _j.execute).toBeDefined();
+    expect(topWorkflowInputVariables === null || topWorkflowInputVariables === void 0 ? void 0 : topWorkflowInputVariables.hello).toBe("world");
+    expect(variables).toMatchObject({ hello: "inner" });
+});
+test("WorkflowResource execute detects wrapper cycle", async () => {
+    const workflowA = new TestWorkflowResource({
+        id: "workflow-a",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-a",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: "workflow-b",
+        },
+    });
+    const workflowB = new TestWorkflowResource({
+        id: "workflow-b",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-b",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: "workflow-a",
+        },
+    });
+    await expect(workflowA.execute({
+        context: {},
+        variables: { hello: "world" },
+    })).rejects.toThrow("workflow wrapper cycle detected: workflow-b");
+    await expect(workflowB.execute({
+        context: {},
+        variables: { hello: "world" },
+    })).rejects.toThrow("workflow wrapper cycle detected: workflow-a");
+});
+test("WorkflowResource execute with invalid wrapper workflow resource", async () => {
+    const testWorkflowResource = new TestWorkflowResource({
+        id: "workflow-with-invalid-wrapper",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-with-invalid-wrapper",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-5",
+            wrapperWorkflowResourceId: "not-exist",
+        },
+    });
+    await expect(testWorkflowResource.execute({
+        context: {},
+        variables: { hello: "world" },
+    })).rejects.toThrow("invalid wrapper workflow info, wrapper workflow resource id: not-exist");
+});

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

@@ -131,6 +131,7 @@ test("WorkflowResource execute with portId", async () => {
         kind: "workflow",
         parentId: "root",
         settings: {
+            slug: "test",
             title: "",
             description: "",
             startWorkflowNodeResourceId: "start",
@@ -260,6 +261,7 @@ test("WorkflowResource execute without portId", async () => {
         kind: "workflow",
         parentId: "root",
         settings: {
+            slug: "test",
             title: "",
             description: "",
             startWorkflowNodeResourceId: "start",

package/dist/__tests__/unit/wrapper-chain.test.d.ts

@@ -0,0 +1,3 @@
+import { WorkflowExecute } from "../../types";
+export type { WorkflowExecute };
+//# sourceMappingURL=wrapper-chain.test.d.ts.map

package/dist/__tests__/unit/wrapper-chain.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper-chain.test.d.ts","sourceRoot":"","sources":["../../../src/__tests__/unit/wrapper-chain.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAgB,eAAe,EAAyC,MAAM,aAAa,CAAC;AAqPnG,YAAY,EAAE,eAAe,EAAE,CAAC"}

package/dist/__tests__/unit/wrapper-chain.test.js

@@ -0,0 +1,210 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const resource_1 = require("@ldsg/resource");
+const resource_2 = require("../../resource");
+const passthroughExecute = async (params) => ({
+    variables: params.variables,
+});
+const innerWorkflowNodeExecute = async (params) => {
+    var _a, _b;
+    const { context, variables: inputVariables } = params;
+    const { wrapperWorkflowsInfo, variables } = inputVariables;
+    const wrapperWorkflowResourceIdToInnerWorkflowInfoMap = (_a = wrapperWorkflowsInfo === null || wrapperWorkflowsInfo === void 0 ? void 0 : wrapperWorkflowsInfo.wrapperWorkflowResourceIdToInnerWorkflowInfoMap) !== null && _a !== void 0 ? _a : {};
+    const pendingWrapperWorkflowResourceIdsFromInnerToOuter = (_b = wrapperWorkflowsInfo === null || wrapperWorkflowsInfo === void 0 ? void 0 : wrapperWorkflowsInfo.pendingWrapperWorkflowResourceIdsFromInnerToOuter) !== null && _b !== void 0 ? _b : [];
+    const currentWrapperWorkflowResourceId = pendingWrapperWorkflowResourceIdsFromInnerToOuter[pendingWrapperWorkflowResourceIdsFromInnerToOuter.length - 1];
+    if (!currentWrapperWorkflowResourceId) {
+        throw new Error("invalid wrapper workflows info, no pending wrapper workflow resource id");
+    }
+    const innerWorkflowInfo = wrapperWorkflowResourceIdToInnerWorkflowInfoMap[currentWrapperWorkflowResourceId];
+    if (!(innerWorkflowInfo === null || innerWorkflowInfo === void 0 ? void 0 : innerWorkflowInfo.execute)) {
+        throw new Error(`invalid inner workflow info: ${currentWrapperWorkflowResourceId}`);
+    }
+    const executeRes = await innerWorkflowInfo.execute({
+        context,
+        variables: {
+            ...variables,
+            wrapperWorkflowsInfo: {
+                wrapperWorkflowResourceIdToInnerWorkflowInfoMap,
+                pendingWrapperWorkflowResourceIdsFromInnerToOuter: pendingWrapperWorkflowResourceIdsFromInnerToOuter.slice(0, -1),
+            },
+        },
+    });
+    return {
+        variables: {
+            result: executeRes.variables,
+        },
+    };
+};
+const startNode = {
+    id: "node-1",
+    propertiesSchema: {
+        type: "object",
+        properties: {
+            input: {
+                type: "object",
+                properties: {
+                    hello: { type: "string", "x-expression": "hello" },
+                    wrapperWorkflowsInfo: { type: "object", "x-expression": "wrapperWorkflowsInfo" },
+                },
+            },
+            output: {
+                type: "object",
+                properties: {
+                    hello: { type: "string", "x-expression": "hello" },
+                    wrapperWorkflowsInfo: { type: "object", "x-expression": "wrapperWorkflowsInfo" },
+                },
+            },
+        },
+    },
+    execute: passthroughExecute,
+};
+const innerWorkflowNode = {
+    id: "node-2",
+    propertiesSchema: {
+        type: "object",
+        properties: {
+            input: {
+                type: "object",
+                properties: {
+                    variables: { type: "object", "x-expression": `$."node-1"` },
+                    wrapperWorkflowsInfo: {
+                        type: "object",
+                        "x-expression": `$."node-1"."wrapperWorkflowsInfo"`,
+                    },
+                },
+            },
+            output: {
+                type: "object",
+                properties: {
+                    result: { type: "object", "x-expression": "result" },
+                },
+            },
+        },
+    },
+    execute: innerWorkflowNodeExecute,
+};
+const endNode = {
+    id: "node-3",
+    propertiesSchema: {
+        type: "object",
+        properties: {
+            input: {
+                type: "object",
+                properties: {
+                    result: { type: "object", "x-expression": `$."node-2"."result"` },
+                },
+            },
+            output: {
+                type: "object",
+                properties: {
+                    result: { type: "object", "x-expression": "result" },
+                },
+            },
+        },
+    },
+    execute: passthroughExecute,
+};
+const businessEndNode = {
+    id: "node-3",
+    propertiesSchema: {
+        type: "object",
+        properties: {
+            input: {
+                type: "object",
+                properties: {
+                    result: { type: "string", "x-expression": `$."node-1"."hello"` },
+                },
+            },
+            output: {
+                type: "object",
+                properties: {
+                    result: { type: "string", "x-expression": "result" },
+                },
+            },
+        },
+    },
+    execute: passthroughExecute,
+};
+const makeWorkflowData = (nodes) => ({
+    edges: nodes.slice(1).map((node, index) => ({
+        sourceWorkflowNodeResourceId: nodes[index].id,
+        targetWorkflowNodeResourceId: node.id,
+    })),
+    nodes,
+});
+const makeWorkflowResourceClass = (workflowData) => {
+    const getWorkflowDataRes = { workflowData };
+    return class extends resource_2.WorkflowResource {
+        constructor() {
+            super(...arguments);
+            this.getWorkflowData = () => getWorkflowDataRes;
+        }
+    };
+};
+const WrapperWorkflowResource = makeWorkflowResourceClass(makeWorkflowData([startNode, innerWorkflowNode, endNode]));
+const InnermostWorkflowResource = makeWorkflowResourceClass(makeWorkflowData([startNode, businessEndNode]));
+beforeEach(() => {
+    (0, resource_1.clearResourceRegistry)();
+});
+test("three layer wrapper chain with inner workflow node", async () => {
+    const topWorkflowResource = new WrapperWorkflowResource({
+        id: "workflow-top",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-top",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-3",
+        },
+    });
+    const middleWorkflowResource = new WrapperWorkflowResource({
+        id: "workflow-middle",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-middle",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-3",
+            wrapperWorkflowResourceId: topWorkflowResource.id,
+        },
+    });
+    const innerWorkflowResource = new InnermostWorkflowResource({
+        id: "workflow-inner",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-inner",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-3",
+            wrapperWorkflowResourceId: middleWorkflowResource.id,
+        },
+    });
+    const { variables } = await innerWorkflowResource.execute({
+        context: {},
+        variables: { hello: "world" },
+    });
+    expect(variables).toMatchObject({
+        result: { result: { result: "world" } },
+    });
+});
+test("inner workflow node without pending wrapper workflow resource id", async () => {
+    const workflowResource = new WrapperWorkflowResource({
+        id: "workflow-no-chain",
+        kind: "workflow",
+        parentId: "root",
+        settings: {
+            slug: "workflow-no-chain",
+            title: "",
+            description: "",
+            startWorkflowNodeResourceId: "node-1",
+            endWorkflowNodeResourceId: "node-3",
+        },
+    });
+    await expect(workflowResource.execute({ context: {}, variables: { hello: "world" } })).rejects.toThrow("no pending wrapper workflow resource id");
+});

package/dist/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,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,+BAQnE,CAAC;AAEJ,eAAO,MAAM,6CAA6C,EAAE,uBAG3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAG1D,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,iEAAiE;;;CAGpE,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../src/constants.ts"],"names":[],"mappings":"AAAA,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,uBAIpE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,uDAAuD,EAAE,+BAQnE,CAAC;AAEJ,eAAO,MAAM,6CAA6C,EAAE,uBAI3D,CAAC;AAEF,eAAO,MAAM,8CAA8C,EAAE,0CAG1D,CAAC;AAEJ;;GAEG;AACH,eAAO,MAAM,iEAAiE;;;CAGpE,CAAC"}

package/dist/constants.js

@@ -6,6 +6,7 @@ exports.SPECIFIC_WORKFLOW_NODE_TYPE_TO_WORKFLOW_NODE_TYPE_RESOURCE_ID_MAP = expo
  * 实例化资源处理程序普通资源配置
  */
 exports.INSTANTIATE_RESOURCE_HANDLER_GENERAL_RESOURCE_SETTINGS = {
+    slug: "workflow-instantiate-resource-handler",
     title: "工作流实例化资源处理程序",
     description: "",
 };
@@ -23,6 +24,7 @@ exports.INSTANTIATE_RESOURCE_HANDLER_SPECIFIC_RESOURCE_SETTINGS = {
     ],
 };
 exports.RESOURCE_DEFINITION_GENERAL_RESOURCE_SETTINGS = {
+    slug: "workflow-resource-definition",
     title: "工作流资源定义",
     description: "",
 };

package/dist/resource.d.ts

@@ -20,6 +20,10 @@ export declare class WorkflowResource extends Resource<WorkflowSpecificResourceS
     getWorkflowEdgeInfoList: GetWorkflowEdgeInfoList;
     getWorkflowNodeInfoList: GetWorkflowNodeInfoList;
     getWorkflowData: GetWorkflowData;
+    /**
+     * 执行当前工作流自身（不包含外层包装工作流）
+     */
+    executeWorkflowWithoutWrapper: WorkflowExecute;
     execute: WorkflowExecute;
     getWorkflowInfo: GetWorkflowInfo;
 }

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,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"}
+{"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,EAEjC,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;;OAEG;IACH,6BAA6B,EAAE,eAAe,CAuB5C;IAEF,OAAO,EAAE,eAAe,CAsFtB;IAEF,eAAe,EAAE,eAAe,CAa9B;CACH"}

package/dist/resource.js

@@ -55,7 +55,10 @@ class WorkflowResource extends resource_1.Resource {
             };
             return res;
         };
-        this.execute = async (params) => {
+        /**
+         * 执行当前工作流自身（不包含外层包装工作流）
+         */
+        this.executeWorkflowWithoutWrapper = async (params) => {
             const { context, presetWorkflowVariables, variables, traceContext } = params;
             const { getWorkflowData, settings: { startWorkflowNodeResourceId, endWorkflowNodeResourceId }, } = this;
             const { workflowData } = getWorkflowData();
@@ -72,9 +75,68 @@ class WorkflowResource extends resource_1.Resource {
                 traceContext,
             });
         };
+        this.execute = async (params) => {
+            var _a, _b, _c;
+            const { context, presetWorkflowVariables, variables: workflowInputVariables, traceContext, } = params;
+            const { id, settings } = this;
+            const { wrapperWorkflowResourceId } = settings;
+            /**
+             * 若当前工作流配置了外层包装工作流，则执行包装工作流，
+             * 并把当前工作流自身的执行方法登记到内嵌工作流信息表中，
+             * 由包装工作流决定何时调用内层工作流。
+             */
+            if (wrapperWorkflowResourceId) {
+                const { wrapperWorkflowsInfo, ...restWorkflowInputVariables } = workflowInputVariables;
+                const wrapperWorkflowResourceIdToInnerWorkflowInfoMap = {
+                    ...wrapperWorkflowsInfo === null || wrapperWorkflowsInfo === void 0 ? void 0 : wrapperWorkflowsInfo.wrapperWorkflowResourceIdToInnerWorkflowInfoMap,
+                };
+                const pendingWrapperWorkflowResourceIdsFromInnerToOuter = [
+                    ...((_a = wrapperWorkflowsInfo === null || wrapperWorkflowsInfo === void 0 ? void 0 : wrapperWorkflowsInfo.pendingWrapperWorkflowResourceIdsFromInnerToOuter) !== null && _a !== void 0 ? _a : []),
+                ];
+                /**
+                 * 每个工作流只有一个包装工作流，合法的包装链中各 key 不会重复。
+                 * 若该 key 已存在，说明同一个包装工作流在链中出现了两次，即为循环引用。
+                 */
+                if (wrapperWorkflowResourceIdToInnerWorkflowInfoMap[wrapperWorkflowResourceId]) {
+                    throw new Error(`workflow wrapper cycle detected: ${wrapperWorkflowResourceId}`);
+                }
+                const wrapperWorkflowInfo = (_c = (_b = this.getFilteredResource({
+                    id: wrapperWorkflowResourceId,
+                })) === null || _b === void 0 ? void 0 : _b.resource) === null || _c === void 0 ? void 0 : _c.getWorkflowInfo().workflowInfo;
+                if (!wrapperWorkflowInfo) {
+                    throw new Error(`invalid wrapper workflow info, wrapper workflow resource id: ${wrapperWorkflowResourceId}`);
+                }
+                const innerWorkflowInfo = {
+                    id,
+                    execute: this.executeWorkflowWithoutWrapper,
+                };
+                wrapperWorkflowResourceIdToInnerWorkflowInfoMap[wrapperWorkflowResourceId] =
+                    innerWorkflowInfo;
+                /**
+                 * 登记的包装工作流 ID 入栈，包装工作流执行时消费栈末位
+                 */
+                pendingWrapperWorkflowResourceIdsFromInnerToOuter.push(wrapperWorkflowResourceId);
+                const wrapperWorkflowInputVariables = {
+                    ...restWorkflowInputVariables,
+                    wrapperWorkflowsInfo: {
+                        wrapperWorkflowResourceIdToInnerWorkflowInfoMap,
+                        pendingWrapperWorkflowResourceIdsFromInnerToOuter,
+                    },
+                };
+                const res = await wrapperWorkflowInfo.execute({
+                    context,
+                    presetWorkflowVariables,
+                    variables: wrapperWorkflowInputVariables,
+                    traceContext,
+                });
+                return res;
+            }
+            return this.executeWorkflowWithoutWrapper(params);
+        };
         this.getWorkflowInfo = () => {
-            const { execute } = this;
+            const { execute, id } = this;
             const workflowInfo = {
+                id,
                 execute,
             };
             const res = {

package/dist/types/specific-resource-settings.d.ts

@@ -1,9 +1,11 @@
 import { z } from "zod";
 export declare const WorkflowSpecificResourceSettingsSchema: z.ZodObject<{
+    wrapperWorkflowResourceId: z.ZodOptional<z.ZodString>;
     startWorkflowNodeResourceId: z.ZodString;
     endWorkflowNodeResourceId: z.ZodString;
 }, z.core.$catchall<z.ZodAny>>;
 export declare const SpecificResourceSettingsSchema: z.ZodObject<{
+    wrapperWorkflowResourceId: z.ZodOptional<z.ZodString>;
     startWorkflowNodeResourceId: z.ZodString;
     endWorkflowNodeResourceId: z.ZodString;
 }, z.core.$catchall<z.ZodAny>>;

package/dist/types/specific-resource-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,sCAAsC;;;8BAY/B,CAAC;AAErB,eAAO,MAAM,8BAA8B;;;8BAAyC,CAAC;AACrF,MAAM,MAAM,gCAAgC,GAAG,CAAC,CAAC,KAAK,CACpD,OAAO,sCAAsC,CAC9C,CAAC"}
+{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,sCAAsC;;;;8BAiB/B,CAAC;AAErB,eAAO,MAAM,8BAA8B;;;;8BAAyC,CAAC;AAErF,MAAM,MAAM,gCAAgC,GAAG,CAAC,CAAC,KAAK,CACpD,OAAO,sCAAsC,CAC9C,CAAC"}

package/dist/types/specific-resource-settings.js

@@ -4,6 +4,10 @@ exports.SpecificResourceSettingsSchema = exports.WorkflowSpecificResourceSetting
 const zod_1 = require("zod");
 exports.WorkflowSpecificResourceSettingsSchema = zod_1.z
     .object({
+    /**
+     * Wrapper Workflow Resource ID
+     */
+    wrapperWorkflowResourceId: zod_1.z.string().optional(),
     /**
      * Start Workflow Node Resource ID
      */

package/dist/types/workflow.d.ts

@@ -36,6 +36,35 @@ export interface WorkflowExecuteRes {
  */
 export type WorkflowExecute = (params: WorkflowExecuteParams) => Promise<WorkflowExecuteRes>;
 export interface WorkflowInfo {
+    /**
+     * 工作流资源 ID
+     */
+    id: string;
     execute: WorkflowExecute;
 }
+/**
+ * 包装工作流资源 ID 到内嵌工作流信息的映射表
+ *
+ * 以包装工作流资源 ID 为 key，值为把该包装工作流作为外层包装的工作流（即被包装者）的执行信息。
+ */
+export type WrapperWorkflowResourceIdToInnerWorkflowInfoMap = Record<string, WorkflowInfo>;
+/**
+ * 包装工作流链信息
+ *
+ * 由被包装者登记后随包装链由内向外透传，供「执行内嵌工作流」节点消费。
+ */
+export interface WrapperWorkflowsInfo {
+    /**
+     * 包装工作流资源 ID 到内嵌工作流信息的映射表
+     */
+    wrapperWorkflowResourceIdToInnerWorkflowInfoMap: WrapperWorkflowResourceIdToInnerWorkflowInfoMap;
+    /**
+     * 待消费的包装工作流资源 ID 栈（由内到外）
+     *
+     * 登记由内向外发生，消费由外向内发生，因此以栈的形式使用：
+     * 末位为当前工作流应当消费的键，消费后弹出末位，
+     * 再将剩余部分透传给内嵌工作流，供更内层继续消费。
+     */
+    pendingWrapperWorkflowResourceIdsFromInnerToOuter: string[];
+}
 //# sourceMappingURL=workflow.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/types/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE5D;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE7F,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,eAAe,CAAC;CAC1B"}
+{"version":3,"file":"workflow.d.ts","sourceRoot":"","sources":["../../src/types/workflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAC1C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,gBAAgB,EAAE,CAAC;CAC3B;AAED,MAAM,WAAW,qBAAqB;IACpC;;OAEG;IACH,OAAO,EAAE,GAAG,CAAC;IAEb;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAE5D;;;OAGG;IACH,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,qBAAqB,KAAK,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAE7F,MAAM,WAAW,YAAY;IAC3B;;OAEG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX,OAAO,EAAE,eAAe,CAAC;CAC1B;AAED;;;;GAIG;AACH,MAAM,MAAM,+CAA+C,GAAG,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;AAE3F;;;;GAIG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,+CAA+C,EAAE,+CAA+C,CAAC;IAEjG;;;;;;OAMG;IACH,iDAAiD,EAAE,MAAM,EAAE,CAAC;CAC7D"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/workflow",
-  "version": "0.3.38",
+  "version": "0.3.41",
   "description": "",
   "keywords": [],
   "license": "MIT",
@@ -20,11 +20,11 @@
     "jsonata": "2.2.2",
     "lodash": "^4.17.21",
     "zod": "^4.1.11",
-    "@ldsg/constants": "0.3.38",
-    "@ldsg/handler": "0.3.38",
-    "@ldsg/resource-definition": "0.3.38",
-    "@ldsg/types": "0.3.38",
-    "@ldsg/resource": "0.3.38"
+    "@ldsg/handler": "0.3.41",
+    "@ldsg/resource": "0.3.41",
+    "@ldsg/constants": "0.3.41",
+    "@ldsg/resource-definition": "0.3.41",
+    "@ldsg/types": "0.3.41"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",

package/dist/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.js.bak

@@ -1,96 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveJsonSchema = void 0;
-const jsonata_1 = __importDefault(require("jsonata"));
-const lodash_1 = __importDefault(require("lodash"));
-const resolveJsonSchema = async (params) => {
-    var _a;
-    const { input, jsonSchema, source } = params;
-    const { type: jsonSchemaType, 'x-expression': jsonSchemaExpression, const: jsonSchemaConst, prefixItems: jsonSchemaPrefixItems } = jsonSchema;
-    let data;
-    /**
-     * 若常量值存在，则直接返回
-     */
-    if (jsonSchemaConst) {
-        data = jsonSchemaConst;
-    }
-    else {
-        data = source;
-        /**
-         * 若表达式存在，则尝试获取表达式值
-         */
-        if (jsonSchemaExpression) {
-            const expression = (0, jsonata_1.default)(jsonSchemaExpression);
-            data = await expression.evaluate(input);
-        }
-        switch (jsonSchemaType) {
-            case 'object': {
-                data = data !== null && data !== void 0 ? data : {};
-                const jsonSchemaProperties = (_a = jsonSchema.properties) !== null && _a !== void 0 ? _a : {};
-                const keys = lodash_1.default.keys(jsonSchemaProperties);
-                const keysMapResPromises = keys.map(async (key) => {
-                    const source = lodash_1.default.get(data, key);
-                    const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
-                        jsonSchema: jsonSchemaProperties[key],
-                        input,
-                        source
-                    });
-                    const res = {
-                        key,
-                        resolveJsonSchemaRes
-                    };
-                    return res;
-                });
-                const keysMapRes = await Promise.all(keysMapResPromises);
-                lodash_1.default.each(keysMapRes, ({ key, resolveJsonSchemaRes }) => {
-                    lodash_1.default.set(data, key, resolveJsonSchemaRes.data);
-                });
-                break;
-            }
-            case 'array': {
-                /**
-                 * 如果 prefixItems 存在，则转为数组结果
-                 */
-                if (jsonSchemaPrefixItems) {
-                    if (jsonSchemaPrefixItems.length > 0) {
-                        const itemsDataPromises = jsonSchemaPrefixItems.map(async (prefixItem) => {
-                            const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
-                                jsonSchema: prefixItem,
-                                input,
-                                source
-                            });
-                            return resolveJsonSchemaRes.data;
-                        });
-                        const itemsData = await Promise.all(itemsDataPromises);
-                        data = itemsData;
-                    }
-                    else {
-                        /**
-                         * 空数组时，初始化为空数组
-                         */
-                        data = [];
-                    }
-                }
-                break;
-            }
-            case 'boolean':
-            case 'integer':
-            case 'number':
-            case 'string': {
-                break;
-            }
-            case 'null': {
-                break;
-            }
-            default: {
-                break;
-            }
-        }
-    }
-    const res = { data };
-    return res;
-};
-exports.resolveJsonSchema = resolveJsonSchema;