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

package/out/concepts/Logic__.js

@@ -46,6 +46,7 @@ const OqlQueryComponent__1 = __importDefault(require("./OqlQueryComponent__"));
 const TypeAnnotation__1 = __importDefault(require("./TypeAnnotation__"));
 const CallInterface__1 = __importDefault(require("./CallInterface__"));
 const CallLogic__1 = __importDefault(require("./CallLogic__"));
+const ViewElement__1 = __importDefault(require("./ViewElement__"));
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
@@ -56,6 +57,7 @@ const Param__1 = __importDefault(require("./Param__"));
 const Return__1 = __importDefault(require("./Return__"));
 const Variable__1 = __importDefault(require("./Variable__"));
 const LogicItem__1 = __importDefault(require("./LogicItem__"));
+const View__1 = __importDefault(require("./View__"));
 const Process__1 = __importDefault(require("./Process__"));
 /**
  * 逻辑
@@ -163,7 +165,8 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
      * @param source 需要合并的部分参数
      */
     constructor(source) {
-        source = Object.assign({}, Logic_1.getDefaultOptions(), source);
+        // @ts-ignore
+        source = { ...Logic_1.getDefaultOptions(), ...source };
         super(source);
         super.subConstructor(source);
     }
@@ -569,7 +572,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             transactional = this.transactional;
             if (!transactional) {
-                throw new Error('找不到事务 ' + options);
+                throw new Error(`找不到事务 ${options}`);
             }
         }
         else {
@@ -578,7 +581,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return transactional.delete();
     }
     __removeTransactional(transactional) {
-        const parentKey = transactional.parentKey;
+        const { parentKey } = transactional;
         const params = {
             parentNode: this,
             parentKey,
@@ -605,7 +608,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             typeParam = this.typeParams.find((item) => item.name === options);
             if (!typeParam) {
-                throw new Error('找不到类型参数 ' + options);
+                throw new Error(`找不到类型参数 ${options}`);
             }
         }
         else {
@@ -614,7 +617,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return typeParam.delete();
     }
     __removeTypeParam(typeParam) {
-        const parentKey = typeParam.parentKey;
+        const { parentKey } = typeParam;
         const params = {
             parentNode: this,
             parentKey,
@@ -641,7 +644,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             param = this.params.find((item) => item.name === options);
             if (!param) {
-                throw new Error('找不到输入参数 ' + options);
+                throw new Error(`找不到输入参数 ${options}`);
             }
         }
         else {
@@ -650,7 +653,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return param.delete();
     }
     __removeParam(param) {
-        const parentKey = param.parentKey;
+        const { parentKey } = param;
         const params = {
             parentNode: this,
             parentKey,
@@ -677,7 +680,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             ret = this.returns.find((item) => item.name === options);
             if (!ret) {
-                throw new Error('找不到输出参数 ' + options);
+                throw new Error(`找不到输出参数 ${options}`);
             }
         }
         else {
@@ -686,7 +689,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return ret.delete();
     }
     __removeReturn(ret) {
-        const parentKey = ret.parentKey;
+        const { parentKey } = ret;
         const params = {
             parentNode: this,
             parentKey,
@@ -713,7 +716,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             variable = this.variables.find((item) => item.name === options);
             if (!variable) {
-                throw new Error('找不到变量 ' + options);
+                throw new Error(`找不到变量 ${options}`);
             }
         }
         else {
@@ -722,7 +725,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return variable.delete();
     }
     __removeVariable(variable) {
-        const parentKey = variable.parentKey;
+        const { parentKey } = variable;
         const params = {
             parentNode: this,
             parentKey,
@@ -753,7 +756,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         return logicItem.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -775,13 +778,13 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     // 用于calllogic树中定位是那个logic，回显
     get calleewholeKey() {
-        return this.getNamespace() + '.' + this.name;
+        return `${this.getNamespace()}.${this.name}`;
     }
     // 设置定时任务
     setCronAndTriggerType(cron, triggerType) {
@@ -857,7 +860,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         // params
         if (Array.isArray(this.params)) {
             this.params.forEach((param) => {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + '';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}`;
                 code += param.toJS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -865,7 +868,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         // variables
         if (Array.isArray(this.variables)) {
             this.variables.forEach((variable) => {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                 code += variable.toJS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -873,7 +876,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         // returns
         if (Array.isArray(this.returns)) {
             this.returns.forEach((ret) => {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                 code += ret.toJS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             });
@@ -891,7 +894,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (type === 'IIFE') {
             code += `await (async () => {\n`;
             code = this.toJSContent(code, state);
-            code += (0, translator_1.indent)(state?.tabSize || 0) + '})();\n';
+            code += `${(0, translator_1.indent)(state?.tabSize || 0)}})();\n`;
             return code;
         }
         code += `async ${this.name} (`;
@@ -904,7 +907,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         }
         code += ') {\n';
         code = this.toJSContent(code, state);
-        code += (0, translator_1.indent)(state?.tabSize || 0) + '}\n';
+        code += `${(0, translator_1.indent)(state?.tabSize || 0)}}\n`;
         return code;
     }
     toProcessService() {
@@ -919,7 +922,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         };
     }
     toService() {
-        const parentNode = this.parentNode;
+        const { parentNode } = this;
         const { concept, name: entityName } = parentNode || {};
         const logicName = this.name;
         let serviceType = 'micro';
@@ -937,7 +940,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             const dataSource = parentNode.getAncestor('DataSource');
             // 默认数据源不动，其他数据源需要拼接数据源信息
             if (dataSource && dataSource.name !== 'defaultDS') {
-                entityPath = dataSource.name + '/' + entityPath;
+                entityPath = `${dataSource.name}/${entityPath}`;
             }
             path = `/api/${entityPath}`;
             switch (this.name) {
@@ -1002,7 +1005,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (!prefix)
             code += `${noName ? '' : `${this.name}:`} function(`;
         else
-            code += `function ${this.name}(`; //加空格会导致无法查询到引用
+            code += `function ${this.name}(`; // 加空格会导致无法查询到引用
         this.params.forEach((param, index) => {
             code += param.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             if (index !== this.params.length - 1)
@@ -1012,17 +1015,17 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         code += prependCode || '';
         code += '\n';
         this.variables.forEach((variable) => {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
             code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ';\n';
         });
         this.returns.forEach((ret) => {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
             code += ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             code += ';\n';
         });
         if (!this.body.length && this.returns.length) {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `return ${this.returns[0].name};\n`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;
         }
         else {
             if (this.parentNode.type === 'ExclusiveGateway') {
@@ -1033,7 +1036,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             }
             else if (this.body.length <= 2 && !(this.parentNode instanceof Namespace__1.default) && !(this.parentNode instanceof Process__1.default)) {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
-                code += (0, translator_1.indent)(state?.tabSize || 0 + 4) + 'const __LogicEmpty: any = null;';
+                code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}const __LogicEmpty: any = null;`;
             }
             this.body.forEach((item) => {
                 code += item.toEmbeddedTS && item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
@@ -1045,7 +1048,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += '\n';
         });
-        code += (0, translator_1.indent)(state?.tabSize || 0 + 4) + '}';
+        code += `${(0, translator_1.indent)(state?.tabSize || 0 + 4)}}`;
         code += '\n';
         return code;
     }
@@ -1093,7 +1096,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         this.traverseChildren((el) => {
             if (el && (el instanceof BatchAssignment__1.default || (el instanceof Assignment__1.default && el.left?.name))) {
                 if (el instanceof Assignment__1.default) {
-                    const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && (el.left?.name === variable.name));
+                    const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && el.left?.name === variable.name);
                     if (advanceVar && !advanceMap.get(advanceVar)) {
                         advanceMap.set(advanceVar, el);
                     }
@@ -1104,8 +1107,10 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                 }
                 else if (el instanceof BatchAssignment__1.default) {
                     el.assignmentLines.forEach(({ leftIndex }) => {
-                        const leftCode = leftIndex.length === 1 ? el.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : el.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
-                        const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && (leftCode === variable.name));
+                        const leftCode = leftIndex.length === 1
+                            ? el.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                            : el.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                        const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && leftCode === variable.name);
                         if (advanceVar && !advanceMap.get(advanceVar)) {
                             advanceMap.set(advanceVar, el);
                         }
@@ -1145,34 +1150,36 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         }
         code += '{\n';
         // 用于虚拟节点的查找引用
-        this.virtualParams
-            && Array.isArray(this.virtualParams)
-            && this.virtualParams.forEach((param) => {
+        this.virtualParams &&
+            Array.isArray(this.virtualParams) &&
+            this.virtualParams.forEach((param) => {
                 code += (0, translator_1.indent)((state?.tabSize || 0) + 1);
                 code += param.toEmbeddedNameTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += '\n';
             });
         this.variables.forEach((variable) => {
             if (!advanceMap.get(variable)) {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                 code += variable.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             }
         });
         this.returns.forEach((ret) => {
             if (!advanceMap.get(ret)) {
-                code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+                code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
                 code += ret.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                 code += ';\n';
             }
         });
         advanceMap.forEach((assignment, node) => {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + '// @ts-ignore\n';
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + 'let ';
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}// @ts-ignore\n`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}let `;
             code += node.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
             if (assignment instanceof BatchAssignment__1.default) {
                 assignment.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-                    const leftCode = leftIndex.length === 1 ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                    const leftCode = leftIndex.length === 1
+                        ? assignment.left.expression.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
+                        : assignment.left.members[leftIndex[1]]?.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }));
                     if (leftCode === node.name) {
                         const rightNode = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
@@ -1234,7 +1241,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             code += ';\n';
         });
         if (!this.body.length && this.returns.length) {
-            code += (0, translator_1.indent)((state?.tabSize || 0) + 1) + `return ${this.returns[0].name};\n`;
+            code += `${(0, translator_1.indent)((state?.tabSize || 0) + 1)}return ${this.returns[0].name};\n`;
         }
         else {
             // 如果长度小于2 并且不是虚拟节点就 加 报错，
@@ -1257,7 +1264,124 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             code += item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: (state?.tabSize || 0) + 1 }));
             code += ';\n';
         });
-        code += (0, translator_1.indent)(state?.tabSize || 0) + '}';
+        code += `${(0, translator_1.indent)(state?.tabSize || 0)}}`;
+        if (prefix === 'inObject') {
+            code += `,`;
+        }
+        code += '\n';
+        return code;
+    }
+    toNaturalTS(state, prefix, logicName) {
+        if (!logicName) {
+            if (this.parentNode instanceof BindEvent__1.default && this.parentNode.parentNode instanceof View__1.default) {
+                logicName = `on_view_${this.name}`;
+            }
+            else if (this.parentNode instanceof BindEvent__1.default && this.parentNode.parentNode instanceof ViewElement__1.default) {
+                logicName = `on_${this.parentNode.element.name}_${this.name}`;
+            }
+            else {
+                logicName = this.name;
+            }
+        }
+        // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
+        let code = '';
+        if (!prefix) {
+            code += `export function ${logicName}`;
+        }
+        else if (prefix === 'noExport') {
+            code += `function ${logicName}`;
+        }
+        else if (prefix === 'inObject') {
+            code += `${logicName}`;
+        }
+        if (this.typeParams?.length) {
+            code += '<';
+            this.typeParams.forEach((typeParam, typeParamIndex) => {
+                code += typeParam.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+                if (typeParamIndex !== this.typeParams.length - 1)
+                    code += ', ';
+            });
+            code += '>';
+        }
+        // 有参数长度
+        code += '(';
+        this.params.forEach((param, index) => {
+            code += param.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            if (index !== this.params.length - 1)
+                code += ', ';
+        });
+        code += ')';
+        // 需要类型推导的局部变量/返回值需要调整申明顺序
+        const advanceMap = new Map();
+        const needGetSourceMapOqlList = [];
+        this.traverseChildren((el) => {
+            if (el && (el instanceof BatchAssignment__1.default || (el instanceof Assignment__1.default && el.left?.name))) {
+                const jsCode = el.toJS();
+                const advanceVar = this.variables?.find((variable) => !variable.typeAnnotation && jsCode.includes(`${variable.name} = `));
+                if (advanceVar && !advanceMap.get(advanceVar)) {
+                    advanceMap.set(advanceVar, el);
+                }
+                const advanceRn = this.returns?.find((ret) => !ret.typeAnnotation && jsCode.includes(`${ret.name} = `));
+                if (advanceRn && !advanceMap.get(advanceRn)) {
+                    advanceMap.set(advanceRn, el);
+                }
+            }
+            // 如果有sql查询组件就需要把他们存起来
+            if (el instanceof OqlQueryComponent__1.default) {
+                if (!el.codeSourceMap) {
+                    needGetSourceMapOqlList.push(el.requestEmbeddedTS());
+                }
+            }
+        });
+        if (needGetSourceMapOqlList.length) {
+            Promise.all(needGetSourceMapOqlList).then(() => {
+                // 触发一下更新重新生成代码
+                this.app?.naslServer?.embeddedTSEmitter.emit('change', {
+                    value: [{
+                            originEvent: {
+                                action: 'update',
+                                target: this,
+                            },
+                        }],
+                });
+            });
+        }
+        // 兼容 return 没有类型情况
+        if (this.returns.length && this.returns[0].typeAnnotation) {
+            code += ': ';
+            code += this.returns[0].typeAnnotation?.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+        }
+        code += ' {\n';
+        this.variables.forEach((variable) => {
+            code += `${(0, translator_1.indent)(state.tabSize + 1)}let `;
+            code += variable.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += ';\n';
+        });
+        this.returns.forEach((ret) => {
+            code += `${(0, translator_1.indent)(state.tabSize + 1)}let `;
+            code += ret.toNaturalTS((0, translator_1.shiftState)(state, code, { inline: true }));
+            code += ';\n';
+        });
+        code += `${(0, translator_1.indent)(state.tabSize + 1)}// 当前位置\n`;
+        if (!this.body.length && this.returns.length) {
+            code += `${(0, translator_1.indent)(state.tabSize + 1)}return ${this.returns[0].name};\n`;
+        }
+        else {
+            this.body.forEach((item) => {
+                let partialCode = '';
+                if (item.toNaturalTS) {
+                    partialCode = item.toNaturalTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
+                }
+                else if (item.toEmbeddedTS) {
+                    partialCode = item.toEmbeddedTS((0, translator_1.shiftState)(state, code, { tabSize: state.tabSize + 1 }));
+                }
+                if (partialCode.trim()) {
+                    code += partialCode;
+                    code += '\n';
+                }
+            });
+        }
+        code += `${(0, translator_1.indent)(state.tabSize)}}`;
         if (prefix === 'inObject') {
             code += `,`;
         }
@@ -1361,9 +1485,9 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (this.parentNode) {
             const parentNamespace = this.parentNode?.getNamespace();
             // 针对Connector, 其对应的引入入口只有连接器。且唯一标识由
-            // calleeName、calleeNamespace、calleeConnectorName 三个字段组合确认，
-            // 故这里只返回 Connector 对应的nameSpace 且 三字段组合默认会含带logic 字段
-            // 因此最后 CallConnector 的 calleewholeKey 为 ： `${calleeNamespace}.${calleeConnectorName}.logics.${calleeName}`
+            // calleeName、calleeNamespace 两个字段组合确认，
+            // 故这里只返回 Connector 对应的nameSpace 且 俩字段组合默认会含带logic 字段
+            // 因此最后 CallConnector 的 calleewholeKey 为 ： `${calleeNamespace}.logics.${calleeName}`
             if (this.parentNode.concept === 'Connector') {
                 return parentNamespace;
             }
@@ -1373,14 +1497,24 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace)
-                && !namespace.includes('.logics')) {
+            if (![
+                'nasl.ui',
+                'nasl.utils',
+                'nasl.util',
+                'nasl.browser',
+                'nasl.auth',
+                'nasl.configuration',
+                'nasl.process',
+                'nasl.logging',
+                'nasl.io',
+                'nasl.event',
+            ].includes(namespace) &&
+                !namespace.includes('.logics')) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;
         }
-        else
-            throw new Error('无法获取命名空间，请设置 parentNode！');
+        throw new Error('无法获取命名空间，请设置 parentNode！');
     }
     getTsNamespace() {
         if (this.parentNode) {
@@ -1391,14 +1525,23 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                 arr.push(parentName);
             }
             let namespace = arr.join('.');
-            if (!['nasl.ui', 'nasl.utils', 'nasl.util', 'nasl.browser', 'nasl.auth', 'nasl.configuration', 'nasl.process', 'nasl.logging', 'nasl.io'].includes(namespace)
-                && !namespace.includes('.logics')) {
+            if (![
+                'nasl.ui',
+                'nasl.utils',
+                'nasl.util',
+                'nasl.browser',
+                'nasl.auth',
+                'nasl.configuration',
+                'nasl.process',
+                'nasl.logging',
+                'nasl.io',
+            ].includes(namespace) &&
+                !namespace.includes('.logics')) {
                 namespace = `${namespace}.logics`;
             }
             return namespace;
         }
-        else
-            throw new Error('无法获取命名空间，请设置 parentNode！');
+        throw new Error('无法获取命名空间，请设置 parentNode！');
     }
     /**
      * 生成宿主语言的文件路径
@@ -1505,7 +1648,8 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
         if (this.view) {
             return this.getEventLogicName('chinese');
         }
-        else if (this.parentNode.concept === 'BindEvent' && this.parentNode.parentNode.concept === 'Frontend') {
+        let { parentNode } = this;
+        if (parentNode.concept === 'BindEvent' && parentNode.parentNode.concept === 'Frontend') {
             const frontEndEventNameMap = {
                 rendered: '应用进入后',
                 preRequest: '调用服务端逻辑前',
@@ -1514,7 +1658,6 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
                 afterRouter: '页面切换后',
             };
             const pathName = [this.name];
-            let parentNode = this.parentNode;
             while (parentNode && parentNode.concept !== 'Frontend') {
                 const name = frontEndEventNameMap[parentNode.name] || parentNode.name;
                 pathName.unshift(name);
@@ -1532,7 +1675,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             OnClose: '用户任务关闭时',
         };
         const pathName = [this.name];
-        let parentNode = this.parentNode;
+        parentNode = this.parentNode;
         while (parentNode && parentNode.concept !== 'Process') {
             const name = nameMap[parentNode.name] || parentNode.name;
             pathName.unshift(name);
@@ -1571,7 +1714,7 @@ let Logic = Logic_1 = class Logic extends BaseNode_1.default {
             }
             else if (logicType.typeNamespace === 'nasl.core' && logicType.typeKind === 'union') {
                 // 如果 logic 有 returns 而且，也有typeArguments的长度
-                findHasError = Boolean(logicType.typeArguments?.find((item) => (item?.typeNamespace === 'nasl.ui' && item?.typeName === 'Error')));
+                findHasError = Boolean(logicType.typeArguments?.find((item) => item?.typeNamespace === 'nasl.ui' && item?.typeName === 'Error'));
             }
         }
         return findHasError;
@@ -1625,14 +1768,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Logic.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], Logic.prototype, "toNaturalTS", null);
 Logic = Logic_1 = __decorate([
     (0, decorators_1.concept)('逻辑')
 ], Logic);
 exports.Logic = Logic;
 classMap_1.default.Logic = Logic;
 exports.default = Logic;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=Logic__.js.map