@ldsg/workflow 0.3.31 → 0.3.33

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

@@ -7,10 +7,10 @@ const getDataWithJsonSchemaAndInput = async (params) => {
     const { data } = await (0, resolve_json_schema_1.resolveJsonSchema)({
         input,
         jsonSchema,
-        source: {}
+        source: {},
     });
     const res = {
-        data
+        data,
     };
     return res;
 };

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

@@ -1,4 +1,4 @@
-import { JSONSchemaWithExpressionExtension } from '../../../../types';
+import { JSONSchemaWithExpressionExtension } from "../../../../types";
 interface ResolveJsonSchemaParams {
     /**
      * 输入

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

@@ -9,7 +9,7 @@ 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;
+    const { type: jsonSchemaType, "x-expression": jsonSchemaExpression, const: jsonSchemaConst, prefixItems: jsonSchemaPrefixItems, } = jsonSchema;
     let data;
     /**
      * 若常量值存在，则直接返回
@@ -27,7 +27,7 @@ const resolveJsonSchema = async (params) => {
             data = await expression.evaluate(input);
         }
         switch (jsonSchemaType) {
-            case 'object': {
+            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);
@@ -36,11 +36,11 @@ const resolveJsonSchema = async (params) => {
                     const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
                         jsonSchema: jsonSchemaProperties[key],
                         input,
-                        source
+                        source,
                     });
                     const res = {
                         key,
-                        resolveJsonSchemaRes
+                        resolveJsonSchemaRes,
                     };
                     return res;
                 });
@@ -50,7 +50,7 @@ const resolveJsonSchema = async (params) => {
                 });
                 break;
             }
-            case 'array': {
+            case "array": {
                 /**
                  * 如果 prefixItems 存在，则转为数组结果
                  */
@@ -60,7 +60,7 @@ const resolveJsonSchema = async (params) => {
                             const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
                                 jsonSchema: prefixItem,
                                 input,
-                                source
+                                source,
                             });
                             return resolveJsonSchemaRes.data;
                         });
@@ -76,13 +76,13 @@ const resolveJsonSchema = async (params) => {
                 }
                 break;
             }
-            case 'boolean':
-            case 'integer':
-            case 'number':
-            case 'string': {
+            case "boolean":
+            case "integer":
+            case "number":
+            case "string": {
                 break;
             }
-            case 'null': {
+            case "null": {
                 break;
             }
             default: {

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

@@ -0,0 +1,96 @@
+"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;

package/dist/utils/evaluate-variables/utils/get-field-path-by-field-type-key.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getFieldPathByFieldTypeKey = void 0;
 const getFieldPathByFieldTypeKey = (fieldTypeKey) => {
     // 将字符串按点分割成数组
-    const splitRes = fieldTypeKey.split('.');
+    const splitRes = fieldTypeKey.split(".");
     // 过滤数组：除了索引为复数且值为 properties ，其他所有元素均保留
     const filterRes = splitRes.filter((value, index) => {
-        const res = !(value === 'properties' && index % 2 === 0);
+        const res = !(value === "properties" && index % 2 === 0);
         return res;
     });
     // 将过滤后的数组重新用点连接成字符串
-    const res = filterRes.join('.');
+    const res = filterRes.join(".");
     return res;
 };
 exports.getFieldPathByFieldTypeKey = getFieldPathByFieldTypeKey;

package/dist/utils/execute-workflow.d.ts

@@ -1,9 +1,9 @@
-import { WorkflowData, WorkflowExecuteRes, WorkflowNodeInfo, WorkflowVariables } from '../types';
+import { WorkflowData, WorkflowExecuteRes, WorkflowNodeInfo, WorkflowVariables } from "../types";
 export interface ExecuteWorkflowParams {
     context: any;
     endWorkflowNodeResourceId: string;
     nodes: WorkflowNodeInfo[];
-    edges: WorkflowData['edges'];
+    edges: WorkflowData["edges"];
     presetWorkflowVariables?: Record<string, WorkflowVariables>;
     startWorkflowNodeResourceId: string;
     variables: any;

package/dist/utils/execute-workflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"execute-workflow.d.ts","sourceRoot":"","sources":["../../src/utils/execute-workflow.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAqBlB,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,GAAG,CAAC;IACb,yBAAyB,EAAE,MAAM,CAAC;IAClC,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC5D,2BAA2B,EAAE,MAAM,CAAC;IACpC,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AA2KD;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAsHhG"}
+{"version":3,"file":"execute-workflow.d.ts","sourceRoot":"","sources":["../../src/utils/execute-workflow.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAElB,MAAM,UAAU,CAAC;AAqBlB,MAAM,WAAW,qBAAqB;IACpC,OAAO,EAAE,GAAG,CAAC;IACb,yBAAyB,EAAE,MAAM,CAAC;IAClC,KAAK,EAAE,gBAAgB,EAAE,CAAC;IAC1B,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC,CAAC;IAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC5D,2BAA2B,EAAE,MAAM,CAAC;IACpC,SAAS,EAAE,GAAG,CAAC;IACf,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,CAAC,EAAE,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,GAAG,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAyND;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6HhG"}

package/dist/utils/execute-workflow.js

@@ -7,16 +7,16 @@ exports.executeWorkflow = executeWorkflow;
 const api_1 = __importDefault(require("@opentelemetry/api"));
 const lodash_1 = __importDefault(require("lodash"));
 const evaluate_variables_1 = require("./evaluate-variables");
-const tracer = api_1.default.trace.getTracer('workspace');
+const tracer = api_1.default.trace.getTracer("workspace");
 /**
  * 安全的 JSON 序列化，处理循环引用
  */
 function safeStringify(obj) {
     const seen = new WeakSet();
     return JSON.stringify(obj, (key, value) => {
-        if (typeof value === 'object' && value !== null) {
+        if (typeof value === "object" && value !== null) {
             if (seen.has(value)) {
-                return '[Circular Reference]';
+                return "[Circular Reference]";
             }
             seen.add(value);
         }
@@ -29,51 +29,81 @@ function safeStringify(obj) {
 async function executeNode(node, context, workflowVariablesMap, isFirstLevel, workflowInputVariables) {
     const { id, propertiesSchema, execute: nodeExecute } = node;
     const workflowVariables = Object.fromEntries(workflowVariablesMap);
+    if (process.env.DEBUG) {
+        console.debug("executeNode", node.id, {
+            isFirstLevel,
+            workflowVariablesKeys: Object.keys(workflowVariables),
+        });
+    }
     // 输入变量从工作流变量中使用表达式获取
-    const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, 'properties.input');
-    const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, 'properties.output');
+    const workflowNodePropertiesInputSchema = lodash_1.default.get(propertiesSchema, "properties.input");
+    const workflowNodePropertiesOutputSchema = lodash_1.default.get(propertiesSchema, "properties.output");
     /**
      * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
      */
-    const workflowNodeInputExpressionEvaluateInput = isFirstLevel ? workflowInputVariables : workflowVariables;
+    const workflowNodeInputExpressionEvaluateInput = isFirstLevel
+        ? workflowInputVariables
+        : workflowVariables;
     let workflowNodeInputVariables = {};
     if (workflowNodePropertiesInputSchema) {
         const { variables } = await (0, evaluate_variables_1.evaluateVariables)({
             jsonSchema: workflowNodePropertiesInputSchema,
-            variables: workflowNodeInputExpressionEvaluateInput
+            variables: workflowNodeInputExpressionEvaluateInput,
         });
         workflowNodeInputVariables = variables;
     }
-    const { variables: workflowNodeOutputExpressionEvaluateInput, portId } = await nodeExecute({
-        context,
-        variables: workflowNodeInputVariables
-    });
-    /**
-     * 输出变量从结果中使用表达式获取
-     * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
-     */
-    let workflowNodeOutputVariables = {};
-    if (workflowNodePropertiesOutputSchema) {
-        const { variables } = await (0, evaluate_variables_1.evaluateVariables)({
-            jsonSchema: workflowNodePropertiesOutputSchema,
-            variables: workflowNodeOutputExpressionEvaluateInput
-        });
-        workflowNodeOutputVariables = variables;
-    }
     if (process.env.DEBUG) {
-        console.dir({
-            nodeId: id,
-            portId,
-            inputVariables: workflowNodeInputVariables,
-            outputVariables: workflowNodeOutputVariables
-        });
+        console.log(`[EXEC] node ${id} inputExpressionEvaluateInput keys:`, Object.keys(workflowNodeInputExpressionEvaluateInput || {}));
+        console.log(`[EXEC] node ${id} inputVariables:`, safeStringify(workflowNodeInputVariables));
     }
-    const res = {
+    let consoleDirInfo = {
         nodeId: id,
-        variables: workflowNodeOutputVariables,
-        portId
+        inputVariables: workflowNodeInputVariables,
+        status: "processing",
     };
-    return res;
+    try {
+        const { variables: workflowNodeOutputExpressionEvaluateInput, portId } = await nodeExecute({
+            context,
+            variables: workflowNodeInputVariables,
+        });
+        /**
+         * 输出变量从结果中使用表达式获取
+         * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
+         */
+        let workflowNodeOutputVariables = {};
+        if (workflowNodePropertiesOutputSchema) {
+            const { variables } = await (0, evaluate_variables_1.evaluateVariables)({
+                jsonSchema: workflowNodePropertiesOutputSchema,
+                variables: workflowNodeOutputExpressionEvaluateInput,
+            });
+            workflowNodeOutputVariables = variables;
+        }
+        consoleDirInfo = {
+            ...consoleDirInfo,
+            status: "success",
+            portId,
+            outputVariables: workflowNodeOutputVariables,
+        };
+        const res = {
+            nodeId: id,
+            variables: workflowNodeOutputVariables,
+            portId,
+        };
+        return res;
+    }
+    catch (error) {
+        consoleDirInfo = {
+            ...consoleDirInfo,
+            status: "error",
+            error,
+        };
+        throw error;
+    }
+    finally {
+        if (process.env.DEBUG) {
+            console.dir(consoleDirInfo);
+        }
+    }
 }
 /**
  * 查找下一个需要执行的节点集合
@@ -152,15 +182,15 @@ function findNextNodeIds(levelResults, edges, visitedNodes, completedNodePredece
  * 执行工作流
  */
 async function executeWorkflow(params) {
-    const { context, endWorkflowNodeResourceId, nodes, edges, presetWorkflowVariables = {}, startWorkflowNodeResourceId, variables: workflowInputVariables, traceContext } = params;
+    const { context, endWorkflowNodeResourceId, nodes, edges, presetWorkflowVariables = {}, startWorkflowNodeResourceId, variables: workflowInputVariables, traceContext, } = params;
     // 使用传入的 traceContext 或当前活跃的 context 来创建 span
     const parentContext = traceContext || api_1.default.context.active();
-    const executeWorkflowSpan = tracer.startSpan('execute-workflow', undefined, parentContext);
+    const executeWorkflowSpan = tracer.startSpan("execute-workflow", undefined, parentContext);
     const workflowVariablesMap = new Map(Object.entries(presetWorkflowVariables));
     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");
     }
     let workflowOutputVariables;
     // 使用动态执行，根据 portId 决定下一步执行哪些节点
@@ -185,12 +215,12 @@ async function executeWorkflow(params) {
             if (!node) {
                 throw new Error(`node not found: ${nodeId}`);
             }
-            span.addEvent('execution workflow node');
+            span.addEvent("execution workflow node");
             const res = await executeNode(node, context, workflowVariablesMap, isFirstLevel, workflowInputVariables);
             const { portId: outputPortId } = res;
             span.setAttributes({
                 currentNodeId: nodeId,
-                outputPortId
+                outputPortId,
             });
             span.end();
             return res;
@@ -203,6 +233,12 @@ async function executeWorkflow(params) {
                 workflowVariablesMap.set(result.nodeId, result.variables);
             }
         });
+        if (process.env.DEBUG) {
+            console.debug("executeWorkflow level done", {
+                executedNodes: levelResults.filter(Boolean).map((r) => r.nodeId),
+                workflowVariablesKeys: [...workflowVariablesMap.keys()],
+            });
+        }
         // 根据执行结果和 portId 查找下一个节点集合
         const { nextNodeIds, workflowOutputVariables: tempOutputVariables } = findNextNodeIds(levelResults, edges, visitedNodes, completedNodePredecessors, activatedEdges, endNode.id);
         if (tempOutputVariables !== undefined) {
@@ -214,7 +250,7 @@ async function executeWorkflow(params) {
         isFirstLevel = false;
     }
     const res = {
-        variables: workflowOutputVariables
+        variables: workflowOutputVariables,
     };
     executeWorkflowSpan.end();
     return res;

package/package.json

@@ -1,26 +1,29 @@
 {
   "name": "@ldsg/workflow",
-  "version": "0.3.31",
+  "version": "0.3.33",
   "description": "",
   "keywords": [],
   "license": "MIT",
   "author": "wanxger",
-  "main": "dist/index.js",
-  "types": "dist",
   "files": [
     "dist/"
   ],
+  "main": "dist/index.js",
+  "types": "dist",
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@opentelemetry/api": "~1.9.0",
     "json-schema": "0.4.0",
     "json-schema-default": "^1.0.2",
-    "jsonata": "^2.0.6",
+    "jsonata": "2.2.2",
     "lodash": "^4.17.21",
     "zod": "^4.1.11",
-    "@ldsg/constants": "0.3.31",
-    "@ldsg/handler": "0.3.31",
-    "@ldsg/resource": "0.3.31",
-    "@ldsg/resource-definition": "0.3.31"
+    "@ldsg/constants": "0.3.33",
+    "@ldsg/resource-definition": "0.3.33",
+    "@ldsg/handler": "0.3.33",
+    "@ldsg/resource": "0.3.33"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
@@ -29,18 +32,19 @@
     "@types/lodash": "^4.14.202",
     "fs-extra": "^11.3.0",
     "jest": "^29.5.0",
+    "oxfmt": "latest",
+    "oxlint": "latest",
     "supertest": "^6.3.4",
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "@ldsg/types": "0.3.31"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@ldsg/types": "0.3.33"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",
     "clean": "rm -rf dist",
+    "format": "oxfmt --write src/",
+    "lint": "oxlint src/",
     "test": "jest"
   }
 }