@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/concepts/CallQueryComponent__.ts

@@ -103,6 +103,8 @@ export class CallQueryComponent extends LogicItem {
     @property()
     ideVersion: string = undefined;
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -119,6 +121,7 @@ export class CallQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallQueryComponent;
     }
 
+    
     /**
      * 设置select
      */
@@ -218,6 +221,10 @@ export class CallQueryComponent extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -250,6 +257,8 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -272,6 +281,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -291,6 +302,8 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInWherePlaygroundAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -314,6 +327,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
     * 插入查询分组
     * @internal
@@ -346,6 +361,8 @@ export class CallQueryComponent extends LogicItem {
         return queryGroupByExpression;
     }
 
+    
+
     /**
      * 插入查询分组
      * @param queryGroupByExpressionOptions 查询分组参数
@@ -368,6 +385,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加查询分组
      * @internal
@@ -387,6 +406,8 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryGroupByExpressionInGroupByAt(options as any, index);
     }
 
+    
+
     /**
      * 添加查询分组
      * @param queryGroupByExpressionOptions 查询分组参数
@@ -410,6 +431,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
     * 插入逻辑项
     * @internal
@@ -442,6 +465,8 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
+    
+
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -464,6 +489,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加逻辑项
      * @internal
@@ -483,6 +510,8 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInHavingPlaygroundAt(options as any, index);
     }
 
+    
+
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -506,6 +535,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
     * 插入查询排序子句
     * @internal
@@ -538,6 +569,8 @@ export class CallQueryComponent extends LogicItem {
         return queryOrderByExpression;
     }
 
+    
+
     /**
      * 插入查询排序子句
      * @param queryOrderByExpressionOptions 查询排序子句参数
@@ -560,6 +593,8 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加查询排序子句
      * @internal
@@ -579,6 +614,8 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryOrderByExpressionInOrderByAt(options as any, index);
     }
 
+    
+
     /**
      * 添加查询排序子句
      * @param queryOrderByExpressionOptions 查询排序子句参数
@@ -602,6 +639,9 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -650,6 +690,8 @@ export class CallQueryComponent extends LogicItem {
         return params;
     }
 
+
+
     /**
     * 删除查询选择子句
     * @param name 查询选择子句名称
@@ -675,6 +717,8 @@ export class CallQueryComponent extends LogicItem {
         return select.delete();
     }
 
+    
+
     /**
     * 删除查询 From 子句
     * @param name 查询 From 子句名称
@@ -700,6 +744,8 @@ export class CallQueryComponent extends LogicItem {
         return from.delete();
     }
 
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -725,6 +771,8 @@ export class CallQueryComponent extends LogicItem {
         return where.delete();
     }
 
+    
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -732,10 +780,12 @@ export class CallQueryComponent extends LogicItem {
     removeItemInWherePlayground(logicItem: LogicItem): void;
 
     removeItemInWherePlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
+    
+
     /**
      * 删除查询分组
      * @param queryGroupByExpression 已有的查询分组实例
@@ -743,10 +793,12 @@ export class CallQueryComponent extends LogicItem {
     removeQueryGroupByExpressionInGroupBy(queryGroupByExpression: QueryGroupByExpression): void;
 
     removeQueryGroupByExpressionInGroupBy(options: QueryGroupByExpression) {
-        const queryGroupByExpression: QueryGroupByExpression = options;
+        let queryGroupByExpression: QueryGroupByExpression = options;
         return queryGroupByExpression.delete();
     }
 
+    
+
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -772,6 +824,8 @@ export class CallQueryComponent extends LogicItem {
         return having.delete();
     }
 
+    
+
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -779,10 +833,12 @@ export class CallQueryComponent extends LogicItem {
     removeItemInHavingPlayground(logicItem: LogicItem): void;
 
     removeItemInHavingPlayground(options: LogicItem) {
-        const logicItem: LogicItem = options;
+        let logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
+    
+
     /**
      * 删除查询排序子句
      * @param queryOrderByExpression 已有的查询排序子句实例
@@ -790,10 +846,12 @@ export class CallQueryComponent extends LogicItem {
     removeQueryOrderByExpressionInOrderBy(queryOrderByExpression: QueryOrderByExpression): void;
 
     removeQueryOrderByExpressionInOrderBy(options: QueryOrderByExpression) {
-        const queryOrderByExpression: QueryOrderByExpression = options;
+        let queryOrderByExpression: QueryOrderByExpression = options;
         return queryOrderByExpression.delete();
     }
 
+    
+
     /**
     * 删除查询分页子句
     * @param name 查询分页子句名称
@@ -1074,7 +1132,7 @@ export class CallQueryComponent extends LogicItem {
         } else if (this.select.selectFieldElements.some((item) => item.entityAsName === entityName && item.propertyName)) {
             // 2.22 选择字段时，生成选择字段的匿名数据结构 { entity1: { prop1, prop2 } }
             const entity: Entity = this.app.findNodeByCompleteName(entityNamespace + '.' + entityName);
-            properties.push(StructureProperty.from({
+            entity && properties.push(StructureProperty.from({
                 name: utils.firstLowerCase(entityName),
                 typeAnnotation: TypeAnnotation.from({
                     concept: 'TypeAnnotation',
@@ -1182,9 +1240,10 @@ export class CallQueryComponent extends LogicItem {
     }
 
     genStructure(structureName?: string, properties: any[] = []) {
+        const logic = this.logic || this.AuthLogic || this.AuthLogicForCallInterface;
         return Structure.from({
             concept: 'Structure',
-            name: structureName || this.typeAnnotation?.typeName || `${utils.firstUpperCase(this.logic.name)}Structure`,
+            name: structureName || this.typeAnnotation?.typeName || `${utils.firstUpperCase(logic.name)}Structure`,
             origin: 'CallQueryComponent',
             properties,
         });
@@ -1222,7 +1281,8 @@ export class CallQueryComponent extends LogicItem {
             }
         }
 
-        structureName = structureName || utils.unique(`${utils.firstUpperCase(this.logic.name)}Structure`, this.app.getStructureExistingNames());
+        const logic = this.logic || this.AuthLogic || this.AuthLogicForCallInterface;
+        structureName = structureName || utils.unique(`${utils.firstUpperCase(logic.name)}Structure`, this.app.getStructureExistingNames());
         const groupByLength = groupBy.filter((item) => (item.groupElement as QueryFieldExpression)?.propertyName && (item.groupElement as QueryFieldExpression).asName).length;
         const aggregateLength = selectElements.filter((item) => item.aggregateName && item.asName).length;
 

package/src/concepts/Destination__.ts

@@ -66,6 +66,8 @@ export class Destination extends LogicItem {
     @property()
     target: string = '_self';
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -82,6 +84,7 @@ export class Destination extends LogicItem {
         return super.from(source, parentNode, parentKey) as Destination;
     }
 
+    
     /**
      * 设置viewNamespace
      */
@@ -133,6 +136,10 @@ export class Destination extends LogicItem {
         });
     }
 
+    
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -165,6 +172,8 @@ export class Destination extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -187,6 +196,8 @@ export class Destination extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -206,6 +217,8 @@ export class Destination extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -229,6 +242,9 @@ export class Destination extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -236,10 +252,12 @@ export class Destination extends LogicItem {
     removeArgumentInArguments(argument: Argument): void;
 
     removeArgumentInArguments(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
+    
+
     /**
     * 删除锚点参数
     * @param name 锚点参数名称

package/src/concepts/End__.ts

@@ -1,4 +1,6 @@
 import { TranslatorState, indent } from '../translator';
+import Return from './Return__';
+import Logic from './Logic__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -71,9 +73,35 @@ export class End extends LogicItem {
 
     toEmbeddedTS(state?: TranslatorState): string {
         let code = '';
-        const ret = this.logic.returns[0];
-        if (ret) {
-            code += indent((state?.tabSize || 0)) + 'return ' + ret.name + ';';
+        let ret;
+        let logic;
+        switch (this.parentNode.concept) {
+            case 'Logic':
+                ret = this.logic.returns[0];
+                break;
+            case 'AuthLogic':
+                ret = this.AuthLogic.returns[0];
+                break;
+            case 'AuthLogicForCallInterface':
+                // 导出接口鉴权参数返回值固定为下面逻辑；
+                ret = `${indent((state?.tabSize || 0))}let ${this.parentNode.name}Result: ApiReturn; \n ${indent((state?.tabSize || 0))}return ${this.parentNode.name}Result;\n`;
+                break;
+            case 'OverriddenLogic':
+                ret = this.OverriddenLogic.returns[0];
+                break;
+            default:
+                // 旧逻辑默认走这里，
+                // 期望后期可以直接走完整的case， default 直接抛出异常好更明确定位错误
+                logic = logic = this.parentNode.getAncestor('Logic')
+                    || this.parentNode.getAncestor('AuthLogic')
+                    || this.parentNode.getAncestor('AuthLogicForCallInterface')
+                    || this.parentNode.getAncestor('OverriddenLogic');
+                ret = (logic as Logic).returns[0];
+        }
+        if (ret && this.parentNode.concept === 'AuthLogicForCallInterface') {
+            code += ret;
+        } else if (ret && this.parentNode.concept !== 'AuthLogicForCallInterface') {
+            code += indent((state?.tabSize || 0)) + 'return ' + (ret as Return).name + ';';
         } else {
             code += indent((state?.tabSize || 0)) + 'return;';
         }

package/src/concepts/EntityProperty__.ts

@@ -286,6 +286,10 @@ export class EntityProperty extends BaseNode {
         });
     }
 
+    
+
+    
+
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -334,6 +338,8 @@ export class EntityProperty extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除数据库存储类型
     * @param name 数据库存储类型名称

package/src/concepts/Entity__.ts

@@ -130,7 +130,7 @@ export class Entity extends BaseNode {
         });
     }
 
-    getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
+        getPropertyExistingNames(excludedList: Array<EntityProperty> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.properties as EntityProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -271,6 +271,7 @@ export class Entity extends BaseNode {
         return node;
     }
 
+
     getEntityIndexExistingNames(excludedList: Array<EntityIndex> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.indexes as EntityIndex[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -412,6 +413,9 @@ export class Entity extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除实体属性
     * @param name 实体属性名称
@@ -460,6 +464,8 @@ export class Entity extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除实体索引
     * @param name 实体索引名称
@@ -530,7 +536,7 @@ export class Entity extends BaseNode {
     /**
      * 设置实体表名并修改表名
      */
-    async setName(name: string) {
+    setName(name: string) {
         const object: any = {
             name,
         };
@@ -547,14 +553,10 @@ export class Entity extends BaseNode {
 
         this.name = oldName;
         this.tableName = oldTableName;
-        this.app?.emit('collect:start', { actionMsg: '修改实体名' });
-        const refs = await this.findUsage();
         this.update({
             ...object,
             field: 'name',
         });
-        this._effect(refs);
-        this.app?.emit('collect:end');
     }
     /**
      * 设置实体表名
@@ -563,7 +565,6 @@ export class Entity extends BaseNode {
         const object = {
             tableName,
         };
-        console.log(123123123);
 
         const oldTableName = this.tableName;
         this.tableName = tableName;
@@ -670,30 +671,6 @@ export class Entity extends BaseNode {
         // 重命名 properties columnName
         this.formatPropertyColumnName();
     }
-    async _effect(refs: any = []) {
-        // 处理选中的此实体的 CallQueryComponent
-        const callQueryComponents: Set<CallQueryComponent> = new Set();
-        refs.forEach((val: any) => {
-            const loopFindNode = (item: any) => {
-                if (item.children) {
-                    item.children.forEach((i: any) => loopFindNode(i));
-                } else {
-                    const target = item.node?.getAncestor('CallQueryComponent');
-                    if (target) {
-                        callQueryComponents.add(target);
-                    }
-                }
-            };
-            loopFindNode(val);
-        });
-        callQueryComponents.forEach((node) => {
-            const targetField = node.select.selectFieldElements.find((item) => item.entityAsName === this.name);
-            if (targetField) {
-                // 更新数据结构
-                node.saveStructure();
-            }
-        });
-    }
 
     public static getDefaultOptions() {
         return {

package/src/concepts/ForEachStatement__.ts

@@ -511,10 +511,15 @@ export class ForEachStatement extends LogicItem {
         const list = this.each ? this.each.toJS(shiftState(state, code, {
             tabSize: 0,
         })) : '';
-        code += `if(Array.isArray(${list})) {\n`;
-        code += `for (let ${this.index.name} = ${this.start && this.start.toJS() ? this.start.toJS() : ''}; `;
-        code += `${this.index.name} < (${this.end && this.end.toJS() ? this.end.toJS() : ''}); ${this.index.name}++) {\n`;
-        code += `const ${this.item.name} = (${list})[${this.index.name}];\n`;
+        const random = Math.random();
+        const number = Math.round(random * 10000);
+        code += `var $forEachListVariable${number} = ${list};\n`;
+        code += `var $forEachStartVariable${number} = ${this.start && this.start.toJS() ? this.start.toJS() : ''};\n`;
+        code += `var $forEachEndVariable${number} = ${this.end && this.end.toJS() ? this.end.toJS() : ''};\n`;
+        code += `if(Array.isArray($forEachListVariable${number})) {\n`;
+        code += `for (let ${this.index.name} = $forEachStartVariable${number}; `;
+        code += `${this.index.name} < $forEachEndVariable${number}; ${this.index.name}++) {\n`;
+        code += `const ${this.item.name} = $forEachListVariable${number}[${this.index.name}];\n`;
         if (Array.isArray(this.body)) {
             this.body.forEach((logicItem) => {
                 code