npm - @ldsg/workflow - Versions diffs - 0.3.32 → 0.3.33 - Mend

@ldsg/workflow 0.3.32 → 0.3.33

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

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

@@ -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/execute-workflow.d.ts.map CHANGED Viewed

	@@ -1 +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;~~AAiLD~~;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,~~CAsHhG~~"}
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;AAyND;;GAEG;AACH,wBAAsB,eAAe,CAAC,MAAM,EAAE,qBAAqB,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA6HhG"}

package/dist/utils/execute-workflow.js CHANGED Viewed

@@ -29,6 +29,12 @@ 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");
@@ -46,36 +52,58 @@ async function executeNode(node, context, workflowVariablesMap, isFirstLevel, wo
         });
         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);
+        }
+    }
 }
 /**
  * 查找下一个需要执行的节点集合
@@ -205,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) {

package/package.json CHANGED Viewed

@@ -1,15 +1,18 @@
 {
   "name": "@ldsg/workflow",
-  "version": "0.3.32",
+  "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",
@@ -17,10 +20,10 @@
     "jsonata": "2.2.2",
     "lodash": "^4.17.21",
     "zod": "^4.1.11",
-    "@ldsg/constants": "0.3.32",
-    "@ldsg/resource": "0.3.32",
-    "@ldsg/handler": "0.3.32",
-    "@ldsg/resource-definition": "0.3.32"
+    "@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",
@@ -35,10 +38,7 @@
     "ts-jest": "^29.1.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.8.3",
-    "@ldsg/types": "0.3.32"
-  },
-  "publishConfig": {
-    "access": "public"
+    "@ldsg/types": "0.3.33"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",