@lcap/nasl 3.7.1-beta.1 → 3.7.1-beta.3

package/src/concepts/TypeAnnotation__.ts

@@ -137,25 +137,19 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 类型种类
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeKind: 'primitive' | 'reference' | 'generic' | 'typeParam' | 'function' | 'union' | 'anonymousStructure';
 
   /**
    * 类型命名空间
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeNamespace: string;
 
   /**
    * 类型名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   typeName: string;
 
   /**
@@ -166,7 +160,7 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  typeArguments?: Array<TypeAnnotation> = null;
+  typeArguments?: Array<TypeAnnotation>;
 
   /**
    * 返回类型
@@ -176,14 +170,12 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  returnType?: Array<TypeAnnotation> = null;
+  returnType?: Array<TypeAnnotation>;
 
   /**
    * 是否是推断出来的
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   inferred: boolean;
 
   /**
@@ -194,15 +186,13 @@ export class TypeAnnotation extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  properties?: Array<StructureProperty> = null;
+  properties?: Array<StructureProperty>;
 
   /**
    * 规则对象
    */
-  @property({
-    objectRef: '',
-  })
-  ruleMap: Map<string, number>;
+  @property()
+  ruleMap: Record<string, number>;
 
   /**
    * @param source 需要合并的部分参数
@@ -220,7 +210,7 @@ export class TypeAnnotation extends BaseNode {
   /**
    * 设置规则对象
    */
-  setRuleMap(ruleMap: Map<string, number>) {
+  setRuleMap(ruleMap: Record<string, number>) {
     const object = {
       ruleMap,
     };
@@ -713,10 +703,11 @@ export class TypeAnnotation extends BaseNode {
     } else if (this.typeKind === 'reference') {
       return this.typeName;
     } else if (this.typeKind === 'generic') {
-      return `${this.typeName}<${!this.typeArguments?.length
-        ? 'T'
-        : this.typeArguments.map((arg) => arg?.typeTitle || arg?.name || 'T').join(', ')
-        }>`;
+      return `${this.typeName}<${
+        !this.typeArguments?.length
+          ? 'T'
+          : this.typeArguments.map((arg) => arg?.typeTitle || arg?.name || 'T').join(', ')
+      }>`;
     } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation?.typeTitle : '未知'}`)
@@ -740,10 +731,11 @@ export class TypeAnnotation extends BaseNode {
     } else if (this.typeKind === 'reference') {
       return this.typeName;
     } else if (this.typeKind === 'generic') {
-      return `${this.typeName}<${!this?.typeArguments?.length
-        ? 'T'
-        : this.typeArguments.map((arg) => arg?.typeInlineTitle || arg?.name || 'T').join(', ')
-        }>`;
+      return `${this.typeName}<${
+        !this?.typeArguments?.length
+          ? 'T'
+          : this.typeArguments.map((arg) => arg?.typeInlineTitle || arg?.name || 'T').join(', ')
+      }>`;
     } else if (this.typeKind === 'anonymousStructure') {
       return `{ ${this.properties
         ?.map(({ name, typeAnnotation }) => `${name}: ${typeAnnotation ? typeAnnotation?.typeInlineTitle : '未知'}`)
@@ -961,12 +953,13 @@ export class TypeAnnotation extends BaseNode {
       let code = `{ `;
       yield* wrapForEach(self.properties || [], function* warpForEachGenerator(property, i) {
         code += `${property.name}: `;
-        code += `${property.typeAnnotation
-          ? yield* property.typeAnnotation.toEmbeddedTS(
-            shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 }),
-          )
-          : '`未知`'
-          }`;
+        code += `${
+          property.typeAnnotation
+            ? yield* property.typeAnnotation.toEmbeddedTS(
+                shiftState(state, code, { inline: true, tabSize: (state?.tabSize || 0) + 1 }),
+              )
+            : '`未知`'
+        }`;
         code += ', ';
       });
       code += `__name: "AStructure_${self.hash}" `;
@@ -986,7 +979,11 @@ export class TypeAnnotation extends BaseNode {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
-      if (this.typeKind === 'reference' && this.typeNamespace && this.typeNamespace.match(/\.(enums|entities|structures)$/)) {
+      if (
+        this.typeKind === 'reference' &&
+        this.typeNamespace &&
+        this.typeNamespace.match(/\.(enums|entities|structures)$/)
+      ) {
         if (this.tsCalleeNamespace.startsWith('nasl.ui')) {
           return `${this.tsCalleeNamespace}.${this.typeName}`;
         }
@@ -1036,8 +1033,7 @@ export class TypeAnnotation extends BaseNode {
   @withSourceMap()
   toTextualNASL(state = createCompilerState()): string {
     if (this.typeKind === 'primitive') {
-      if (this.typeName === 'Long')
-        return 'Integer';
+      if (this.typeName === 'Long') return 'Integer';
       return this.typeName;
     } else if (this.typeKind === 'reference') {
       return textualNamespace(`${this.typeNamespace}.${this.typeName}`);
@@ -1228,9 +1224,22 @@ export class TypeAnnotation extends BaseNode {
     // 由于 序列化 出来的 TypeAnnotation 会有很多多余的属性
     // 因此增加白名单，只有这些值才会被比较，其他均会被忽略
     const whiteList = [
-      'concept', 'typeKind', 'typeNamespace', 'typeName', 'typeArguments',
-      'returnType', 'inferred', 'ruleMap', 'properties', 'name', 'label',
-      'description', 'typeAnnotation', 'required', 'defaultValue', 'jsonName'
+      'concept',
+      'typeKind',
+      'typeNamespace',
+      'typeName',
+      'typeArguments',
+      'returnType',
+      'inferred',
+      'ruleMap',
+      'properties',
+      'name',
+      'label',
+      'description',
+      'typeAnnotation',
+      'required',
+      'defaultValue',
+      'jsonName',
     ];
     const typeAnnotation1 = this.toJSON();
     const typeAnnotation2 = typeAnnotation.toJSON();
@@ -1355,7 +1364,7 @@ export class TypeAnnotation extends BaseNode {
     this.properties.splice(index, 0, property);
     return property;
   }
-  
+
   _addProperty(options?: string | Partial<StructureProperty> | StructureProperty) {
     const index = this.properties.length;
     return this._insertPropertyAt(options as any, index);

package/src/concepts/TypeParam__.ts

@@ -45,9 +45,7 @@ export class TypeParam extends BaseNode {
   /**
    * 类型名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**

package/src/concepts/UnaryExpression__.ts

@@ -56,9 +56,7 @@ export class UnaryExpression extends LogicItem {
   /**
    * 运算符
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   operator: '!' | 'isNull';
 
   /**

package/src/concepts/Unparsed__.ts

@@ -46,9 +46,7 @@ export class Unparsed extends LogicItem {
   /**
    * 表达式代码
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**

package/src/concepts/UseComponent__.ts

@@ -35,17 +35,13 @@ export class UseComponent extends BaseNode {
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: string;
 
   /**
    * 需要传入的属性
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   attrs: string;
 
   /**

package/src/concepts/ValidationRule__.ts

@@ -56,17 +56,13 @@ export class ValidationRule extends LogicItem {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
@@ -85,7 +81,7 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  errorMessage?: LogicItem = null;
+  errorMessage?: LogicItem;
 
   /**
    * 验证对象
@@ -93,14 +89,12 @@ export class ValidationRule extends LogicItem {
   @property({
     objectRef: 'LogicItem',
   })
-  target?: LogicItem = null;
+  target?: LogicItem;
 
   /**
    * 是否启用服务端验证
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   enableServerValidation?: boolean = true;
 
   /**

package/src/concepts/Variable__.ts

@@ -76,18 +76,14 @@ export class Variable extends BaseNode {
   /**
    * 变量名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 变量描述
    */
-  @property({
-    objectRef: '',
-  })
-  description: string;
+  @property()
+  description?: string;
 
   /**
    * 类型
@@ -103,7 +99,7 @@ export class Variable extends BaseNode {
   @property({
     objectRef: 'DefaultValue',
   })
-  defaultValue?: DefaultValue = null;
+  defaultValue?: DefaultValue;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/ViewBlockWithImage__.ts

@@ -36,17 +36,13 @@ export class ViewBlockWithImage extends ViewBlock {
   /**
    * 截图
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   screenshot: string;
 
   /**
    * 手绘
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   drawing: string;
 
   /**

package/src/concepts/ViewBlock__.ts

@@ -35,26 +35,20 @@ export class ViewBlock extends BaseNode {
   /**
    * 标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 代码
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   code: string;
 
   /**
    * 描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/ViewComponentDeclaration__.ts

@@ -41,58 +41,44 @@ export class ViewComponentDeclaration extends BaseNode {
   /**
    * 页面组件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 页面组件中划线名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   kebabName: string;
 
   /**
    * 页面组件标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 所在分组
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   group: string;
 
   /**
    * 页面组件图标
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   icon: string;
 
   /**
    * 页面组件描述
    */
-  @property({
-    objectRef: '',
-  })
-  description?: string = null;
+  @property()
+  description?: string;
 
   /**
    * 关于 TS 的 typeParams
    */
-  @property({
-    objectRef: '',
-  })
-  tsTypeParams?: string = null;
+  @property()
+  tsTypeParams?: string;
 
   /**
    * 组件属性列表
@@ -177,10 +163,8 @@ export class ViewComponentDeclaration extends BaseNode {
   /**
    * 国际化配置列表
    */
-  @property({
-    objectRef: '',
-  })
-  i18nMap: Map<string, Map<string, string>> = new Map();
+  @property()
+  i18nMap?: Record<string, Record<string, string>>;
 
   /**
    * @param source 需要合并的部分参数