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

package/src/concepts/CallLogic__.ts

@@ -58,6 +58,12 @@ export class CallLogic extends LogicItem {
     @property()
     shortcut: boolean = undefined;
 
+    /**
+     * handleError
+     */
+    @property()
+    handleError: boolean = undefined;
+
     /**
      * 类型参数
      */
@@ -70,6 +76,8 @@ export class CallLogic extends LogicItem {
     @property('Argument')
     arguments: Array<Argument> = [];
 
+    
+
     /**
      * @param source 需要合并的部分参数
      */
@@ -78,11 +86,21 @@ export class CallLogic extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'CallLogic';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): CallLogic {
         return super.from(source, parentNode, parentKey) as CallLogic;
     }
 
+    
+    
+
+    
+
+    
+
     /**
     * 插入类型标注
     * @internal
@@ -115,6 +133,8 @@ export class CallLogic extends LogicItem {
         return typeAnnotation;
     }
 
+    
+
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -137,6 +157,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加类型标注
      * @internal
@@ -156,6 +178,8 @@ export class CallLogic extends LogicItem {
         return this._insertTypeAnnotationAt(options as any, index);
     }
 
+    
+
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -179,6 +203,11 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+
+
+    
+
     /**
     * 插入实际参数
     * @internal
@@ -211,6 +240,8 @@ export class CallLogic extends LogicItem {
         return argument;
     }
 
+    
+
     /**
      * 插入实际参数
      * @param argumentOptions 实际参数参数
@@ -233,6 +264,8 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+    
+
     /**
      * 添加实际参数
      * @internal
@@ -252,6 +285,8 @@ export class CallLogic extends LogicItem {
         return this._insertArgumentAt(options as any, index);
     }
 
+    
+
     /**
      * 添加实际参数
      * @param argumentOptions 实际参数参数
@@ -275,6 +310,9 @@ export class CallLogic extends LogicItem {
         return node;
     }
 
+
+    
+
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -282,7 +320,7 @@ export class CallLogic extends LogicItem {
     removeTypeAnnotation(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotation(options: TypeAnnotation) {
-        const typeAnnotation: TypeAnnotation = options;
+        let typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -309,6 +347,8 @@ export class CallLogic extends LogicItem {
         return params;
     }
 
+
+
     /**
      * 删除实际参数
      * @param argument 已有的实际参数实例
@@ -316,7 +356,7 @@ export class CallLogic extends LogicItem {
     removeArgument(argument: Argument): void;
 
     removeArgument(options: Argument) {
-        const argument: Argument = options;
+        let argument: Argument = options;
         return argument.delete();
     }
 
@@ -411,6 +451,17 @@ export class CallLogic extends LogicItem {
             ...object,
         });
     }
+    /**
+     * 设置 handleError
+     */
+    setHandleError(handleError: boolean) {
+        const object = {
+            handleError,
+        };
+        this.update({
+            ...object,
+        });
+    }
 
     _setCallee(logic: Logic) {
         this.calleeNamespace = logic.getNamespace();
@@ -460,6 +511,12 @@ export class CallLogic extends LogicItem {
                 return typeArgu;
             });
         }
+
+        // 如果打开了处理error的开关 或者是 依赖库的逻辑引用，而且类型中携带了Error的
+        let handleError = false;
+        if (calleeNamespace?.startsWith('extensions') && Logic.checkLogicReturnTypeHasError(logic)) {
+            handleError = true;
+        }
         if (this.app) {
             this.app.emit('collect:start', {
                 actionMsg: `切换调用逻辑`,
@@ -471,6 +528,7 @@ export class CallLogic extends LogicItem {
                 arguments: params,
                 typeArguments,
                 folded: false,
+                handleError,
             });
             if (parentNode.concept === 'MemberExpression') {
                 const topNode = parentNode.firstMemberExpressionNode();
@@ -484,6 +542,7 @@ export class CallLogic extends LogicItem {
                 arguments: params,
                 typeArguments,
                 folded: false,
+                handleError,
             });
         }
     }
@@ -567,7 +626,7 @@ export class CallLogic extends LogicItem {
 
         const node = this.getCallNode();
         let logicParam: Param[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {
@@ -931,7 +990,11 @@ export class CallLogic extends LogicItem {
 
     @withSourceMap()
     toEmbeddedTS(state?: TranslatorState): string {
-        let code = this.calleeKey;
+        let code = '';
+        if (this.handleError) {
+            code += 'nasl.util.autoHandleError(';
+        }
+        code += this.calleeKey;
         if (Array.isArray(this.typeArguments) && this.typeArguments.length) {
             // 如果有内容
             const typeAnnotation = this.typeArguments[0];
@@ -950,18 +1013,6 @@ export class CallLogic extends LogicItem {
                     code += ', ';
             });
             code += ')';
-            if (this.parentNode.concept !== 'Argument'
-                && this.parentKey !== 'test'
-                && this.parentKey !== 'patterns'
-                && this.parentNode.concept !== 'Assignment'
-                && this.parentNode.concept !== 'ForEachStatement'
-                && this.parentNode.concept !== 'SelectMembers'
-                && this.parentNode.concept !== 'BinaryExpression'
-                && this.parentNode.concept !== 'StringInterpolation'
-                && this.parentNode.concept !== 'MemberExpression'
-                && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
-                code += ';';
-            }
         } else {
             const completeArguments = this.completeArguments;
             if (completeArguments.length) {
@@ -973,34 +1024,26 @@ export class CallLogic extends LogicItem {
                         code += ', ';
                 });
                 code += ')';
-                if (this.parentNode.concept !== 'Argument'
-                    && this.parentKey !== 'test'
-                    && this.parentKey !== 'patterns'
-                    && this.parentNode.concept !== 'Assignment'
-                    && this.parentNode.concept !== 'ForEachStatement'
-                    && this.parentNode.concept !== 'SelectMembers'
-                    && this.parentNode.concept !== 'BinaryExpression'
-                    && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression'
-                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
-                    code += ';';
-                }
             } else {
                 code += '()';
-                if (this.parentNode.concept !== 'Argument'
-                    && this.parentKey !== 'test'
-                    && this.parentKey !== 'patterns'
-                    && this.parentNode.concept !== 'Assignment'
-                    && this.parentNode.concept !== 'ForEachStatement'
-                    && this.parentNode.concept !== 'SelectMembers'
-                    && this.parentNode.concept !== 'BinaryExpression'
-                    && this.parentNode.concept !== 'StringInterpolation'
-                    && this.parentNode.concept !== 'MemberExpression'
-                    && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
-                    code += ';';
-                }
             }
         }
+
+        if (this.handleError) {
+            code += ')';
+        }
+        if (this.parentNode.concept !== 'Argument'
+            && this.parentKey !== 'test'
+            && this.parentKey !== 'patterns'
+            && this.parentNode.concept !== 'Assignment'
+            && this.parentNode.concept !== 'ForEachStatement'
+            && this.parentNode.concept !== 'SelectMembers'
+            && this.parentNode.concept !== 'BinaryExpression'
+            && this.parentNode.concept !== 'StringInterpolation'
+            && this.parentNode.concept !== 'MemberExpression'
+            && !['NewMap', 'NewList'].includes(this.parentNode.concept)) {
+            code += ';';
+        }
         return code;
     }
 
@@ -1041,7 +1084,7 @@ export class CallLogic extends LogicItem {
         const node = this.getCallNode();
         let logicParam: Param[] = [];
         const Arguments: Argument[] = [];
-        if (node) {
+        if (node?.params) {
             logicParam = node.params;
         }
         if (this.arguments?.length) {

package/src/concepts/CallQueryComponent__.ts

@@ -113,6 +113,9 @@ export class CallQueryComponent extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'CallQueryComponent';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): CallQueryComponent {
         return super.from(source, parentNode, parentKey) as CallQueryComponent;
@@ -932,7 +935,7 @@ export class CallQueryComponent extends LogicItem {
                 },
                 pageSizeElement: {
                     concept: 'NumericLiteral',
-                    value: 20,
+                    value: 1000,
                 },
             },
         };
@@ -996,7 +999,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.Integer } {\n`;
+            code += `${this.typeAnnotation.toEmbeddedTS(shiftState(state, code))}>, total: nasl.core.Long } {\n`;
         }
         // 2.11版本后 分组使用别名
         if (this.isAutoInfer()) {
@@ -1148,7 +1151,7 @@ export class CallQueryComponent extends LogicItem {
             .map((item) => {
                 let typeName;
                 if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
-                    typeName = 'Integer';
+                    typeName = 'Long';
                 } else if (['AVG'].includes(item.aggregateName)) {
                     const { entityAsName, propertyName } = item.aggregateParam;
                     const entity = entities.find((item: Entity) => item.name === entityAsName);
@@ -1157,7 +1160,7 @@ export class CallQueryComponent extends LogicItem {
                     if (propertyTypeName === 'Decimal') {
                         typeName = 'Decimal';
                     } else {
-                        typeName = 'Double';
+                        typeName = 'Decimal';
                     }
                 } else {
                     const { entityAsName, propertyName } = item.aggregateParam;
@@ -1248,7 +1251,7 @@ export class CallQueryComponent extends LogicItem {
         // 1. 有分组
         if (groupByLength) {
             if (!aggregateLength && groupByLength === 1) {
-                // 1.1 单分组无聚合：`{ list: List<列的类型>, total: Integer }`
+                // 1.1 单分组无聚合：`{ list: List<列的类型>, total: Long }`
                 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);
@@ -1279,13 +1282,13 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Integer',
+                                typeName: 'Long',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],
                 }, this, 'typeAnnotation');
             } else {
-                // 1.2 多分组：`{ list: List<anonymousStructure>, total: Integer }`
+                // 1.2 多分组：`{ list: List<anonymousStructure>, total: Long }`
                 typeAnnotation = TypeAnnotation.from({
                     concept: 'TypeAnnotation',
                     typeKind: 'anonymousStructure',
@@ -1315,7 +1318,7 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Integer',
+                                typeName: 'Long',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],
@@ -1327,8 +1330,8 @@ export class CallQueryComponent extends LogicItem {
                     // 2.1 单聚合：`基本类型`
                     let typeName;
                     if (['COUNT', 'COUNTD'].includes(selectElements[0].aggregateName)) {
-                        // 2.1.1. `COUNT`、`COUNTD` 返回 `Integer`
-                        typeName = 'Integer';
+                        // 2.1.1. `COUNT`、`COUNTD` 返回 `Long`
+                        typeName = 'Long';
                     } else if (['AVG'].includes(selectElements[0].aggregateName)) {
                         const { entityAsName, propertyName } = selectElements[0].aggregateParam;
                         const entity = entities.find((item: Entity) => item.name === entityAsName);
@@ -1340,7 +1343,7 @@ export class CallQueryComponent extends LogicItem {
                             typeName = 'Double';
                         }
                     } else {
-                        // 2.1.3. 其他返回列类型，包含：`Integer`、`Long`、`Double`
+                        // 2.1.3. 其他返回列类型，包含：`Long`、`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);
@@ -1361,7 +1364,7 @@ export class CallQueryComponent extends LogicItem {
                     }, this, 'typeAnnotation');
                 }
             } else {
-                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Integer }`
+                // 2.3. 无聚合(默认情况)：`{ list: List<Structure>, total: Long }`
                 typeAnnotation = TypeAnnotation.from({
                     concept: 'TypeAnnotation',
                     typeKind: 'anonymousStructure',
@@ -1388,7 +1391,7 @@ export class CallQueryComponent extends LogicItem {
                                 concept: 'TypeAnnotation',
                                 typeKind: 'primitive',
                                 typeNamespace: 'nasl.core',
-                                typeName: 'Integer',
+                                typeName: 'Long',
                             }, this.typeAnnotation, 'typeAnnotation'),
                         }),
                     ],

package/src/concepts/Comment__.ts

@@ -39,6 +39,9 @@ export class Comment extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Comment';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Comment {
         return super.from(source, parentNode, parentKey) as Comment;

package/src/concepts/CompletionProperty__.ts

@@ -75,6 +75,9 @@ export class CompletionProperty extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'CompletionProperty';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): CompletionProperty {
         return super.from(source, parentNode, parentKey) as CompletionProperty;
@@ -257,6 +260,8 @@ export class CompletionProperty extends BaseNode {
 
     isProcess: boolean = false;
 
+    jsonName: String;
+
     //================================================================================
     // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
     // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ConfigGroup__.ts

@@ -52,6 +52,9 @@ export class ConfigGroup extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigGroup';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigGroup {
         return super.from(source, parentNode, parentKey) as ConfigGroup;
@@ -81,7 +84,7 @@ export class ConfigGroup extends BaseNode {
         });
     }
 
-    getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
+        getConfigPropertyExistingNames(excludedList: Array<ConfigProperty> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.properties as ConfigProperty[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -222,6 +225,9 @@ export class ConfigGroup extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置属性
     * @param name 配置属性名称

package/src/concepts/ConfigPropertyValue__.ts

@@ -49,6 +49,9 @@ export class ConfigPropertyValue extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigPropertyValue';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigPropertyValue {
         return super.from(source, parentNode, parentKey) as ConfigPropertyValue;

package/src/concepts/ConfigProperty__.ts

@@ -67,6 +67,9 @@ export class ConfigProperty extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'ConfigProperty';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): ConfigProperty {
         return super.from(source, parentNode, parentKey) as ConfigProperty;
@@ -96,7 +99,7 @@ export class ConfigProperty extends BaseNode {
         });
     }
 
-    getConfigPropertyValueExistingNames(excludedList: Array<ConfigPropertyValue> = []) {
+        getConfigPropertyValueExistingNames(excludedList: Array<ConfigPropertyValue> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.values as ConfigPropertyValue[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -237,6 +240,9 @@ export class ConfigProperty extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置属性值
     * @param name 配置属性值名称

package/src/concepts/Configuration__.ts

@@ -45,6 +45,9 @@ export class Configuration extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Configuration';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Configuration {
         return super.from(source, parentNode, parentKey) as Configuration;
@@ -61,8 +64,9 @@ export class Configuration extends BaseNode {
         }
         return params;
     }
+    
 
-    getConfigGroupExistingNames(excludedList: Array<ConfigGroup> = []) {
+        getConfigGroupExistingNames(excludedList: Array<ConfigGroup> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.groups as ConfigGroup[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -203,6 +207,9 @@ export class Configuration extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除配置组
     * @param name 配置组名称

package/src/concepts/Constant__.ts

@@ -106,6 +106,9 @@ export class Constant extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'Constant';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Constant {
         return super.from(source, parentNode, parentKey) as Constant;

package/src/concepts/DataElement__.ts

@@ -56,6 +56,9 @@ export class DataElement extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'DataElement';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): DataElement {
         return super.from(source, parentNode, parentKey) as DataElement;

package/src/concepts/DataSource__.ts

@@ -66,6 +66,9 @@ export class DataSource extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'DataSource';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): DataSource {
         return super.from(source, parentNode, parentKey) as DataSource;
@@ -94,7 +97,7 @@ export class DataSource extends BaseNode {
         });
     }
 
-    getEntityExistingNames(excludedList: Array<Entity> = []) {
+        getEntityExistingNames(excludedList: Array<Entity> = []) {
         const excludedSet = new Set(excludedList);
         return ((this.entities as Entity[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -235,6 +238,9 @@ export class DataSource extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除实体
     * @param name 实体名称
@@ -459,19 +465,23 @@ export class DataSource extends BaseNode {
             target.semanticDiagnostics.push({
                 text: errorText,
                 node: this,
-                severity: 'error',
+                severity: 'warning',
                 message: `数据源配置：数据源 ${this.name} ${envText}环境数据源连接不通，请先检查${envText}环境数据源配置`,
                 originalDiagnostic: {
                     fileName: '',
                     start: null,
                     end: null,
-                    category: 'error',
+                    category: 'warning',
                     text: `DataSource connection error`,
                 },
             });
         }
     }
 
+    get dataSourceSqlType() {
+        return JSON.parse(this.dataSourceConfig?.devProperty?.value || '{}')?.type;
+    }
+
     // 获取datasource对应的数据源配置
     get dataSourceConfig() {
         let devProperty = null;