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

package/src/concepts/BinaryExpression__.ts

@@ -101,9 +101,7 @@ export class BinaryExpression extends LogicItem {
   /**
    * 运算符
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   operator:
     | '+'
     | '-'
@@ -204,9 +202,9 @@ export class BinaryExpression extends LogicItem {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
-  get processType () {
-    if(this.left?.concept === 'MemberExpression') {
-      return (this.left as MemberExpression)?.lastObject?.name
+  get processType() {
+    if (this.left?.concept === 'MemberExpression') {
+      return (this.left as MemberExpression)?.lastObject?.name;
     }
     return null;
   }
@@ -355,7 +353,11 @@ export class BinaryExpression extends LogicItem {
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
-    if(['in', 'contains'].includes(self.operator) && self.parentNode?.concept === 'FlowConditionV2' && self.right.concept === 'NewList') {
+    if (
+      ['in', 'contains'].includes(self.operator) &&
+      self.parentNode?.concept === 'FlowConditionV2' &&
+      self.right.concept === 'NewList'
+    ) {
       let code = '';
       code += `nasl.langUtil.ruleIn(`;
       code += self.left?.toEmbeddedTS

package/src/concepts/BindAttribute__.ts

@@ -63,26 +63,20 @@ export class BindAttribute extends BaseNode {
   /**
    * 元素绑定属性名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: 'string' | 'static' | 'dynamic';
 
   /**
    * 属性值
    */
-  @property({
-    objectRef: '',
-  })
-  value?: string = null;
+  @property()
+  value?: string;
 
   /**
    * 属性表达式
@@ -90,7 +84,7 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  expression?: LogicItem = null;
+  expression?: LogicItem;
 
   /**
    * 跳转页面
@@ -98,7 +92,7 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'Destination',
   })
-  destination?: Destination = null;
+  destination?: Destination;
 
   /**
    * 跳转页面
@@ -106,7 +100,7 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'ExternalDestination',
   })
-  externalDestination?: ExternalDestination = null;
+  externalDestination?: ExternalDestination;
 
   /**
    * 验证规则
@@ -116,7 +110,7 @@ export class BindAttribute extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  rules?: Array<ValidationRule> = null;
+  rules?: Array<ValidationRule>;
 
   /**
    * 经办人
@@ -124,7 +118,7 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'Assignee',
   })
-  assignee?: Assignee = null;
+  assignee?: Assignee;
 
   /**
    * 经办人
@@ -132,23 +126,19 @@ export class BindAttribute extends BaseNode {
   @property({
     objectRef: 'AssigneeV2',
   })
-  assigneeV2?: AssigneeV2 = null;
+  assigneeV2?: AssigneeV2;
 
   /**
    * 是否使用 v-model
    */
-  @property({
-    objectRef: '',
-  })
-  model?: boolean = null;
+  @property()
+  model?: boolean;
 
   /**
    * 是否开启双向绑定
    */
-  @property({
-    objectRef: '',
-  })
-  sync?: boolean = null;
+  @property()
+  sync?: boolean;
 
   /**
    * 草稿态
@@ -163,10 +153,8 @@ export class BindAttribute extends BaseNode {
   /**
    * 国际化键
    */
-  @property({
-    objectRef: '',
-  })
-  i18nKey?: string = null;
+  @property()
+  i18nKey?: string;
 
   /**
    * @param source 需要合并的部分参数
@@ -1110,7 +1098,9 @@ export class BindAttribute extends BaseNode {
     let code = `${this.name}: `;
 
     if (['destination', 'externalDestination'].includes(this.name) && this.type === 'dynamic') {
-      code += (this as any)[this.name].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+      code += (this as any)[this.name].toNaturalTS(
+        shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }),
+      );
     } else if (this.name === 'rules') {
       code += '[\n';
       this.rules?.forEach((item) => {
@@ -1119,10 +1109,8 @@ export class BindAttribute extends BaseNode {
       });
       code += `\n${indent(state.tabSize)}]`;
     } else {
-      if (this.type === 'string')
-        code += `'${this.value?.replace(/'/g, "\\'")}'`;
-      else if (this.type === 'static')
-        code += `${this.value}`;
+      if (this.type === 'string') code += `'${this.value?.replace(/'/g, "\\'")}'`;
+      else if (this.type === 'static') code += `${this.value}`;
       else {
         code += this.expression?.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
       }
@@ -1136,7 +1124,9 @@ export class BindAttribute extends BaseNode {
     let code = `${this.name} = `;
 
     if (['destination', 'externalDestination'].includes(this.name) && this.type === 'dynamic') {
-      code += (this as any)[this.name].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }));
+      code += (this as any)[this.name].toNaturalTS(
+        shiftState(state, code, { tabSize: state.tabSize + 1, inline: true }),
+      );
     } else if (this.name === 'rules') {
       code += '[\n';
       this.rules?.forEach((item) => {
@@ -1145,10 +1135,8 @@ export class BindAttribute extends BaseNode {
       });
       code += '\n]';
     } else {
-      if (this.type === 'string')
-        code += `'${this.value.replace(/'/g, "\\'")}'`;
-      else if (this.type === 'static')
-        code += `${this.value}`;
+      if (this.type === 'string') code += `'${this.value.replace(/'/g, "\\'")}'`;
+      else if (this.type === 'static') code += `${this.value}`;
       else {
         code += this.expression?.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize, inline: true }));
       }

package/src/concepts/BindDirective__.ts

@@ -52,34 +52,26 @@ export class BindDirective extends BaseNode {
   /**
    * 元素指令名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
    * 原始名称
    */
-  @property({
-    objectRef: '',
-  })
-  rawName: string;
+  @property()
+  rawName?: string;
 
   /**
    * type
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   type: 'string' | 'static' | 'dynamic';
 
   /**
    * 指令值
    */
-  @property({
-    objectRef: '',
-  })
-  value: string;
+  @property()
+  value?: string;
 
   /**
    * 属性表达式
@@ -87,23 +79,19 @@ export class BindDirective extends BaseNode {
   @property({
     objectRef: 'LogicItem',
   })
-  expression: LogicItem;
+  expression?: LogicItem;
 
   /**
    * 指令参数
    */
-  @property({
-    objectRef: '',
-  })
-  arg: string;
+  @property()
+  arg?: string;
 
   /**
    * 指令修饰器
    */
-  @property({
-    objectRef: '',
-  })
-  modifiers: string;
+  @property()
+  modifiers?: string;
 
   /**
    * 草稿态
@@ -118,10 +106,8 @@ export class BindDirective extends BaseNode {
   /**
    * 国际化键
    */
-  @property({
-    objectRef: '',
-  })
-  i18nKey: string;
+  @property()
+  i18nKey?: string;
 
   /**
    * @param source 需要合并的部分参数

package/src/concepts/BindEvent__.ts

@@ -61,9 +61,7 @@ export class BindEvent extends BaseNode {
   /**
    * 元素绑定事件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**
@@ -79,18 +77,14 @@ export class BindEvent extends BaseNode {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
-  calleeNamespace: string;
+  @property()
+  calleeNamespace?: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
-  calleeName: string;
+  @property()
+  calleeName?: string;
 
   /**
    * 实际参数
@@ -100,7 +94,7 @@ export class BindEvent extends BaseNode {
     isArray: true,
     defaultValue: null,
   })
-  arguments: Array<Argument> = [];
+  arguments?: Array<Argument>;
 
   /**
    * @param source 需要合并的部分参数
@@ -663,7 +657,7 @@ export class BindEvent extends BaseNode {
     });
 
     code += `${indent(state.tabSize)}]`;
-    
+
     return code;
   }
 

package/src/concepts/BindStyle__.ts

@@ -53,9 +53,7 @@ export class BindStyle extends BaseNode {
   /**
    * 元素绑定样式名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string = '';
 
   /**

package/src/concepts/BooleanLiteral__.ts

@@ -46,9 +46,7 @@ export class BooleanLiteral extends LogicItem {
   /**
    * 字面量的值
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   value: string;
 
   /**

package/src/concepts/BusinessComponent__.ts

@@ -71,25 +71,19 @@ export class BusinessComponent extends BaseNode {
   /**
    * 业务组件名称
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   name: string;
 
   /**
    * 业务组件标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   title: string;
 
   /**
    * 业务组件描述
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   description: string;
 
   /**
@@ -155,9 +149,7 @@ export class BusinessComponent extends BaseNode {
   /**
    * icon
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   icon: string;
 
   /**
@@ -1895,10 +1887,15 @@ export class BusinessComponent extends BaseNode {
     });
   }
   // 获取当前element，铺平
-  elementsAttrs(elements: Array<ViewElement>, componentList: Array<ViewElement>, allComponentList: Array<ViewElement & {currentIndex: number}>, currentIndex: number) {
+  elementsAttrs(
+    elements: Array<ViewElement>,
+    componentList: Array<ViewElement>,
+    allComponentList: Array<ViewElement & { currentIndex: number }>,
+    currentIndex: number,
+  ) {
     if (elements) {
       elements.forEach((item: ViewElement & { currentIndex: number }) => {
-        let index = currentIndex ?? -1
+        let index = currentIndex ?? -1;
         if (item.tag === 'template' && item.haveScope()) {
           index += 1;
         }
@@ -1906,7 +1903,7 @@ export class BusinessComponent extends BaseNode {
           componentList.push(item);
         }
         item.currentIndex = index;
-        allComponentList.push(item)
+        allComponentList.push(item);
         if (item.children.length > 0) {
           this.elementsAttrs(item.children, componentList, allComponentList, index);
         }
@@ -1999,14 +1996,13 @@ export class BusinessComponent extends BaseNode {
     const callFunctionAdvanceMap: Map<Variable, CallFunction> = new Map();
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
       if (
-        el && (
-          // 批量赋值
-          asserts.isBatchAssignment(el) ||
+        el &&
+        // 批量赋值
+        (asserts.isBatchAssignment(el) ||
           // 赋值
           (asserts.isAssignment(el) && el.left?.name) ||
           // 内置函数对集合类型的推导
-          (asserts.isCallFunction(el) && el.derivablecollection?.name)
-        )
+          (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(

package/src/concepts/BusinessLogic__.ts

@@ -50,9 +50,7 @@ export class BusinessLogic extends Logic {
   /**
    * 是否开放外部调用
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   isPublic: boolean;
 
   /**
@@ -139,14 +137,13 @@ export class BusinessLogic extends Logic {
     const callFunctionAdvanceMap: Map<Return | Variable, CallFunction> = new Map();
     yield* self.traverseChildrenGenerator(function* traverseChildrenGenerator(el) {
       if (
-        el && (
-          // 批量赋值
-          asserts.isBatchAssignment(el) ||
+        el &&
+        // 批量赋值
+        (asserts.isBatchAssignment(el) ||
           // 赋值
           (asserts.isAssignment(el) && el.left?.name) ||
           // 内置函数对集合类型的推导
-          (asserts.isCallFunction(el) && el.derivablecollection?.name)
-        )
+          (asserts.isCallFunction(el) && el.derivablecollection?.name))
       ) {
         if (asserts.isAssignment(el)) {
           const advanceVar = self.variables?.find(
@@ -175,7 +172,7 @@ export class BusinessLogic extends Logic {
               leftIndex.length === 1
                 ? yield* el.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
                 : yield* el.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-                returnOrigin('');
+                    returnOrigin('');
             const advanceVar = self.variables?.find(
               (variable) => !variable.typeAnnotation && leftCode === variable.name,
             );
@@ -249,7 +246,7 @@ export class BusinessLogic extends Logic {
             leftIndex.length === 1
               ? yield* assignment.left.expression.toEmbeddedTS(shiftState(state, code, { inline: true }))
               : yield* assignment.left.members[leftIndex[1]]?.toEmbeddedTS(shiftState(state, code, { inline: true })) ??
-              returnOrigin('');
+                  returnOrigin('');
           if (leftCode === node.name) {
             const rightNode: any =
               rightIndex.length === 1

package/src/concepts/CallConnector__.ts

@@ -55,17 +55,13 @@ export class CallConnector extends CallLogic {
   /**
    * calleeConnectionName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeConnectionName: string;
 
   /**
    * 调用连接器标题
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   label: string = '连接器';
 
   /**
@@ -206,7 +202,7 @@ export class CallConnector extends CallLogic {
           };
         });
       }
-    } catch (err) { }
+    } catch (err) {}
     return node;
   }
 

package/src/concepts/CallEvent__.ts

@@ -48,17 +48,13 @@ export class CallEvent extends LogicItem {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**

package/src/concepts/CallFunction__.ts

@@ -60,26 +60,20 @@ export class CallFunction extends LogicItem {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
    * shortcut
    */
-  @property({
-    objectRef: '',
-  })
-  shortcut: boolean;
+  @property()
+  shortcut?: boolean;
 
   /**
    * 类型参数
@@ -89,7 +83,7 @@ export class CallFunction extends LogicItem {
     isArray: true,
     defaultValue: null,
   })
-  typeArguments?: Array<TypeAnnotation> = null;
+  typeArguments?: Array<TypeAnnotation>;
 
   /**
    * 实际参数
@@ -644,8 +638,7 @@ export class CallFunction extends LogicItem {
       const typeAnnotation = self.typeArguments[0];
       code += `<`;
       code += `${yield* typeAnnotation.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }))}>()`;
-    }
-    else {
+    } else {
       code = self.calleeKey;
       if (Array.isArray(self.typeArguments) && self.typeArguments.length) {
         // 如果有内容

package/src/concepts/CallInterface__.ts

@@ -63,26 +63,20 @@ export class CallInterface extends LogicItem {
   /**
    * calleeNamespace
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeNamespace: string;
 
   /**
    * calleeName
    */
-  @property({
-    objectRef: '',
-  })
+  @property()
   calleeName: string;
 
   /**
    * shortcut
    */
-  @property({
-    objectRef: '',
-  })
-  shortcut: boolean;
+  @property()
+  shortcut?: boolean;
 
   /**
    * 实际参数
@@ -347,9 +341,9 @@ export class CallInterface extends LogicItem {
     const { calleewholeKey, app, completeArguments } = this;
     let [, _name, , _interfaceName] = calleewholeKey.split('.');
     let isAppInterface = calleewholeKey.startsWith('app.interfaces');
-    if(!_interfaceName && isAppInterface){
+    if (!_interfaceName && isAppInterface) {
       // 兼容此两种情况 1 "apis.hsjtest.interfaces.dsfsdf" 2 "app.interfaces.fffffffff"
-      _interfaceName = calleewholeKey.split('.')?.[2]
+      _interfaceName = calleewholeKey.split('.')?.[2];
     }
     let _module: Module | Connector | App;
     // 由于自定义连接器的引入，目前在 集成中心下也存在着一部分接口
@@ -364,7 +358,7 @@ export class CallInterface extends LogicItem {
       // default
       _module = app?.interfaceDependencies?.find?.((item) => item.name === _name);
     }
-    if(isAppInterface){
+    if (isAppInterface) {
       _module = app;
     }
     const _interface = (_module as Module)?.interfaces?.find?.((item) => item.name === _interfaceName);
@@ -700,8 +694,7 @@ export class CallInterface extends LogicItem {
     }
     if (this.arguments?.length) {
       this.arguments.forEach((arg) => {
-        if (!arg)
-          return;
+        if (!arg) return;
         const idx = logicParam.findIndex((params) => arg.keyword === params.name);
         const param = logicParam[idx];