@lcap/nasl 3.2.0-beta.3 → 3.3.0-alpha

package/out/concepts/CallLogic__.js

@@ -34,15 +34,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 var CallLogic_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CallLogic = void 0;
+const JSON5 = __importStar(require("json5"));
+const uuid_1 = require("uuid");
 const translator_1 = require("../translator");
 const Logic__1 = __importDefault(require("./Logic__"));
 const View__1 = __importDefault(require("./View__"));
 const utils_1 = require("../automate/engine/utils");
 const utils_2 = require("../utils");
-const JSON5 = __importStar(require("json5"));
 const Identifier__1 = __importDefault(require("./Identifier__"));
 const decorators_1 = require("../decorators");
-const uuid_1 = require("uuid");
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
 const classMap_1 = __importDefault(require("../common/classMap"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
@@ -100,7 +100,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, CallLogic_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...CallLogic_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -222,7 +223,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return typeAnnotation.delete();
     }
     __removeTypeAnnotation(typeAnnotation) {
-        const parentKey = typeAnnotation.parentKey;
+        const { parentKey } = typeAnnotation;
         const params = {
             parentNode: this,
             parentKey,
@@ -249,7 +250,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return argument.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -276,7 +277,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         if (typeof options === 'string') {
             validation = this.validation;
             if (!validation) {
-                throw new Error('找不到元素绑定属性 ' + options);
+                throw new Error(`找不到元素绑定属性 ${options}`);
             }
         }
         else {
@@ -285,7 +286,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return validation.delete();
     }
     __removeBindAttribute(bindAttribute) {
-        const parentKey = bindAttribute.parentKey;
+        const { parentKey } = bindAttribute;
         const params = {
             parentNode: this,
             parentKey,
@@ -307,10 +308,10 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     get tsCalleeNamespace() {
         if (this.calleeNamespace) {
             let tsCalleeNamespace = this.calleeNamespace;
@@ -327,18 +328,18 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             return `${this.view.getNamespace()}.${this.view.name}.logics.${this.calleeName}`;
         }
         // "app.logics"
-        return this.calleeNamespace + '.' + this.calleeName;
+        return `${this.calleeNamespace}.${this.calleeName}`;
     }
     get calleeKey() {
-        const tsCalleeNamespace = this.tsCalleeNamespace;
-        const calleeName = this.calleeName;
+        const { tsCalleeNamespace } = this;
+        const { calleeName } = this;
         if (!tsCalleeNamespace) {
             return calleeName ? `${calleeName}` : '__IDENTIFIER__';
         }
         // elements单独处理相对路径，和后缀的问题
         if (tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) {
             const methodName = tsCalleeNamespace.substring(0, tsCalleeNamespace.length - '.logics'.length);
-            return '__' + methodName + `.${calleeName}`;
+            return `__${methodName}.${calleeName}`;
         }
         return calleeName ? `${tsCalleeNamespace}.${calleeName}` : '__IDENTIFIER__';
     }
@@ -383,7 +384,6 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         });
     }
     _setCallee(logic) {
-        console.trace();
         this.calleeNamespace = logic.getNamespace();
         if (logic.parentNode instanceof View__1.default) {
             this.calleeNamespace = '';
@@ -439,7 +439,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             this.app.emit('collect:start', {
                 actionMsg: `切换调用逻辑`,
             });
-            const parentNode = this.parentNode;
+            const { parentNode } = this;
             this.update({
                 calleeNamespace,
                 calleeName,
@@ -523,66 +523,20 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     }
     toVue(options) {
         let code = '';
-        if (this.calleeNamespace === 'nasl.browser' || this.calleeNamespace === 'nasl.auth' || this.calleeNamespace === 'nasl.configuration' || this.calleeNamespace === 'nasl.process') {
+        if (this.calleeNamespace === 'nasl.browser' ||
+            this.calleeNamespace === 'nasl.auth' ||
+            this.calleeNamespace === 'nasl.configuration' ||
+            this.calleeNamespace === 'nasl.process') {
             code += '$global.';
         }
-        const completeArguments = this.completeArguments;
-        if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute').name === 'data-source') {
-            code += '(params) =>';
-            code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`;
-            code += `({
-                config: {
-                    download: false,
-                },
-                query: {},`;
-            code += `
-                headers: {
-                    "lcap-calllogic-uuid": "${this.uuid}",
-                },
-            `;
-            code += `path: {},
-            body: {`;
-            const logic = (0, utils_1.getNodeByNodeCallee)(this.app, this.calleewholeKey, (key, tempPoint) => {
-                // 处理 NASL 中未定义的假的节点
-                if (key === tempPoint.name) {
-                    return {
-                        tempPoint,
-                        state: 1,
-                    };
-                }
-                const t = tempPoint[key];
-                return {
-                    tempPoint: t,
-                    state: Array.isArray(t) ? 2 : 1,
-                };
-            });
-            const args = logic?.params || [];
-            const argsStr = args
-                .map((arg, index) => {
-                const actualArg = completeArguments[index];
-                return {
-                    keyword: arg?.name,
-                    arg: actualArg,
-                };
-            })
-                .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toVue(options)}`)
-                .join(', ');
-            code += argsStr;
-            if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
-                code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
-            }
-            code += '\n}';
-            code += '}';
-        }
-        else {
-            code += this.calleeName;
-            code += '(';
-            completeArguments.forEach((arg, index) => {
-                code += arg?.toVue(options);
-                if (index !== completeArguments.length - 1)
-                    code += ', ';
-            });
-        }
+        code += this.calleeName;
+        code += '(';
+        const { completeArguments } = this;
+        completeArguments.forEach((arg, index) => {
+            code += arg?.toVue(options);
+            if (index !== completeArguments.length - 1)
+                code += ', ';
+        });
         code += ')';
         return code;
     }
@@ -613,16 +567,13 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             });
         }
         code += ')';
-        if (this.concept === 'CallLogic' && this.getAncestor('BindAttribute').name === 'data-source') {
-            return this.calleeName;
-        }
         return code;
     }
     // 是否属于页面逻辑
     get isViewLogic() {
         // 页面逻辑
         let flag = true;
-        const calleeNamespace = this.calleeNamespace;
+        const { calleeNamespace } = this;
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
@@ -641,7 +592,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     get isComponentLogic() {
         // 组件逻辑
         let flag = false;
-        const calleeNamespace = this.calleeNamespace;
+        const { calleeNamespace } = this;
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
@@ -657,41 +608,28 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         code += 'await (';
         let refName = '';
         let extensionName = '';
-        const calleeNamespace = this.calleeNamespace;
-        const keywordProcessIndex = (0, utils_2.findConceptKeyWordIndexFromNamespace)(this.calleeNamespace, 'processes');
+        const { calleeName, calleeNamespace, isComponentLogic, completeArguments, isViewLogic, typeArguments } = this;
+        const isShowArgument = (arg) => {
+            return arg.expression || (arg.paramDefaultValue && arg.paramTypeAnnotation);
+        };
+        const keywordProcessIndex = (0, utils_2.findConceptKeyWordIndexFromNamespace)(calleeNamespace, 'processes');
         const isProcessLogic = keywordProcessIndex !== -1;
         const isFrontendLibrary = calleeNamespace.startsWith('extensions') && calleeNamespace.indexOf('frontends');
         // calleeNamespace不存在，一定是页面逻辑
         if (calleeNamespace) {
             const namespaceArr = calleeNamespace.split('.');
-            if (this.isComponentLogic) {
+            if (isComponentLogic) {
                 const componentName = namespaceArr[1];
                 const viewElement = this.view?.findElementByName(componentName);
                 refName = viewElement?.refName ?? componentName;
-                console.log(componentName);
-                console.log(refName);
             }
             if (isFrontendLibrary) {
                 extensionName = namespaceArr[1];
             }
         }
-        const completeArguments = this.completeArguments;
-        // 服务端逻辑
-        if (!this.isViewLogic) {
-            const logic = (0, utils_1.getNodeByNodeCallee)(this.app, this.calleewholeKey, (key, tempPoint) => {
-                // 处理 NASL 中未定义的假的节点
-                if (key === tempPoint.name) {
-                    return {
-                        tempPoint,
-                        state: 1,
-                    };
-                }
-                const t = tempPoint[key];
-                return {
-                    tempPoint: t,
-                    state: Array.isArray(t) ? 2 : 1,
-                };
-            });
+        // 全局逻辑
+        if (!isViewLogic) {
+            const logic = this.getCallNode();
             const args = logic?.params || [];
             const keywordEntitiesIndex = (0, utils_2.findConceptKeyWordIndexFromNamespace)(this.calleeNamespace, 'entities');
             code += `this.$logics['${this.calleeNamespace ? `${this.calleeNamespace}.${this.calleeName}` : this.calleeName}']`;
@@ -709,6 +647,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                         arg: actualArg,
                     };
                 })
+                    .filter((item) => isShowArgument(item.arg))
                     .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS((0, translator_1.shiftState)(state, code))}`)
                     .join(', ');
                 code += argsStr;
@@ -721,7 +660,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             if (keywordEntitiesIndex !== -1) {
                 let logicArgs = this.arguments;
                 let breakBody = false;
-                switch (this.calleeName) {
+                switch (calleeName) {
                     case 'get':
                     case 'delete': {
                         logicArgs = [];
@@ -745,7 +684,6 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                     case 'batchUpdate': {
                         code += `body: {\n`;
                         const argsStr = logicArgs
-                            .filter((arg) => arg.expression)
                             .map((arg) => {
                             const name = arg.keyword === 'body' ? (this.calleeName === 'batchUpdate' ? 'entities' : 'entity') : arg.keyword;
                             return `${name}: ${arg.expression.toJS((0, translator_1.shiftState)(state, code))}`;
@@ -760,7 +698,6 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                     case 'updateBy': {
                         code += `body: {`;
                         const argsStr = logicArgs
-                            .filter((arg) => arg.expression)
                             .map((arg) => {
                             const name = arg.keyword === 'body' ? 'entity' : arg.keyword;
                             // filter回调函数
@@ -772,9 +709,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                                         returnExpression: this.$resolveRequestData(${argsStr})
                                     }`;
                             }
-                            else {
-                                return `${name}: ${arg.expression.toJS((0, translator_1.shiftState)(state, code))}`;
-                            }
+                            return `${name}: ${arg.expression.toJS((0, translator_1.shiftState)(state, code))}`;
                         })
                             .join(',');
                         code += argsStr;
@@ -819,10 +754,11 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                             arg: actualArg,
                         };
                     })
+                        .filter((item) => isShowArgument(item.arg))
                         .map((obj) => `\n${obj?.keyword}: ${obj?.arg?.toJS((0, translator_1.shiftState)(state, code))}`)
                         .join(', ');
                     code += argsStr;
-                    if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
+                    if (Array.isArray(typeArguments) && typeArguments.length) {
                         code += `,\n__typeArguments: ${JSON5.stringify(this.typeArguments)}`;
                     }
                 }
@@ -831,7 +767,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             code += '\n})';
         }
         else {
-            if (this.isComponentLogic) {
+            if (isComponentLogic) {
                 // 组件ref元素的对象没有qu dao的容错
                 code += `this.$refs && this.$refs[\`${refName}\`] && this.$refs[\`${refName}\`].${this.calleeName} && this.$refs[\`${refName}\`].${this.calleeName}`;
             }
@@ -851,9 +787,16 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                         break;
                 }
             }
-            else if (calleeNamespace === 'nasl.browser' || calleeNamespace === 'nasl.auth' || calleeNamespace === 'nasl.configuration' || calleeNamespace === 'nasl.process' || calleeNamespace === 'nasl.io') {
+            else if (calleeNamespace === 'nasl.browser' ||
+                calleeNamespace === 'nasl.auth' ||
+                calleeNamespace === 'nasl.configuration' ||
+                calleeNamespace === 'nasl.process' ||
+                calleeNamespace === 'nasl.io') {
                 code += `this.$global.${this.calleeName}`;
             }
+            else if (calleeNamespace === 'nasl.event') {
+                code += `event && event.${this.calleeName} && event.${this.calleeName}`; // 防止万一event不存在
+            }
             else if (isFrontendLibrary) {
                 code += `this.$library['${extensionName}'].${this.calleeName}`;
             }
@@ -862,7 +805,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             }
             if (calleeNamespace === 'nasl.process' || calleeNamespace === 'nasl.auth') {
                 code += '({';
-                this.arguments?.filter((arg) => arg?.expression)
+                this.arguments
+                    ?.filter((arg) => arg?.expression)
                     .forEach((arg, index) => {
                     code += `${arg.keyword}: ${arg?.toJS((0, translator_1.shiftState)(state, code))}`;
                     if (index !== this.arguments?.length - 1)
@@ -908,8 +852,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                 };
             }
             if (root.concept === 'MemberExpression') {
-                let concept = root.concept;
-                let value = root.value;
+                let { concept } = root;
+                let { value } = root;
                 if (root?.object.name === '_') {
                     return {
                         concept,
@@ -954,8 +898,7 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
             };
         }
         const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
-        const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind)
-            || typeAnnotation.typeName === 'DateTime');
+        const needGenInitFromSchema = typeAnnotation && (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
         if (needGenInitFromSchema) {
             code = `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', ${code})`;
         }
@@ -966,9 +909,8 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         return this.arguments.map((a) => a.toBrief()).join('<br />');
     }
     get useValidation() {
-        const { validation, rootNode, } = this;
-        return (rootNode.preferenceMap.serverValidationRules === 'custom' &&
-            Boolean(validation));
+        const { validation, rootNode } = this;
+        return rootNode?.preferenceMap.serverValidationRules === 'custom' && Boolean(validation);
     }
     get useIife() {
         return Boolean(this.handleError || this.useValidation);
@@ -1003,29 +945,24 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
                 });
                 code += ')';
             }
+            else if (completeArguments.length) {
+                code += '(';
+                completeArguments.forEach((arg, index) => {
+                    // 取到是不是必填放入参数中
+                    code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
+                    if (index !== logicArgs.length - 1)
+                        code += ', ';
+                });
+                code += ')';
+            }
             else {
-                if (['expression'].includes(parentKey) && this.getAncestor('BindAttribute').name === 'data-source' && state?.noNeedParams) {
-                    return;
-                }
-                if (completeArguments.length) {
-                    code += '(';
-                    completeArguments.forEach((arg, index) => {
-                        // 取到是不是必填放入参数中
-                        code += arg.toEmbeddedTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
-                        if (index !== logicArgs.length - 1)
-                            code += ', ';
-                    });
-                    code += ')';
-                }
-                else {
-                    code += '()';
-                }
+                code += '()';
             }
         };
         /** 设置表达式末尾分号 */
         const setEndSemi = () => {
-            const { concept: parentConcept } = parentNode;
-            if (!['test', 'patterns', 'returnExpression', 'expression'].includes(parentKey) &&
+            const { concept: parentConcept } = parentNode ?? {};
+            if (!['test', 'patterns', 'returnExpression'].includes(parentKey) &&
                 ![
                     'Argument',
                     'Assignment',
@@ -1073,6 +1010,103 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         setEndSemi();
         return code;
     }
+    toNaturalTS(state) {
+        const { handleError, calleeKey, calleeName, parentKey, typeArguments, tsCalleeNamespace, completeArguments, parentNode, validation, useIife, useValidation, arguments: logicArgs, } = this;
+        let code = calleeKey.replace('__elements', '$refs');
+        if (/^app.+?\.entities\..+?logics/.test(code))
+            code = code.replace(/^app.+?\.entities\.(.+?)\.logics/, '$1');
+        /** 设置函数范型参数 */
+        const setTypeArguments = () => {
+            if (Array.isArray(typeArguments) && typeArguments.length) {
+                // 如果有内容
+                code += `<`;
+                typeArguments.forEach((arg, i, arr) => {
+                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: 0 }));
+                    if (i !== arr.length - 1) {
+                        code += ', ';
+                    }
+                });
+                code += `>`;
+            }
+        };
+        /** 设置输入参数 */
+        const setInputParam = () => {
+            const paramRequired = ['showMessage', 'consoleLog'].includes(calleeName);
+            if ((tsCalleeNamespace.startsWith('elements') && tsCalleeNamespace.endsWith('logics')) || tsCalleeNamespace.startsWith('nasl.')) {
+                code += '(';
+                logicArgs.forEach((arg, index) => {
+                    // 页面逻辑先都非必填
+                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code), paramRequired);
+                    if (index !== logicArgs.length - 1)
+                        code += ', ';
+                });
+                code += ')';
+            }
+            else if (completeArguments.length) {
+                code += '(';
+                completeArguments.forEach((arg, index) => {
+                    // 取到是不是必填放入参数中
+                    code += arg.toNaturalTS((0, translator_1.shiftState)(state, code), arg?.paramRequired);
+                    if (index !== logicArgs.length - 1)
+                        code += ', ';
+                });
+                code += ')';
+            }
+            else {
+                code += '()';
+            }
+        };
+        /** 设置表达式末尾分号 */
+        const setEndSemi = () => {
+            const { concept: parentConcept } = parentNode ?? {};
+            if (!['test', 'patterns', 'returnExpression'].includes(parentKey) &&
+                ![
+                    'Argument',
+                    'Assignment',
+                    'ForEachStatement',
+                    'SelectMembers',
+                    'UnaryExpression',
+                    'BinaryExpression',
+                    'StringInterpolation',
+                    'MemberExpression',
+                    'NewMap',
+                    'NewList',
+                ].includes(parentConcept)) {
+                code += ';';
+            }
+        };
+        if (useIife) {
+            code += '(() =>{\nconst wrapper = ';
+            if (handleError) {
+                code += 'nasl.util.autoHandleError(';
+            }
+            if (useValidation) {
+                code += 'nasl.util.callLogicWithChecker(';
+            }
+            code += calleeKey;
+            setTypeArguments();
+            if (useValidation) {
+                code += ', (';
+                code += completeArguments.map((item) => item.keyword).join(', ');
+                code += ') => {\n';
+                code += validation.toNaturalTS((0, translator_1.shiftState)(state, code));
+                code += ';\n})';
+            }
+            if (handleError) {
+                code += ')';
+            }
+            code += ';\nreturn wrapper';
+            setInputParam();
+            code += ';\n})()';
+        }
+        else {
+            code += calleeKey;
+            setTypeArguments();
+            setInputParam();
+        }
+        setEndSemi();
+        return code;
+    }
     // 通过内容过去节点
     getCallNode() {
         let node;
@@ -1106,6 +1140,20 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
         }
         return node;
     }
+    /** 获取类型标注时的偏移量 */
+    getQuickInfoOffset(detail, code) {
+        if (!this.useIife) {
+            return { ...detail };
+        }
+        const characterOffset = 8;
+        const lines = code.split('\n');
+        // @ts-ignore
+        const lineOffset = lines.findLastIndex((item) => item.startsWith('return wrapper'));
+        return {
+            line: detail.line + lineOffset,
+            offset: characterOffset,
+        };
+    }
     /**
      * 是否允许验证规则
      *  - 当前元素在前端，但是调用的函数在后端
@@ -1117,31 +1165,27 @@ let CallLogic = CallLogic_1 = class CallLogic extends LogicItem__1.default {
     // 可以设置默认值的节点
     // 目前只开放了app下的，所以这些节点，查找引用吧默认值塞回来
     get completeArguments() {
-        const node = this.getCallNode();
-        let logicParam = [];
-        const Arguments = [];
-        if (node?.params) {
-            logicParam = node.params;
-        }
-        if (this.arguments?.length) {
-            this.arguments.forEach((arg, index) => {
-                const param = logicParam[index] || {};
-                // 打开了必填，
-                // 或者遗留问题，没有required = undefined 而且没有defaultValue，就是之前的必填项
-                arg.paramRequired = Boolean(param.required || (param.required === undefined && !param.defaultValue));
-                arg.paramTypeAnnotation = undefined;
-                arg.paramDefaultValue = undefined;
-                arg.keyword = param.name ?? arg.keyword;
-                // 取到是不是必填放入参数中
-                if (param && !arg.expression) {
-                    // 非必填时 才会有默认值
-                    arg.paramTypeAnnotation = param.typeAnnotation;
-                    arg.paramDefaultValue = param.defaultValue;
-                }
-                Arguments.push(arg);
-            });
-        }
-        return Arguments;
+        const callArguments = (this.arguments ?? []).slice();
+        // 没有参数时可以跳过查询原逻辑标签
+        const node = callArguments.length > 0 ? this.getCallNode() : undefined;
+        const logicParams = node?.params ?? [];
+        callArguments.forEach((arg, index) => {
+            const param = logicParams[index] || {};
+            // 打开了必填，
+            // 或者遗留问题，没有required = undefined 而且没有defaultValue，就是之前的必填项
+            arg.paramRequired = Boolean(param.required || (param.required === undefined && !param.defaultValue));
+            arg.paramTypeAnnotation = undefined;
+            arg.paramDefaultValue = undefined;
+            // 强制更新当前的 keyword
+            arg.keyword = param?.name && param.name.length > 0 ? param.name : arg.keyword;
+            // 取到是不是必填放入参数中
+            if (param && !arg.expression) {
+                // 非必填时 才会有默认值
+                arg.paramTypeAnnotation = param.typeAnnotation;
+                arg.paramDefaultValue = param.defaultValue;
+            }
+        });
+        return callArguments;
     }
     static isSystem(node) {
         // 如此处需要更新，则需同时更新 menu-poppup 组件下的 includesSystemLogic 校验逻辑
@@ -1187,14 +1231,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], CallLogic.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], CallLogic.prototype, "toNaturalTS", null);
 CallLogic = CallLogic_1 = __decorate([
     (0, decorators_1.concept)('调用逻辑')
 ], CallLogic);
 exports.CallLogic = CallLogic;
 classMap_1.default.CallLogic = CallLogic;
 exports.default = CallLogic;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=CallLogic__.js.map