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

package/src/concepts/Return__.ts

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

package/src/concepts/Role__.ts

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

package/src/concepts/SelectMembers__.ts

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

package/src/concepts/Slot__.ts

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

package/src/concepts/SqlQueryComponent__.ts

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

package/src/concepts/Start__.ts

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

package/src/concepts/StringInterpolation__.ts

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

package/src/concepts/StringLiteral__.ts

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

package/src/concepts/StructureProperty__.ts

@@ -64,6 +64,12 @@ export class StructureProperty extends BaseNode {
     @property()
     defaultValue: string = undefined;
 
+    /**
+     * 数据结构字段json序列化别名
+     */
+    @property()
+    jsonName: string = undefined;
+
     /**
      * 祖先 Structure
      */
@@ -91,6 +97,9 @@ export class StructureProperty extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'StructureProperty';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): StructureProperty {
         return super.from(source, parentNode, parentKey) as StructureProperty;
@@ -168,6 +177,18 @@ export class StructureProperty extends BaseNode {
         });
     }
 
+    /**
+     * 设置数据结构字段json序列化别名
+     */
+    setJsonName(jsonName: string) {
+        const object = {
+            jsonName,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     
 
     

package/src/concepts/Structure__.ts

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

package/src/concepts/SwitchCase__.ts

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

package/src/concepts/SwitchStatement__.ts

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

package/src/concepts/Theme__.ts

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

package/src/concepts/Transactional__.ts

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

package/src/concepts/TypeAnnotation__.ts

@@ -24,10 +24,10 @@ export enum PRIMITIVE_TYPE {
 export const PRIMITIVE_TITLE: Record<string, string> = {
     Boolean: '布尔值',
     Integer: '整数',
-    Long: '长整数',
+    Long: '整数',
     Double: '小数',
-    Decimal: '精确小数',
-    String: '字符串',
+    Decimal: '小数',
+    String: '文本',
     Text: '长文本',
     Binary: '二进制流',
     Date: '日期',
@@ -37,6 +37,22 @@ export const PRIMITIVE_TITLE: Record<string, string> = {
     Union: '联合类型',
 };
 
+export const PRIMITIVE_DESC: Record<string, string> = {
+    Boolean: '包含真（true）、假（false）两个值',
+    Long: '可表示最大长度约 19 个数字的正负整数',
+    Decimal: '可表示 31 个有效数字以内的小数',
+    String: '表示汉语、英语、数字等文本内容',
+    Date: '通常用于仅日期处理和数据存储',
+    Time: '通常用于仅时间处理和数据存储',
+    DateTime: '通常用于日期和时间的处理和数据存储',
+};
+
+export const GENERIC_DESC: Record<string, string> = {
+    List: 'T类型的数据构成的列表',
+    Map: '从K类型到V类型的映射',
+};
+
+
 /**
  * 判断是否是联合类型
  * @param typeAnnotation
@@ -77,7 +93,7 @@ export class TypeAnnotation extends BaseNode {
      * 类型种类
      */
     @property()
-    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure' = undefined;
+    typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'union' | 'anonymousStructure' | 'function' = undefined;
 
     /**
      * 类型命名空间
@@ -121,8 +137,6 @@ export class TypeAnnotation extends BaseNode {
     @property()
     ruleMap: Object = undefined;
 
-    
-
     /**
      * @param source 需要合并的部分参数
      */
@@ -131,6 +145,9 @@ export class TypeAnnotation extends BaseNode {
         super(source);
         super.subConstructor(source);
     }
+    getClassName() {
+        return 'TypeAnnotation';
+    }
 
     static from(source: any, parentNode?: any, parentKey?: string): TypeAnnotation {
         return super.from(source, parentNode, parentKey) as TypeAnnotation;
@@ -159,10 +176,6 @@ export class TypeAnnotation extends BaseNode {
         });
     }
 
-    
-
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -195,8 +208,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -219,8 +230,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -240,8 +249,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInTypeArgumentsAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -265,8 +272,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
     * 插入类型标注
     * @internal
@@ -299,8 +304,6 @@ export class TypeAnnotation extends BaseNode {
         return typeAnnotation;
     }
 
-    
-
     /**
      * 插入类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -323,8 +326,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加类型标注
      * @internal
@@ -344,8 +345,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertTypeAnnotationInReturnTypeAt(options as any, index);
     }
 
-    
-
     /**
      * 添加类型标注
      * @param typeAnnotationOptions 类型标注参数
@@ -369,11 +368,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-
-
-    
-
     /**
     * 插入数据结构属性
     * @internal
@@ -406,8 +400,6 @@ export class TypeAnnotation extends BaseNode {
         return structureProperty;
     }
 
-    
-
     /**
      * 插入数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -430,8 +422,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @internal
@@ -451,8 +441,6 @@ export class TypeAnnotation extends BaseNode {
         return this._insertStructurePropertyAt(options as any, index);
     }
 
-    
-
     /**
      * 添加数据结构属性
      * @param structurePropertyOptions 数据结构属性参数
@@ -476,9 +464,6 @@ export class TypeAnnotation extends BaseNode {
         return node;
     }
 
-
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -486,12 +471,10 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInTypeArguments(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInTypeArguments(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
-    
-
     /**
      * 删除类型标注
      * @param typeAnnotation 已有的类型标注实例
@@ -499,7 +482,7 @@ export class TypeAnnotation extends BaseNode {
     removeTypeAnnotationInReturnType(typeAnnotation: TypeAnnotation): void;
 
     removeTypeAnnotationInReturnType(options: TypeAnnotation) {
-        let typeAnnotation: TypeAnnotation = options;
+        const typeAnnotation: TypeAnnotation = options;
         return typeAnnotation.delete();
     }
 
@@ -526,8 +509,6 @@ export class TypeAnnotation extends BaseNode {
         return params;
     }
 
-
-
     /**
      * 删除数据结构属性
      * @param structureProperty 已有的数据结构属性实例
@@ -535,7 +516,7 @@ export class TypeAnnotation extends BaseNode {
     removeStructureProperty(structureProperty: StructureProperty): void;
 
     removeStructureProperty(options: StructureProperty) {
-        let structureProperty: StructureProperty = options;
+        const structureProperty: StructureProperty = options;
         return structureProperty.delete();
     }
 
@@ -640,6 +621,9 @@ export class TypeAnnotation extends BaseNode {
      */
     get headTitle(): string {
         if (this.typeKind === 'primitive') {
+            if (this.typeName === 'Long') {
+                return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
+            }
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
         } else if (this.typeKind === 'reference') {
             const typeNamespace = this?.typeNamespace;
@@ -674,6 +658,9 @@ export class TypeAnnotation extends BaseNode {
      */
     get typeTitle(): string {
         if (this.typeKind === 'primitive') {
+            if (this.typeName === 'Long') {
+                return `Integer ${PRIMITIVE_TITLE[this.typeName] || ''}`;
+            }
             return `${this.typeName} ${PRIMITIVE_TITLE[this.typeName] || ''}`;
         } else if (this.typeKind === 'reference') {
             return this.typeName;
@@ -926,7 +913,7 @@ export class TypeAnnotation extends BaseNode {
             const DateTimeReg = /^\d{1,4}(\/|-)\d{1,2}(\/|-)\d{1,2}\s(\d{1,2})(:\d{1,2})?:(\d{1,2})$/;
             const BooleanReg = /(false|true|\u662f|\u5426)/i;
             if (EmailReg.test(code)) {
-                return this.createPrimitive('Email');
+                return this.createPrimitive('String');
             } else if (TimeReg.test(code)) {
                 return this.createPrimitive('Time');
             } else if (BooleanReg.test(code)) {
@@ -937,19 +924,19 @@ export class TypeAnnotation extends BaseNode {
                 return this.createPrimitive('DateTime');
             } else if (!isNaN(Number(code))) {
                 if (code.indexOf('.') !== -1) {
-                    return this.createPrimitive('Double');
+                    return this.createPrimitive('Decimal');
                     // return this.createPrimitive('Decimal');
                 }
                 if (code.length > 8) {
                     return this.createPrimitive('Long');
                 }
-                return this.createPrimitive('Integer');
+                return this.createPrimitive('Long');
             } else if (code.length > 255) {
-                return this.createPrimitive('Text');
+                return this.createPrimitive('String');
             }
             return this.createPrimitive('String');
         } else {
-            return this.createPrimitive('Integer');
+            return this.createPrimitive('Long');
         }
     }
     // 增加插入泛型子类型

package/src/concepts/TypeParam__.ts

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

package/src/concepts/UnaryExpression__.ts

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

package/src/concepts/Unparsed__.ts

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

package/src/concepts/UseComponent__.ts

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

package/src/concepts/ValidationRule__.ts

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

package/src/concepts/Variable__.ts

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

package/src/concepts/ViewBlock__.ts

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

package/src/concepts/ViewComponent__.ts

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