@lcap/nasl 2.16.1 → 2.17.1

package/src/concepts/CallQueryComponent__.ts

@@ -101,7 +101,7 @@ export class CallQueryComponent extends LogicItem {
     @property()
     ideVersion: string = undefined;
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -116,7 +116,7 @@ export class CallQueryComponent extends LogicItem {
         return super.from(source, parentNode, parentKey) as CallQueryComponent;
     }
 
-    
+
     /**
      * 设置select
      */
@@ -216,9 +216,9 @@ export class CallQueryComponent extends LogicItem {
         });
     }
 
-    
 
-    
+
+
 
     /**
     * 插入逻辑项
@@ -252,7 +252,7 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
-    
+
 
     /**
      * 插入逻辑项
@@ -276,7 +276,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -297,7 +297,7 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInWherePlaygroundAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -322,7 +322,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
     * 插入查询分组
@@ -356,7 +356,7 @@ export class CallQueryComponent extends LogicItem {
         return queryGroupByExpression;
     }
 
-    
+
 
     /**
      * 插入查询分组
@@ -380,7 +380,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加查询分组
@@ -401,7 +401,7 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryGroupByExpressionInGroupByAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加查询分组
@@ -426,7 +426,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
     * 插入逻辑项
@@ -460,7 +460,7 @@ export class CallQueryComponent extends LogicItem {
         return logicItem;
     }
 
-    
+
 
     /**
      * 插入逻辑项
@@ -484,7 +484,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -505,7 +505,7 @@ export class CallQueryComponent extends LogicItem {
         return this._insertItemInHavingPlaygroundAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加逻辑项
@@ -530,7 +530,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
     * 插入查询排序子句
@@ -564,7 +564,7 @@ export class CallQueryComponent extends LogicItem {
         return queryOrderByExpression;
     }
 
-    
+
 
     /**
      * 插入查询排序子句
@@ -588,7 +588,7 @@ export class CallQueryComponent extends LogicItem {
         return node;
     }
 
-    
+
 
     /**
      * 添加查询排序子句
@@ -609,7 +609,7 @@ export class CallQueryComponent extends LogicItem {
         return this._insertQueryOrderByExpressionInOrderByAt(options as any, index);
     }
 
-    
+
 
     /**
      * 添加查询排序子句
@@ -635,7 +635,7 @@ export class CallQueryComponent extends LogicItem {
     }
 
 
-    
+
 
     /**
     * 删除类型标注
@@ -712,7 +712,7 @@ export class CallQueryComponent extends LogicItem {
         return select.delete();
     }
 
-    
+
 
     /**
     * 删除查询 From 子句
@@ -739,7 +739,7 @@ export class CallQueryComponent extends LogicItem {
         return from.delete();
     }
 
-    
+
 
     /**
     * 删除逻辑项
@@ -766,7 +766,7 @@ export class CallQueryComponent extends LogicItem {
         return where.delete();
     }
 
-    
+
 
     /**
      * 删除逻辑项
@@ -779,7 +779,7 @@ export class CallQueryComponent extends LogicItem {
         return logicItem.delete();
     }
 
-    
+
 
     /**
      * 删除查询分组
@@ -792,7 +792,7 @@ export class CallQueryComponent extends LogicItem {
         return queryGroupByExpression.delete();
     }
 
-    
+
 
     /**
     * 删除逻辑项
@@ -819,7 +819,7 @@ export class CallQueryComponent extends LogicItem {
         return having.delete();
     }
 
-    
+
 
     /**
      * 删除逻辑项
@@ -832,7 +832,7 @@ export class CallQueryComponent extends LogicItem {
         return logicItem.delete();
     }
 
-    
+
 
     /**
      * 删除查询排序子句
@@ -845,7 +845,7 @@ export class CallQueryComponent extends LogicItem {
         return queryOrderByExpression.delete();
     }
 
-    
+
 
     /**
     * 删除查询分页子句
@@ -993,8 +993,8 @@ export class CallQueryComponent extends LogicItem {
         if (this.isAutoInfer()) {
             code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))} {\n`;
         } else {
-            code += `nasl.collection.PageOf<`;
-            code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))}> {\n`;
+            code += `{ list: nasl.collection.List<`;
+            code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))}>, total: nasl.core.Integer } {\n`;
         }
         // 2.11版本后 分组使用别名
         if (this.isAutoInfer()) {
@@ -1080,6 +1080,29 @@ export class CallQueryComponent extends LogicItem {
         return code;
     }
 
+    genPropertiesFrom(node: QueryFromExpression | QueryJoinExpression, properties: StructureProperty[] = []) {
+        if (!node)
+            return [];
+
+        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,
+            }),
+        }));
+
+        for (const sub of node.joinParts) {
+            this.genPropertiesFrom(sub, properties);
+        }
+
+        return properties;
+    }
+
     genPropertyListOfFrom(node: QueryFromExpression | QueryJoinExpression, entities: any[] = []) {
         if (!node)
             return [];
@@ -1180,7 +1203,7 @@ export class CallQueryComponent extends LogicItem {
         let structureName;
         let typeAnnotation;
 
-        // Structures
+        // remove structure
         if (this.typeAnnotation) {
             const { typeNamespace, typeName, typeArguments } = this.typeAnnotation;
             if (typeNamespace === 'app.structures') {
@@ -1202,46 +1225,76 @@ export class CallQueryComponent extends LogicItem {
         // 1. 有分组
         if (groupByLength) {
             if (!aggregateLength && groupByLength === 1) {
-                // 1.1 单分组无聚合：`PageOf<列的类型>`
+                // 1.1 单分组无聚合：`{ list: List<列的类型>, total: Integer }`
                 const { entityAsName, propertyName } = groupBy[0].groupElement as QueryFieldExpression;
                 const entity = entities.find((item: Entity) => item.name === entityAsName);
                 const property = entity?.properties.find((item: any) => item.name === propertyName);
                 const propertyTypeAnnotation = property.typeAnnotation;
 
                 typeAnnotation = TypeAnnotation.from({
-                    text: `PageOf<${propertyTypeAnnotation.typeName}>`,
                     concept: 'TypeAnnotation',
-                    typeKind: 'generic',
-                    typeName: 'PageOf',
-                    typeNamespace: `nasl.collection`,
-                    typeArguments: [TypeAnnotation.from({
-                        concept: propertyTypeAnnotation.concept,
-                        typeKind: propertyTypeAnnotation.typeKind,
-                        typeName: propertyTypeAnnotation.typeName,
-                        typeNamespace: propertyTypeAnnotation.typeNamespace,
-                    }, this.typeAnnotation, 'typeAnnotation')],
+                    typeKind: 'anonymousStructure',
+                    properties: [
+                        StructureProperty.from({
+                            name: 'list',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'generic',
+                                typeName: 'List',
+                                typeNamespace: 'nasl.collection',
+                                typeArguments: [TypeAnnotation.from({
+                                    concept: propertyTypeAnnotation.concept,
+                                    typeKind: propertyTypeAnnotation.typeKind,
+                                    typeName: propertyTypeAnnotation.typeName,
+                                    typeNamespace: propertyTypeAnnotation.typeNamespace,
+                                })],
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
+                        StructureProperty.from({
+                            name: 'total',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'primitive',
+                                typeNamespace: 'nasl.core',
+                                typeName: 'Integer',
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
+                    ],
                 }, this, 'typeAnnotation');
             } else {
-                // 1.2 多分组：`PageOf<Structure>`
-                const structure = this.genStructure(structureName, [
-                    ...this.genPropertyListOfGroupBy(this, entities),
-                    ...this.genPropertyListOfAggregate(this, entities),
-                ]);
-                this.app.addStructure(structure);
-
+                // 1.2 多分组：`{ list: List<anonymousStructure>, total: Integer }`
                 typeAnnotation = TypeAnnotation.from({
-                    text: `PageOf<${structureName}>`,
                     concept: 'TypeAnnotation',
-                    typeKind: 'generic',
-                    typeName: 'PageOf',
-                    typeNamespace: `nasl.collection`,
-                    typeArguments: [
-                        TypeAnnotation.from({
-                            concept: 'TypeAnnotation',
-                            typeKind: 'reference',
-                            typeName: structureName,
-                            typeNamespace: 'app.structures',
-                        }, this.typeAnnotation, 'typeAnnotation'),
+                    typeKind: 'anonymousStructure',
+                    properties: [
+                        StructureProperty.from({
+                            name: 'list',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'generic',
+                                typeName: 'List',
+                                typeNamespace: 'nasl.collection',
+                                typeArguments: [
+                                    TypeAnnotation.from({
+                                        concept: 'TypeAnnotation',
+                                        typeKind: 'anonymousStructure',
+                                        properties: [
+                                            ...this.genPropertyListOfGroupBy(this, entities),
+                                            ...this.genPropertyListOfAggregate(this, entities),
+                                        ],
+                                    }),
+                                ],
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
+                        StructureProperty.from({
+                            name: 'total',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'primitive',
+                                typeNamespace: 'nasl.core',
+                                typeName: 'Integer',
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
                     ],
                 }, this, 'typeAnnotation');
             }
@@ -1270,40 +1323,44 @@ export class CallQueryComponent extends LogicItem {
                         typeNamespace: 'nasl.core',
                     }, this, 'typeAnnotation');
                 } else {
-                    // 2.2. 多聚合：`Structure`（自动创建 `Structure`）
-                    const structure = this.genStructure(structureName, [
-                        ...this.genPropertyListOfAggregate(this, entities),
-                    ]);
-                    this.app.addStructure(structure);
-
+                    // 2.2. 多聚合：`{ Structure }`
                     typeAnnotation = TypeAnnotation.from({
                         concept: 'TypeAnnotation',
-                        typeKind: 'reference',
-                        typeName: structureName,
-                        typeNamespace: `app.structures`,
+                        typeKind: 'anonymousStructure',
+                        properties: [...this.genPropertyListOfAggregate(this, entities)],
                     }, this, 'typeAnnotation');
                 }
             } else {
-                // 2.3. 无聚合(默认情况)：`PageOf<Structure>`（自动创建 `Structure`）
-                const structure = this.genStructure(structureName, [
-                    ...this.genPropertyListOfFrom(this.from),
-                    ...this.genPropertyListOfAggregate(this, entities),
-                ]);
-                this.app.addStructure(structure);
-
+                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Integer }`
                 typeAnnotation = TypeAnnotation.from({
-                    text: structureName,
                     concept: 'TypeAnnotation',
-                    typeKind: 'generic',
-                    typeName: 'PageOf',
-                    typeNamespace: `nasl.collection`,
-                    typeArguments: [
-                        TypeAnnotation.from({
-                            concept: 'TypeAnnotation',
-                            typeKind: 'reference',
-                            typeName: structureName,
-                            typeNamespace: 'app.structures',
-                        }, this.typeAnnotation, 'typeAnnotation'),
+                    typeKind: 'anonymousStructure',
+                    properties: [
+                        StructureProperty.from({
+                            name: 'list',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'generic',
+                                typeName: 'List',
+                                typeNamespace: 'nasl.collection',
+                                typeArguments: [
+                                    TypeAnnotation.from({
+                                        concept: 'TypeAnnotation',
+                                        typeKind: 'anonymousStructure',
+                                        properties: this.genPropertiesFrom(this.from),
+                                    }),
+                                ],
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
+                        StructureProperty.from({
+                            name: 'total',
+                            typeAnnotation: TypeAnnotation.from({
+                                concept: 'TypeAnnotation',
+                                typeKind: 'primitive',
+                                typeNamespace: 'nasl.core',
+                                typeName: 'Integer',
+                            }, this.typeAnnotation, 'typeAnnotation'),
+                        }),
                     ],
                 }, this, 'typeAnnotation');
             }
@@ -1318,14 +1375,24 @@ export class CallQueryComponent extends LogicItem {
             ...this.genPropertyListOfAggregate(this, entities),
         ]);
         if (this.typeAnnotation) {
-            const structure = this.app.structures.find((item) => item.name === this.typeAnnotation.typeName);
-            if (structure) {
-                const properties = source.properties.map((property) => StructureProperty.from(property, structure, 'properties'));
-                structure.update({
-                    properties,
-                });
-            } else
-                this.app.addStructure(source);
+            // 老版本没有 ListTotal 结构，支持匿名数据结构
+            if (this.typeAnnotation.typeKind === 'anonymousStructure') {
+                const typeAnnotation = TypeAnnotation.from({
+                    concept: 'TypeAnnotation',
+                    typeKind: 'anonymousStructure',
+                    properties: source.properties,
+                }, this, 'typeAnnotation');
+                this.update({ typeAnnotation });
+            } else {
+                const structure = this.app.structures.find((item) => item.name === this.typeAnnotation.typeName);
+                if (structure) {
+                    const properties = source.properties.map((property) => StructureProperty.from(property, structure, 'properties'));
+                    structure.update({
+                        properties,
+                    });
+                } else
+                    this.app.addStructure(source);
+            }
         } else {
             source.name = utils.unique(source.name, this.app.getStructureExistingNames());
             this.app.addStructure(source);

package/src/concepts/CompletionProperty__.ts

@@ -13,9 +13,9 @@ import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
 
 /**
- * 自动补全字段
+ * 自动补全属性
  */
-@concept('自动补全字段')
+@concept('自动补全属性')
 export class CompletionProperty extends BaseNode {
     /**
      * 产品概念
@@ -24,25 +24,25 @@ export class CompletionProperty extends BaseNode {
     concept: 'CompletionProperty' = 'CompletionProperty';
 
     /**
-     * 自动补全字段名称
+     * 自动补全属性名称
      */
     @property()
     name: string = undefined;
 
     /**
-     * 自动补全字段的值
+     * 自动补全属性的值
      */
     @property()
     value: string = undefined;
 
     /**
-     * 自动补全字段标题
+     * 自动补全属性标题
      */
     @property()
     label: string = undefined;
 
     /**
-     * 自动补全字段描述
+     * 自动补全属性描述
      */
     @property()
     description: string = undefined;
@@ -65,7 +65,7 @@ export class CompletionProperty extends BaseNode {
     @property()
     defaultValue: string = undefined;
 
-    
+
 
     /**
      * @param source 需要合并的部分参数
@@ -92,7 +92,7 @@ export class CompletionProperty extends BaseNode {
         return params;
     }
     /**
-     * 设置自动补全字段名称
+     * 设置自动补全属性名称
      */
     setName(name: string) {
         const object = {
@@ -105,7 +105,7 @@ export class CompletionProperty extends BaseNode {
     }
 
     /**
-     * 设置自动补全字段的值
+     * 设置自动补全属性的值
      */
     setValue(value: string) {
         const object = {
@@ -117,7 +117,7 @@ export class CompletionProperty extends BaseNode {
     }
 
     /**
-     * 设置自动补全字段标题
+     * 设置自动补全属性标题
      */
     setLabel(label: string) {
         const object = {
@@ -129,7 +129,7 @@ export class CompletionProperty extends BaseNode {
     }
 
     /**
-     * 设置自动补全字段描述
+     * 设置自动补全属性描述
      */
     setDescription(description: string) {
         const object = {
@@ -164,9 +164,9 @@ export class CompletionProperty extends BaseNode {
         });
     }
 
-    
 
-    
+
+
 
     /**
     * 删除类型标注
@@ -224,6 +224,17 @@ export class CompletionProperty extends BaseNode {
         return this.expression?.completeName;
     }
 
+    get rootName() {
+        if (!this.completeName)
+            return null;
+        const completeNameArr = this.completeName.split('.');
+        let name = completeNameArr[0];
+        // 公共变量， 全局变量情况下
+        if (completeNameArr[0] === 'app' || completeNameArr[0] === 'nasl')
+            name = `${completeNameArr[0]}.${completeNameArr[1]}.${completeNameArr[2]}`;
+        return name;
+    }
+
     /**
      * 子集
      */