@lcap/nasl 2.22.0-beta.0 → 2.22.0-beta.2

package/src/concepts/CallQueryComponent__.ts

@@ -103,8 +103,6 @@ export class CallQueryComponent extends LogicItem {
     @property()
     ideVersion: string = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -121,7 +119,6 @@ export class CallQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallQueryComponent;
     }
 
-    
     /**
      * 设置select
      */
@@ -221,10 +218,6 @@ export class CallQueryComponent extends LogicItem {
         });
     }
 
-    
-
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -257,8 +250,6 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -281,8 +272,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -302,8 +291,6 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInWherePlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -327,8 +314,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
     * 插入查询分组
     * @internal
@@ -361,8 +346,6 @@ export class CallQueryComponent extends LogicItem {
         return queryGroupByExpression;
     }
 
-    
-
     /**
      * 插入查询分组
      * @param queryGroupByExpressionOptions 查询分组参数
@@ -385,8 +368,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加查询分组
      * @internal
@@ -406,8 +387,6 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryGroupByExpressionInGroupByAt(options as any, index);
     }
 
-    
-
     /**
      * 添加查询分组
      * @param queryGroupByExpressionOptions 查询分组参数
@@ -431,8 +410,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
     * 插入逻辑项
     * @internal
@@ -465,8 +442,6 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
-    
-
     /**
      * 插入逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -489,8 +464,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加逻辑项
      * @internal
@@ -510,8 +483,6 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInHavingPlaygroundAt(options as any, index);
     }
 
-    
-
     /**
      * 添加逻辑项
      * @param logicItemOptions 逻辑项参数
@@ -535,8 +506,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
     * 插入查询排序子句
     * @internal
@@ -569,8 +538,6 @@ export class CallQueryComponent extends LogicItem {
         return queryOrderByExpression;
     }
 
-    
-
     /**
      * 插入查询排序子句
      * @param queryOrderByExpressionOptions 查询排序子句参数
@@ -593,8 +560,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
-
     /**
      * 添加查询排序子句
      * @internal
@@ -614,8 +579,6 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryOrderByExpressionInOrderByAt(options as any, index);
     }
 
-    
-
     /**
      * 添加查询排序子句
      * @param queryOrderByExpressionOptions 查询排序子句参数
@@ -639,9 +602,6 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-
-    
-
     /**
     * 删除类型标注
     * @param name 类型标注名称
@@ -690,8 +650,6 @@ export class CallQueryComponent extends LogicItem {
         return params;
     }
 
-
-
     /**
     * 删除查询选择子句
     * @param name 查询选择子句名称
@@ -717,8 +675,6 @@ export class CallQueryComponent extends LogicItem {
         return select.delete();
     }
 
-    
-
     /**
     * 删除查询 From 子句
     * @param name 查询 From 子句名称
@@ -744,8 +700,6 @@ export class CallQueryComponent extends LogicItem {
         return from.delete();
     }
 
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -771,8 +725,6 @@ export class CallQueryComponent extends LogicItem {
         return where.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -780,12 +732,10 @@ export class CallQueryComponent extends LogicItem {
     removeItemInWherePlayground(logicItem: LogicItem): void;
 
     removeItemInWherePlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
-    
-
     /**
      * 删除查询分组
      * @param queryGroupByExpression 已有的查询分组实例
@@ -793,12 +743,10 @@ export class CallQueryComponent extends LogicItem {
     removeQueryGroupByExpressionInGroupBy(queryGroupByExpression: QueryGroupByExpression): void;
 
     removeQueryGroupByExpressionInGroupBy(options: QueryGroupByExpression) {
-        let queryGroupByExpression: QueryGroupByExpression = options;
+        const queryGroupByExpression: QueryGroupByExpression = options;
         return queryGroupByExpression.delete();
     }
 
-    
-
     /**
     * 删除逻辑项
     * @param name 逻辑项名称
@@ -824,8 +772,6 @@ export class CallQueryComponent extends LogicItem {
         return having.delete();
     }
 
-    
-
     /**
      * 删除逻辑项
      * @param logicItem 已有的逻辑项实例
@@ -833,12 +779,10 @@ export class CallQueryComponent extends LogicItem {
     removeItemInHavingPlayground(logicItem: LogicItem): void;
 
     removeItemInHavingPlayground(options: LogicItem) {
-        let logicItem: LogicItem = options;
+        const logicItem: LogicItem = options;
         return logicItem.delete();
     }
 
-    
-
     /**
      * 删除查询排序子句
      * @param queryOrderByExpression 已有的查询排序子句实例
@@ -846,12 +790,10 @@ export class CallQueryComponent extends LogicItem {
     removeQueryOrderByExpressionInOrderBy(queryOrderByExpression: QueryOrderByExpression): void;
 
     removeQueryOrderByExpressionInOrderBy(options: QueryOrderByExpression) {
-        let queryOrderByExpression: QueryOrderByExpression = options;
+        const queryOrderByExpression: QueryOrderByExpression = options;
         return queryOrderByExpression.delete();
     }
 
-    
-
     /**
     * 删除查询分页子句
     * @param name 查询分页子句名称
@@ -984,8 +926,14 @@ export class CallQueryComponent extends LogicItem {
         //   })`;
     }
 
+    // 2.11版本，自动推断返回类型
     isAutoInfer() {
-        return this.ideVersion === '2.11';
+        return this.ideVersion === '2.11' || this.ideVersion === '2.22';
+    }
+    // 2.22版本，实体支持列筛选  2.11版本不支持列筛选，需要运维select.selectElements
+    get entityPropertySelectable() {
+        return false; // 回滚功能
+        // return this.ideVersion === '2.22';
     }
 
     @withSourceMap()
@@ -1020,7 +968,7 @@ export class CallQueryComponent extends LogicItem {
             });
         }
         // 聚合属性别名
-        this.select.selectElements.forEach((item, index, array) => {
+        this.select.selectAggregateElements.forEach((item, index, array) => {
             code += indent((state?.tabSize || 0) + 1);
             const { asName, aggregateName, aggregateParam } = item;
             if (asName)
@@ -1048,11 +996,19 @@ export class CallQueryComponent extends LogicItem {
             multipleErrorType: '__WHERE_MULTIPLE_CONDITION__',
         });
 
-        // 聚合属性
-        code = this.toEmbeddedTSOfSubPart('SELECT', this.select.selectElements, {
-            code,
-            state,
-        });
+        if (this.select.selectAggregateElements.length) {
+            // 聚合属性
+            code = this.toEmbeddedTSOfSubPart('SELECT', this.select.selectAggregateElements, {
+                code,
+                state,
+            });
+        } else {
+            // select实体字段
+            code = this.toEmbeddedTSOfSubPart('SELECT', this.select.selectFieldElements.filter((node) => !node.isDotStar), {
+                code,
+                state,
+            });
+        }
 
         // 分组属性（Group by）
         code = this.toEmbeddedTSOfSubPart('GROUP_BY', this.groupBy, {
@@ -1088,6 +1044,7 @@ export class CallQueryComponent extends LogicItem {
             && this.parentNode.concept !== 'Assignment'
             && this.parentNode.concept !== 'ForEachStatement'
             && this.parentNode.concept !== 'SelectMembers'
+            && this.parentNode.concept !== 'UnaryExpression'
             && this.parentNode.concept !== 'BinaryExpression'
             && this.parentNode.concept !== 'StringInterpolation'
             && this.parentNode.concept !== 'MemberExpression'
@@ -1104,15 +1061,37 @@ export class CallQueryComponent extends LogicItem {
 
         const entityName = node.entityName;
         const entityNamespace = node.entityNamespace;
-        properties.push(StructureProperty.from({
-            name: utils.firstLowerCase(entityName),
-            typeAnnotation: TypeAnnotation.from({
-                concept: 'TypeAnnotation',
-                typeKind: 'reference',
-                typeName: entityName,
-                typeNamespace: entityNamespace,
-            }),
-        }));
+        // 生成整个实体类型 { entity1: Entity1 }  在2.11属于默认情况；在2.22勾选实体节点(isDotStar=true)时
+        if (!this.entityPropertySelectable || this.select.selectFieldElements.some((item) => item.entityAsName === entityName && item.isDotStar)) {
+            properties.push(StructureProperty.from({
+                name: utils.firstLowerCase(entityName),
+                typeAnnotation: TypeAnnotation.from({
+                    concept: 'TypeAnnotation',
+                    typeKind: 'reference',
+                    typeName: entityName,
+                    typeNamespace: entityNamespace,
+                }),
+            }));
+        } 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({
+                name: utils.firstLowerCase(entityName),
+                typeAnnotation: TypeAnnotation.from({
+                    concept: 'TypeAnnotation',
+                    typeKind: 'anonymousStructure',
+                    properties: this.select.selectFieldElements
+                        .filter((sel) => sel.entityAsName === entityName && sel.propertyName)
+                        .map((item) => {
+                            const property = entity.properties.find((prop) => prop.name === item.propertyName);
+                            return property && StructureProperty.from({
+                                name: item.propertyName,
+                                typeAnnotation: TypeAnnotation.from(property.typeAnnotation),
+                            });
+                        }).filter(Boolean),
+                }),
+            }));
+        } else { /* 实体或属性都不选择时，不生成数据结构 */ }
 
         for (const sub of node.joinParts) {
             this.genPropertiesFrom(sub, properties);
@@ -1146,7 +1125,7 @@ export class CallQueryComponent extends LogicItem {
     }
 
     genPropertyListOfAggregate(node: CallQueryComponent, entities: Entity[]) {
-        return node.select.selectElements
+        return node.select.selectAggregateElements
             .filter((item) => item.aggregateName && item.asName)
             .map((item) => {
                 let typeName;
@@ -1225,7 +1204,7 @@ export class CallQueryComponent extends LogicItem {
         }
 
         const groupBy = this.groupBy;
-        const selectElements = this.select.selectElements;
+        const selectElements = this.select.selectAggregateElements;
         let structureName;
         let typeAnnotation;
 
@@ -1356,7 +1335,7 @@ export class CallQueryComponent extends LogicItem {
                         typeNamespace: 'nasl.core',
                     }, this, 'typeAnnotation');
                 } else {
-                    // 2.2. 多聚合：`{ Structure }`
+                    // 2.2 多聚合：`{ Structure }`
                     typeAnnotation = TypeAnnotation.from({
                         concept: 'TypeAnnotation',
                         typeKind: 'anonymousStructure',
@@ -1364,7 +1343,7 @@ export class CallQueryComponent extends LogicItem {
                     }, this, 'typeAnnotation');
                 }
             } else {
-                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Long }`
+                // 2.3 无分组&&无聚合 (默认情况)：`{ list: List<Structure>, total: Long }`
                 typeAnnotation = TypeAnnotation.from({
                     concept: 'TypeAnnotation',
                     typeKind: 'anonymousStructure',
@@ -1587,6 +1566,18 @@ export class CallQueryComponent extends LogicItem {
         });
         return contentVariables;
     }
+    // 临时升级脚本
+    // 将所有from的实体，在selectElements中初始化一个isDotStar=true的QueryFieldExpression
+    initFieldSelectElement(node: CallQueryComponent = this) {
+        const loop = (from: QueryFromExpression | QueryJoinExpression) => {
+            node.select.addQueryFieldExpressionInSelectElements({
+                entityAsName: from.entityName,
+                isDotStar: true,
+            });
+            from.joinParts?.forEach(loop);
+        };
+        loop(node.from);
+    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ConfigProperty__.ts

@@ -1,6 +1,7 @@
 import { TranslatorState, withSourceMap, createCompilerState, indent } from '../translator';
 import ConfigGroup from './ConfigGroup__';
 import Namespace from './Namespace__';
+import View from './View__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -46,6 +47,12 @@ export class ConfigProperty extends BaseNode {
     @property('ConfigPropertyValue')
     values: Array<ConfigPropertyValue> = [];
 
+    /**
+     * isPrivate
+     */
+    @property()
+    isPrivate: boolean = undefined;
+
     /**
      * 祖先 App
      */
@@ -335,7 +342,17 @@ export class ConfigProperty extends BaseNode {
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = `let ${this.name}: nasl.core.String; \n`;
+        let modifier;
+        if (this.isPrivate) {
+            modifier = 'private';
+        } else {
+            modifier = '';
+        }
+        let code = `class Custom${this.name} {
+            ${modifier} static FrontEnd${this.name}: nasl.core.String
+            static BackEnd${this.name}: nasl.core.String
+        };`;
+
         if (this.parentNode.name === 'custom') {
             this.values.forEach((value) => {
                 code += indent((state?.tabSize || 0) + 1);

package/src/concepts/Destination__.ts

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