@ldsg/workflow 0.3.8 → 0.3.10

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

@@ -1,4 +1,4 @@
-import { SpecificResourceSettings } from "@ldsg/types";
+import { SpecificResourceSettings } from '@ldsg/types';
 export interface WorkflowSpecificResourceSettings extends SpecificResourceSettings {
     /**
      * Start Workflow Node Resource ID

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,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,gCACf,SAAQ,wBAAwB;IAChC;;OAEG;IACH,2BAA2B,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,yBAAyB,EAAE,MAAM,CAAC;CACnC"}
+{"version":3,"file":"specific-resource-settings.d.ts","sourceRoot":"","sources":["../../src/types/specific-resource-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAEvD,MAAM,WAAW,gCAAiC,SAAQ,wBAAwB;IAChF;;OAEG;IACH,2BAA2B,EAAE,MAAM,CAAC;IAEpC;;OAEG;IACH,yBAAyB,EAAE,MAAM,CAAC;CACnC"}

package/dist/types/workflow.d.ts

@@ -1,11 +1,15 @@
-import { WorkflowEdgeInfo } from "./edge";
-import { WorkflowNodeInfo } from "./node";
-import { WorkflowVariables } from "./variables";
+import { WorkflowEdgeInfo } from './edge';
+import { WorkflowNodeInfo } from './node';
+import { WorkflowVariables } from './variables';
 export interface WorkflowData {
     edges: WorkflowEdgeInfo[];
     nodes: WorkflowNodeInfo[];
 }
 export interface WorkflowExecuteParams {
+    /**
+     * 上下文
+     */
+    context: any;
     /**
      * 工作流输入变量
      */

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,SAAS,EAAE,iBAAiB,CAAC;IAE7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,SAAS,EAAE,iBAAiB,CAAC;CAC9B;AAED;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAC5B,MAAM,EAAE,qBAAqB,KAC1B,OAAO,CAAC,kBAAkB,CAAC,CAAC;AAEjC,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;CAC7D;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"}

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

@@ -1 +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,EAuCpE,CAAC"}
+{"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,KAC1C,OAAO,CAAC,kCAAkC,CAAC,GAAG,kCAAkC,CAAC;AAEtF;;GAEG;AACH,UAAU,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,+BAA+B,CAAC;CACzC;AAqCD;;GAEG;AACH,eAAO,MAAM,6BAA6B,EAAE,yBAAyB,EAuCpE,CAAC"}

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

@@ -6,7 +6,7 @@ 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,
+    const { input, retrievalMethodValue, returnExpressionAsData, objectExpression
     // expressionMayContainObject
      } = params;
     /**
@@ -14,17 +14,17 @@ const expressionHandle = async (params) => {
      */
     if (returnExpressionAsData) {
         return {
-            expression: retrievalMethodValue,
+            expression: retrievalMethodValue
         };
     }
     let jsonataStr = retrievalMethodValue;
     if (objectExpression) {
-        jsonataStr = retrievalMethodValue.replace("{}", objectExpression);
+        jsonataStr = retrievalMethodValue.replace('{}', objectExpression);
     }
     const expression = (0, jsonata_1.default)(jsonataStr);
     const data = await expression.evaluate(input);
     const res = {
-        data,
+        data
     };
     return res;
 };
@@ -33,37 +33,37 @@ const expressionHandle = async (params) => {
  */
 exports.FIELD_VALUE_RETRIEVAL_METHODS = [
     {
-        name: "const",
+        name: 'const',
         handle: (params) => {
             const { retrievalMethodValue } = params;
             const res = {
                 const: retrievalMethodValue,
-                data: retrievalMethodValue,
+                data: retrievalMethodValue
             };
             return res;
-        },
+        }
     },
     {
-        name: "x-expression-const",
-        handle: expressionHandle,
+        name: 'x-expression-const',
+        handle: expressionHandle
     },
     {
-        name: "x-expression",
-        handle: expressionHandle,
+        name: 'x-expression',
+        handle: expressionHandle
     },
     {
-        name: "x-expression-default",
-        handle: expressionHandle,
+        name: 'x-expression-default',
+        handle: expressionHandle
     },
     {
-        name: "default",
+        name: 'default',
         handle: (params) => {
             const { retrievalMethodValue } = params;
             const res = {
                 default: retrievalMethodValue,
-                data: retrievalMethodValue,
+                data: retrievalMethodValue
             };
             return res;
-        },
-    },
+        }
+    }
 ];

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

@@ -1,6 +1,6 @@
-import { JSONSchema7 } from "json-schema";
+import { JSONSchemaWithExpressionExtension } from '../../types';
 interface EvaluateVariablesParams {
-    jsonSchema: JSONSchema7;
+    jsonSchema: JSONSchemaWithExpressionExtension;
     variables: any;
 }
 interface EvaluateVariablesRes {

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

@@ -1 +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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,aAAa,CAAC;AAGhE,UAAU,uBAAuB;IAC/B,UAAU,EAAE,iCAAiC,CAAC;IAC9C,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,UAAU,oBAAoB;IAC5B,SAAS,EAAE,GAAG,CAAC;CAChB;AAED,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5F,eAAO,MAAM,iBAAiB,EAAE,iBAe/B,CAAC"}

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.debug.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.debug.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/index.debug.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,194 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
+const _1 = require(".");
+const input = {
+    Account: {
+        'Account Name': 'Firefly',
+        Order: [
+            {
+                OrderID: 'order103',
+                Product: [
+                    {
+                        'Product Name': 'Bowler Hat',
+                        ProductID: 858383,
+                        SKU: '0406654608',
+                        Description: {
+                            Colour: 'Purple',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.75
+                        },
+                        Price: 34.45,
+                        Quantity: 2
+                    },
+                    {
+                        'Product Name': 'Trilby hat',
+                        ProductID: 858236,
+                        SKU: '0406634348',
+                        Description: {
+                            Colour: 'Orange',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.6
+                        },
+                        Price: 21.67,
+                        Quantity: 1
+                    }
+                ]
+            },
+            {
+                OrderID: 'order104',
+                Product: [
+                    {
+                        'Product Name': 'Bowler Hat',
+                        ProductID: 858383,
+                        SKU: '040657863',
+                        Description: {
+                            Colour: 'Purple',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.75
+                        },
+                        Price: 34.45,
+                        Quantity: 4
+                    },
+                    {
+                        ProductID: 345664,
+                        SKU: '0406654603',
+                        'Product Name': 'Cloak',
+                        Description: {
+                            Colour: 'Black',
+                            Width: 30,
+                            Height: 20,
+                            Depth: 210,
+                            Weight: 2
+                        },
+                        Price: 107.99,
+                        Quantity: 1
+                    }
+                ]
+            }
+        ]
+    }
+};
+const subJsonSchema = {
+    type: 'object',
+    properties: {
+        CurrentAccount: {
+            type: 'string',
+            /**
+             * 从默认值内取值
+             */
+            default: 'Current Account',
+            const: 'Current Account'
+        },
+        type: {
+            type: 'string',
+            default: 'order',
+            const: 'order'
+        },
+        AccountName: {
+            type: 'string',
+            /**
+             * 根据 jsonata 取值
+             */
+            'x-expression': `Account."Account Name"`
+        },
+        CurrentOrder: {
+            type: 'string',
+            /**
+             * 根据 jsonata 取值
+             */
+            'x-expression': `"Current Order"`
+        },
+        OrderPrice: {
+            type: 'number',
+            'x-expression': '$sum(Account.Order.Product.(Price * Quantity))'
+        },
+        ProductIds: {
+            type: 'array',
+            items: {
+                type: 'number'
+            },
+            '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'
+                        },
+                        'x-expression': '$v.Product.ProductID'
+                    },
+                    AccountName: {
+                        type: 'string',
+                        /**
+                         * 根据 jsonata 取值
+                         */
+                        'x-expression': `Account."Account Name"`
+                    },
+                    orderId: {
+                        type: 'string',
+                        'x-expression': '$v.OrderID'
+                    }
+                }
+            },
+            'x-expression': '$map($.Account.Order, function($v, $i, $a) {{}})'
+        }
+    }
+};
+const jsonSchema = {
+    type: 'object',
+    properties: {
+        ...subJsonSchema.properties,
+        nestd: {
+            type: 'object',
+            properties: {
+                ...subJsonSchema.properties,
+                nestd: {
+                    type: 'object',
+                    properties: {
+                        ...subJsonSchema.properties,
+                        nestd: {
+                            type: 'object',
+                            properties: {
+                                ...subJsonSchema.properties
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+};
+const main = async () => {
+    const evaluateVariablesRes = await (0, _1.evaluateVariables)({
+        jsonSchema,
+        variables: input
+    });
+    await fs_extra_1.default.writeJson(path_1.default.resolve(__dirname, 'evaluate-variables-res.json'), evaluateVariablesRes, {
+        spaces: 2
+    });
+};
+main();

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

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

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=index.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.test.d.ts","sourceRoot":"","sources":["../../../src/utils/evaluate-variables/index.test.ts"],"names":[],"mappings":""}

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

@@ -0,0 +1,219 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const _1 = require(".");
+const input = {
+    Account: {
+        'Account Name': 'Firefly',
+        Order: [
+            {
+                OrderID: 'order103',
+                Product: [
+                    {
+                        'Product Name': 'Bowler Hat',
+                        ProductID: 858383,
+                        SKU: '0406654608',
+                        Description: {
+                            Colour: 'Purple',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.75
+                        },
+                        Price: 34.45,
+                        Quantity: 2
+                    },
+                    {
+                        'Product Name': 'Trilby hat',
+                        ProductID: 858236,
+                        SKU: '0406634348',
+                        Description: {
+                            Colour: 'Orange',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.6
+                        },
+                        Price: 21.67,
+                        Quantity: 1
+                    }
+                ]
+            },
+            {
+                OrderID: 'order104',
+                Product: [
+                    {
+                        'Product Name': 'Bowler Hat',
+                        ProductID: 858383,
+                        SKU: '040657863',
+                        Description: {
+                            Colour: 'Purple',
+                            Width: 300,
+                            Height: 200,
+                            Depth: 210,
+                            Weight: 0.75
+                        },
+                        Price: 34.45,
+                        Quantity: 4
+                    },
+                    {
+                        ProductID: 345664,
+                        SKU: '0406654603',
+                        'Product Name': 'Cloak',
+                        Description: {
+                            Colour: 'Black',
+                            Width: 30,
+                            Height: 20,
+                            Depth: 210,
+                            Weight: 2
+                        },
+                        Price: 107.99,
+                        Quantity: 1
+                    }
+                ]
+            }
+        ]
+    }
+};
+const subJsonSchema = {
+    type: 'object',
+    properties: {
+        CurrentAccount: {
+            type: 'string',
+            /**
+             * 从默认值内取值
+             */
+            default: 'Current Account',
+            const: 'Current Account'
+        },
+        type: {
+            type: 'string',
+            default: 'order'
+        },
+        AccountName: {
+            type: 'string',
+            /**
+             * 根据 jsonata 取值
+             */
+            'x-expression': `Account."Account Name"`
+        },
+        CurrentOrder: {
+            type: 'string',
+            /**
+             * 根据 jsonata 取值
+             */
+            'x-expression': `"Current Order"`
+        },
+        OrderPrice: {
+            type: 'number',
+            'x-expression': '$sum(Account.Order.Product.(Price * Quantity))'
+        },
+        ProductIds: {
+            type: 'array',
+            items: {
+                type: 'number'
+            },
+            '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'
+                        },
+                        'x-expression': '$v.Product.ProductID'
+                    },
+                    AccountName: {
+                        type: 'string',
+                        /**
+                         * 根据 jsonata 取值
+                         */
+                        'x-expression': `Account."Account Name"`
+                    },
+                    orderId: {
+                        type: 'string',
+                        'x-expression': '$v.OrderID'
+                    }
+                }
+            },
+            'x-expression': '$map($.Account.Order, function($v, $i, $a) {{}})'
+        }
+    }
+};
+const jsonSchema = {
+    type: 'object',
+    properties: {
+        ...subJsonSchema.properties,
+        nestd: {
+            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, _1.evaluateVariables)({
+        jsonSchema,
+        variables: input
+    });
+    const expectedObject = {
+        variables: {
+            CurrentAccount: 'Current Account',
+            type: 'order',
+            AccountName: 'Firefly',
+            CurrentOrder: 'Current Order',
+            OrderPrice: 336.36,
+            ProductIds: [858383, 858236, 858383, 345664],
+            nestd: {
+                CurrentAccount: 'Current Account',
+                type: 'order',
+                AccountName: 'Firefly',
+                CurrentOrder: 'Current Order',
+                OrderPrice: 336.36,
+                ProductIds: [858383, 858236, 858383, 345664],
+                nestd: {
+                    CurrentAccount: 'Current Account',
+                    type: 'order',
+                    AccountName: 'Firefly',
+                    CurrentOrder: 'Current Order',
+                    OrderPrice: 336.36,
+                    ProductIds: [858383, 858236, 858383, 345664],
+                    nestd: {
+                        CurrentAccount: 'Current Account',
+                        type: 'order',
+                        AccountName: 'Firefly',
+                        CurrentOrder: 'Current Order',
+                        OrderPrice: 336.36,
+                        ProductIds: [858383, 858236, 858383, 345664]
+                    }
+                }
+            }
+        }
+    };
+    expect(evaluateVariablesRes).toMatchObject(expectedObject);
+});

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

@@ -0,0 +1,21 @@
+import { JSONSchemaWithExpressionExtension } from '../../../../types';
+interface GetDataWithJsonSchemaAndInputParams {
+    /**
+     * 输入
+     */
+    input: any;
+    /**
+     * json schema
+     */
+    jsonSchema: JSONSchemaWithExpressionExtension;
+}
+interface GetDataWithJsonSchemaAndInputRes {
+    /**
+     * 数据
+     */
+    data?: any;
+}
+type GetDataWithJsonSchemaAndInput = (params: GetDataWithJsonSchemaAndInputParams) => Promise<GetDataWithJsonSchemaAndInputRes>;
+export declare const getDataWithJsonSchemaAndInput: GetDataWithJsonSchemaAndInput;
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAGtE,UAAU,mCAAmC;IAC3C;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,UAAU,EAAE,iCAAiC,CAAC;CAC/C;AAED,UAAU,gCAAgC;IACxC;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,KAAK,6BAA6B,GAAG,CACnC,MAAM,EAAE,mCAAmC,KACxC,OAAO,CAAC,gCAAgC,CAAC,CAAC;AAE/C,eAAO,MAAM,6BAA6B,EAAE,6BAc3C,CAAC"}

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

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

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

@@ -1,20 +1,23 @@
-import { JSONSchema7 } from "json-schema";
+import { JSONSchemaWithExpressionExtension } from '../../../../types';
 interface ResolveJsonSchemaParams {
-    jsonSchema: JSONSchema7;
     /**
      * 输入
      */
     input: any;
     /**
-     * 直接返回表达式作为数据
+     * json schema
      */
-    returnExpressionAsData?: boolean;
+    jsonSchema: JSONSchemaWithExpressionExtension;
+    /**
+     * 源数据，即上级数据
+     */
+    source?: any;
 }
 interface ResolveJsonSchemaRes {
-    const?: any;
+    /**
+     * 数据
+     */
     data?: any;
-    default?: any;
-    expression?: any;
 }
 type ResolveJsonSchema = (params: ResolveJsonSchemaParams) => Promise<ResolveJsonSchemaRes>;
 export declare const resolveJsonSchema: ResolveJsonSchema;

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-json-schema.d.ts","sourceRoot":"","sources":["../../../../../src/utils/evaluate-variables/utils/get-data-with-json-schema-and-input/resolve-json-schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAEtE,UAAU,uBAAuB;IAC/B;;OAEG;IACH,KAAK,EAAE,GAAG,CAAC;IAEX;;OAEG;IACH,UAAU,EAAE,iCAAiC,CAAC;IAE9C;;OAEG;IACH,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED,UAAU,oBAAoB;IAC5B;;OAEG;IACH,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAED,KAAK,iBAAiB,GAAG,CAAC,MAAM,EAAE,uBAAuB,KAAK,OAAO,CAAC,oBAAoB,CAAC,CAAC;AAE5F,eAAO,MAAM,iBAAiB,EAAE,iBAkF/B,CAAC"}