@ldsg/workflow 0.3.0 → 0.3.1

package/dist/__tests__/unit/resource.js

@@ -17,57 +17,75 @@ const nodes = nodeIdList.map((nodeId) => {
     switch (nodeId) {
         case "node-1": {
             input = {
-                hello: "jsonata:hello",
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        "x-expression": "hello",
+                    },
+                },
             };
             output = {
-                hello: "jsonata:hello",
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        "x-expression": "hello",
+                    },
+                },
             };
             break;
         }
         case "node-5": {
             input = {
-                hello: `jsonata:$."node-1".hello`,
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        "x-expression": `$."node-1".hello`,
+                    },
+                },
             };
             output = {
-                hello: "jsonata:hello",
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        "x-expression": "hello",
+                    },
+                },
             };
             break;
         }
         default: {
             input = {
-                hello: "other",
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        default: "other",
+                    },
+                },
             };
             output = {
-                hello: "other",
+                type: "object",
+                properties: {
+                    hello: {
+                        type: "string",
+                        default: "other",
+                    },
+                },
             };
             break;
         }
     }
     const res = {
         id: nodeId,
-        properties: {
-            input,
-            output,
-        },
         propertiesSchema: {
             type: "object",
             properties: {
-                input: {
-                    type: "object",
-                    properties: {
-                        hello: {
-                            type: "string",
-                        },
-                    },
-                },
-                output: {
-                    type: "object",
-                    properties: {
-                        hello: {
-                            type: "string",
-                        },
-                    },
-                },
+                input,
+                output,
             },
         },
         execute: workflowNodeExecute,

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

package/dist/resource.js

@@ -79,12 +79,17 @@ class WorkflowResource extends resource_1.Resource {
             let workflowOutputVariables;
             for (let index = 0; index < orderedNodeListLength; index++) {
                 const node = orderedNodeList[index];
-                const { id, properties, propertiesSchema, execute: nodeExecute } = node;
+                const { id, propertiesSchema, execute: nodeExecute } = node;
                 const workflowVariables = Object.fromEntries(workflowVariablesMap);
                 // 输入变量从工作流变量中使用表达式获取
-                const workflowNodeInputJsonataExpression = lodash_1.default.get(properties, "input");
+                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)({
-                    expression: workflowNodeInputJsonataExpression,
+                    jsonSchema: workflowNodePropertiesInputSchema,
                     /**
                      * 对于开始节点，不忽略 input 表达式，但替换工作流内部变量为工作流输入变量。
                      */
@@ -100,9 +105,8 @@ class WorkflowResource extends resource_1.Resource {
                  * 输出变量从结果中使用表达式获取
                  * 对于结束节点，不忽略 output 表达式，但表达式固定为取返回变量。
                  */
-                const workflowNodeOutputJsonataExpression = lodash_1.default.get(properties, "output");
                 const { variables: workflowNodeOutputVariables } = await (0, evaluate_variables_1.evaluateVariables)({
-                    expression: workflowNodeOutputJsonataExpression,
+                    jsonSchema: workflowNodePropertiesOutputSchema,
                     variables: workflowNodeOutputExpressionEvaluateInput,
                 });
                 workflowVariablesMap.set(id, workflowNodeOutputVariables);

package/dist/types/node.d.ts

@@ -28,10 +28,6 @@ export interface WorkflowNodeInfo {
      * ID
      */
     id: string;
-    /**
-     * Workflow Node Properties
-     */
-    properties: any;
     /**
      * Workflow Node Properties Schema
      * 在运行时，可用于检验数据，默认不开启，仅开启调试模式时开启

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

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

package/dist/utils/evaluate-variables/constants.d.ts

@@ -0,0 +1,39 @@
+interface FieldValueRetrievalMethodHandleParams {
+    /**
+     * 取值方式的值
+     */
+    retrievalMethodValue: any;
+    /**
+     * 输入
+     * 表达式将使用此值进行计算
+     */
+    input: any;
+    /**
+     * 直接返回表达式作为数据
+     */
+    returnExpressionAsData?: boolean;
+    /**
+     * 对象项表达式
+     */
+    objectExpression?: string;
+}
+export interface FieldValueRetrievalMethodHandleRes {
+    const?: any;
+    data?: string;
+    default?: any;
+    expression?: string;
+}
+type FieldValueRetrievalMethodHandle = (params: FieldValueRetrievalMethodHandleParams) => Promise<FieldValueRetrievalMethodHandleRes> | FieldValueRetrievalMethodHandleRes;
+/**
+ * 字段值获取方法
+ */
+interface FieldValueRetrievalMethod {
+    name: string;
+    handle: FieldValueRetrievalMethodHandle;
+}
+/**
+ * 取值方式优先级应由高到低排序，取第一个有效值
+ */
+export declare const FIELD_VALUE_RETRIEVAL_METHODS: FieldValueRetrievalMethod[];
+export {};
+//# sourceMappingURL=constants.d.ts.map

package/dist/utils/evaluate-variables/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/constants.ts"],"names":[],"mappings":"AAEA,UAAU,qCAAqC;IAC7C;;OAEG;IACH,oBAAoB,EAAE,GAAG,CAAC;IAE1B;;;OAGG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;IAEjC;;OAEG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAG3B;AAED,MAAM,WAAW,kCAAkC;IACjD,KAAK,CAAC,EAAE,GAAG,CAAC;IAEZ,IAAI,CAAC,EAAE,MAAM,CAAC;IAEd,OAAO,CAAC,EAAE,GAAG,CAAC;IAEd,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,KAAK,+BAA+B,GAAG,CACrC,MAAM,EAAE,qCAAqC,KAE3C,OAAO,CAAC,kCAAkC,CAAC,GAC3C,kCAAkC,CAAC;AAEvC;;GAEG;AACH,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,+BAA+B,CAAC;CACzC;AAqCD;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,yBAAyB,EAmCpE,CAAC"}

package/dist/utils/evaluate-variables/constants.js

@@ -0,0 +1,65 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FIELD_VALUE_RETRIEVAL_METHODS = void 0;
+const jsonata_1 = __importDefault(require("jsonata"));
+const expressionHandle = async (params) => {
+    const { input, retrievalMethodValue, returnExpressionAsData, objectExpression,
+    // expressionMayContainObject
+     } = params;
+    /**
+     * 具有 objectArrayItemsExpression 的说明数据，不能返回表达式，只就返回数据。
+     */
+    if (returnExpressionAsData) {
+        return {
+            expression: retrievalMethodValue,
+        };
+    }
+    let jsonataStr = retrievalMethodValue;
+    if (objectExpression) {
+        jsonataStr = retrievalMethodValue.replace("{}", objectExpression);
+    }
+    const expression = (0, jsonata_1.default)(jsonataStr);
+    const data = await expression.evaluate(input);
+    const res = {
+        data,
+    };
+    return res;
+};
+/**
+ * 取值方式优先级应由高到低排序，取第一个有效值
+ */
+exports.FIELD_VALUE_RETRIEVAL_METHODS = [
+    {
+        name: "const",
+        handle: (params) => {
+            const { retrievalMethodValue } = params;
+            const res = {
+                const: retrievalMethodValue,
+                data: retrievalMethodValue,
+            };
+            return res;
+        },
+    },
+    {
+        name: "x-expression-const",
+        handle: expressionHandle,
+    },
+    {
+        name: "x-expression",
+        handle: expressionHandle,
+    },
+    {
+        name: "default",
+        handle: (params) => {
+            const { retrievalMethodValue } = params;
+            const res = {
+                default: retrievalMethodValue,
+                data: retrievalMethodValue,
+            };
+            return res;
+        },
+    },
+];

package/dist/utils/{evaluate-variables.d.ts → evaluate-variables/index.d.ts}

@@ -1,5 +1,6 @@
+import { JSONSchema7 } from "json-schema";
 interface EvaluateVariablesParams {
-    expression: any;
+    jsonSchema: JSONSchema7;
     variables: any;
 }
 interface EvaluateVariablesRes {
@@ -8,4 +9,4 @@ interface EvaluateVariablesRes {
 type EvaluateVariables = (params: EvaluateVariablesParams) => Promise<EvaluateVariablesRes>;
 export declare const evaluateVariables: EvaluateVariables;
 export {};
-//# sourceMappingURL=evaluate-variables.d.ts.map
+//# sourceMappingURL=index.d.ts.map

package/dist/utils/evaluate-variables/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1C,UAAU,uBAAuB;IAC/B,UAAU,EAAE,WAAW,CAAC;IACxB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,KAAK,iBAAiB,GAAG,CACvB,MAAM,EAAE,uBAAuB,KAC5B,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,eAAO,MAAM,iBAAiB,EAAE,iBAe/B,CAAC"}

package/dist/utils/evaluate-variables/index.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.evaluateVariables = void 0;
+const resolve_json_schema_1 = require("./utils/resolve-json-schema");
+const evaluateVariables = async (params) => {
+    const { jsonSchema, variables: paramsVariables } = params;
+    const resolveJsonSchemaRes = await (0, resolve_json_schema_1.resolveJsonSchema)({
+        jsonSchema,
+        input: paramsVariables,
+    });
+    const variables = JSON.parse(JSON.stringify(resolveJsonSchemaRes.data));
+    const res = {
+        variables,
+    };
+    return res;
+};
+exports.evaluateVariables = evaluateVariables;

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

@@ -0,0 +1,2 @@
+export declare const getFieldPathByFieldTypeKey: (fieldTypeKey: string) => string;
+//# sourceMappingURL=get-field-path-by-field-type-key.d.ts.map

package/dist/utils/evaluate-variables/utils/get-field-path-by-field-type-key.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-field-path-by-field-type-key.d.ts","sourceRoot":"","sources":["../../../../src/utils/evaluate-variables/utils/get-field-path-by-field-type-key.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,0BAA0B,GAAI,cAAc,MAAM,KAAG,MAiBjE,CAAC"}

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

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

package/dist/utils/evaluate-variables/utils/resolve-json-schema.d.ts

@@ -0,0 +1,22 @@
+import { JSONSchema7 } from "json-schema";
+interface ResolveJsonSchemaParams {
+    jsonSchema: JSONSchema7;
+    /**
+     * 输入
+     */
+    input: any;
+    /**
+     * 直接返回表达式作为数据
+     */
+    returnExpressionAsData?: boolean;
+}
+interface ResolveJsonSchemaRes {
+    const?: any;
+    data?: any;
+    default?: any;
+    expression?: any;
+}
+type ResolveJsonSchema = (params: ResolveJsonSchemaParams) => Promise<ResolveJsonSchemaRes>;
+export declare const resolveJsonSchema: ResolveJsonSchema;
+export {};
+//# sourceMappingURL=resolve-json-schema.d.ts.map

package/dist/utils/evaluate-variables/utils/resolve-json-schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-json-schema.d.ts","sourceRoot":"","sources":["../../../../src/utils/evaluate-variables/utils/resolve-json-schema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAuB,MAAM,aAAa,CAAC;AAO/D,UAAU,uBAAuB;IAC/B,UAAU,EAAE,WAAW,CAAC;IAExB;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CAClC;AAED,UAAU,oBAAoB;IAC5B,KAAK,CAAC,EAAE,GAAG,CAAC;IAEZ,IAAI,CAAC,EAAE,GAAG,CAAC;IAEX,OAAO,CAAC,EAAE,GAAG,CAAC;IAEd,UAAU,CAAC,EAAE,GAAG,CAAC;CAClB;AAED,KAAK,iBAAiB,GAAG,CACvB,MAAM,EAAE,uBAAuB,KAC5B,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,eAAO,MAAM,iBAAiB,EAAE,iBAkK/B,CAAC"}

package/dist/utils/evaluate-variables/utils/resolve-json-schema.js

@@ -0,0 +1,112 @@
+"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 lodash_1 = __importDefault(require("lodash"));
+const constants_1 = require("../constants");
+const resolveJsonSchema = async (params) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
+    const { input, jsonSchema, returnExpressionAsData } = params;
+    const { type } = jsonSchema;
+    const res = {};
+    switch (type) {
+        case "object": {
+            const properties = lodash_1.default.get(jsonSchema, "properties");
+            const promises = lodash_1.default.keys(properties).map(async (propertyKey) => {
+                const propertyValue = lodash_1.default.get(properties, propertyKey);
+                if (!lodash_1.default.isObject(propertyValue)) {
+                    return;
+                }
+                const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
+                    jsonSchema: propertyValue,
+                    input,
+                    returnExpressionAsData,
+                });
+                lodash_1.default.set(res, `data.${propertyKey}`, resolveJsonSchemaRes.data);
+                lodash_1.default.set(res, `const.${propertyKey}`, resolveJsonSchemaRes.const);
+                lodash_1.default.set(res, `default.${propertyKey}`, resolveJsonSchemaRes.default);
+                lodash_1.default.set(res, `expression.${propertyKey}`, resolveJsonSchemaRes.expression);
+            });
+            await Promise.all(promises);
+            break;
+        }
+        case "array": {
+            const itemsType = (_a = jsonSchema.items) === null || _a === void 0 ? void 0 : _a.type;
+            let objectExpression;
+            if (itemsType === "object") {
+                const resolveJsonSchemaRes = await (0, exports.resolveJsonSchema)({
+                    jsonSchema: jsonSchema.items,
+                    input,
+                    returnExpressionAsData: true,
+                });
+                const expressionSubstrings = [];
+                lodash_1.default.each(resolveJsonSchemaRes.expression, (value, key) => {
+                    if (value) {
+                        expressionSubstrings.push(`"${key}": ${value}`);
+                    }
+                });
+                objectExpression = `{${expressionSubstrings.join(",")}}`;
+            }
+            const promises = constants_1.FIELD_VALUE_RETRIEVAL_METHODS.map(async (fieldValueRetrievalMethod) => {
+                const { name, handle } = fieldValueRetrievalMethod;
+                /**
+                 * 字段的真实 path 是 key 去除类型
+                 */
+                const value = lodash_1.default.get(jsonSchema, name);
+                let res;
+                if (!lodash_1.default.isNil(value)) {
+                    res = await handle({
+                        input,
+                        retrievalMethodValue: value,
+                        objectExpression,
+                        returnExpressionAsData,
+                    });
+                }
+                return res;
+            });
+            const fieldValues = await Promise.all(promises);
+            res.const = (_b = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.const))) === null || _b === void 0 ? void 0 : _b.const;
+            res.data = (_c = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.data))) === null || _c === void 0 ? void 0 : _c.data;
+            res.default = (_d = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.default))) === null || _d === void 0 ? void 0 : _d.default;
+            res.expression = (_e = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.expression))) === null || _e === void 0 ? void 0 : _e.expression;
+            break;
+        }
+        case "boolean":
+        case "integer":
+        case "number":
+        case "string": {
+            const promises = constants_1.FIELD_VALUE_RETRIEVAL_METHODS.map(async (fieldValueRetrievalMethod) => {
+                const { name, handle } = fieldValueRetrievalMethod;
+                /**
+                 * 字段的真实 path 是 key 去除类型
+                 */
+                const value = lodash_1.default.get(jsonSchema, name);
+                let res;
+                if (!lodash_1.default.isNil(value)) {
+                    res = await handle({
+                        input,
+                        retrievalMethodValue: value,
+                        returnExpressionAsData,
+                    });
+                }
+                return res;
+            });
+            const fieldValues = await Promise.all(promises);
+            res.const = (_f = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.const))) === null || _f === void 0 ? void 0 : _f.const;
+            res.data = (_g = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.data))) === null || _g === void 0 ? void 0 : _g.data;
+            res.default = (_h = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.default))) === null || _h === void 0 ? void 0 : _h.default;
+            res.expression = (_j = fieldValues.find((value) => !lodash_1.default.isNil(value === null || value === void 0 ? void 0 : value.expression))) === null || _j === void 0 ? void 0 : _j.expression;
+            break;
+        }
+        case "null": {
+            break;
+        }
+        default: {
+            throw new Error("invalid field type");
+        }
+    }
+    return res;
+};
+exports.resolveJsonSchema = resolveJsonSchema;

package/dist/utils/evaluate-variables.test.js

@@ -74,64 +74,150 @@ const input = {
         ],
     },
 };
-const expression = JSON.parse(JSON.stringify({
-    CurrentAccount: "Current Account",
-    AccountName: `jsonata:Account."Account Name"`,
-    CurrentOrder: `jsonata:"Current Order"`,
-    OrderPrice: `jsonata:$sum(Account.Order.Product.(Price * Quantity))`,
-    OrderIds: `jsonata:Account.Order.Product.ProductID`,
-    nestd: {
-        CurrentAccount: "Current Account",
-        AccountName: `jsonata:Account."Account Name"`,
-        CurrentOrder: `jsonata:"Current Order"`,
-        OrderPrice: `jsonata:$sum(Account.Order.Product.(Price * Quantity))`,
-        OrderIds: `jsonata:Account.Order.Product.ProductID`,
+const subJsonSchema = {
+    type: "object",
+    properties: {
+        CurrentAccount: {
+            type: "string",
+            /**
+             * 从默认值内取值
+             */
+            default: "Current Account",
+            const: "Current Account",
+        },
+        type: {
+            type: "string",
+            default: "order",
+        },
+        AccountName: {
+            type: "string",
+            /**
+             * 根据 jsonata 取值
+             */
+            // @ts-ignore
+            "x-expression": `Account."Account Name"`,
+        },
+        CurrentOrder: {
+            type: "string",
+            /**
+             * 根据 jsonata 取值
+             */
+            // @ts-ignore
+            "x-expression": `"Current Order"`,
+        },
+        OrderPrice: {
+            type: "number",
+            // @ts-ignore
+            "x-expression": "$sum(Account.Order.Product.(Price * Quantity))",
+        },
+        ProductIds: {
+            type: "array",
+            items: {
+                type: "number",
+            },
+            // @ts-ignore
+            "x-expression": "Account.Order.Product.ProductID",
+        },
+        ordersWithProductIds: {
+            type: "array",
+            title: "具有产品 ID 的订单列表",
+            items: {
+                type: "object",
+                properties: {
+                    CurrentOrdersWithProductIdsTitle: {
+                        type: "string",
+                        /**
+                         * 从默认值内取值
+                         */
+                        default: "CurrentOrdersWithProductIdsTitle",
+                        const: "CurrentOrdersWithProductIdsTitle",
+                    },
+                    productIds: {
+                        type: "array",
+                        items: {
+                            type: "number",
+                        },
+                        // @ts-ignore
+                        "x-expression": "$v.Product.ProductID",
+                    },
+                    AccountName: {
+                        type: "string",
+                        /**
+                         * 根据 jsonata 取值
+                         */
+                        // @ts-ignore
+                        "x-expression": `Account."Account Name"`,
+                    },
+                    orderId: {
+                        type: "string",
+                        // @ts-ignore
+                        "x-expression": "$v.OrderID",
+                    },
+                },
+            },
+            // @ts-ignore
+            "x-expression": "$map($.Account.Order, function($v, $i, $a) {{}})",
+        },
+    },
+};
+const jsonSchema = {
+    type: "object",
+    properties: {
+        ...subJsonSchema.properties,
         nestd: {
-            CurrentAccount: "Current Account",
-            AccountName: `jsonata:Account."Account Name"`,
-            CurrentOrder: `jsonata:"Current Order"`,
-            OrderPrice: `jsonata:$sum(Account.Order.Product.(Price * Quantity))`,
-            OrderIds: `jsonata:Account.Order.Product.ProductID`,
-            nestd: {
-                CurrentAccount: "Current Account",
-                AccountName: `jsonata:Account."Account Name"`,
-                CurrentOrder: `jsonata:"Current Order"`,
-                OrderPrice: `jsonata:$sum(Account.Order.Product.(Price * Quantity))`,
-                OrderIds: `jsonata:Account.Order.Product.ProductID`,
+            type: "object",
+            properties: {
+                ...subJsonSchema.properties,
+                nestd: {
+                    type: "object",
+                    properties: {
+                        ...subJsonSchema.properties,
+                        nestd: {
+                            type: "object",
+                            properties: {
+                                ...subJsonSchema.properties,
+                            },
+                        },
+                    },
+                },
             },
         },
     },
-}));
+};
 test("evaluate variables", async () => {
     const evaluateVariablesRes = await (0, evaluate_variables_1.evaluateVariables)({
-        expression,
+        jsonSchema,
         variables: input,
     });
     const expectedObject = {
         variables: {
             CurrentAccount: "Current Account",
+            type: "order",
             AccountName: "Firefly",
             CurrentOrder: "Current Order",
             OrderPrice: 336.36,
-            OrderIds: [858383, 858236, 858383, 345664],
+            ProductIds: [858383, 858236, 858383, 345664],
             nestd: {
                 CurrentAccount: "Current Account",
+                type: "order",
                 AccountName: "Firefly",
                 CurrentOrder: "Current Order",
                 OrderPrice: 336.36,
-                OrderIds: [858383, 858236, 858383, 345664],
+                ProductIds: [858383, 858236, 858383, 345664],
                 nestd: {
                     CurrentAccount: "Current Account",
+                    type: "order",
                     AccountName: "Firefly",
                     CurrentOrder: "Current Order",
                     OrderPrice: 336.36,
-                    OrderIds: [858383, 858236, 858383, 345664],
+                    ProductIds: [858383, 858236, 858383, 345664],
                     nestd: {
                         CurrentAccount: "Current Account",
+                        type: "order",
                         AccountName: "Firefly",
                         CurrentOrder: "Current Order",
                         OrderPrice: 336.36,
-                        OrderIds: [858383, 858236, 858383, 345664],
+                        ProductIds: [858383, 858236, 858383, 345664],
                     },
                 },
             },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ldsg/workflow",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "",
   "main": "dist/index.js",
   "files": [
@@ -16,16 +16,17 @@
   "dependencies": {
     "flat": "^5.0.2",
     "json-schema": "0.4.0",
+    "json-schema-default": "^1.0.2",
     "lodash": "^4.17.21",
-    "@ldsg/handler": "0.3.0",
-    "@ldsg/resource-definition": "0.3.0",
-    "@ldsg/resource": "0.3.0"
+    "@ldsg/handler": "0.3.1",
+    "@ldsg/resource-definition": "0.3.1",
+    "@ldsg/resource": "0.3.1"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",
     "@types/json-schema": "^7.0.15",
     "@types/lodash": "^4.14.202",
-    "@ldsg/types": "0.3.0"
+    "@ldsg/types": "0.3.1"
   },
   "scripts": {
     "build": "tsc --project tsconfig.build.json",

package/dist/utils/evaluate-variables.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"evaluate-variables.d.ts","sourceRoot":"","sources":["../../src/utils/evaluate-variables.ts"],"names":[],"mappings":"AAIA,UAAU,uBAAuB;IAC/B,UAAU,EAAE,GAAG,CAAC;IAChB,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,KAAK,iBAAiB,GAAG,CACvB,MAAM,EAAE,uBAAuB,KAC5B,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAEnC,eAAO,MAAM,iBAAiB,EAAE,iBAkC/B,CAAC"}

package/dist/utils/evaluate-variables.js

@@ -1,35 +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.evaluateVariables = void 0;
-const flat_1 = require("flat");
-const jsonata_1 = __importDefault(require("jsonata"));
-const lodash_1 = __importDefault(require("lodash"));
-const evaluateVariables = async (params) => {
-    const { expression: paramsExpression, variables: input } = params;
-    const flattenRes = (0, flat_1.flatten)(paramsExpression);
-    const expressionSubstrings = [];
-    lodash_1.default.each(flattenRes, (value, key) => {
-        if (value.startsWith("jsonata:")) {
-            const { pathname } = new URL(value);
-            if (pathname) {
-                expressionSubstrings.push(`"${key}": ${pathname}`);
-            }
-        }
-        else {
-            const stringifyRes = JSON.stringify({ [key]: value });
-            const pushParams = stringifyRes.slice(1, -1);
-            expressionSubstrings.push(pushParams);
-        }
-    });
-    const expression = `{${expressionSubstrings.join(",")}}`;
-    const evaluateRes = await (0, jsonata_1.default)(expression).evaluate(input);
-    const variables = (0, flat_1.unflatten)(evaluateRes);
-    const res = {
-        variables: JSON.parse(JSON.stringify(variables)),
-    };
-    return res;
-};
-exports.evaluateVariables = evaluateVariables;