@lcap/nasl 2.21.0-beta.2 → 2.21.0-beta.3

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 查询分页子句名称
@@ -999,7 +941,7 @@ export class CallQueryComponent extends LogicItem {
             code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))} {\n`;
         } else {
             code += `{ list: nasl.collection.List<`;
-            code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))}>, total: nasl.core.Long } {\n`;
+            code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))}>, total: nasl.core.Integer } {\n`;
         }
         // 2.11版本后 分组使用别名
         if (this.isAutoInfer()) {
@@ -1151,7 +1093,7 @@ export class CallQueryComponent extends LogicItem {
             .map((item) => {
                 let typeName;
                 if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
-                    typeName = 'Long';
+                    typeName = 'Integer';
                 } else if (['AVG'].includes(item.aggregateName)) {
                     const { entityAsName, propertyName } = item.aggregateParam;
                     const entity = entities.find((item: Entity) => item.name === entityAsName);
@@ -1160,7 +1102,7 @@ export class CallQueryComponent extends LogicItem {
                     if (propertyTypeName === 'Decimal') {
                         typeName = 'Decimal';
                     } else {
-                        typeName = 'Decimal';
+                        typeName = 'Double';
                     }
                 } else {
                     const { entityAsName, propertyName } = item.aggregateParam;
@@ -1251,7 +1193,7 @@ export class CallQueryComponent extends LogicItem {
         // 1. 有分组
         if (groupByLength) {
             if (!aggregateLength && groupByLength === 1) {
-                // 1.1 单分组无聚合：`{ list: List<列的类型>, total: Long }`
+                // 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);
@@ -1282,13 +1224,13 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Long',
+                                typeName: 'Integer',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],
                 }, this, 'typeAnnotation');
             } else {
-                // 1.2 多分组：`{ list: List<anonymousStructure>, total: Long }`
+                // 1.2 多分组：`{ list: List<anonymousStructure>, total: Integer }`
                 typeAnnotation = TypeAnnotation.from({
                     concept: 'TypeAnnotation',
                     typeKind: 'anonymousStructure',
@@ -1318,7 +1260,7 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Long',
+                                typeName: 'Integer',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],
@@ -1330,8 +1272,8 @@ export class CallQueryComponent extends LogicItem {
                     // 2.1 单聚合：`基本类型`
                     let typeName;
                     if (['COUNT', 'COUNTD'].includes(selectElements[0].aggregateName)) {
-                        // 2.1.1. `COUNT`、`COUNTD` 返回 `Long`
-                        typeName = 'Long';
+                        // 2.1.1. `COUNT`、`COUNTD` 返回 `Integer`
+                        typeName = 'Integer';
                     } else if (['AVG'].includes(selectElements[0].aggregateName)) {
                         const { entityAsName, propertyName } = selectElements[0].aggregateParam;
                         const entity = entities.find((item: Entity) => item.name === entityAsName);
@@ -1343,7 +1285,7 @@ export class CallQueryComponent extends LogicItem {
                             typeName = 'Double';
                         }
                     } else {
-                        // 2.1.3. 其他返回列类型，包含：`Long`、`Long`、`Double`
+                        // 2.1.3. 其他返回列类型，包含：`Integer`、`Long`、`Double`
                         const { entityAsName, propertyName } = selectElements[0].aggregateParam;
                         const entity = entities.find((item: Entity) => item.name === entityAsName);
                         const property = entity?.properties.find((item: any) => item.name === propertyName);
@@ -1364,7 +1306,7 @@ export class CallQueryComponent extends LogicItem {
                     }, this, 'typeAnnotation');
                 }
             } else {
-                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Long }`
+                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Integer }`
                 typeAnnotation = TypeAnnotation.from({
                     concept: 'TypeAnnotation',
                     typeKind: 'anonymousStructure',
@@ -1391,7 +1333,7 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Long',
+                                typeName: 'Integer',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],

package/src/concepts/ConfigPropertyValue__.ts

@@ -92,10 +92,6 @@ export class ConfigPropertyValue extends BaseNode {
         });
     }
 
-    
-
-    
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。

package/src/concepts/DataSource__.ts

@@ -478,10 +478,6 @@ export class DataSource extends BaseNode {
         }
     }
 
-    get dataSourceSqlType() {
-        return JSON.parse(this.dataSourceConfig?.devProperty?.value || '{}')?.type;
-    }
-
     // 获取datasource对应的数据源配置
     get dataSourceConfig() {
         let devProperty = null;

package/src/concepts/EntityProperty__.ts

@@ -16,7 +16,6 @@ import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import classMap from '../common/classMap';
 import TypeAnnotation from './TypeAnnotation__';
-import DatabaseTypeAnnotation from './DatabaseTypeAnnotation__';
 import Entity from './Entity__';
 import Module from './Module__';
 import App from './App__';
@@ -69,12 +68,6 @@ export class EntityProperty extends BaseNode {
     @property('TypeAnnotation')
     typeAnnotation: TypeAnnotation = undefined;
 
-    /**
-     * 数据库存储类型
-     */
-    @property('DatabaseTypeAnnotation')
-    databaseTypeAnnotation: DatabaseTypeAnnotation = undefined;
-
     /**
      * 是否必填
      */
@@ -222,21 +215,6 @@ export class EntityProperty extends BaseNode {
         });
     }
 
-    /**
-     * 设置数据库存储类型
-     */
-    setDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
-        databaseTypeAnnotation._delete();
-        const relationOptions = { parentNode: this, parentKey: 'databaseTypeAnnotation' };
-        Object.assign(databaseTypeAnnotation, relationOptions);
-        const object = {
-            databaseTypeAnnotation,
-        };
-        this.update({
-            ...object,
-        });
-    }
-
     /**
      * 设置是否必填
      */
@@ -337,56 +315,6 @@ export class EntityProperty extends BaseNode {
         return params;
     }
 
-
-
-    /**
-    * 删除数据库存储类型
-    * @param name 数据库存储类型名称
-    */
-    removeDatabaseTypeAnnotation(name: string): void;
-
-    /**
-     * 删除数据库存储类型
-     * @param databaseTypeAnnotation 已有的数据库存储类型实例
-     */
-    removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation): void;
-
-    removeDatabaseTypeAnnotation(options: string | DatabaseTypeAnnotation) {
-        let databaseTypeAnnotation: DatabaseTypeAnnotation;
-        if (typeof options === 'string') {
-            databaseTypeAnnotation = this.databaseTypeAnnotation;
-            if (!databaseTypeAnnotation) {
-                throw new Error('找不到数据库存储类型 ' + options);
-            }
-        } else {
-            databaseTypeAnnotation = options;
-        }
-        return databaseTypeAnnotation.delete();
-    }
-
-    __removeDatabaseTypeAnnotation(databaseTypeAnnotation: DatabaseTypeAnnotation) {
-        const parentKey = databaseTypeAnnotation.parentKey;
-        const params: Params = {
-            parentNode: this,
-            parentKey,
-            index: -1,
-            object: null,
-            oldObject: databaseTypeAnnotation,
-        };
-        if (parentKey) {
-            params.parentKey = parentKey;
-            if (Array.isArray((this as any)[parentKey])) {
-                const index = (this as any)[parentKey].indexOf(databaseTypeAnnotation);
-                ~index && (this as any)[parentKey].splice(index, 1);
-                params.index = index;
-            } else if ((this as any)[parentKey] === databaseTypeAnnotation) {
-                params.index = 0;
-                (this as any)[parentKey] = undefined;
-            }
-        }
-        return params;
-    }
-
     //================================================================================
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
@@ -443,69 +371,12 @@ export class EntityProperty extends BaseNode {
             ...object,
         });
     }
-
-    get hasChildren() {
-        const { typeKind, typeName, typeNamespace } = this.typeAnnotation;
-        if (typeKind === 'reference' || typeKind === 'generic') {
-            if (typeNamespace.endsWith('.enums'))
-                return null;
-            return [{}];
-        } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-            return [{}];
-        }
-        return null;
-    }
-    get isTreeLeaf() {
-        return !this.hasChildren;
-    }
-
     /**
      * 是否展开
      */
     @property()
     isLeaf: boolean = true;
 
-    getSelectRef() {
-        try {
-            const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-            let completionChildren;
-            if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = (node as Structure)?.properties || [];
-                    completionChildren = properties;
-                } else if (typeNamespace.endsWith('.enums')) {
-                    completionChildren = [];
-                } else {
-                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
-                    const properties = node?.properties || [];
-                    completionChildren = properties;
-                }
-            } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                for (let i = 0; i < properties.length; i++) {
-                    const item = properties[i];
-                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
-                        const newItem = StructureProperty.from(item.toJSON());
-                        newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
-                        newItem.parentNode = this;
-                        properties[i] = newItem;
-                    }
-                }
-                completionChildren = properties;
-            } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                completionChildren = properties;
-            } else {
-                completionChildren = [];
-            }
-            return completionChildren;
-        } catch (err) {
-            console.log(err);
-        }
-    }
     /**
      * 设置是否必填
      */

package/src/concepts/InterfaceParam__.ts

@@ -283,61 +283,6 @@ export class InterfaceParam extends BaseNode {
         return code;
     }
 
-    get hasChildren() {
-        const { typeKind, typeName, typeNamespace } = this.typeAnnotation;
-        if (typeKind === 'reference' || typeKind === 'generic') {
-            if (typeNamespace.endsWith('.enums'))
-                return null;
-            return [{}];
-        } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-            return [{}];
-        }
-        return null;
-    }
-    get isTreeLeaf() {
-        return !this.hasChildren;
-    }
-    getSelectRef() {
-        try {
-            const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-            let completionChildren;
-            if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = (node as Structure)?.properties || [];
-                    completionChildren = properties;
-                } else if (typeNamespace.endsWith('.enums')) {
-                    completionChildren = [];
-                } else {
-                    const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
-                    const properties = node?.properties || [];
-                    completionChildren = properties;
-                }
-            } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                for (let i = 0; i < properties.length; i++) {
-                    const item = properties[i];
-                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
-                        const newItem = StructureProperty.from(item.toJSON());
-                        newItem.typeAnnotation = this?.typeAnnotation?.typeArguments[0];
-                        newItem.parentNode = this;
-                        properties[i] = newItem;
-                    }
-                }
-                completionChildren = properties;
-            } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                completionChildren = properties;
-            } else {
-                completionChildren = [];
-            }
-            return completionChildren;
-        } catch (err) {
-            console.log(err);
-        }
-    }
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/Interface__.ts

@@ -521,14 +521,14 @@ export class Interface extends BaseNode {
     /**
      * 协议
      */
-    @property()
-    protocol: string = undefined;
+    // @property()
+    // protocol: string = undefined;
 
     /**
      * 协议参数列表
      */
-    @property('Param')
-    protocolParams: Array<Param> = [];
+    // @property('Param')
+    // protocolParams: Array<Param> = [];
 
     /**
      * 是否可编辑