apipost-cli 2.0.23 → 2.0.24

package/dist/index.js

@@ -222169,6 +222169,33 @@ const parseExp = (exp, environments, lang = 'en', customFunc) => {
             };
         }
         // } else if (isNumericString(distData) || (_.startsWith(distData, '"') && _.endsWith(distData, '"')) ||
+    } else if (_.startsWith(distData, '$function.fn_')) {
+        const regex = /\$function\.fn_([a-zA-Z0-9_]+)\(([^)]*)\)/;
+        const match = distData.match(regex);
+
+        if (!match || !_.isString(match[1]) || !_.isString(match[2]) || !_.has(encodeFunctions, `fn_${_.toLower(_.trim(match[1]))}`)) {
+            dist = {
+                type: 'fixed',
+                expression: `{{${distData}}}`,
+                value: `{{${distData}}}`,
+            };
+        } else {
+            try {
+                const callMethod = _.get(encodeFunctions, `fn_${_.toLower(_.trim(match[1]))}`);
+                const parameter = match[2];
+                dist = {
+                    type: 'function',
+                    expression: `fn_${_.trim(match[1])}(${parameter})`,
+                    value: callMethod(parameter),
+                };
+            } catch (e) {
+                dist = {
+                    type: 'fixed',
+                    expression: `{{${distData}}}`,
+                    value: `{{${distData}}}`,
+                };
+            }
+        }
     } else if ((_.startsWith(distData, '"') && _.endsWith(distData, '"')) ||
         (_.startsWith(distData, "'") && _.endsWith(distData, "'"))) {
         dist = {
@@ -528542,6 +528569,7 @@ const convert2PostmanRequest = (request, option) => {
     const queryAddEqual = _.toInteger(
         _.get(request, "request.query.query_add_equal") || -1
     );
+
     _.forEach(_.get(request, "request.query.parameter"), (item) => {
         if (_.isObject(item) && item?.is_checked > 0) {
             let { key, value, schema } = item;
@@ -528549,7 +528577,7 @@ const convert2PostmanRequest = (request, option) => {
             value = String(autoReplaceMockVar(value));
 
             if (value == '' && _.isObject(schema)) {
-                const tmpValue = jsfGenerate(schema, [], option?.lang);
+                const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                 if (!_.isUndefined(tmpValue)) {
                     value = tmpValue;
@@ -528592,7 +528620,7 @@ const convert2PostmanRequest = (request, option) => {
                 value = autoReplaceMockVar(value);
 
                 if (value == '' && _.isObject(schema)) {
-                    const tmpValue = jsfGenerate(schema, [], option?.lang);
+                    const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                     if (!_.isUndefined(tmpValue)) {
                         value = tmpValue;
@@ -528779,7 +528807,7 @@ const convert2PostmanRequest = (request, option) => {
             value = autoReplaceMockVar(value);
 
             if (value == '' && _.isObject(schema)) {
-                const tmpValue = jsfGenerate(schema, [], option?.lang);
+                const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                 if (!_.isUndefined(tmpValue)) {
                     value = tmpValue;
@@ -528869,7 +528897,7 @@ const convert2PostmanRequest = (request, option) => {
                     let value = autoReplaceMockVar(item.value);
 
                     if (value == '' && _.isObject(item?.schema)) {
-                        const tmpValue = jsfGenerate(item?.schema, [], option?.lang);
+                        const tmpValue = jsfGenerate(item?.schema, [], option?.lang, option?.custom_functions || {});
 
                         if (!_.isUndefined(tmpValue)) {
                             value = tmpValue;
@@ -528965,7 +528993,7 @@ const convert2PostmanRequest = (request, option) => {
                                 value = autoReplaceMockVar(value);
 
                                 if (value == '' && _.isObject(schema)) {
-                                    const tmpValue = jsfGenerate(schema, [], option?.lang);
+                                    const tmpValue = jsfGenerate(schema, [], option?.lang, option?.custom_functions || {});
 
                                     if (!_.isUndefined(tmpValue)) {
                                         value = tmpValue;
@@ -530962,7 +530990,7 @@ module.exports = (event, option, callback, eventRuntimeData, eventResultList) =>
                             },
 
                             responseData(cursor, data) {
-                                if (!_.includes(['get_parsed_request'], scene)) {
+                                if (!_.includes(['get_parsed_request'], scene) && requestJson?.target_type === 'sse') {
                                     callback({
                                         action: "sse",
                                         data: {
@@ -531525,8 +531553,9 @@ module.exports = async (event, option, callback, eventRuntimeData, eventResultLi
 /***/ 248657:
 /***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {
 
-const { repeatArrayToLength, formatAutotestReport, formatAutotestReportList } = __nccwpck_require__(490181);
+const { repeatArrayToLength, formatAutotestReport, formatAutotestReportList, getInsideVariables } = __nccwpck_require__(490181);
 const _ = __nccwpck_require__(690250);
+const { mockExp } = __nccwpck_require__(693436);
 const aTools = __nccwpck_require__(167350);
 const { executeEvent, iterationEvent } = __nccwpck_require__(890666);
 const ABORT_RECURSION_ERROR = ['systemError']; //需要跳出递归的错误
@@ -531540,7 +531569,7 @@ const run = async (events, option, callback) => {
     }
 
     const tempEvents = _.cloneDeep(_.flatten(new Array(scene == 'auto_test' ? _.max([_.toInteger(iterationCount), 1]) : 1).fill(events))) || [];
-    const iterationDataArr = _.flatMap(repeatArrayToLength(iterationData, _.max([_.toInteger(iterationCount), 1])), (element) => _.times(_.size(events), () => element));
+    const iterationDataArrTemp = _.flatMap(repeatArrayToLength(_.cloneDeep(iterationData), _.max([_.toInteger(iterationCount), 1])), (element) => _.times(_.size(events), () => element));
     const eventOptions = _.pick(option, ["scene", "lang", "project", "env", "globals", "cookies", "system_configs", "custom_functions", "collection", "database_configs", "enable_sandbox", "sleep", "name", "testing_id"]);
 
     // 初始化变量
@@ -531555,6 +531584,37 @@ const run = async (events, option, callback) => {
         }
     };
 
+    const iterationDataArr = [];
+    if (scene != 'http_request') {
+        // 解析测试数据
+        const regex = /{{([^}]+)}}/g;
+        _.forEach(iterationDataArrTemp, (obj, index) => {
+            const cloneObj = _.cloneDeep(obj);
+            if (_.isObject(obj) && !_.isEmpty(obj)) {
+                _.forEach(obj, (val, key) => {
+                    if (_.trim(val) != '' && _.isString(val)) {
+                        const matches = val.match(regex);
+
+                        if (!_.isEmpty(matches)) {
+                            _.forEach(matches, (match) => {
+                                try {
+                                    const tmpVal = mockExp(match, getInsideVariables(), option?.lang, option?.custom_functions || {});
+
+                                    if (tmpVal != match && !_.isUndefined(tmpVal)) {
+                                        _.set(cloneObj, [key], _.replace(val, match, tmpVal));
+
+                                    }
+                                } catch (e) { }
+                            })
+                        }
+                    }
+                })
+            }
+
+            iterationDataArr.push(cloneObj)
+        })
+    }
+
     const tempVars = { environment: _.get(option, 'env.environment', {}), globals: _.get(option, 'globals', {}), iterationDataArr };
 
     ['environment', 'globals', 'iterationDataArr'].forEach((type) => {
@@ -532332,13 +532392,14 @@ const encodeURIComponentUnique = (str) => {
     }
 }
 
-const jsfGenerate = (schema, mockRules = [], lang) => {
+const jsfGenerate = (schema, mockRules = [], lang, customFunctions = {}) => {
     jsf.option({
         alwaysFakeOptionals: true,
         useExamplesValue: true,
         fillProperties: false,
         useDefaultValue: true,
         mockRules,
+        customFunctions,
         lang: 'zh-cn',
     });
 
@@ -820606,6 +820667,32 @@ var require_exp_mock = __commonJS({
             value: `{{${distData}}}`
           };
         }
+      } else if (_.startsWith(distData, "$function.fn_")) {
+        const regex = /\$function\.fn_([a-zA-Z0-9_]+)\(([^)]*)\)/;
+        const match2 = distData.match(regex);
+        if (!match2 || !_.isString(match2[1]) || !_.isString(match2[2]) || !_.has(encodeFunctions, `fn_${_.toLower(_.trim(match2[1]))}`)) {
+          dist = {
+            type: "fixed",
+            expression: `{{${distData}}}`,
+            value: `{{${distData}}}`
+          };
+        } else {
+          try {
+            const callMethod = _.get(encodeFunctions, `fn_${_.toLower(_.trim(match2[1]))}`);
+            const parameter = match2[2];
+            dist = {
+              type: "function",
+              expression: `fn_${_.trim(match2[1])}(${parameter})`,
+              value: callMethod(parameter)
+            };
+          } catch (e2) {
+            dist = {
+              type: "fixed",
+              expression: `{{${distData}}}`,
+              value: `{{${distData}}}`
+            };
+          }
+        }
       } else if (_.startsWith(distData, '"') && _.endsWith(distData, '"') || _.startsWith(distData, "'") && _.endsWith(distData, "'")) {
         dist = {
           type: "fixed",
@@ -823290,7 +823377,8 @@ function traverse(schema2, path2, resolve2, rootSchema) {
                 } catch (e2) {
                 }
               }
-              value = (0, import_exp_mock.mockExp)(mockPlaceholder, {}, lang2);
+              const customFunctions = option_default("customFunctions") || {};
+              value = (0, import_exp_mock.mockExp)(mockPlaceholder, {}, lang2, customFunctions);
               break;
           }
           break;
@@ -823453,7 +823541,8 @@ function traverse(schema2, path2, resolve2, rootSchema) {
             return { value: import_mockjs5_pro.default.mock(mockRule), context };
           }
           if (import_lodash3.default.startsWith(mockRule, "{{$") && import_lodash3.default.endsWith(mockRule, "}}")) {
-            return { value: (0, import_exp_mock.mockExp)(mockRule, {}, lang2), context };
+            const customFunctions = option_default("customFunctions") || {};
+            return { value: (0, import_exp_mock.mockExp)(mockRule, {}, lang2, customFunctions), context };
           }
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apipost-cli",
-  "version": "2.0.23",
+  "version": "2.0.24",
   "description": "Apipost 命令行运行工具。适合Apipost8及以上版本。",
   "main": "./dist/index.js",
   "files": [