@lcap/nasl 3.3.0-beta.0 → 3.4.0-alpha.1

package/out/concepts/Logic__.js

@@ -49,6 +49,7 @@ const CallLogic__1 = __importDefault(require("./CallLogic__"));
 const decorators_1 = require("../decorators");
 const utils = __importStar(require("../utils"));
 const BaseNode_1 = __importDefault(require("../common/BaseNode"));
+const classMap_1 = __importDefault(require("../common/classMap"));
 const Transactional__1 = __importDefault(require("./Transactional__"));
 const TypeParam__1 = __importDefault(require("./TypeParam__"));
 const Param__1 = __importDefault(require("./Param__"));
@@ -59,51 +60,39 @@ const Process__1 = __importDefault(require("./Process__"));
 /**
  * 逻辑
  */
-let Logic = Logic_1 = 
-// @ts-ignore
-class Logic extends BaseNode_1.default {
-    /** 类名 */
-    static ConceptName = 'Logic';
+let Logic = Logic_1 = class Logic extends BaseNode_1.default {
     /**
      * 产品概念
      */
-    // @ts-ignore
-    concept;
+    concept = 'Logic';
     /**
      * 逻辑名称
      */
-    // @ts-ignore
-    name;
-    /**
-     * 逻辑标题
-     */
-    // @ts-ignore
-    title;
+    name = undefined;
     /**
      * 逻辑描述
      */
-    // @ts-ignore
-    description;
+    description = undefined;
     /**
-     * 触发方式
+     * triggerType
      */
-    // @ts-ignore
-    triggerType;
+    triggerType = undefined;
     /**
-     * 定时任务表达式
+     * cron
      */
-    // @ts-ignore
-    cron;
+    cron = undefined;
     /**
-     * 是否可覆写
+     * overridable
      */
-    // @ts-ignore
-    overridable;
+    overridable = undefined;
     /**
      * 事务
      */
-    // @ts-ignore
-    transactional;
+    transactional = undefined;
+    /**
+     * 编译器信息
+     */
+    compilerInfoMap = undefined;
     /**
      * 类型参数列表
      */
@@ -174,10 +163,14 @@ 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);
     }
+    getClassName() {
+        return 'Logic';
+    }
     static from(source, parentNode, parentKey) {
         return super.from(source, parentNode, parentKey);
     }
@@ -204,17 +197,6 @@ class Logic extends BaseNode_1.default {
             field: 'name',
         });
     }
-    /**
-     * 设置逻辑标题
-     */
-    setTitle(title) {
-        const object = {
-            title,
-        };
-        this.update({
-            ...object,
-        });
-    }
     /**
      * 设置逻辑描述
      */
@@ -227,7 +209,7 @@ class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置触发方式
+     * 设置triggerType
      */
     setTriggerType(triggerType) {
         const object = {
@@ -238,7 +220,7 @@ class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置定时任务表达式
+     * 设置cron
      */
     setCron(cron) {
         const object = {
@@ -249,7 +231,7 @@ class Logic extends BaseNode_1.default {
         });
     }
     /**
-     * 设置是否可覆写
+     * 设置overridable
      */
     setOverridable(overridable) {
         const object = {
@@ -588,7 +570,7 @@ class Logic extends BaseNode_1.default {
         if (typeof options === 'string') {
             transactional = this.transactional;
             if (!transactional) {
-                throw new Error('找不到事务 ' + options);
+                throw new Error(`找不到事务 ${options}`);
             }
         }
         else {
@@ -597,7 +579,7 @@ class Logic extends BaseNode_1.default {
         return transactional.delete();
     }
     __removeTransactional(transactional) {
-        const parentKey = transactional.parentKey;
+        const { parentKey } = transactional;
         const params = {
             parentNode: this,
             parentKey,
@@ -624,7 +606,7 @@ 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 {
@@ -633,7 +615,7 @@ class Logic extends BaseNode_1.default {
         return typeParam.delete();
     }
     __removeTypeParam(typeParam) {
-        const parentKey = typeParam.parentKey;
+        const { parentKey } = typeParam;
         const params = {
             parentNode: this,
             parentKey,
@@ -660,7 +642,7 @@ 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 {
@@ -669,7 +651,7 @@ class Logic extends BaseNode_1.default {
         return param.delete();
     }
     __removeParam(param) {
-        const parentKey = param.parentKey;
+        const { parentKey } = param;
         const params = {
             parentNode: this,
             parentKey,
@@ -696,7 +678,7 @@ 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 {
@@ -705,7 +687,7 @@ class Logic extends BaseNode_1.default {
         return ret.delete();
     }
     __removeReturn(ret) {
-        const parentKey = ret.parentKey;
+        const { parentKey } = ret;
         const params = {
             parentNode: this,
             parentKey,
@@ -732,7 +714,7 @@ 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 {
@@ -741,7 +723,7 @@ class Logic extends BaseNode_1.default {
         return variable.delete();
     }
     __removeVariable(variable) {
-        const parentKey = variable.parentKey;
+        const { parentKey } = variable;
         const params = {
             parentNode: this,
             parentKey,
@@ -764,15 +746,15 @@ class Logic extends BaseNode_1.default {
         return params;
     }
     removeItemInBody(options) {
-        let logicItem = options;
+        const logicItem = options;
         return logicItem.delete();
     }
     removeItemInPlayground(options) {
-        let logicItem = options;
+        const logicItem = options;
         return logicItem.delete();
     }
     __removeLogicItem(logicItem) {
-        const parentKey = logicItem.parentKey;
+        const { parentKey } = logicItem;
         const params = {
             parentNode: this,
             parentKey,
@@ -794,10 +776,10 @@ class Logic extends BaseNode_1.default {
         }
         return params;
     }
-    //================================================================================
+    //= ===============================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
-    //================================================================================
+    //= ===============================================================================
     // 用于calllogic树中定位是那个logic，回显
     get calleewholeKey() {
         return `${this.getNamespace()}.${this.name}`;
@@ -853,8 +835,6 @@ class Logic extends BaseNode_1.default {
             varList.push(...this.variables);
         }
         if (this.view) {
-            // 页面下，变量名不可以跟逻辑名相同，会有js 翻译问题
-            varList.push(this);
             if (Array.isArray(this.view.params)) {
                 varList.push(...this.view.params);
             }
@@ -1052,9 +1032,7 @@ class Logic extends BaseNode_1.default {
                     code += 'const __LogicEmpty: any = null;';
                 }
             }
-            else if (this.body.length <= 2 &&
-                !(this.parentNode instanceof Namespace__1.default) &&
-                !(this.parentNode instanceof Process__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;`;
             }
@@ -1201,9 +1179,7 @@ class Logic extends BaseNode_1.default {
                         ? 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]];
+                        const rightNode = rightIndex.length === 1 ? assignment.rights[rightIndex[0]]?.expression : assignment.rights[rightIndex[0]]?.members[rightIndex[1]];
                         // 当右边有明确类型时，直接使用其类型。旧版本数据查询不能直接使用其 typeAnnotation
                         if (rightNode?.typeAnnotation && !(rightNode instanceof CallQueryComponent__1.default && !rightNode.isAutoInfer())) {
                             if (rightNode.concept === 'NewComposite' && rightNode.typeAnnotation?.typeKind === 'anonymousStructure') {
@@ -1227,20 +1203,17 @@ class Logic extends BaseNode_1.default {
                     }
                 });
             }
-            else if (['NewList', 'NewMap'].includes(assignment.right?.concept) &&
-                !assignment.right?.typeAnnotation) {
+            else if (['NewList', 'NewMap'].includes(assignment.right?.concept) && !assignment.right?.typeAnnotation) {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
-            else if (assignment.right?.concept === 'NewComposite' &&
-                assignment.right?.typeAnnotation?.typeKind === 'anonymousStructure') {
+            else if (assignment.right?.concept === 'NewComposite' && assignment.right?.typeAnnotation?.typeKind === 'anonymousStructure') {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getInitCode((0, translator_1.shiftState)(state, code, { inline: true }));
             }
-            else if (assignment.right?.concept === 'NewComposite' &&
-                assignment.right?.typeAnnotation?.typeKind === 'generic') {
+            else if (assignment.right?.concept === 'NewComposite' && assignment.right?.typeAnnotation?.typeKind === 'generic') {
                 const rightNode = assignment.right;
                 code += ' = ';
                 code += rightNode.getNewCompositeCode((0, translator_1.shiftState)(state, code, { inline: true }));
@@ -1256,16 +1229,10 @@ class Logic extends BaseNode_1.default {
                     code += ' = ';
                     let rightCode = '';
                     // 因为右侧枚举要赋值就得new 一下；
-                    if (rightNode &&
-                        rightNode instanceof Identifier__1.default &&
-                        rightNode.namespace &&
-                        rightNode.namespace.endsWith('enums')) {
+                    if (rightNode && rightNode instanceof Identifier__1.default && rightNode.namespace && rightNode.namespace.endsWith('enums')) {
                         rightCode += 'new ';
                     }
-                    rightCode +=
-                        rightNode && rightNode.toEmbeddedTS
-                            ? rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true }))
-                            : '__RIGHT__';
+                    rightCode += rightNode && rightNode.toEmbeddedTS ? rightNode.toEmbeddedTS((0, translator_1.shiftState)(state, code, { inline: true })) : '__RIGHT__';
                     code += this.getRightCode(rightCode, assignment, rightNode);
                 }
             }
@@ -1302,6 +1269,134 @@ class Logic extends BaseNode_1.default {
         code += '\n';
         return code;
     }
+    toNaturalTS(state = (0, translator_1.createCompilerState)(), prefix, logicName, currentNode) {
+        // 如果传了不要前缀那就为空， 要不用传进来的，要是都没有就默认导出
+        let code = '';
+        if (currentNode === this) {
+            code += `\n${(0, translator_1.indent)(state.tabSize)}/**
+${(0, translator_1.indent)(state.tabSize)} * 当前逻辑
+${(0, translator_1.indent)(state.tabSize)} */\n`;
+        }
+        if (!logicName) {
+            const { name, parentNode } = this;
+            if (parentNode?.concept === 'View') {
+                logicName = `viewLogic_${name}`;
+            }
+            else if (parentNode?.concept === 'BindEvent') {
+                logicName = `on_${(parentNode?.parentNode)?.name}_${name}`;
+            }
+            else {
+                logicName = this.name;
+            }
+        }
+        if (!prefix) {
+            code += `${(0, translator_1.indent)(state.tabSize)}export ${currentNode !== this ? 'declare function' : 'function'} ${logicName}`;
+        }
+        else if (prefix === 'noExport') {
+            code += `${(0, translator_1.indent)(state.tabSize)}${currentNode !== this ? 'declare function' : '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 }));
+        }
+        if (currentNode !== this) {
+            code += ';';
+        }
+        else {
+            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 += `,`;
+        }
+        code += '\n';
+        return code;
+    }
     getRightCode(code, assignment, rightNode) {
         code = code.replaceAll('\n', ' ');
         if (assignment instanceof Assignment__1.default && !assignment.right)
@@ -1406,11 +1501,6 @@ class Logic extends BaseNode_1.default {
                 return parentNamespace;
             }
             const parentName = this.parentNode.name;
-            // 自定义连接器，增加了分组概念，故需要额外扩展一层namespace
-            const connector = this.getAncestor('Connector');
-            if (connector && connector.connectorKind === 'app') {
-                return `${parentNamespace}.${parentName}`;
-            }
             const arr = [parentNamespace];
             if (this.parentNode.concept !== 'App' && parentName) {
                 arr.push(parentName);
@@ -1438,8 +1528,6 @@ class Logic extends BaseNode_1.default {
     getTsNamespace() {
         if (this.parentNode) {
             const parentNamespace = this.parentNode?.getTsNamespace();
-            // 对于parent类型为Namespace的情况，getTsNamespace 已经返回了具体的 name，
-            // 为什么下文还要重新获取？？？
             const parentName = this.parentNode.tsName || this.parentNode.name;
             const arr = [parentNamespace];
             if (this.parentNode.concept !== 'App' && parentName) {
@@ -1474,13 +1562,7 @@ class Logic extends BaseNode_1.default {
             _path = `/${this.module.parentKey}/${this.module.name}`;
         }
         else if (this.connector) {
-            // 自定义连接器有分组的概念因此，需要做文件夹处理
-            if (this.connector.connectorKind === 'app') {
-                _path = `/${this.connector.parentKey}/${this.connector.name}/${this.parentNode.name}`;
-            }
-            else {
-                _path = `/${this.connector.parentKey}/${this.connector.name}`;
-            }
+            _path = `/${this.connector.parentKey}/${this.connector.name}`;
         }
         if (this.parentNode instanceof FrontendLibrary__1.FrontendLibrary) {
             _path += `/frontends/${this.parentNode.type}`;
@@ -1554,26 +1636,14 @@ class Logic extends BaseNode_1.default {
         let actionMsg = '删除逻辑项';
         if (this.name)
             actionMsg += `“${this.name}”`;
+        this.app?.emit('logicDeleted', { actionMsg: this.nodePath });
         this.app?.emit('collect:start', {
             actionMsg,
         });
         super.delete();
-        this.traverseChildren(async (el) => {
+        this.traverseChildren((el) => {
             if (el?.concept === 'CallQueryComponent')
                 el.removeStructure();
-            // 仅仅针对 自定义连接器下的 Loigc，其他需要界定边界
-            const connector = el?.getAncestor?.('Connector');
-            if (['CallAuthInterface', 'CallInterface'].includes(el?.concept) && connector) {
-                const { calleeName } = el;
-                const targetInterface = connector.interfaces.find(i => i.name === calleeName);
-                if (targetInterface) {
-                    const refs = await this.app?.naslServer?._isHaveRef(targetInterface);
-                    // 如果只有两个引用，则必然为自身以及当前logic引用，需要删除此接口
-                    if (refs?.length <= 2) {
-                        targetInterface.delete();
-                    }
-                }
-            }
         });
         this.app?.emit('collect:end');
     }
@@ -1662,10 +1732,10 @@ class Logic extends BaseNode_1.default {
 };
 __decorate([
     (0, decorators_1.property)()
-], Logic.prototype, "name", void 0);
+], Logic.prototype, "concept", void 0);
 __decorate([
     (0, decorators_1.property)()
-], Logic.prototype, "title", void 0);
+], Logic.prototype, "name", void 0);
 __decorate([
     (0, decorators_1.property)()
 ], Logic.prototype, "description", void 0);
@@ -1681,6 +1751,9 @@ __decorate([
 __decorate([
     (0, decorators_1.property)('Transactional')
 ], Logic.prototype, "transactional", void 0);
+__decorate([
+    (0, decorators_1.property)()
+], Logic.prototype, "compilerInfoMap", void 0);
 __decorate([
     (0, decorators_1.property)('TypeParam')
 ], Logic.prototype, "typeParams", void 0);
@@ -1705,15 +1778,17 @@ __decorate([
 __decorate([
     (0, translator_1.withSourceMap)()
 ], Logic.prototype, "toEmbeddedTS", null);
+__decorate([
+    (0, translator_1.withSourceMap)()
+], Logic.prototype, "toNaturalTS", null);
 Logic = Logic_1 = __decorate([
-    decorators_1.className,
     (0, decorators_1.concept)('逻辑')
-    // @ts-ignore
 ], Logic);
 exports.Logic = Logic;
+classMap_1.default.Logic = Logic;
 exports.default = Logic;
-//================================================================================
+//= ===============================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//================================================================================
+//= ===============================================================================
 //# sourceMappingURL=Logic__.js.map